mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-03-28 11:42:42 +01:00
Code Issues Releases Wiki Activity

Merge branch 'master' into watchforchanges-ng

Browse Source 
Conflicts:
	src/libtomahawk/infosystem/infosystem.cpp
	src/musicscanner.cpp
	src/scanmanager.cpp
	src/tomahawkapp.cpp
	src/tomahawkwindow.ui
This commit is contained in:
Jeff Mitchell 2011-05-30 09:56:45 -04:00
commit c98842935d
41 changed files with 655 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ChangeLog
View File

@ -1,6 +1,16 @@
Version 0.1.0:
* Fixed stations so they resolve against all available sources instead of
only local and friend's collections.
* Add a Song seed for stations and automatic playlists, and allow dragging of
any tracks to the New Stations entry to create a pre-seeded station.
* Added auto-completion for artists while filling in a station or automatic
playlist.
* SOCKS5 proxy support. Noproxy hosts are also supported but no wildcard
support (yet).
* Support loading of - and exporting to - .xspf playlists
* Added Tomahawk:// protocol support and share links for many things including
tracks, playlists, and stations.
* Autoload automatically detected resolvers on startup.
* Fix issue where track resolving spinner never stopped if tracks were
removed from playlist while resolving.
* Twitter & Jabber profile pictures are shown.
@ -9,18 +19,26 @@ Version 0.1.0:
* Add new Google account type that is a thin wrapper around a Jabber plugin.
* Overhaul the settings dialog interface.
* Resolvers can now be enabled and disabled, and some can be configured
directly in Tomahawk.
directly in Tomahawk, for example the new Spotify resolver.
* Split playlists and stations in sources sidebar. Show Recently Played
as a node under the Super Collection.
* Fix massive speed bottleneck on startup in the case of many recently
played playlists.
* Removed filter and song view from Super Collection, coming back in the next
release.
* Browse and play collections in our snappy tree-mode, which also shows
images for artists and albums.
* Fixed crash that could occur when playing a track from a browser.
* Fixed a crash caused by sources going on- or offline.
* Fixed a crash caused by sources going on or offline.
* Huge optimizations in the resolving pipeline.
* Improved the handling of automatic status messages for Google Talk
* Switch to Phonon sound system, allowing us to support a wide variety
of audio formats.
* UI tweaks and cleanup.
* (OS X) Open configuration dialogs as sliding sheets.
* (OS X) Increase our available file watches to the maximum that the system
reports.
* (OS X) Added 'Window' menu with zoom/minimize actions
Version 0.0.3:
* Show spinner while resolving playlists.

6
admin/mac/deposx.sh
View File

@ -85,8 +85,8 @@ function deplib_change
install_name_tool -change $ORIGROOT/libtomahawk_sipzeroconf.dylib @executable_path/libtomahawk_sipzeroconf.dylib $1
install_name_tool -change $ORIGROOT/libtomahawk_qtweetlib.dylib @executable_path/libtomahawk_qtweetlib.dylib $1
install_name_tool -change $ORIGROOT/libtomahawk_portfwd.dylib @executable_path/libtomahawk_portfwd.dylib $1
install_name_tool -change $ORIGROOT/libjreen.0.dylib @executable_path/libjreen.0.dylib $1
install_name_tool -change /usr/local/Cellar/jreen/HEAD/lib/libjreen.dylib @executable_path/libjreen.0.dylib $1
install_name_tool -change $ORIGROOT/libjreen.dylib @executable_path/libjreen.dylib $1
install_name_tool -change /usr/local/Cellar/jreen/HEAD/lib/libjreen.dylib @executable_path/libjreen.dylib $1
install_name_tool -change /usr/local/Cellar/qca/2.0.2/lib/qca.framework/Versions/2/qca @executable_path/../Frameworks/qca.framework/Versions/2/qca $1
install_name_tool -change /usr/local/Cellar/gettext/0.18.1.1/lib/libintl.8.dylib @executable_path/libintl.8.dylib $1
install_name_tool -change /usr/local/Cellar/vlc-git/HEAD/lib/libvlc.5.dylib @executable_path/libvlc.5.dylib $1
@ -127,7 +127,7 @@ import_lib /usr/local/Cellar/vlc-git/HEAD/lib/libvlc.5.dylib
import_lib /usr/local/Cellar/vlc-git/HEAD/lib/libvlccore.4.dylib
import_lib /usr/local/Cellar/gettext/0.18.1.1/lib/libintl.8.dylib
import_lib $ORIGROOT/libjreen.0.dylib
import_lib $ORIGROOT/libjreen.dylib
import_lib $ORIGROOT/libtomahawklib.dylib
import_lib $ORIGROOT/libtomahawk_sipjabber.dylib
import_lib $ORIGROOT/libtomahawk_sipgoogle.dylib

33
admin/win/nsi/tomahawk.nsi
View File

@ -15,9 +15,10 @@
;-----------------------------------------------------------------------------
; Some paths.
;-----------------------------------------------------------------------------
!define MING_PATH "/usr/i686-w64-mingw32/sys-root/mingw"
!ifndef MING_PATH
!define MING_PATH "/usr/i686-w64-mingw32/sys-root/mingw"
!endif
!define MING_BIN "${MING_PATH}/bin"
!define MING_DLL_PATH "${MING_BIN}"
!define MING_LIB "${MING_PATH}/lib"
!define ROOT_PATH "..\..\.." ; assuming the script is in ROOT/admin/win/nsi
!define BUILD_PATH "${ROOT_PATH}\build"
@ -316,20 +317,20 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
SetOutPath "$INSTDIR"
;Cygwin/c++ stuff
;File "${MING_DLL_PATH}\cygmad-0.dll"
;File "${MING_DLL_PATH}\libgcc_s_dw2-1.dll"
;File "${MING_DLL_PATH}\mingwm10.dll"
File "${MING_DLL_PATH}\libgcc_s_sjlj-1.dll"
File "${MING_DLL_PATH}\libstdc++-6.dll"
;File "${MING_BIN}\cygmad-0.dll"
;File "${MING_BIN}\libgcc_s_dw2-1.dll"
;File "${MING_BIN}\mingwm10.dll"
File "${MING_BIN}\libgcc_s_sjlj-1.dll"
File "${MING_BIN}\libstdc++-6.dll"
;Phonon stuff
;Fix the phonon build to not use Dbus
File "${QT_DLL_PATH}\QtDbus4.dll"
File "${MING_DLL_PATH}\libdbus-1-3.dll"
File "${MING_DLL_PATH}\dbus-daemon.exe"
File "${MING_BIN}\libdbus-1-3.dll"
File "${MING_BIN}\dbus-daemon.exe"
File "${MING_DLL_PATH}\libphonon.dll"
File "${MING_BIN}\libphonon.dll"
SetOutPath "$INSTDIR\phonon_backend"
File "${MING_BIN}\phonon_backend\phonon_vlc.dll"
SetOutPath "$INSTDIR"
@ -350,13 +351,13 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
; Other
File "${MING_DLL_PATH}\libqjson.dll"
File "${MING_DLL_PATH}\libtag.dll"
File "${MING_DLL_PATH}\libpng15-15.dll"
File "${MING_DLL_PATH}\libjpeg-8.dll"
File "${MING_DLL_PATH}\zlib1.dll"
File "${MING_BIN}\libqjson.dll"
File "${MING_BIN}\libtag.dll"
File "${MING_BIN}\libpng15-15.dll"
File "${MING_BIN}\libjpeg-8.dll"
File "${MING_BIN}\zlib1.dll"
File "${MING_DLL_PATH}\libechonest.dll"
File "${MING_BIN}\libechonest.dll"
File "${MING_BIN}\libQTweetLib.dll"
; Jabber

