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

Merge branch 'master' of git://github.com/tomahawk-player/tomahawk

Browse Source
This commit is contained in:
Dominik Schmidt
2011-05-02 04:04:12 +02:00
parent 0d43d54c3b 6340b82921
commit 819fc4881e
3 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libtomahawk/database/localcollection.cpp
View File

@@ -22,8 +22,7 @@
#include "sourcelist.h" #include "sourcelist.h"
#include "viewmanager.h" #include "viewmanager.h"
#include <tomahawksettings.h>
#define MAGIC_BOOKMARK_GUID "_bookmarkplaylist"
LocalCollection::LocalCollection( const Tomahawk::source_ptr& source, QObject* parent ) LocalCollection::LocalCollection( const Tomahawk::source_ptr& source, QObject* parent )
: DatabaseCollection( source, parent ) : DatabaseCollection( source, parent )
@@ -34,18 +33,23 @@ LocalCollection::LocalCollection( const Tomahawk::source_ptr& source, QObject* p
Tomahawk::playlist_ptr Tomahawk::playlist_ptr
LocalCollection::bookmarksPlaylist() LocalCollection::bookmarksPlaylist()
{ {
return playlist( MAGIC_BOOKMARK_GUID ); if( TomahawkSettings::instance()->bookmarkPlaylist().isEmpty() )
return Tomahawk::playlist_ptr();
return playlist( TomahawkSettings::instance()->bookmarkPlaylist() );
} }
void void
LocalCollection::createBookmarksPlaylist() LocalCollection::createBookmarksPlaylist()
{ {
if( bookmarksPlaylist().isNull() ) { if( bookmarksPlaylist().isNull() ) {
Tomahawk::playlist_ptr p = Tomahawk::Playlist::create( SourceList::instance()->getLocal(), MAGIC_BOOKMARK_GUID, tr( "Bookmarks" ), tr( "Saved tracks" ), QString(), false ); QString guid = uuid();
Tomahawk::playlist_ptr p = Tomahawk::Playlist::create( SourceList::instance()->getLocal(), guid, tr( "Bookmarks" ), tr( "Saved tracks" ), QString(), false );
ViewManager::instance()->createPageForPlaylist( p ); ViewManager::instance()->createPageForPlaylist( p );
// connect( p.data(), SIGNAL( revisionLoaded( Tomahawk::PlaylistRevision ) ), this, SLOT( loaded( Tomahawk::PlaylistRevision ) ), Qt::QueuedConnection ); // connect( p.data(), SIGNAL( revisionLoaded( Tomahawk::PlaylistRevision ) ), this, SLOT( loaded( Tomahawk::PlaylistRevision ) ), Qt::QueuedConnection );
connect( p.data(), SIGNAL( created() ), this, SLOT( created() ) ); connect( p.data(), SIGNAL( created() ), this, SLOT( created() ) );
TomahawkSettings::instance()->setBookmarkPlaylist( guid );
// p->createNewRevision( uuid(), p->currentrevision(), QList< Tomahawk::plentry_ptr >() ); // p->createNewRevision( uuid(), p->currentrevision(), QList< Tomahawk::plentry_ptr >() );
} }
} }

12
src/libtomahawk/tomahawksettings.cpp
View File

@@ -306,6 +306,18 @@ TomahawkSettings::appendRecentlyPlayedPlaylist( const Tomahawk::playlist_ptr& pl
setValue( "playlists/recentlyPlayed", playlist_guids ); setValue( "playlists/recentlyPlayed", playlist_guids );
} }
QString
TomahawkSettings::bookmarkPlaylist() const
{
return value( "playlists/bookmark", QString() ).toString();
}
void
TomahawkSettings::setBookmarkPlaylist( const QString& guid )
{
setValue( "playlists/bookmark", guid );
}
bool bool
TomahawkSettings::jabberAutoConnect() const TomahawkSettings::jabberAutoConnect() const

3
src/libtomahawk/tomahawksettings.h
View File

@@ -68,6 +68,9 @@ public:
QList<Tomahawk::playlist_ptr> recentlyPlayedPlaylists() const; QList<Tomahawk::playlist_ptr> recentlyPlayedPlaylists() const;
void appendRecentlyPlayedPlaylist( const Tomahawk::playlist_ptr& playlist ); void appendRecentlyPlayedPlaylist( const Tomahawk::playlist_ptr& playlist );
void setBookmarkPlaylist( const QString& guid );
QString bookmarkPlaylist() const;
/// Jabber settings /// Jabber settings
bool jabberAutoConnect() const; /// true by default bool jabberAutoConnect() const; /// true by default
void setJabberAutoConnect( bool autoconnect = false ); void setJabberAutoConnect( bool autoconnect = false );