add supercollection back

turn off proxy and cleanup trying to find signal issue
fix parent() that was causing all sorts of weird inserted bugs
fix removing to not work on a copy!

src/libtomahawk/database/databasecollection.h

@@ -51,7 +51,7 @@ public slots:
     virtual void removeTracks( const QDir& dir );
 
 private slots:
-    void dynamicPlaylistCreated( const Tomahawk::source_ptr& source, const QVariantList& data );
+//     void dynamicPlaylistCreated( const Tomahawk::source_ptr& source, const QVariantList& data );
 };
 
 #endif // DATABASECOLLECTION_H

src/sourcetree/sourcesmodel.cpp

@@ -33,7 +33,12 @@ SourcesModel::SourcesModel( QObject* parent )
     : QAbstractItemModel( parent )
 {
     m_rootItem = new SourceTreeItem( this, 0, Invalid );
+<<<<<<< HEAD
 
+=======
+    appendItem( source_ptr() );
+
+>>>>>>> add supercollection back
     onSourcesAdded( SourceList::instance()->sources() );
 
     connect( SourceList::instance(), SIGNAL( sourceAdded( Tomahawk::source_ptr ) ), SLOT( onSourceAdded( Tomahawk::source_ptr ) ) );
@@ -82,6 +87,7 @@ SourcesModel::rowCount( const QModelIndex& parent ) const
     return itemFromIndex( parent )->children().count();
 }
 
+<<<<<<< HEAD
 bool
 SourcesModel::hasChildren( const QModelIndex& parent ) const
 {
@@ -90,6 +96,9 @@ SourcesModel::hasChildren( const QModelIndex& parent ) const
 
 
 QModelIndex
+=======
+QModelIndex
+>>>>>>> add supercollection back
 SourcesModel::parent( const QModelIndex& child ) const
 {
 //     qDebug() << Q_FUNC_INFO << child;
@@ -101,8 +110,13 @@ SourcesModel::parent( const QModelIndex& child ) const
     SourceTreeItem* parent = node->parent();
     if( parent == m_rootItem )
         return QModelIndex();
+<<<<<<< HEAD
 
     return createIndex( rowForItem( node ), 0, parent );
+=======
+
+    return createIndex( rowForItem( parent ), 0, parent );
+>>>>>>> add supercollection back
 }
 
 QModelIndex
@@ -180,11 +194,18 @@ SourcesModel::appendItem( const Tomahawk::source_ptr& source )
 
     m_rootItem->appendChild( item );
     endInsertRows();
+<<<<<<< HEAD
 
     qDebug() << "Appending source item:" << item->source()->friendlyName();
 
+=======
+
+
+>>>>>>> add supercollection back
     if ( !source.isNull() )
     {
+        qDebug() << "Appending source item:" << item->source()->friendlyName();
+
         connect( source.data(), SIGNAL( stats( QVariantMap ) ), SLOT( onSourceChanged() ) );
         connect( source.data(), SIGNAL( playbackStarted( Tomahawk::query_ptr ) ), SLOT( onSourceChanged() ) );
         connect( source.data(), SIGNAL( stateChanged() ), SLOT( onSourceChanged() ) );
@@ -369,7 +390,7 @@ SourcesModel::indexFromItem( SourceTreeItem* item ) const
         idx = index( childIndexList[ i ], 0, idx );
     }
     qDebug() << "Got index from item:" << idx << idx.data( Qt::DisplayRole ).toString();
-
+    qDebug() << "parent:" << idx.parent();
     return idx;
 }
 

src/sourcetree/sourcesmodel.h

@@ -80,9 +80,8 @@ public:
     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;
-    virtual bool hasChildren( const QModelIndex& parent = QModelIndex() ) const;
 
-    void appendItem( const Tomahawk::source_ptr& source );
+        void appendItem( const Tomahawk::source_ptr& source );
     bool removeItem( const Tomahawk::source_ptr& source );
 
 signals:

src/sourcetree/sourcetreeitem.cpp

@@ -172,6 +172,9 @@ CollectionItem::CollectionItem(  SourcesModel* mdl, SourceTreeItem* parent, cons
     : SourceTreeItem( mdl, parent, SourcesModel::Collection )
     , m_source( source )
 {
+    if( m_source.isNull() ) { // super collection
+        return;
+    }
     // create category item
     m_playlists = new CategoryItem( model(), this, SourcesModel::PlaylistsCategory );
     appendChild( m_playlists );
@@ -237,14 +240,15 @@ CollectionItem::onPlaylistsAdded( const QList< playlist_ptr >& playlists )
 void 
 CollectionItem::onPlaylistsDeleted( const QList< playlist_ptr >& playlists )
 {
-    int curCount = m_playlists->children().count();
     foreach( const playlist_ptr& playlist, playlists ) {
+        int curCount = m_playlists->children().count();
         for( int i = 0; i < curCount; i++ ) {
             PlaylistItem* pl = qobject_cast< PlaylistItem* >( m_playlists->children().at( i ) );
             if( pl && pl->playlist() == playlist ) {
                 m_playlists->beginRowsRemoved( i, i );
-                m_playlists->children().removeAt( i );
+                m_playlists->removeChild( pl );
                 m_playlists->endRowsRemoved();
+                break;
             }
         }
     }

src/sourcetree/sourcetreeitem.h

@@ -85,6 +85,7 @@ public:
         return QString();
     }
     virtual void activate();
+    virtual Qt::ItemFlags flags() { return Qt::ItemIsEnabled; }
     
     SourcesModel::CategoryType categoryType() { return m_category; }
     

src/sourcetree/sourcetreeview.cpp

@@ -94,13 +94,11 @@ SourceTreeView::SourceTreeView( QWidget* parent )
     header()->setStretchLastSection( false );
     header()->setResizeMode( 0, QHeaderView::Stretch );
 
-    connect( m_model, SIGNAL( clicked( QModelIndex ) ), SIGNAL( clicked( QModelIndex ) ) );
+    connect( m_proxyModel, SIGNAL( clicked( QModelIndex ) ), SIGNAL( clicked( QModelIndex ) ) );
     connect( this, SIGNAL( clicked( QModelIndex ) ), SLOT( onItemActivated( QModelIndex ) ) );
 
     connect( selectionModel(), SIGNAL( selectionChanged( QItemSelection, QItemSelection ) ), SLOT( onSelectionChanged() ) );
 
-//     m_model->appendItem( source_ptr() );
-
     hideOfflineSources();
 
 //     connect( PlaylistManager::instance(), SIGNAL( playlistActivated( Tomahawk::playlist_ptr ) ),
@@ -488,7 +486,7 @@ SourceDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, co
     Q_ASSERT( item );
 
     QStyleOptionViewItemV4 o3 = option;
-    if ( type != SourcesModel::Collection )
+    if ( type != SourcesModel::Collection && type != SourcesModel::Category )
         o3.rect.setX( 0 );
 
     QApplication::style()->drawControl( QStyle::CE_ItemViewItem, &o3, painter );