Fix settings

VTX-Molecular-Visualization · Jul 13, 2024 · eb948a3 · eb948a3
1 parent 9b22743
commit eb948a3
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 25 deletions.
diff --git a/lib/ui/qt/include/qt/application.hpp b/lib/ui/qt/include/qt/application.hpp
@@ -7,6 +7,7 @@
 #include <QPointer>
 #include <QSettings>
 #include <QTimer>
+#include <app/filesystem.hpp>
 #include <ui/base_application.hpp>
 
 class QMenu;
@@ -15,6 +16,8 @@ class QSplashScreen;
 
 namespace VTX::UI::QT
 {
+	inline QSettings SETTINGS
+		= QSettings( QString::fromStdString( App::Filesystem::getConfigIniFile().string() ), QSettings::IniFormat );
 
 	class Application final : public UI::BaseApplication<MainWindow>, QApplication
 	{
@@ -32,17 +35,14 @@ namespace VTX::UI::QT
 		void _start() override;
 
 	  private:
+		QTimer					_timer;
+		QElapsedTimer			_elapsedTimer;
 		QPointer<QSplashScreen> _qSplashScreen;
 
-		QSettings	  _settings;
-		QTimer		  _timer;
-		QElapsedTimer _elapsedTimer;
-
 		void _loadTheme();
 		void _saveSettings();
 		void _restoreSettings();
 	};
-
 } // namespace VTX::UI::QT
 
 #endif
diff --git a/lib/ui/qt/include/qt/dialog/download.hpp b/lib/ui/qt/include/qt/dialog/download.hpp
@@ -1,6 +1,7 @@
 #ifndef __VTX_UI_QT_DIALOG_DOWNLOAD__
 #define __VTX_UI_QT_DIALOG_DOWNLOAD__
 
+#include "qt/application.hpp"
 #include "qt/base_widget.hpp"
 #include <QComboBox>
 #include <QDialog>
@@ -130,15 +131,13 @@ namespace VTX::UI::QT::Dialog
 
 		void _loadHistory( const std::string & p_key, QComboBox * const p_comboBox )
 		{
-			QSettings	settings;
-			QStringList history = settings.value( p_key.c_str() ).toStringList();
+			QStringList history = SETTINGS.value( p_key.c_str() ).toStringList();
 			p_comboBox->addItems( history );
 		}
 
 		void _saveHistory( const std::string & p_key, const std::string & p_value )
 		{
-			QSettings	settings;
-			QStringList history = settings.value( p_key.c_str() ).toStringList();
+			QStringList history = SETTINGS.value( p_key.c_str() ).toStringList();
 			// Remove duplicates.
 			if ( history.contains( p_value.c_str() ) )
 			{
@@ -151,7 +150,7 @@ namespace VTX::UI::QT::Dialog
 			{
 				history.removeLast();
 			}
-			settings.setValue( p_key.c_str(), history );
+			SETTINGS.setValue( p_key.c_str(), history );
 		}
 	};
 

diff --git a/lib/ui/qt/src/qt/application.cpp b/lib/ui/qt/src/qt/application.cpp
@@ -6,7 +6,6 @@
 #include <QFile>
 #include <QIcon>
 #include <QSplashScreen>
-#include <app/filesystem.hpp>
 #include <app/infos.hpp>
 #include <util/enum.hpp>
 
@@ -21,9 +20,8 @@ namespace VTX::UI::QT
 
 	// Create QApplication with zero argc and nullptr argv.
 	int zero = 0;
-	Application::Application() :
-		UI::BaseApplication<MainWindow>(), QApplication( zero, nullptr ),
-		_settings( QString::fromStdString( App::Filesystem::getConfigIniFile().string() ), QSettings::IniFormat )
+	Application::Application() : UI::BaseApplication<MainWindow>(), QApplication( zero, nullptr )
+
 	{
 		using namespace Resources;
 		using namespace VTX::App::Info;
@@ -176,27 +174,27 @@ namespace VTX::UI::QT
 
 	void Application::_saveSettings()
 	{
-		VTX_INFO( "Saving settings: {}", _settings.fileName().toStdString() );
-		_settings.setValue( "geometry", _mainWindow->saveGeometry() );
-		_settings.setValue( "windowState", _mainWindow->saveState() );
-		_settings.sync();
+		VTX_INFO( "Saving settings: {}", SETTINGS.fileName().toStdString() );
+		SETTINGS.setValue( "geometry", _mainWindow->saveGeometry() );
+		SETTINGS.setValue( "windowState", _mainWindow->saveState() );
+		SETTINGS.sync();
 
-		if ( _settings.status() != QSettings::NoError )
+		if ( SETTINGS.status() != QSettings::NoError )
 		{
-			throw std::runtime_error( fmt::format( "{}", Util::Enum::enumName( _settings.status() ) ) );
+			throw std::runtime_error( fmt::format( "{}", Util::Enum::enumName( SETTINGS.status() ) ) );
 		}
 	}
 
 	void Application::_restoreSettings()
 	{
-		if ( _settings.status() != QSettings::NoError )
+		if ( SETTINGS.status() != QSettings::NoError )
 		{
-			throw std::runtime_error( fmt::format( "{}", Util::Enum::enumName( _settings.status() ) ) );
+			throw std::runtime_error( fmt::format( "{}", Util::Enum::enumName( SETTINGS.status() ) ) );
 		}
 
-		VTX_INFO( "Restoring settings: {}", _settings.fileName().toStdString() );
-		_mainWindow->restoreGeometry( _settings.value( "geometry" ).toByteArray() );
-		_mainWindow->restoreState( _settings.value( "windowState" ).toByteArray() );
+		VTX_INFO( "Restoring settings: {}", SETTINGS.fileName().toStdString() );
+		_mainWindow->restoreGeometry( SETTINGS.value( "geometry" ).toByteArray() );
+		_mainWindow->restoreState( SETTINGS.value( "windowState" ).toByteArray() );
 	}
 
 } // namespace VTX::UI::QT