diff --git a/Core/Core.cc b/Core/Core.cc
index 112ddd791eccdc8d97a9462f248c3620dbdea836..d383f42b0d00fac04357cd0a745426286127ffb8 100644
--- a/Core/Core.cc
+++ b/Core/Core.cc
@@ -231,7 +231,7 @@ Core::init() {
redrawTime_ = new QTime();
redrawTime_->start ();
- if ( OpenFlipper::Options::splash() ) {
+ if ( OpenFlipperSettings().value("Core/Gui/splash",true).toBool() ) {
QPixmap splashPixmap(OpenFlipper::Options::iconDirStr() + OpenFlipper::Options::dirSeparator() + "splash.png");
splash_ = new QSplashScreen(splashPixmap);
@@ -509,7 +509,7 @@ Core::init() {
QStringList optionFiles = OpenFlipper::Options::optionFiles();
for ( int i = 0 ; i < (int)optionFiles.size(); ++i) {
- if ( OpenFlipper::Options::gui() && OpenFlipper::Options::splash() ) {
+ if ( OpenFlipper::Options::gui() && OpenFlipperSettings().value("Core/Gui/splash",true).toBool() ) {
splash_->showMessage(tr("Loading Configuration File ") + QString::number(i) + "/" + QString::number(optionFiles.size()) ,
Qt::AlignBottom | Qt::AlignLeft , Qt::white);
QApplication::processEvents();
@@ -560,7 +560,7 @@ Core::init() {
coreWidget_->toolBox_->restoreState (windowStates);
windowStates.endGroup ();
- if ( OpenFlipper::Options::splash() ) {
+ if ( OpenFlipperSettings().value("Core/Gui/splash",true).toBool() ) {
splash_->finish(coreWidget_);
}
diff --git a/Core/ParseIni.cc b/Core/ParseIni.cc
index 37825d4ffae203fa9ac653e34b7327e174bdc7e1..dbed752a256e622d960d4b3eca6b46c962187c17 100644
--- a/Core/ParseIni.cc
+++ b/Core/ParseIni.cc
@@ -130,13 +130,6 @@ void Core::readApplicationOptions(INIFile& _ini) {
if (_ini.get_entry(type, "Options" , "default_DataType" ))
OpenFlipper::Options::lastDataType(type);
- //============================================================================
- // Splash Screen
- //============================================================================
- bool splash;
- if( _ini.get_entry(splash, "Options", "Splash") )
- OpenFlipper::Options::splash(splash);
-
//============================================================================
// Load the startup dir for file dialogs
//============================================================================
@@ -510,11 +503,6 @@ void Core::writeApplicationOptions(INIFile& _ini) {
if ( OpenFlipper::Options::gui() )
coreWidget_->saveKeyBindings(_ini);
- //============================================================================
- // Splash Screen
- //============================================================================
- _ini.add_entry( "Options" , "Splash" , OpenFlipper::Options::splash() );
-
//write default dataType to INI
_ini.add_entry( "Options" , "default_DataType" , OpenFlipper::Options::lastDataType() );
diff --git a/Core/PluginLoader.cc b/Core/PluginLoader.cc
index 6963b4e16ca558b87f9fbe63642dfbaf65b76cf1..f42e55d940620dd5174f2b4fa545f5d4d6c94011 100644
--- a/Core/PluginLoader.cc
+++ b/Core/PluginLoader.cc
@@ -184,7 +184,7 @@ void Core::loadPlugins()
// Try to load each file as a plugin
for ( int i = 0 ; i < pluginlist.size() ; ++i) {
- if ( OpenFlipper::Options::gui() && OpenFlipper::Options::splash() ) {
+ if ( OpenFlipper::Options::gui() && OpenFlipperSettings().value("Core/Gui/splash",true).toBool() ) {
splashMessage_ = tr("Loading Plugin %1/%2").arg(i).arg(pluginlist.size()) ;
splash_->showMessage( splashMessage_ , Qt::AlignBottom | Qt::AlignLeft , Qt::white);
QApplication::processEvents();
@@ -359,7 +359,7 @@ void Core::loadPlugin(QString filename, bool silent){
if ( basePlugin ) {
emit log(LOGOUT,tr("Found Plugin :\t\t %1 at %2.").arg(basePlugin->name()).arg( filename));
- if ( OpenFlipper::Options::gui() && OpenFlipper::Options::splash() ) {
+ if ( OpenFlipper::Options::gui() && OpenFlipperSettings().value("Core/Gui/splash",true).toBool() ) {
splashMessage_ = splashMessage_ + " " + basePlugin->name() ;
splash_->showMessage( splashMessage_ , Qt::AlignBottom | Qt::AlignLeft , Qt::white);
QApplication::processEvents();
diff --git a/OpenFlipper.cc b/OpenFlipper.cc
index 67bd046aa56342327581fee85fd065cea19e33fd..0be9a30d8a5d579fd5d2ab74261acec500cc70d3 100644
--- a/OpenFlipper.cc
+++ b/OpenFlipper.cc
@@ -243,7 +243,7 @@ bool parseCommandLineOptions(CSimpleOpt& args){
openPolyMeshes = true;
break;
case OPT_NOSPLASH:
- OpenFlipper::Options::splash(false);
+ OpenFlipperSettings().setValue("Core/Gui/splash",false);
break;
case OPT_REMOTE:
OpenFlipper::Options::remoteControl(true);
diff --git a/common/GlobalOptions.cc b/common/GlobalOptions.cc
index d5ba43cdc186e562359638fc3285a95edb13655e..24abc831f4f1c58d9a16fc0e68b4a7949d4324b6 100644
--- a/common/GlobalOptions.cc
+++ b/common/GlobalOptions.cc
@@ -187,9 +187,6 @@ static QString defaultToolboxMode_ = "";
static QString title_ = "OpenFlipper v?";
-/// Show a splash screen on init?
-static bool splash_ = true;
-
/// default base color
static QColor defaultBaseColor_ = QColor("white");
@@ -667,14 +664,6 @@ void windowTitle( QString _titel ) {
title_ = _titel;
}
-void splash( bool _splash ) {
- splash_ = _splash;
-}
-
-bool splash( ) {
- return splash_;
-}
-
void defaultBaseColor( QColor _color ) {
defaultBaseColor_ = _color;
}
diff --git a/common/GlobalOptions.hh b/common/GlobalOptions.hh
index 3633c988547fec8f3209944e37aad5794da60239..fdfade62d523c59159a47b4404632d97f6bc67f8 100644
--- a/common/GlobalOptions.hh
+++ b/common/GlobalOptions.hh
@@ -87,6 +87,7 @@
* User Interface Settings
* * Core/Gui/glViewer/defaultBackgroundColor This controls the default background color of the glViewer (QColor)
* * Core/Gui/glViewer/showControlWheels This setting controls if the control wheels should be visible in the glViewer (bool)
+* * Core/Gui/splash This setting controls if the splash screen is shown at startup(bool)
*
* Mouse Controls\n
* * Core/Mouse/Wheel/ZoomFactor Zoom factor used when turning the mouse wheel (double)\n
@@ -590,14 +591,6 @@ QString helpDirStr();
DLLEXPORT
void windowTitle( QString _titel );
- /// Display splash screen?
- DLLEXPORT
- void splash( bool _splash );
-
- /// Display splash screen?
- DLLEXPORT
- bool splash( );
-
/// Default base color
DLLEXPORT
void defaultBaseColor( QColor _color );
diff --git a/widgets/PluginDialog/PluginDialog.cc b/widgets/PluginDialog/PluginDialog.cc
index 038ff4bf3bd5b1c514da78619768efae86ec6bd1..ed621ba9a2faee385a64e62c597da8f026904f89 100644
--- a/widgets/PluginDialog/PluginDialog.cc
+++ b/widgets/PluginDialog/PluginDialog.cc
@@ -143,7 +143,7 @@ void PluginDialog::slotUnload()
QMessageBox::No);
}
- // Store the new setting
+ // Store the new setting and remove plugin from all lists
if (buttonState == QMessageBox::Yes || buttonState == QMessageBox::YesToAll) {
QStringList dontLoadPlugins = OpenFlipperSettings().value("PluginControl/DontLoadNames").toStringList();
if ( !dontLoadPlugins.contains(name) ){
diff --git a/widgets/optionsWidget/optionsWidget.cc b/widgets/optionsWidget/optionsWidget.cc
index 9fc82226ff888dbcc71c0256ece83f281816d88c..8cf8caa4fce6fdf5c90624abd2eb068809dc404b 100644
--- a/widgets/optionsWidget/optionsWidget.cc
+++ b/widgets/optionsWidget/optionsWidget.cc
@@ -233,7 +233,7 @@ void OptionsWidget::showEvent ( QShowEvent * /*event*/ ) {
//general
fullscreen->setChecked( OpenFlipper::Options::fullScreen() );
- splash->setChecked( OpenFlipper::Options::splash() );
+ splash->setChecked( OpenFlipperSettings().value("Core/Gui/splash",true).toBool() );
toolbox->setChecked( !OpenFlipper::Options::hideToolbox() );
loggerHidden->setChecked( OpenFlipper::Options::loggerState() == OpenFlipper::Options::Hidden);
@@ -544,7 +544,7 @@ void OptionsWidget::slotApply() {
//general
OpenFlipper::Options::fullScreen( fullscreen->isChecked() );
- OpenFlipper::Options::splash( splash->isChecked() );
+ OpenFlipperSettings().setValue("Core/Gui/splash",splash->isChecked());
OpenFlipper::Options::hideToolbox( !toolbox->isChecked() );
if (loggerHidden->isChecked())
OpenFlipper::Options::loggerState( OpenFlipper::Options::Hidden );