Auto-save - Fix double negations and some cleanup

LMMS · Feb 13, 2017 · 901fea5 · 901fea5
1 parent f244d9a
commit 901fea5
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 26 deletions.
diff --git a/include/SetupDialog.h b/include/SetupDialog.h
@@ -176,8 +176,8 @@ private slots:
 	QString m_backgroundArtwork;
 
 	bool m_smoothScroll;
-	bool m_disableAutoSave;
-	bool m_disableRunningAutoSave;
+	bool m_enableAutoSave;
+	bool m_enableRunningAutoSave;
 	int m_saveInterval;
 	QSlider * m_saveIntervalSlider;
 	QLabel * m_saveIntervalLbl;

diff --git a/src/core/main.cpp b/src/core/main.cpp
@@ -725,7 +725,7 @@ int main( int argc, char * * argv )
 		bool recoveryFilePresent = QFileInfo( recoveryFile ).exists() &&
 				QFileInfo( recoveryFile ).isFile();
 		bool autoSaveEnabled =
-			!ConfigManager::inst()->value( "ui", "disableautosave" ).toInt();
+			ConfigManager::inst()->value( "ui", "enableautosave" ).toInt();
 		if( recoveryFilePresent )
 		{
 			QMessageBox mb;

diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
@@ -199,7 +199,7 @@ MainWindow::MainWindow() :
 
 	m_updateTimer.start( 1000 / 20, this );  // 20 fps
 
-	if( !ConfigManager::inst()->value( "ui", "disableautosave" ).toInt() )
+	if( ConfigManager::inst()->value( "ui", "enableautosave" ).toInt() )
 	{
 		// connect auto save
 		connect(&m_autoSaveTimer, SIGNAL(timeout()), this, SLOT(autoSave()));
@@ -1373,7 +1373,7 @@ void MainWindow::closeEvent( QCloseEvent * _ce )
 	if( mayChangeProject(true) )
 	{
 		// delete recovery file
-		if( !ConfigManager::inst()->value( "ui", "disableautosave" ).toInt()
+		if( ConfigManager::inst()->value( "ui", "enableautosave" ).toInt()
 			&& getSession() != Limited )
 		{
 			sessionCleanup();
@@ -1529,10 +1529,11 @@ void MainWindow::browseHelp()
 
 void MainWindow::autoSave()
 {
-	if( ( !ConfigManager::inst()->value( "ui", "disablerunningautosave" ).toInt() ||
-		! Engine::getSong()->isPlaying() ) &&
-		!( Engine::getSong()->isExporting() ||
-		QApplication::mouseButtons() ) )
+	if( !Engine::getSong()->isExporting() &&
+		!QApplication::mouseButtons() &&
+			( ConfigManager::inst()->value( "ui",
+					"enablerunningautosave" ).toInt() ||
+				! Engine::getSong()->isPlaying() ) )
 	{
 		Engine::getSong()->saveProjectFile(ConfigManager::inst()->recoveryFile());
 		autoSaveTimerReset();  // Reset timer
@@ -1552,7 +1553,7 @@ void MainWindow::autoSave()
 // from the timer where we need to do extra tests.
 void MainWindow::runAutoSave()
 {
-	if( !ConfigManager::inst()->value( "ui", "disableautosave" ).toInt() &&
+	if( ConfigManager::inst()->value( "ui", "enableautosave" ).toInt() &&
 		getSession() != Limited )
 	{
 		autoSave();

diff --git a/src/gui/SetupDialog.cpp b/src/gui/SetupDialog.cpp
@@ -45,7 +45,6 @@
 #include "Engine.h"
 #include "debug.h"
 #include "ToolTip.h"
-
 #include "LcdSpinBox.h"
 #include "FileDialog.h"
 
@@ -124,8 +123,8 @@ SetupDialog::SetupDialog( ConfigTabs _tab_to_open ) :
 #endif
 	m_backgroundArtwork( QDir::toNativeSeparators( ConfigManager::inst()->backgroundArtwork() ) ),
 	m_smoothScroll( ConfigManager::inst()->value( "ui", "smoothscroll" ).toInt() ),
-	m_disableAutoSave( !ConfigManager::inst()->value( "ui", "disableautosave" ).toInt() ),
-	m_disableRunningAutoSave( !ConfigManager::inst()->value( "ui", "disablerunningautosave" ).toInt() ),
+	m_enableAutoSave( ConfigManager::inst()->value( "ui", "enableautosave" ).toInt() ),
+	m_enableRunningAutoSave( ConfigManager::inst()->value( "ui", "enablerunningautosave" ).toInt() ),
 	m_saveInterval(	ConfigManager::inst()->value( "ui", "saveinterval" ).toInt() < 1 ?
 					MainWindow::DEFAULT_SAVE_INTERVAL_MINUTES :
 			ConfigManager::inst()->value( "ui", "saveinterval" ).toInt() ),
@@ -666,14 +665,14 @@ SetupDialog::SetupDialog( ConfigTabs _tab_to_open ) :
 	m_autoSave = new LedCheckBox(
 			tr( "Enable auto-save" ), auto_save_tw );
 	m_autoSave->move( 10, 70 );
-	m_autoSave->setChecked( m_disableAutoSave );
+	m_autoSave->setChecked( m_enableAutoSave );
 	connect( m_autoSave, SIGNAL( toggled( bool ) ),
 				this, SLOT( toggleAutoSave( bool ) ) );
 
 	m_runningAutoSave = new LedCheckBox(
 			tr( "Allow auto-save while playing" ), auto_save_tw );
 	m_runningAutoSave->move( 20, 90 );
-	m_runningAutoSave->setChecked( m_disableRunningAutoSave );
+	m_runningAutoSave->setChecked( m_enableRunningAutoSave );
 	connect( m_runningAutoSave, SIGNAL( toggled( bool ) ),
 				this, SLOT( toggleRunningAutoSave( bool ) ) );
 
@@ -690,8 +689,8 @@ SetupDialog::SetupDialog( ConfigTabs _tab_to_open ) :
 	connect( saveIntervalBtn, SIGNAL( clicked() ), this,
 						SLOT( displaySaveIntervalHelp() ) );
 
-	m_saveIntervalSlider->setEnabled( m_disableAutoSave );
-	m_runningAutoSave->setVisible( m_disableAutoSave );
+	m_saveIntervalSlider->setEnabled( m_enableAutoSave );
+	m_runningAutoSave->setVisible( m_enableAutoSave );
 
 
 	perf_layout->addWidget( auto_save_tw );
@@ -1027,12 +1026,12 @@ void SetupDialog::accept()
 					QString::number( m_hqAudioDev ) );
 	ConfigManager::inst()->setValue( "ui", "smoothscroll",
 					QString::number( m_smoothScroll ) );
-	ConfigManager::inst()->setValue( "ui", "disableautosave",
-					QString::number( !m_disableAutoSave ) );
+	ConfigManager::inst()->setValue( "ui", "enableautosave",
+					QString::number( m_enableAutoSave ) );
 	ConfigManager::inst()->setValue( "ui", "saveinterval",
 					QString::number( m_saveInterval ) );
-	ConfigManager::inst()->setValue( "ui", "disablerunningautosave",
-					QString::number( !m_disableRunningAutoSave ) );
+	ConfigManager::inst()->setValue( "ui", "enablerunningautosave",
+					QString::number( m_enableRunningAutoSave ) );
 	ConfigManager::inst()->setValue( "ui", "oneinstrumenttrackwindow",
 					QString::number( m_oneInstrumentTrackWindow ) );
 	ConfigManager::inst()->setValue( "ui", "compacttrackbuttons",
@@ -1215,7 +1214,7 @@ void SetupDialog::toggleSmoothScroll( bool _enabled )
 
 void SetupDialog::toggleAutoSave( bool _enabled )
 {
-	m_disableAutoSave = _enabled;
+	m_enableAutoSave = _enabled;
 	m_saveIntervalSlider->setEnabled( _enabled );
 	m_runningAutoSave->setVisible( _enabled );
 	setAutoSaveInterval( m_saveIntervalSlider->value() );
@@ -1226,13 +1225,12 @@ void SetupDialog::toggleAutoSave( bool _enabled )
 
 void SetupDialog::toggleRunningAutoSave( bool _enabled )
 {
-	m_disableRunningAutoSave = _enabled;
+	m_enableRunningAutoSave = _enabled;
 }
 
 
 
 
-
 void SetupDialog::toggleCompactTrackButtons( bool _enabled )
 {
 	m_compactTrackButtons = _enabled;
@@ -1512,7 +1510,7 @@ void SetupDialog::setAutoSaveInterval( int value )
 	m_saveIntervalSlider->setValue( m_saveInterval );
 	QString minutes = m_saveInterval > 1 ? tr( "minutes" ) : tr( "minute" );
 	minutes = QString( "%1 %2" ).arg( QString::number( m_saveInterval ), minutes );
-	minutes = m_disableAutoSave ?  minutes : tr( "Disabled" );
+	minutes = m_enableAutoSave ?  minutes : tr( "Disabled" );
 	m_saveIntervalLbl->setText( tr( "Auto-save interval: %1" ).arg( minutes ) );
 }
 
@@ -1534,7 +1532,7 @@ void SetupDialog::displaySaveIntervalHelp()
 	QWhatsThis::showText( QCursor::pos(),
 			tr( "Set the time between automatic backup to %1.\n"
 			"Remember to also save your project manually. "
-			"You can also choose to disable saving while playing, "
+			"You can choose to disable saving while playing, "
 			"something some older systems find difficult." ).arg(
 			ConfigManager::inst()->recoveryFile() ) );
 }