added warning when quitting with unsaved playlist.

set window modified is set to true in more cases than previously.
fixed save as bug in preset playlist file dialog


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@920 6778bc44-b910-0410-a7a0-be141de4315d

src/projectM-qt/qplaylistfiledialog.hpp

@@ -128,8 +128,18 @@
 		 
 		 QString filter = getFilter();
 		 		
-		 if (QFileInfo(fileName).isDir()) {
-			 if (isDirectorySelectAllowed())  
+		 	
+		if (fileName == QString()) {
+			 if (isPlaylistSaveMode())
+				 this->setFileMode(QFileDialog::AnyFile);
+			 else
+				 this->setFileMode(QFileDialog::ExistingFile);
+		}	
+		 
+		else if (QFileInfo(fileName).isDir()) {
+			if (isPlaylistSaveMode())
+				this->setFileMode(QFileDialog::AnyFile);			
+			 else if (isDirectorySelectAllowed())  
 			 	this->setFileMode(QFileDialog::Directory);
 			 else 
 				 this->setFileMode(QFileDialog::ExistingFile);
@@ -143,20 +153,13 @@
 			 else
 				 this->setFileMode(QFileDialog::Directory);
 		}
-		
-		else {
-			if (isPlaylistSaveMode())
-				this->setFileMode(QFileDialog::AnyFile);
-			else
-				this->setFileMode(QFileDialog::ExistingFile);
-		}
 				
 		this->setFilter(filter);
 	 }
 	 
 	 void updateFileMode(const QStringList & selectedFiles) {
 		 if (selectedFiles.empty())
-			 return;
+			 updateFileMode(QString());
 		 updateFileMode(selectedFiles[0]);
 	}
 };

src/projectM-qt/qprojectm_mainwindow.cpp

@@ -361,6 +361,7 @@ void QProjectM_MainWindow::dragAndDropPlaylistItems(const QModelIndexList & indi
 	
 	removePlaylistItems(singularList);	
 	insertPlaylistItem(metaData, newIndex);
+	ui->presetPlayListDockWidget->setWindowModified ( true );
 }
 
 void QProjectM_MainWindow::setMenuVisible(bool visible) {
@@ -400,6 +401,8 @@ void QProjectM_MainWindow::changeRating ( const QModelIndex & index ) {
 	playlistItemMetaDataHash[id].rating = newRating;
 	
 	playlistModel->setData( index, newRating, QPlaylistModel::RatingRole);
+	ui->presetPlayListDockWidget->setWindowModified ( true );
+	
 	
 }
 
@@ -519,10 +522,37 @@ void QProjectM_MainWindow::refreshHeaders(QResizeEvent * event) {
 }
 
 
+bool QProjectM_MainWindow::warnIfPlaylistModified() {
+	
+	if (ui->presetPlayListDockWidget->isWindowModified()) {
+		int ret = QMessageBox::warning(this, tr("Warning: unsaved playlist!"),
+					       tr("The open playlist has been modified.\n"
+							       "Do you want to save your changes?"),
+	      QMessageBox::Save | QMessageBox::Discard
+			      | QMessageBox::Cancel,
+	 QMessageBox::Save);
+		
+		switch (ret) {
+			case QMessageBox::Save:
+				savePlaylistButtonClick();
+				return true;
+			case QMessageBox::Discard:
+				return true;
+			case QMessageBox::Cancel:
+				return false;
+			default:
+				return true;
+		}
+	}	
+	return true;
+}
 
 void QProjectM_MainWindow::closeEvent ( QCloseEvent *event )
 {	
-	writeSettings();	
+	
+	if (!warnIfPlaylistModified())
+		event->ignore();
+	writeSettings();
 }
 
 
@@ -777,9 +807,9 @@ void QProjectM_MainWindow::removePlaylistItems(const QModelIndexList & items) {
 		
 		foreach (int key, reverseOrderKeys) {	
 			playlistModel->removeRow(key);
-		}
-				
+		}		
 		qprojectMWidget()->releasePresetLock();
+		ui->presetPlayListDockWidget->setWindowModified ( true );
 }
 
 void QProjectM_MainWindow::insertPlaylistItem
@@ -922,6 +952,10 @@ void QProjectM_MainWindow::writeSettings()
 	settings.setValue ( "pos", pos() );
 	settings.setValue ( "size", size() );
 	settings.setValue ( "playlistPath", m_QPlaylistFileDialog->directory().absolutePath() );
+	
+	if (m_currentPlaylistUrl != QString())
+		settings.setValue("PlaylistFile", m_currentPlaylistUrl);
+	
 }
 
 void QProjectM_MainWindow::loadFile ( const QString &fileName, int rating )

src/projectM-qt/qprojectm_mainwindow.hpp

@@ -137,6 +137,8 @@ private slots:
 
 
       private:
+	bool warnIfPlaylistModified();
+	
 	void insertPlaylistItem(const PlaylistItemMetaData & data, int targetIndex);
 
 	void savePlaylist();