SaveOptions: Show the save option dialog on "save as".

LMMS · Jun 9, 2019 · 193e4d8 · 193e4d8
1 parent d8b6cc8
commit 193e4d8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/include/Song.h b/include/Song.h
@@ -69,7 +69,11 @@ class LMMS_EXPORT Song : public TrackContainer
 		/**
 		 * Should we discard MIDI ControllerConnections from project files?
 		 */
-		BoolModel discardMIDIConnections;
+		BoolModel discardMIDIConnections{false};
+
+		void setDefaultOptions() {
+			discardMIDIConnections.setValue(false);
+		}
 	};
 
 	void clearErrors();

diff --git a/src/core/Song.cpp b/src/core/Song.cpp
@@ -1265,7 +1265,11 @@ bool Song::guiSaveProjectAs( const QString & _file_name )
 	m_oldFileName = m_fileName;
 	setProjectFileName(_file_name);
 
-	if(!guiSaveProject())
+	bool saveResult = guiSaveProject();
+	// After saving as, restore default save options.
+	m_saveOptions.setDefaultOptions();
+
+	if(saveResult)
 	{
 		// Saving failed. Restore old filenames.
 		setProjectFileName(m_oldFileName);

diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
@@ -922,7 +922,8 @@ bool MainWindow::saveProject()
 
 bool MainWindow::saveProjectAs()
 {
-	VersionedSaveDialog sfd( this, tr( "Save Project" ), "",
+	auto optionsWidget = new SaveOptionsWidget(Engine::getSong()->getSaveOptions());
+	VersionedSaveDialog sfd( this, optionsWidget, tr( "Save Project" ), "",
 			tr( "LMMS Project" ) + " (*.mmpz *.mmp);;" +
 				tr( "LMMS Project Template" ) + " (*.mpt)" );
 	QString f = Engine::getSong()->projectFileName();