From 7bde21f66ddd82eb6e4a36c2f55154c5f872b03d Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Wed, 26 Mar 2014 12:14:23 +0000 Subject: added new option 'clear previous playlist when opening new one' git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@4208 90c681e8-e032-0410-971d-27865f9a5e38 --- src/qmmpui/uihelper.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'src/qmmpui/uihelper.cpp') diff --git a/src/qmmpui/uihelper.cpp b/src/qmmpui/uihelper.cpp index e7eb3392a..bd2cf9c5c 100644 --- a/src/qmmpui/uihelper.cpp +++ b/src/qmmpui/uihelper.cpp @@ -28,6 +28,7 @@ #include #include #include +#include #include "general.h" #include "generalfactory.h" #include "jumptotrackdialog_p.h" @@ -177,13 +178,16 @@ void UiHelper::loadPlayList(QWidget *parent, PlayListModel *model) QString mask = tr("Playlist Files") + " (" + PlayListParser::nameFilters().join(" ") + ")"; //TODO use nonmodal dialog and multiplier playlists - QString f_name = FileDialog::getOpenFileName(parent, tr("Open Playlist"), m_lastDir, mask); - if (!f_name.isEmpty()) + QString f_path = FileDialog::getOpenFileName(parent, tr("Open Playlist"), m_lastDir, mask); + if (!f_path.isEmpty()) { - model->clear(); - model->loadPlaylist(f_name); - model->setName(QFileInfo(f_name).baseName()); - m_lastDir = QFileInfo(f_name).absoluteDir().path(); + if(QmmpUiSettings::instance()->clearPreviousPlayList()) + { + model->clear(); + model->setName(QFileInfo(f_path).baseName()); + } + model->loadPlaylist(f_path); + m_lastDir = QFileInfo(f_path).absoluteDir().path(); } } -- cgit v1.2.3-13-gbd6f