[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: Re: extragear/multimedia/amarok/src/playlist
From: "Seb Ruiz" <ruiz () kde ! org>
Date: 2009-01-11 1:31:37
Message-ID: 60ebdd0b0901101731w2a303f8as72840eb76828d897 () mail ! gmail ! com
[Download RAW message or body]
2009/1/10 Nikolaj Hald Nielsen <nhnfreespirit@gmail.com>:
> whoa! You just killed the "play with the playlist layout until we get
> a real editor widget" drop-down box:
>
> - LayoutConfigWidget * configWidget = new LayoutConfigWidget( this );
>
> Please don't do that, for now I need this for testing! :-)
Haha woops, sorry - I didn't mean to actually do that.
>
> - Nikolaj
>
> On Sat, Jan 10, 2009 at 6:33 AM, Seb Ruiz <ruiz@kde.org> wrote:
>> SVN commit 908670 by seb:
>>
>> Style fixes
>>
>> M +0 -2 PlaylistWidget.cpp
>> M +4 -10 navigators/NavigatorFilterProxyModel.h
>> M +5 -8 view/listview/PrettyListView.cpp
>>
>>
>> --- trunk/extragear/multimedia/amarok/src/playlist/PlaylistWidget.cpp #908669:908670
>> @@ -53,8 +53,6 @@
>> QVBoxLayout* mainPlaylistlayout = new QVBoxLayout( layoutHolder );
>> mainPlaylistlayout->setContentsMargins( 0, 0, 0, 0 );
>>
>> - LayoutConfigWidget * configWidget = new LayoutConfigWidget( this );
>> -
>> PrettyListView* playView = new PrettyListView( this );
>> playView->show();
>> m_playlistView = qobject_cast<QWidget*>( playView );
>> --- trunk/extragear/multimedia/amarok/src/playlist/navigators/NavigatorFilterProxyModel.h #908669:908670
>> @@ -24,8 +24,8 @@
>>
>> #include "playlist/PlaylistItem.h"
>>
>> -namespace Playlist {
>> -
>> +namespace Playlist
>> +{
>> /**
>> A proxy model used by navigators to only operate on tracks that match the current paylist search term
>>
>> @@ -35,7 +35,8 @@
>>
>> @author Nikolaj Hald Nielsen <nhnFreespirit@gmail.com>
>> */
>> -class NavigatorFilterProxyModel : public QSortFilterProxyModel {
>> +class NavigatorFilterProxyModel : public QSortFilterProxyModel
>> +{
>> Q_OBJECT
>> public:
>>
>> @@ -102,7 +103,6 @@
>> */
>> void setPassThrough( bool passThrough );
>>
>> -
>> QVariant data( const QModelIndex& index, int role ) const;
>>
>> bool rowExists( int row ) const;
>> @@ -115,9 +115,6 @@
>> QMimeData* mimeData( const QModelIndexList& ) const;
>> bool dropMimeData( const QMimeData*, Qt::DropAction, int, int, const QModelIndex& );
>>
>> -
>> -
>> -
>> int find( const QString & searchTerm, int searchFields );
>> int findNext( const QString & searchTerm, int selectedRow, int searchFields );
>> int findPrevious( const QString & searchTerm, int selectedRow, int searchFields );
>> @@ -139,7 +136,6 @@
>> virtual bool filterAcceptsRow ( int row, const QModelIndex & source_parent ) const;
>>
>> protected slots:
>> -
>> /**
>> * Slot called when the source model has inserted new tracks. Uses filterAcceptsRow
>> * to determine if a given id should be included in the list forwarded to any
>> @@ -157,7 +153,6 @@
>> void slotRemovedIds( const QList<quint64> &ids );
>>
>> signals:
>> -
>> /**
>> * Signal forwarded from the source model.
>> * @param the list of id's added that are also represented by this proxy.
>> @@ -176,7 +171,6 @@
>> void filterChanged();
>>
>> private:
>> -
>> /**
>> * Constructor.
>> */
>> --- trunk/extragear/multimedia/amarok/src/playlist/view/listview/PrettyListView.cpp #908669:908670
>> @@ -311,10 +311,7 @@
>> mousePressPos.ry() += verticalOffset();
>> return PrettyItemDelegate::insideItemHeader( mousePressPos, rectForIndex( index ) );
>> }
>> - else
>> - {
>> - return false;
>> - }
>> + return false;
>> }
>>
>> void
>> @@ -394,7 +391,8 @@
>> updateProxy = true;
>>
>> int row = GroupingProxy::instance()->find( searchTerm, fields );
>> - if( row != -1 ) {
>> + if( row != -1 )
>> + {
>> //select this track
>> debug() << "Got match at row: " << row;
>>
>> @@ -407,9 +405,9 @@
>> scrollTo( foundIndex, QAbstractItemView::PositionAtCenter );
>>
>> emit( found() );
>> - } else {
>> - emit( notFound() );
>> }
>> + else
>> + emit( notFound() );
>>
>>
>> //instead of kicking the proxy right away, start a 500msec timeout.
>> @@ -419,7 +417,6 @@
>> //before this timeout. Only start count if values have actually changed!
>> if ( updateProxy )
>> startProxyUpdateTimeout();
>> -
>> }
>>
>> void Playlist::PrettyListView::findNext( const QString & searchTerm, int fields )
>>
>
--
Seb Ruiz
http://www.sebruiz.net/
http://amarok.kde.org/
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic