mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-11 08:34:34 +02:00
Code Issues Releases Wiki Activity

Introduced SourcesModel::DeletablePage. Fixes uppercasing WhatsNew-page.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2014-10-14 05:56:07 +02:00
parent c1d0cfcd29
commit f68a8dcc5f
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/tomahawk/sourcetree/SourceDelegate.cpp
View File

@@ -530,7 +530,7 @@ SourceDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, co
paintStandardItem( painter, optIndentation, index, count ); paintStandardItem( painter, optIndentation, index, count );
} }
else if ( type == SourcesModel::TemporaryPage ) else if ( type == SourcesModel::TemporaryPage || SourcesModel::DeletablePage )
{ {
if ( opt.state & QStyle::State_MouseOver ) if ( opt.state & QStyle::State_MouseOver )
{ {
@@ -660,7 +660,7 @@ SourceDelegate::editorEvent( QEvent* event, QAbstractItemModel* model, const QSt
if ( event->type() == QEvent::MouseButtonRelease || event->type() == QEvent::MouseButtonPress ) if ( event->type() == QEvent::MouseButtonRelease || event->type() == QEvent::MouseButtonPress )
{ {
SourcesModel::RowType type = static_cast< SourcesModel::RowType >( index.data( SourcesModel::SourceTreeItemTypeRole ).toInt() ); SourcesModel::RowType type = static_cast< SourcesModel::RowType >( index.data( SourcesModel::SourceTreeItemTypeRole ).toInt() );
if ( type == SourcesModel::TemporaryPage ) if ( type == SourcesModel::TemporaryPage || type == SourcesModel::DeletablePage )
{ {
SourceTreeItem* gpi = index.data( SourcesModel::SourceTreeItemRole ).value< SourceTreeItem* >(); SourceTreeItem* gpi = index.data( SourcesModel::SourceTreeItemRole ).value< SourceTreeItem* >();
Q_ASSERT( gpi ); Q_ASSERT( gpi );

3
src/tomahawk/sourcetree/SourcesModel.cpp
View File

@@ -329,9 +329,8 @@ void
SourcesModel::appendPageItem( const QString& name, ViewPage* page, int sortValue ) SourcesModel::appendPageItem( const QString& name, ViewPage* page, int sortValue )
{ {
// If there should be no page item, there is nothing to do for us here. // If there should be no page item, there is nothing to do for us here.
if ( !page->addPageItem() ) { if ( !page->addPageItem() )
return; return;
}
QModelIndex parentIndex = indexFromItem( m_browse ); QModelIndex parentIndex = indexFromItem( m_browse );
beginInsertRows( parentIndex, rowCount( parentIndex ), rowCount( parentIndex ) ); beginInsertRows( parentIndex, rowCount( parentIndex ), rowCount( parentIndex ) );

1
src/tomahawk/sourcetree/SourcesModel.h
View File

@@ -62,6 +62,7 @@ public:
GenericPage = 6, GenericPage = 6,
TemporaryPage = 7, TemporaryPage = 7,
LovedTracksPage = 10, LovedTracksPage = 10,
DeletablePage = 15,
Collection = 14, Collection = 14,
ScriptCollection = 11, ScriptCollection = 11,

2
src/tomahawk/sourcetree/items/GenericPageItems.cpp
View File

@@ -121,7 +121,7 @@ GenericPageItem::setDeletable( bool deletable )
{ {
if ( deletable ) if ( deletable )
{ {
setRowType( SourcesModel::TemporaryPage ); setRowType( SourcesModel::DeletablePage );
} }
else else
{ {