From 7737c2f596be620d1e4a89bfcc0935b3cfd8ef1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Thu, 7 Jan 2010 12:28:22 +0000 Subject: [PATCH] Use QSettings for splash screen settings git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@8090 383ad7c9-94d9-4d36-a494-682f7c89f535 --- Core/Core.cc | 6 +++--- Core/ParseIni.cc | 12 ------------ Core/PluginLoader.cc | 4 ++-- OpenFlipper.cc | 2 +- common/GlobalOptions.cc | 11 ----------- common/GlobalOptions.hh | 9 +-------- widgets/PluginDialog/PluginDialog.cc | 2 +- widgets/optionsWidget/optionsWidget.cc | 4 ++-- 8 files changed, 10 insertions(+), 40 deletions(-) diff --git a/Core/Core.cc b/Core/Core.cc index 112ddd79..d383f42b 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 37825d4f..dbed752a 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 6963b4e1..f42e55d9 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 67bd046a..0be9a30d 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 d5ba43cd..24abc831 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 3633c988..fdfade62 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 038ff4bf..ed621ba9 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 9fc82226..8cf8caa4 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 ); -- GitLab