3
src/libtomahawk/CMakeLists.txt
View File

@ -162,6 +162,7 @@ set( libSources
utils/xspfgenerator.cpp
widgets/newplaylistwidget.cpp
widgets/playlisttypeselectordlg.cpp
widgets/welcomewidget.cpp
widgets/welcomeplaylistmodel.cpp
widgets/overlaywidget.cpp
@ -326,6 +327,7 @@ set( libHeaders
utils/xspfgenerator.h
widgets/newplaylistwidget.h
widgets/playlisttypeselectordlg.h
widgets/welcomewidget.h
widgets/welcomeplaylistmodel.h
widgets/overlaywidget.h
@ -341,6 +343,7 @@ set( libHeaders_NoMOC
playlist/dynamic/GeneratorInterface.h
)
set( libUI ${libUI}
widgets/playlisttypeselectordlg.ui
widgets/newplaylistwidget.ui
widgets/welcomewidget.ui
widgets/infowidgets/sourceinfowidget.ui

9
src/libtomahawk/audio/audioengine.cpp
View File

@ -64,7 +64,8 @@ AudioEngine::~AudioEngine()
{
qDebug() << Q_FUNC_INFO;
stop();
m_mediaObject->stop();
// stop();
delete m_audioOutput;
delete m_mediaObject;
@ -300,6 +301,12 @@ void
AudioEngine::onStateChanged( Phonon::State newState, Phonon::State oldState )
{
qDebug() << Q_FUNC_INFO << oldState << newState;
if ( newState == Phonon::ErrorState )
{
qDebug() << "Phonon Error:" << m_mediaObject->errorString() << m_mediaObject->errorType();
}
if ( oldState == Phonon::PlayingState && newState == Phonon::StoppedState )
{
if ( !m_expectStop )

5
src/libtomahawk/database/databasecommand_resolve.cpp
View File

@ -42,7 +42,10 @@ DatabaseCommand_Resolve::exec( DatabaseImpl* lib )
qDebug() << "Using result-hint to speed up resolving:" << m_query->resultHint();
Tomahawk::result_ptr result = lib->resultFromHint( m_query );
if ( !result.isNull() && result->collection()->source()->isOnline() )
/* qDebug() << "Result null:" << result.isNull();
qDebug() << "Collection null:" << result->collection().isNull();
qDebug() << "Source null:" << result->collection()->source().isNull();*/
if ( !result.isNull() && !result->collection().isNull() && result->collection()->source()->isOnline() )
{
res << result;
emit results( m_query->id(), res );

22
src/libtomahawk/infosystem/infosystem.cpp
View File

@ -86,30 +86,26 @@ InfoSystem::~InfoSystem()
if ( !m_worker.isNull() )
{
if( m_infoSystemWorkerThreadController )
{
m_worker.clear();
m_infoSystemWorkerThreadController->quit();
m_infoSystemWorkerThreadController->wait( 60000 );
delete m_infoSystemWorkerThreadController;
qDebug() << Q_FUNC_INFO << " worker thread controller finished, deleting worker";
m_infoSystemWorkerThreadController = 0;
}
}
m_infoSystemWorkerThreadController->quit();
m_infoSystemWorkerThreadController->wait( 60000 );
delete m_worker.data();
delete m_infoSystemWorkerThreadController;
m_infoSystemWorkerThreadController = 0;
}
qDebug() << Q_FUNC_INFO << " done deleting worker";
if( m_infoSystemCacheThreadController )
{
m_cache.clear();
m_infoSystemCacheThreadController->quit();
m_infoSystemCacheThreadController->wait( 60000 );
delete m_cache.data();
delete m_infoSystemCacheThreadController;
qDebug() << Q_FUNC_INFO << " cache thread controller finished, deleting cache";
m_infoSystemCacheThreadController = 0;
}
qDebug() << Q_FUNC_INFO << " done deleting cache, exiting";
qDebug() << Q_FUNC_INFO << " done deleting cache";
}

5
src/libtomahawk/playlist/dynamic/DynamicModel.cpp
View File

@ -64,7 +64,10 @@ DynamicModel::loadPlaylist( const Tomahawk::dynplaylist_ptr& playlist, bool load
QString
DynamicModel::description() const
{
return m_playlist->generator()->sentenceSummary();
if( !m_playlist.isNull() && !m_playlist->generator().isNull() )
return m_playlist->generator()->sentenceSummary();
else
return QString();
}

6
src/libtomahawk/playlist/dynamic/widgets/DynamicControlList.cpp
View File

@ -63,7 +63,11 @@ DynamicControlList::init()
m_layout->setColumnStretch( 2, 1 );
m_layout->setMargin( 0 );
m_layout->setVerticalSpacing( 0 );
#ifdef Q_WS_MAC // on OS X we don't want the right edge of the toolbuttons against the window
m_layout->setContentsMargins( 0, 0, 3, 0 );
#else
m_layout->setContentsMargins( 0, 0, 0, 0 );
#endif
m_layout->setSizeConstraint( QLayout::SetMinimumSize );
m_collapseLayout = new QHBoxLayout();
@ -139,7 +143,7 @@ void DynamicControlList::addNewControl()
m_layout->removeItem( m_collapseLayout );
dyncontrol_ptr control = m_generator->createControl();
m_controls.append( new DynamicControlWrapper( control, m_layout, m_controls.size(), this ) );
m_controls.append( new DynamicControlWrapper( control, m_layout, m_layout->rowCount(), this ) );
connect( m_controls.last(), SIGNAL( removeControl() ), this, SLOT( removeControl() ) );
connect( m_controls.last(), SIGNAL( changed() ), this, SLOT( controlChanged() ) );

3
src/libtomahawk/playlist/dynamic/widgets/DynamicControlWrapper.cpp
View File

@ -41,7 +41,6 @@ DynamicControlWrapper::DynamicControlWrapper( const Tomahawk::dyncontrol_ptr& co
, m_typeSelector( 0 )
, m_layout( QWeakPointer< QGridLayout >( layout ) )
{
qDebug() << "CREATING DYNAMIC CONTROL WRAPPER WITH ROW:" << row << layout;
m_typeSelector = new QComboBox( m_parent );
@ -74,8 +73,6 @@ DynamicControlWrapper::DynamicControlWrapper( const Tomahawk::dyncontrol_ptr& co
m_layout.data()->addLayout( m_plusL, m_row, 3, Qt::AlignCenter );
m_plusL->setCurrentIndex( 0 );
}
DynamicControlWrapper::~DynamicControlWrapper()

3
src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp
View File

@ -424,6 +424,7 @@ DynamicWidget::onDeleted()
void
DynamicWidget::onChanged()
{
if( !m_playlist.isNull() )
if( !m_playlist.isNull() &&
ViewManager::instance()->currentPage() == this )
emit nameChanged( m_playlist->title() );
}

20
src/libtomahawk/playlist/playlistmodel.cpp
View File

@ -34,6 +34,7 @@ using namespace Tomahawk;
PlaylistModel::PlaylistModel( QObject* parent )
: TrackModel( parent )
, m_waitForUpdate( false )
, m_isTemporary( false )
{
qDebug() << Q_FUNC_INFO;
@ -91,6 +92,7 @@ PlaylistModel::loadPlaylist( const Tomahawk::playlist_ptr& playlist, bool loadEn
setTitle( playlist->title() );
setDescription( tr( "A playlist by %1" ).arg( playlist->author()->isLocal() ? tr( "you" ) : playlist->author()->friendlyName() ) );
m_isTemporary = false;
if ( !loadEntries )
return;
@ -192,6 +194,12 @@ PlaylistModel::append( const Tomahawk::album_ptr& album )
connect( album.data(), SIGNAL( tracksAdded( QList<Tomahawk::query_ptr> ) ),
SLOT( onTracksAdded( QList<Tomahawk::query_ptr> ) ) );
if( rowCount( QModelIndex() ) == 0 ) {
setTitle( album->name() );
setDescription( tr( "All tracks by %1 on album %2" ).arg( album->artist()->name() ).arg( album->name() ) );
m_isTemporary = true;
}
onTracksAdded( album->tracks() );
}
@ -205,6 +213,12 @@ PlaylistModel::append( const Tomahawk::artist_ptr& artist )
connect( artist.data(), SIGNAL( tracksAdded( QList<Tomahawk::query_ptr> ) ),
SLOT( onTracksAdded( QList<Tomahawk::query_ptr> ) ) );
if( rowCount( QModelIndex() ) == 0 ) {
setTitle( artist->name() );
setDescription( tr( "All tracks by %1" ).arg( artist->name() ) );
m_isTemporary = true;
}
onTracksAdded( artist->tracks() );
}
@ -494,3 +508,9 @@ PlaylistModel::removeIndex( const QModelIndex& index, bool moreToCome )
onPlaylistChanged();
}
}
bool
PlaylistModel::isTemporary() const
{
return m_isTemporary;
}

3
src/libtomahawk/playlist/playlistmodel.h
View File

@ -67,6 +67,7 @@ public:
void remove( unsigned int row, bool moreToCome = false );
virtual void removeIndex( const QModelIndex& index, bool moreToCome = false );
bool isTemporary() const;
signals:
void repeatModeChanged( PlaylistInterface::RepeatMode mode );
void shuffleModeChanged( bool enabled );
@ -90,7 +91,7 @@ private:
QList<Tomahawk::plentry_ptr> playlistEntries() const;
Tomahawk::playlist_ptr m_playlist;
bool m_waitForUpdate;
bool m_waitForUpdate, m_isTemporary;
QList< Tomahawk::Query* > m_waitingForResolved;
};

20
src/libtomahawk/playlist/playlistview.cpp
View File

@ -24,6 +24,7 @@
#include "playlist/playlistproxymodel.h"
#include "widgets/overlaywidget.h"
#include "viewmanager.h"
using namespace Tomahawk;
@ -70,8 +71,12 @@ PlaylistView::setPlaylistModel( PlaylistModel* model )
if ( !m_model->playlist().isNull() )
setGuid( QString( "playlistview/%1" ).arg( m_model->playlist()->guid() ) );
else
{
setGuid( "playlistview" );
m_model->title();
m_model->description();
}
connect( m_model, SIGNAL( trackCountChanged( unsigned int ) ), SLOT( onTrackCountChanged( unsigned int ) ) );
connect( m_model, SIGNAL( playlistDeleted() ), SLOT( onDeleted() ) );
connect( m_model, SIGNAL( playlistChanged() ), SLOT( onChanged() ) );
@ -134,7 +139,7 @@ PlaylistView::keyPressEvent( QKeyEvent* event )
if ( !model() )
return;
if ( event->key() == Qt::Key_Delete && !model()->isReadOnly() )
if ( ( event->key() == Qt::Key_Delete || event->key() == Qt::Key_Backspace ) && !model()->isReadOnly() )
{
qDebug() << "Removing selected items";
proxyModel()->removeIndexes( selectedIndexes() );
@ -186,6 +191,17 @@ PlaylistView::onDeleted()
void
PlaylistView::onChanged()
{
if ( m_model && !m_model->playlist().isNull() )
if ( m_model && !m_model->playlist().isNull() &&
ViewManager::instance()->currentPage() == this )
emit nameChanged( m_model->playlist()->title() );
}
bool
PlaylistView::isTemporaryPage() const
{
if ( m_model ) {
return m_model->isTemporary();
} else {
return false;
}
}

3
src/libtomahawk/playlist/playlistview.h
View File

@ -52,6 +52,7 @@ public:
virtual QPixmap pixmap() const { return QPixmap( RESPATH "images/playlist-icon.png" ); }
virtual bool jumpToCurrentTrack();
virtual bool isTemporaryPage() const;
signals:
void nameChanged( const QString& title );
@ -75,6 +76,8 @@ private:
PlaylistModel* m_model;
QMenu m_itemMenu;
QString m_customTitle;
QString m_customDescripton;
QAction* m_playItemAction;
QAction* m_addItemsToQueueAction;

17
src/libtomahawk/utils/tomahawkutils.h
View File

@ -37,23 +37,6 @@ class QNetworkProxy;
namespace TomahawkUtils
{
class DLLEXPORT Sleep : public QThread
{
public:
static void sleep( unsigned long secs )
{
QThread::sleep( secs );
}
static void msleep( unsigned long msecs )
{
QThread::msleep( msecs );
}
static void usleep( unsigned long usecs )
{
QThread::usleep( usecs );
}
};
class DLLEXPORT NetworkProxyFactory : public QNetworkProxyFactory
{
public:

18
src/libtomahawk/viewmanager.cpp
View File

@ -599,24 +599,12 @@ ViewManager::setPage( ViewPage* page, bool trackHistory )
setHistoryPosition( m_pageHistory.count() - 1 );
}
if ( !playlistForInterface( currentPlaylistInterface() ).isNull() )
emit playlistActivated( playlistForInterface( currentPlaylistInterface() ) );
else if ( dynamicPlaylistForInterface( currentPlaylistInterface() ) )
emit dynamicPlaylistActivated( dynamicPlaylistForInterface( currentPlaylistInterface() ) );
else if ( collectionForInterface( currentPlaylistInterface() ) )
emit collectionActivated( collectionForInterface( currentPlaylistInterface() ) );
else if ( isSuperCollectionVisible() )
emit superCollectionActivated();
else if( isNewPlaylistPageVisible() )
emit newPlaylistActivated();
/* TODO refactor. now we have rows in the sourcetreeview that are connected to pages, e.g. Stations, Recently Updated, etc
else if ( !currentPlaylistInterface() )
emit tempPageActivated();*/
qDebug() << "View page shown:" << page->title();
emit viewPageActivated( page );
if( page->isTemporaryPage() )
emit tempPageActivated( page );
if ( !AudioEngine::instance()->playlist() )
AudioEngine::instance()->setPlaylist( currentPlaylistInterface() );

8
src/libtomahawk/viewmanager.h
View File

@ -111,13 +111,7 @@ signals:
void historyBackAvailable( bool avail );
void historyForwardAvailable( bool avail );
void tempPageActivated();
void superCollectionActivated();
void collectionActivated( const Tomahawk::collection_ptr& collection );
void playlistActivated( const Tomahawk::playlist_ptr& playlist );
void dynamicPlaylistActivated( const Tomahawk::dynplaylist_ptr& playlist );
void newPlaylistActivated();
void tempPageActivated( Tomahawk::ViewPage* );
void viewPageActivated( Tomahawk::ViewPage* );
public slots:

3
src/libtomahawk/viewpage.h
View File

@ -51,7 +51,10 @@ public:
virtual bool jumpToCurrentTrack() = 0;
virtual bool isTemporaryPage() const { return false; }
/** subclasses implementing ViewPage can emit the following signals:
* nameChanged( const QString& )
* descriptionChanged( const QString& )
* destroyed( QWidget* widget );
*

6
src/libtomahawk/widgets/newplaylistwidget.ui
View File

@ -10,6 +10,9 @@
<height>460</height>
</rect>
</property>
<property name="focusPolicy">
<enum>Qt::TabFocus</enum>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="label_2">
@ -31,6 +34,9 @@
<height>26</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
</widget>
</item>
<item>

88
src/libtomahawk/widgets/playlisttypeselectordlg.cpp Normal file
View File

@ -0,0 +1,88 @@
/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
*
* Copyright 2011, Christopher Reichert <creichert07@gmail.com>
*
* Tomahawk is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Tomahawk is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
*/
#include "widgets/newplaylistwidget.h"
#include "viewmanager.h"
#include "viewpage.h"
#include "sourcelist.h"
#include "playlisttypeselectordlg.h"
#include "ui_playlisttypeselectordlg.h"
PlaylistTypeSelectorDlg::PlaylistTypeSelectorDlg( QWidget* parent, Qt::WindowFlags f )
: QDialog( parent, f )
, ui( new Ui::PlaylistTypeSelectorDlg )
{
ui->setupUi( this );
#ifdef Q_WS_MAC
// ui->
ui->horizontalLayout_2->setContentsMargins( 4, 4, 4, 4 );
setSizeGripEnabled( false );
setMinimumSize( size() );
setMaximumSize( size() ); // to remove the resize grip on osx this is the only way
#endif
m_isAutoPlaylist = false;
m_playlistName = "";
connect( ui->manualPlaylistButton, SIGNAL( clicked() ),
this, SLOT( createNormalPlaylist() ));
connect( ui->autoPlaylistButton, SIGNAL( clicked() ),
this, SLOT( createAutomaticPlaylist() ));
connect( ui->autoPlaylistNameLine, SIGNAL( textChanged( const QString& )),
this, SLOT( enableAutoPlaylistButton( const QString& )));
}
PlaylistTypeSelectorDlg::~PlaylistTypeSelectorDlg()
{
delete ui;
}
void
PlaylistTypeSelectorDlg::createNormalPlaylist()
{
m_isAutoPlaylist = false;
done( QDialog::Accepted ); // return code is used to vaidate we did not exit out of the Dialog
}
void PlaylistTypeSelectorDlg::createAutomaticPlaylist() { m_isAutoPlaylist = true;
m_playlistName = ui->autoPlaylistNameLine->text();
done( QDialog::Accepted ); // return code is used to vaidate we did not exit out of the Dialog successfully
}
QString
PlaylistTypeSelectorDlg::playlistName() const
{
return m_playlistName;
}
bool
PlaylistTypeSelectorDlg::playlistTypeIsAuto() const
{
return m_isAutoPlaylist;
}
void
PlaylistTypeSelectorDlg::enableAutoPlaylistButton( const QString &text )
{
ui->autoPlaylistButton->setEnabled( !text.isEmpty() );
}

55
src/libtomahawk/widgets/playlisttypeselectordlg.h Normal file
View File

@ -0,0 +1,55 @@
/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
*
* Copyright 2011, Christopher Reichert <creichert07@gmail.com>
*
* Tomahawk is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Tomahawk is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef PLAYLISTTYPESELECTORDLG_H
#define PLAYLISTTYPESELECTORDLG_H
#include <QDialog>
#include "dllmacro.h"
namespace Ui
{
class PlaylistTypeSelectorDlg;
}
class DLLEXPORT PlaylistTypeSelectorDlg : public QDialog
{
Q_OBJECT
public:
PlaylistTypeSelectorDlg( QWidget* parent = 0, Qt::WindowFlags = 0 );
~PlaylistTypeSelectorDlg();
bool playlistTypeIsNormal() const;
bool playlistTypeIsAuto() const;
QString playlistName() const;
private slots:
void createNormalPlaylist();
void createAutomaticPlaylist();
void enableAutoPlaylistButton( const QString& );
private:
bool m_isAutoPlaylist; // if not an auto playlist then its a normal playlist
Ui::PlaylistTypeSelectorDlg *ui;
QString m_playlistName;
};
#endif // PlaylistTypeSelectorDlg_H

184
src/libtomahawk/widgets/playlisttypeselectordlg.ui Normal file
View File

@ -0,0 +1,184 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>PlaylistTypeSelectorDlg</class>
<widget class="QDialog" name="PlaylistTypeSelectorDlg">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>554</width>
<height>169</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>482</width>
<height>145</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>10000</width>
<height>10000</height>
</size>
</property>
<property name="windowTitle">
<string>New Playlist</string>
</property>
<property name="modal">
<bool>false</bool>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_2" stretch="1,1,0">
<item>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>2</number>
</property>
<item>
<widget class="QLabel" name="label">
<property name="minimumSize">
<size>
<width>221</width>
<height>40</height>
</size>
</property>
<property name="text">
<string>Just a regular old playlist... Give it a name, drag in some tracks, and go!</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="margin">
<number>2</number>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>28</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="manualPlaylistButton">
<property name="text">
<string>Create Manual Playlist</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
</widget>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="leftMargin">
<number>4</number>
</property>
<property name="rightMargin">
<number>1</number>
</property>
<item>
<widget class="QLabel" name="label_2">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Don't know exactly what you want? Give Tomahawk a few pointers and let it build a playlist for you!</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="margin">
<number>1</number>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_4">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="label_3">
<property name="text">
<string>Name:</string>
</property>
<property name="margin">
<number>1</number>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="autoPlaylistNameLine">
<property name="placeholderText">
<string>New Playlist...</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="autoPlaylistButton">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Create Automatic Playlist</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>

26
src/musicscanner.cpp
View File

@ -162,28 +162,12 @@ MusicScanner::~MusicScanner()
if ( !m_dirLister.isNull() )
{
m_dirLister.data()->setIsDeleting();
QMetaObject::invokeMethod( m_dirLister.data(), "deleteLater", Qt::DirectConnection );
while( !m_dirLister.isNull() )
{
qDebug() << Q_FUNC_INFO << " scanner not deleted";
TomahawkUtils::Sleep::msleep( 50 );
}
m_dirListerThreadController->quit();;
m_dirListerThreadController->wait( 60000 );
if ( m_dirListerThreadController )
m_dirListerThreadController->quit();
if( m_dirListerThreadController )
{
while( !m_dirListerThreadController->isFinished() )
{
qDebug() << Q_FUNC_INFO << " scanner thread controller not finished";
TomahawkUtils::Sleep::msleep( 50 );
}
delete m_dirListerThreadController;
m_dirListerThreadController = 0;
}
delete m_dirLister.data();
delete m_dirListerThreadController;
m_dirListerThreadController = 0;
}
}

50
src/scanmanager.cpp
View File

@ -71,27 +71,12 @@ ScanManager::~ScanManager()
if ( !m_scanner.isNull() )
{
QMetaObject::invokeMethod( m_scanner.data(), "deleteLater", Qt::DirectConnection );
while( !m_scanner.isNull() )
{
qDebug() << Q_FUNC_INFO << " scanner not deleted";
TomahawkUtils::Sleep::msleep( 50 );
}
m_musicScannerThreadController->quit();
m_musicScannerThreadController->wait( 60000 );
if ( m_musicScannerThreadController )
m_musicScannerThreadController->quit();
if( m_musicScannerThreadController )
{
while( !m_musicScannerThreadController->isFinished() )
{
qDebug() << Q_FUNC_INFO << " scanner thread controller not finished";
TomahawkUtils::Sleep::msleep( 50 );
}
delete m_musicScannerThreadController;
m_musicScannerThreadController = 0;
}
delete m_scanner.data();
delete m_musicScannerThreadController;
m_musicScannerThreadController = 0;
}
qDebug() << Q_FUNC_INFO << " scanner thread controller finished, exiting ScanManager";
}
@ -180,27 +165,12 @@ ScanManager::scannerFinished()
{
if ( !m_scanner.isNull() )
{
QMetaObject::invokeMethod( m_scanner.data(), "deleteLater", Qt::DirectConnection );
while( !m_scanner.isNull() )
{
qDebug() << Q_FUNC_INFO << " scanner not deleted";
TomahawkUtils::Sleep::msleep( 50 );
}
m_musicScannerThreadController->quit();
m_musicScannerThreadController->wait( 60000 );
if ( m_musicScannerThreadController )
m_musicScannerThreadController->quit();
if( m_musicScannerThreadController )
{
while( !m_musicScannerThreadController->isFinished() )
{
qDebug() << Q_FUNC_INFO << " scanner thread controller not finished";
TomahawkUtils::Sleep::msleep( 50 );
}
delete m_musicScannerThreadController;
m_musicScannerThreadController = 0;
}
delete m_scanner.data();
delete m_musicScannerThreadController;
m_musicScannerThreadController = 0;
}
emit finished();
}

29
src/sourcetree/items/categoryitems.cpp
View File

@ -19,6 +19,7 @@
#include "tomahawkapp.h"
#include "utils/tomahawkutils.h"
#include "widgets/newplaylistwidget.h"
#include "widgets/playlisttypeselectordlg.h"
#include "viewmanager.h"
#include "viewpage.h"
#include "sourcelist.h"
@ -59,13 +60,30 @@ CategoryAddItem::activate()
{
switch( m_categoryType )
{
case SourcesModel::PlaylistsCategory:
// only show if none is shown yet
if( !ViewManager::instance()->isNewPlaylistPageVisible() ) {
ViewPage* p = ViewManager::instance()->show( new NewPlaylistWidget() );
model()->linkSourceItemToPage( this, p );
case SourcesModel::PlaylistsCategory: {
PlaylistTypeSelectorDlg playlistSelectorDlg( TomahawkApp::instance()->mainWindow() );
int successfulReturn = playlistSelectorDlg.exec();
if ( !playlistSelectorDlg.playlistTypeIsAuto() && successfulReturn ) {
// only show if none is shown yet
if( !ViewManager::instance()->isNewPlaylistPageVisible() ) {
//fix this namespace resolution problem, was not there before
Tomahawk::ViewPage* p = ViewManager::instance()->show( new NewPlaylistWidget() );
model()->linkSourceItemToPage( this, p );
}
} else if ( playlistSelectorDlg.playlistTypeIsAuto() && successfulReturn ) {
// create Auto Playlist
QString playlistName = playlistSelectorDlg.playlistName();
APP->mainWindow()->createAutomaticPlaylist( playlistName );
} else if ( !successfulReturn ) {
model()->viewPageActivated( ViewManager::instance()->currentPage() );
}
break;
}
case SourcesModel::StationsCategory:
APP->mainWindow()->createStation();
break;
@ -218,4 +236,5 @@ CategoryItem::activate()
if( m_category == SourcesModel::StationsCategory ) {
// TODO activate stations page
}
}

42
src/sourcetree/items/collectionitem.cpp
View File

@ -21,6 +21,7 @@
#include "playlistitems.h"
#include "viewmanager.h"
#include "playlist.h"
#include "genericpageitems.h"
/// CollectionItem
@ -31,8 +32,12 @@ CollectionItem::CollectionItem( SourcesModel* mdl, SourceTreeItem* parent, cons
, m_source( source )
, m_playlists( 0 )
, m_stations( 0 )
, m_tempItem( 0 )
, m_curTempPage( 0 )
{
if( m_source.isNull() ) { // super collection
connect( ViewManager::instance(), SIGNAL( tempPageActivated( Tomahawk::ViewPage*) ), this, SLOT( tempPageActivated( Tomahawk::ViewPage* ) ) );
return;
}
// create category items if there are playlists to show, or stations to show
@ -264,3 +269,40 @@ CollectionItem::onStationsDeleted( const QList< dynplaylist_ptr >& stations )
{
playlistsDeletedInternal( m_stations, stations );
}
void
CollectionItem::tempPageActivated( Tomahawk::ViewPage* v )
{
QString name = v->title();
m_curTempPage = v;
if( !m_tempItem ) {
emit beginRowsAdded( children().count(), children().count() );
m_tempItem = new GenericPageItem( model(), this, name, QIcon( RESPATH "images/playlist-icon.png" ),
boost::bind( &CollectionItem::tempItemClicked, this ),
boost::bind( &CollectionItem::getTempPage, this )
);
emit endRowsAdded();
} else {
m_tempItem->setText( name );
}
model()->linkSourceItemToPage( m_tempItem, v );
emit selectRequest( m_tempItem );
}
ViewPage*
CollectionItem::tempItemClicked()
{
if( m_curTempPage ) {
// show the last temporary page the user displayed
return ViewManager::instance()->show( m_curTempPage );
}
return 0;
}
ViewPage*
CollectionItem::getTempPage() const
{
return m_curTempPage;
}

12
src/sourcetree/items/collectionitem.h
View File

@ -19,7 +19,11 @@
#include "sourcetreeitem.h"
class GenericPageItem;
class CategoryItem;
namespace Tomahawk {
class ViewPage;
}
class CollectionItem : public SourceTreeItem
{
@ -38,6 +42,7 @@ public:
CategoryItem* playlistsCategory() const { return m_playlists; }
void setStationsCategory( CategoryItem* item ) { m_stations = item; }
void setPlaylistsCategory( CategoryItem* item ) { m_playlists = item; }
private slots:
void onPlaylistsAdded( const QList<Tomahawk::playlist_ptr>& playlists );
void onPlaylistsDeleted( const QList<Tomahawk::playlist_ptr>& playlists );
@ -46,6 +51,10 @@ private slots:
void onStationsAdded( const QList<Tomahawk::dynplaylist_ptr>& stations );
void onStationsDeleted( const QList<Tomahawk::dynplaylist_ptr>& stations );
void tempPageActivated( Tomahawk::ViewPage* );
Tomahawk::ViewPage* tempItemClicked();
Tomahawk::ViewPage* getTempPage() const;
private:
void playlistsAddedInternal( SourceTreeItem* parent, const QList< Tomahawk::dynplaylist_ptr >& playlists );
template< typename T >
@ -54,6 +63,9 @@ private:
Tomahawk::source_ptr m_source;
CategoryItem* m_playlists;
CategoryItem* m_stations;
GenericPageItem* m_tempItem;
Tomahawk::ViewPage* m_curTempPage;
};

7
src/sourcetree/items/genericpageitems.cpp
View File

@ -63,3 +63,10 @@ GenericPageItem::willAcceptDrag(const QMimeData* data) const
{
return false;
}
void
GenericPageItem::setText( const QString &text )
{
m_text = text;
emit updated();
}

1
src/sourcetree/items/genericpageitems.h
View File

@ -36,6 +36,7 @@ public:
virtual bool willAcceptDrag( const QMimeData* data ) const;
virtual QIcon icon() const;
void setText( const QString& text );
signals:
void activated();

2
src/sourcetree/items/sourcetreeitem.cpp
View File

@ -30,7 +30,7 @@ SourceTreeItem::SourceTreeItem( SourcesModel* model, SourceTreeItem* parent, Sou
connect( this, SIGNAL( childRowsAdded() ), m_model, SLOT( onItemRowsAddedDone() ) );
connect( this, SIGNAL( childRowsRemoved() ), m_model, SLOT( onItemRowsRemovedDone() ) );
connect( this, SIGNAL( updated() ), m_model, SLOT( itemUpdated() ) );
connect( this, SIGNAL( selectRequest( SourceTreeItem* ) ), m_model, SLOT( itemSelectRequest( SourceTreeItem* ) ) );
if( !m_parent )
return;

1
src/sourcetree/items/sourcetreeitem.h
View File

@ -62,6 +62,7 @@ public:
signals:
void updated();
void selectRequest( SourceTreeItem* );
void beginChildRowsAdded( int fromRow, int toRow );
void childRowsAdded();

10
src/sourcetree/sourcesmodel.cpp
View File

@ -35,6 +35,7 @@ using namespace Tomahawk;
SourcesModel::SourcesModel( QObject* parent )
: QAbstractItemModel( parent )
, m_rootItem( 0 )
, m_viewPageDelayedCacheItem( 0 )
{
m_rootItem = new SourceTreeItem( this, 0, Invalid );
@ -193,7 +194,7 @@ SourcesModel::mimeData( const QModelIndexList& ) const
bool
SourcesModel::dropMimeData( const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent )
{
SourceTreeItem* item;
SourceTreeItem* item = 0;
qDebug() << "Got mime data dropped:" << row << column << parent << itemFromIndex( parent )->text();
if( row == -1 && column == -1 )
item = itemFromIndex( parent );
@ -389,7 +390,6 @@ SourcesModel::linkSourceItemToPage( SourceTreeItem* item, ViewPage* p )
m_viewPageDelayedCacheItem = 0;
}
SourceTreeItem*
SourcesModel::itemFromIndex( const QModelIndex& idx ) const
{
@ -448,3 +448,9 @@ SourcesModel::rowForItem( SourceTreeItem* item ) const
{
return item->parent()->children().indexOf( item );
}
void
SourcesModel::itemSelectRequest( SourceTreeItem* item )
{
emit selectRequest( indexFromItem( item ) );
}

22
src/sourcetree/sourcesmodel.h
View File

@ -90,16 +90,6 @@ public:
QModelIndex indexFromItem( SourceTreeItem* item ) const;
signals:
void selectRequest( const QModelIndex& idx );
private slots:
void onSourcesAdded( const QList<Tomahawk::source_ptr>& sources );
void onSourceAdded( const Tomahawk::source_ptr& source );
void onSourceRemoved( const Tomahawk::source_ptr& source );
void viewPageActivated( Tomahawk::ViewPage* );
public slots:
void loadSources();
@ -108,6 +98,18 @@ public slots:
void onItemRowsAddedDone();
void onItemRowsRemovedBegin( int first, int last );
void onItemRowsRemovedDone();
void viewPageActivated( Tomahawk::ViewPage* );
void itemSelectRequest( SourceTreeItem* item );
signals:
void selectRequest( const QModelIndex& idx );
private slots:
void onSourcesAdded( const QList<Tomahawk::source_ptr>& sources );
void onSourceAdded( const Tomahawk::source_ptr& source );
void onSourceRemoved( const Tomahawk::source_ptr& source );
private:
SourceTreeItem* itemFromIndex( const QModelIndex& idx ) const;
int rowForItem( SourceTreeItem* item ) const;

35
src/sourcetree/sourcetreeview.cpp
View File

@ -198,9 +198,11 @@ SourceTreeView::onItemExpanded( const QModelIndex& idx )
void
SourceTreeView::selectRequest( const QModelIndex& idx )
{
if( !selectionModel()->selectedIndexes().contains( idx ) )
if ( !selectionModel()->selectedIndexes().contains( idx ) )
{
scrollTo( idx, QTreeView::EnsureVisible );
selectionModel()->select( idx, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Current );
}
}
@ -212,23 +214,23 @@ SourceTreeView::loadPlaylist()
void
SourceTreeView::deletePlaylist()
SourceTreeView::deletePlaylist( const QModelIndex& idxIn )
{
qDebug() << Q_FUNC_INFO;
QModelIndex idx = m_contextMenuIndex;
QModelIndex idx = idxIn.isValid() ? idxIn : m_contextMenuIndex;
if ( !idx.isValid() )
return;
SourcesModel::RowType type = ( SourcesModel::RowType )model()->data( m_contextMenuIndex, SourcesModel::SourceTreeItemTypeRole ).toInt();
SourcesModel::RowType type = ( SourcesModel::RowType )model()->data( idx, SourcesModel::SourceTreeItemTypeRole ).toInt();
if ( type == SourcesModel::StaticPlaylist )
{
PlaylistItem* item = itemFromIndex< PlaylistItem >( m_contextMenuIndex );
PlaylistItem* item = itemFromIndex< PlaylistItem >( idx );
playlist_ptr playlist = item->playlist();
Playlist::remove( playlist );
} else if( type == SourcesModel::AutomaticPlaylist || type == SourcesModel::Station )
{
DynamicPlaylistItem* item = itemFromIndex< DynamicPlaylistItem >( m_contextMenuIndex );
DynamicPlaylistItem* item = itemFromIndex< DynamicPlaylistItem >( idx );
dynplaylist_ptr playlist = item->dynPlaylist();
DynamicPlaylist::remove( playlist );
}
@ -358,6 +360,25 @@ SourceTreeView::dropEvent( QDropEvent* event )
m_dragging = false;
}
void
SourceTreeView::keyPressEvent( QKeyEvent *event )
{
if( ( event->key() == Qt::Key_Delete || event->key() == Qt::Key_Backspace ) && !selectionModel()->selectedIndexes().isEmpty() )
{
QModelIndex idx = selectionModel()->selectedIndexes().first();
if ( model()->data( idx, SourcesModel::SourceTreeItemTypeRole ) == SourcesModel::StaticPlaylist ||
model()->data( idx, SourcesModel::SourceTreeItemTypeRole ) == SourcesModel::AutomaticPlaylist ||
model()->data( idx, SourcesModel::SourceTreeItemTypeRole ) == SourcesModel::Station )
{
PlaylistItem* item = itemFromIndex< PlaylistItem >( idx );
Q_ASSERT( item );
if( item->playlist()->author()->isLocal() ) {
deletePlaylist( idx );
}
}
}
}
void
SourceTreeView::paintEvent( QPaintEvent* event )

3
src/sourcetree/sourcetreeview.h
View File

@ -52,7 +52,7 @@ private slots:
void selectRequest( const QModelIndex& idx );
void loadPlaylist();
void deletePlaylist();
void deletePlaylist( const QModelIndex& = QModelIndex() );
void copyPlaylistLink();
void onCustomContextMenu( const QPoint& pos );
@ -66,6 +66,7 @@ protected:
virtual void dragLeaveEvent( QDragLeaveEvent* event ) { Q_UNUSED( event ); m_dragging = false; setDirtyRegion( m_dropRect ); }
virtual void dragMoveEvent( QDragMoveEvent* event );
virtual void dropEvent( QDropEvent* event );
virtual void keyPressEvent( QKeyEvent* event );
private:
void setupMenus();

15
src/tomahawkapp.cpp
View File

@ -324,12 +324,19 @@ TomahawkApp::~TomahawkApp()
delete m_audioEngine;
#endif
delete SipHandler::instance();
Pipeline::instance()->stop();
delete m_database;
delete m_infoSystem;
//FIXME: delete GeneratorFactory::registerFactory( "echonest", new EchonestFactory ); ?
delete SipHandler::instance();
delete m_servent;
delete m_scanManager;
delete m_database;
Pipeline::instance()->stop();
delete Pipeline::instance();
qDebug() << "Finished shutdown.";
}

26
src/tomahawkwindow.cpp
View File

@ -50,6 +50,7 @@
#include "utils/widgetdragfilter.h"
#include "utils/xspfloader.h"
#include "widgets/newplaylistwidget.h"
#include "widgets/playlisttypeselectordlg.h"
#include "audiocontrols.h"
#include "settingsdialog.h"
@ -275,7 +276,6 @@ TomahawkWindow::setupSignals()
connect( ui->actionRescanCollection, SIGNAL( triggered() ), SLOT( rescanCollectionManually() ) );
connect( ui->actionLoadXSPF, SIGNAL( triggered() ), SLOT( loadSpiff() ));
connect( ui->actionCreatePlaylist, SIGNAL( triggered() ), SLOT( createPlaylist() ));
connect( ui->actionCreateAutomaticPlaylist, SIGNAL( triggered() ), SLOT( createAutomaticPlaylist() ));
connect( ui->actionCreate_New_Station, SIGNAL( triggered() ), SLOT( createStation() ));
connect( ui->actionAboutTomahawk, SIGNAL( triggered() ), SLOT( showAboutTomahawk() ) );
connect( ui->actionExit, SIGNAL( triggered() ), qApp, SLOT( quit() ) );
@ -453,11 +453,11 @@ TomahawkWindow::loadSpiff()
void
TomahawkWindow::createAutomaticPlaylist()
TomahawkWindow::createAutomaticPlaylist( QString playlistName )
{
bool ok;
QString name = QInputDialog::getText( this, tr( "Create New Automatic Playlist" ), tr( "Name:" ), QLineEdit::Normal, tr( "New Automatic Playlist" ), &ok );
if ( !ok || name.isEmpty() )
QString name = playlistName;
if ( name.isEmpty() )
return;
source_ptr author = SourceList::instance()->getLocal();
@ -493,7 +493,21 @@ TomahawkWindow::createStation()
void
TomahawkWindow::createPlaylist()
{
ViewManager::instance()->show( new NewPlaylistWidget() );
PlaylistTypeSelectorDlg playlistSelectorDlg;
int successfulReturn = playlistSelectorDlg.exec();
if ( !playlistSelectorDlg.playlistTypeIsAuto() && successfulReturn ) {
// only show if none is shown yet
if( !ViewManager::instance()->isNewPlaylistPageVisible() ) {
ViewManager::instance()->show( new NewPlaylistWidget() );
}
} else if ( playlistSelectorDlg.playlistTypeIsAuto() && successfulReturn ) {
// create Auto Playlist
QString playlistName = playlistSelectorDlg.playlistName();
APP->mainWindow()->createAutomaticPlaylist( playlistName );
}
}

2
src/tomahawkwindow.h
View File

@ -61,7 +61,7 @@ protected:
void hideEvent( QHideEvent* e );
public slots:
void createAutomaticPlaylist();
void createAutomaticPlaylist( QString );
void createStation();
void createPlaylist();
void loadSpiff();

23
src/tomahawkwindow.ui
View File

@ -35,7 +35,7 @@
<x>0</x>
<y>0</y>
<width>1000</width>
<height>20</height>
<height>21</height>
</rect>
</property>
<widget class="QMenu" name="menuSettings">
@ -56,16 +56,6 @@
<addaction name="separator"/>
<addaction name="actionExit"/>
</widget>
<widget class="QMenu" name="menuPlaylist">
<property name="title">
<string>&amp;Playlist</string>
</property>
<addaction name="actionCreatePlaylist"/>
<addaction name="actionCreateAutomaticPlaylist"/>
<addaction name="actionCreate_New_Station"/>
<addaction name="separator"/>
<addaction name="actionLoadXSPF"/>
</widget>
<widget class="QMenu" name="menuNetwork">
<property name="title">
<string>&amp;Network</string>
@ -87,6 +77,15 @@
<addaction name="actionDiagnostics"/>
<addaction name="actionAboutTomahawk"/>
</widget>
<widget class="QMenu" name="menuPlaylist">
<property name="title">
<string>&amp;Playlist</string>
</property>
<addaction name="actionCreatePlaylist"/>
<addaction name="actionCreate_New_Station"/>
<addaction name="separator"/>
<addaction name="actionLoadXSPF"/>
</widget>
<addaction name="menuApp"/>
<addaction name="menuPlaylist"/>
<addaction name="menuNetwork"/>
@ -108,7 +107,7 @@
</action>
<action name="actionToggleConnect">
<property name="text">
<string>Go &amp;online</string>
<string>Go &amp;Online</string>
</property>
</action>
<action name="actionAddFriendManually">

2
thirdparty/jreen vendored

@ -1 +1 @@
Subproject commit a231a2b3868baf32312d65cb7e371828212d7745
Subproject commit 8f995f246637f533feb7124744e113034a32b505