From 9f087b7da33401d4362cbb02d84dc70124c93d1f Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Sat, 28 May 2011 16:55:35 -0400 Subject: [PATCH] Add Christopher's copyright and less debug --- src/libtomahawk/widgets/playlisttypeselectordlg.cpp | 2 +- src/libtomahawk/widgets/playlisttypeselectordlg.h | 10 +++++----- src/tomahawkwindow.cpp | 11 +++++------ 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/libtomahawk/widgets/playlisttypeselectordlg.cpp b/src/libtomahawk/widgets/playlisttypeselectordlg.cpp index 5f3802661..4458bcd9f 100644 --- a/src/libtomahawk/widgets/playlisttypeselectordlg.cpp +++ b/src/libtomahawk/widgets/playlisttypeselectordlg.cpp @@ -1,6 +1,6 @@ /* === This file is part of Tomahawk Player - === * - * Copyright 2010-2011, Christian Muehlhaeuser + * Copyright 2011, Christopher Reichert * * Tomahawk is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/libtomahawk/widgets/playlisttypeselectordlg.h b/src/libtomahawk/widgets/playlisttypeselectordlg.h index a0331a112..de00c1504 100644 --- a/src/libtomahawk/widgets/playlisttypeselectordlg.h +++ b/src/libtomahawk/widgets/playlisttypeselectordlg.h @@ -1,6 +1,6 @@ /* === This file is part of Tomahawk Player - === * - * Copyright 2010-2011, Christian Muehlhaeuser + * Copyright 2011, Christopher Reichert * * Tomahawk is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -28,7 +28,7 @@ namespace Ui class PlaylistTypeSelectorDlg; } -class DLLEXPORT PlaylistTypeSelectorDlg : public QDialog +class DLLEXPORT PlaylistTypeSelectorDlg : public QDialog { Q_OBJECT @@ -43,13 +43,13 @@ 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 diff --git a/src/tomahawkwindow.cpp b/src/tomahawkwindow.cpp index 173b43f03..16d8fff53 100644 --- a/src/tomahawkwindow.cpp +++ b/src/tomahawkwindow.cpp @@ -447,7 +447,7 @@ void TomahawkWindow::createAutomaticPlaylist( QString playlistName ) { QString name = playlistName; - + if ( name.isEmpty() ) return; @@ -486,17 +486,16 @@ TomahawkWindow::createPlaylist() { PlaylistTypeSelectorDlg playlistSelectorDlg; int successfulReturn = playlistSelectorDlg.exec(); - - qDebug() << "\n\nSTAT == " << successfulReturn; + 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 + // create Auto Playlist QString playlistName = playlistSelectorDlg.playlistName(); APP->mainWindow()->createAutomaticPlaylist( playlistName ); }