#undef ADD_ICON
rebuild( p_root );
- CONNECT( THEMIM->getIM(), metaChanged( int ),
- this, ProcessInputItemUpdate( int ) );
+ CONNECT( THEMIM->getIM(), metaChanged( input_item_t *),
+ this, ProcessInputItemUpdate( input_item_t *) );
CONNECT( THEMIM, inputChanged( input_thread_t * ),
this, ProcessInputItemUpdate( input_thread_t* ) );
}
Qt::ItemFlags PLModel::flags( const QModelIndex &index ) const
{
- Qt::ItemFlags defaultFlags = QAbstractItemModel::flags( index );
- if( index.isValid() )
- return Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled | defaultFlags;
+ Qt::ItemFlags flags = QAbstractItemModel::flags( index );
+
+ PLItem *item = index.isValid() ?
+ static_cast<PLItem*>( index.internalPointer() ) :
+ rootItem;
+
+ int pl_input_id = p_playlist->p_local_category->p_input->i_id;
+ int ml_input_id = p_playlist->p_ml_category->p_input->i_id;
+
+ if( rootItem->i_id == p_playlist->p_root_onelevel->i_id
+ || rootItem->i_id == p_playlist->p_root_category->i_id )
+ {
+ if( item->i_input_id == pl_input_id
+ || item->i_input_id == ml_input_id )
+ flags |= Qt::ItemIsDropEnabled;
+ }
else
- return Qt::ItemIsDropEnabled | defaultFlags;
+ {
+ if ( item->b_is_node &&
+ ( rootItem->i_input_id == pl_input_id ||
+ rootItem->i_input_id == ml_input_id ) )
+ flags |= Qt::ItemIsDropEnabled;
+ flags |= Qt::ItemIsDragEnabled;
+ }
+
+ return flags;
}
/* A list of model indexes are a playlist */
QMimeData *mimeData = new QMimeData();
QByteArray encodedData;
QDataStream stream( &encodedData, QIODevice::WriteOnly );
+ QModelIndexList list;
foreach( const QModelIndex &index, indexes ) {
if( index.isValid() && index.column() == 0 )
- stream << itemId( index );
+ list.append(index);
+ }
+
+ qSort(list);
+
+ foreach( const QModelIndex &index, list ) {
+ stream << itemId( index );
}
mimeData->setData( "vlc/playlist-item-id", encodedData );
return mimeData;
/* Drop operation */
bool PLModel::dropMimeData( const QMimeData *data, Qt::DropAction action,
- int row, int column, const QModelIndex &target )
+ int row, int column, const QModelIndex &parent )
{
if( data->hasFormat( "vlc/playlist-item-id" ) )
{
if( action == Qt::IgnoreAction )
return true;
- if( !target.isValid() )
- /* We don't want to move on an invalid position */
- return true;
+ PL_LOCK;
- PLItem *targetItem = static_cast<PLItem*>( target.internalPointer() );
+ playlist_item_t *p_parent;
+
+ if( !parent.isValid())
+ {
+ if( row > -1)
+ {
+ // dropped into top node
+ p_parent = playlist_ItemGetById( p_playlist, rootItem->i_id );
+ }
+ else
+ {
+ // dropped outside any item
+ PL_UNLOCK;
+ return true;
+ }
+ }
+ else
+ {
+ // dropped into/onto an item (depends on (row = -1) or (row > -1))
+ p_parent = playlist_ItemGetById( p_playlist, itemId ( parent ) );
+ }
+ if( !p_parent || p_parent->i_children == -1 )
+ {
+ PL_UNLOCK;
+ return false;
+ }
QByteArray encodedData = data->data( "vlc/playlist-item-id" );
QDataStream stream( &encodedData, QIODevice::ReadOnly );
- PLItem *newParentItem;
+ /* easiest way to never miss the right index to move to is to
+ track the previously moved item */
+ playlist_item_t *p_target = NULL;
+
while( !stream.atEnd() )
{
- int i;
- int srcId;
- stream >> srcId;
-
- PL_LOCK;
- playlist_item_t *p_target =
- playlist_ItemGetById( p_playlist, targetItem->i_id );
- playlist_item_t *p_src = playlist_ItemGetById( p_playlist, srcId );
+ int src_id;
+ stream >> src_id;
+ playlist_item_t *p_src = playlist_ItemGetById( p_playlist, src_id );
- if( !p_target || !p_src )
+ if( !p_src )
{
PL_UNLOCK;
return false;
}
- if( p_target->i_children == -1 ) /* A leaf */
+ if( !p_target )
{
- PLItem *parentItem = targetItem->parent();
- assert( parentItem );
- playlist_item_t *p_parent =
- playlist_ItemGetById( p_playlist, parentItem->i_id );
- if( !p_parent )
+ if(row == -1)
{
- PL_UNLOCK;
- return false;
+ playlist_TreeMove( p_playlist, p_src, p_parent, 0 );
+ }
+ else {
+ playlist_TreeMove( p_playlist, p_src, p_parent, row );
}
- for( i = 0 ; i< p_parent->i_children ; i++ )
- if( p_parent->pp_children[i] == p_target ) break;
- // Move the item to the element after i
- playlist_TreeMove( p_playlist, p_src, p_parent, i + 1 );
- newParentItem = parentItem;
}
else
{
- /* \todo: if we drop on a top-level node, use copy instead ? */
- playlist_TreeMove( p_playlist, p_src, p_target, 0 );
- i = 0;
- newParentItem = targetItem;
+ int i;
+ for( i = 0 ; i< p_parent->i_children ; i++ )
+ if( p_parent->pp_children[i] == p_target ) break;
+ playlist_TreeMove( p_playlist, p_src, p_parent, i + 1 );
}
- PL_UNLOCK;
+ p_target = p_src;
}
+ PL_UNLOCK;
/*TODO: That's not a good idea to rebuild the playlist */
rebuild();
}
PLItem *item = static_cast<PLItem*>(index.internalPointer());
if( role == Qt::DisplayRole )
{
- return QVariant( item->columnString( index.column() ) );
+ int running_index = -1;
+ int columncount = 0;
+ int metadata = 1;
+
+ if( item->model->i_depth == DEPTH_SEL )
+ {
+ vlc_mutex_lock( &item->p_input->lock );
+ QString returninfo = QString( qfu( item->p_input->psz_name ) );
+ vlc_mutex_unlock( &item->p_input->lock );
+ return QVariant(returninfo);
+ }
+
+ while( metadata < COLUMN_END )
+ {
+ if( item->i_showflags & metadata )
+ running_index++;
+ if( running_index == index.column() )
+ break;
+ metadata <<= 1;
+ }
+
+ if( running_index != index.column() ) return QVariant();
+
+ QString returninfo;
+ if( metadata == COLUMN_NUMBER )
+ returninfo = QString::number( index.row() + 1 );
+ else
+ {
+ char *psz = psz_column_meta( item->p_input, metadata );
+ returninfo = QString( qfu( psz ) );
+ free( psz );
+ }
+ return QVariant( returninfo );
}
else if( role == Qt::DecorationRole && index.column() == 0 )
{
QVariant PLModel::headerData( int section, Qt::Orientation orientation,
int role ) const
{
- if (orientation == Qt::Horizontal && role == Qt::DisplayRole)
- return QVariant( rootItem->columnString( section ) );
- return QVariant();
+ int metadata=1;
+ int running_index=-1;
+ if (orientation != Qt::Horizontal || role != Qt::DisplayRole)
+ return QVariant();
+
+ if( i_depth == DEPTH_SEL ) return QVariant( QString("") );
+
+ while( metadata < COLUMN_END )
+ {
+ if( metadata & rootItem->i_showflags )
+ running_index++;
+ if( running_index == section )
+ break;
+ metadata <<= 1;
+ }
+
+ if( running_index != section ) return QVariant();
+
+ return QVariant( qfu( psz_column_title( metadata ) ) );
}
QModelIndex PLModel::index( int row, int column, const QModelIndex &parent )
int PLModel::columnCount( const QModelIndex &i) const
{
- return rootItem->item_col_strings.count();
+ int columnCount=0;
+ int metadata=1;
+ if( i_depth == DEPTH_SEL ) return 1;
+
+ while( metadata < COLUMN_END )
+ {
+ if( metadata & rootItem->i_showflags )
+ columnCount++;
+ metadata <<= 1;
+ }
+ return columnCount;
}
int PLModel::childrenCount( const QModelIndex &parent ) const
void PLModel::ProcessInputItemUpdate( input_thread_t *p_input )
{
if( !p_input ) return;
- ProcessInputItemUpdate( input_GetItem( p_input )->i_id );
+ ProcessInputItemUpdate( input_GetItem( p_input ) );
+ if( p_input && !( p_input->b_dead || !vlc_object_alive( p_input ) ) )
+ {
+ PLItem *item = FindByInput( rootItem, input_GetItem( p_input )->i_id );
+ emit currentChanged( index( item, 0 ) );
+ }
}
-void PLModel::ProcessInputItemUpdate( int i_input_id )
+void PLModel::ProcessInputItemUpdate( input_item_t *p_item )
{
- if( i_input_id <= 0 ) return;
- PLItem *item = FindByInput( rootItem, i_input_id );
+ if( !p_item || p_item->i_id <= 0 ) return;
+ PLItem *item = FindByInput( rootItem, p_item->i_id );
if( item )
{
QPL_LOCK;
recurseDelete( item->children, &selected );
doDeleteItem( item, &selected );
}
+ if( i > selected.size() ) i = selected.size();
}
}
}
/* UNUSED emit layoutAboutToBeChanged(); */
- index = __MIN( index, rootItem->item_col_strings.count() );
+ index = __MIN( index, columnCount() );
QModelIndex parent = createIndex( 0, 0, rootItem );
if( rootItem->i_showflags & meta )
beginRemoveColumns( parent, index, index+1 );
rootItem->i_showflags &= ~( meta );
getSettings()->setValue( "qt-pl-showflags", rootItem->i_showflags );
- rootItem->updateColumnHeaders();
endRemoveColumns();
}
else
beginInsertColumns( parent, index, index+1 );
rootItem->i_showflags |= meta;
getSettings()->setValue( "qt-pl-showflags", rootItem->i_showflags );
- rootItem->updateColumnHeaders();
endInsertColumns();
}
+ emit columnsChanged( meta );
rebuild();
}
}