Commit 22b254dd authored by Jan Möbius's avatar Jan Möbius
Browse files

Move the logger state to QSettings

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@8848 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 056e1f36
...@@ -208,13 +208,6 @@ void Core::readApplicationOptions(INIFile& _ini) { ...@@ -208,13 +208,6 @@ void Core::readApplicationOptions(INIFile& _ini) {
OpenFlipper::Options::anaglyphRightEyeColorMatrix(set); OpenFlipper::Options::anaglyphRightEyeColorMatrix(set);
} }
//============================================================================
// Load the setting for the loger window
//============================================================================
int loggerState = 0;
if ( _ini.get_entry( loggerState, "Options" , "LoggerState") )
OpenFlipper::Options::loggerState(static_cast<OpenFlipper::Options::LoggerState> (loggerState));
//============================================================================ //============================================================================
// Load the setting for the toolbox window // Load the setting for the toolbox window
//============================================================================ //============================================================================
...@@ -522,7 +515,6 @@ void Core::writeApplicationOptions(INIFile& _ini) { ...@@ -522,7 +515,6 @@ void Core::writeApplicationOptions(INIFile& _ini) {
} }
_ini.add_entry("Options","LoggerState", OpenFlipper::Options::loggerState() );
_ini.add_entry("Options","HideToolbox", OpenFlipper::Options::hideToolbox() ); _ini.add_entry("Options","HideToolbox", OpenFlipper::Options::hideToolbox() );
// check if we are in fullscreen mode: // check if we are in fullscreen mode:
......
...@@ -168,9 +168,6 @@ static bool gridVisible_ = false; ...@@ -168,9 +168,6 @@ static bool gridVisible_ = false;
/// Store the toolbox gui Mode mode /// Store the toolbox gui Mode mode
static bool hideToolbox_ = false; static bool hideToolbox_ = false;
/// Store the logger gui Mode mode
static LoggerState loggerState_ = InScene;
/// Store if we should go into multiview Mode /// Store if we should go into multiview Mode
static bool multiView_ = true; static bool multiView_ = true;
...@@ -563,12 +560,12 @@ unsigned int examinerWidgets() { ...@@ -563,12 +560,12 @@ unsigned int examinerWidgets() {
/// Set to current /// Set to current
void loggerState( LoggerState _state) { void loggerState( LoggerState _state) {
loggerState_ = _state; OpenFlipperSettings().setValue("Core/Gui/LogWindow/LogWindowMode",_state);
} }
/// Current state of the logging window? /// Current state of the logging window?
LoggerState loggerState( ) { LoggerState loggerState( ) {
return loggerState_; return static_cast<OpenFlipper::Options::LoggerState> (OpenFlipperSettings().value("Core/Gui/LogWindow/LogWindowMode",0).toInt() );
} }
/// Set if we start the toolbox widget closed /// Set if we start the toolbox widget closed
......
...@@ -85,25 +85,26 @@ ...@@ -85,25 +85,26 @@
* *
* The following entries are available through the settings: * The following entries are available through the settings:
* *
* <b>User Interface Settings</b> * <b>User Interface Settings</b>\n
* * Core/Gui/glViewer/defaultBackgroundColor This controls the default background color of the glViewer (QColor) * * Core/Gui/glViewer/defaultBackgroundColor This controls the default background color of the glViewer (QColor)\n
* * Core/Gui/glViewer/showControlWheels This setting controls if the control wheels should be visible in the glViewer (bool) * * Core/Gui/glViewer/showControlWheels This setting controls if the control wheels should be visible in the glViewer (bool)\n
* * Core/Gui/glViewer/glMouse This setting controls if the mouse is rendered in OpenGL or in the window manager * * Core/Gui/glViewer/glMouse This setting controls if the mouse is rendered in OpenGL or in the window manager(bool)\n
* * Core/Gui/glViewer/stereoMousePick This setting controls if the mouse depth is picked in stereo mode * * Core/Gui/glViewer/stereoMousePick This setting controls if the mouse depth is picked in stereo mode(bool)\n
* * Core/Gui/glViewer/restrictFrameRate This setting controls if the maximum frame rate should be restricted (bool) * * Core/Gui/glViewer/restrictFrameRate This setting controls if the maximum frame rate should be restricted (bool)\n
* * Core/Gui/glViewer/maxFrameRate If restrictFrameRate is set to yes, this setting controls the maximum frameRate used (unsigned int) * * Core/Gui/glViewer/maxFrameRate If restrictFrameRate is set to yes, this setting controls the maximum frameRate used (unsigned int)\n
* * Core/Gui/splash This setting controls if the splash screen is shown at startup(bool) * * Core/Gui/LogWindow/LogWindowMode Log Window Mode .. 0 InScene, 1 Window, 2 Hidden (int)\n
* * Core/Gui/splash This setting controls if the splash screen is shown at startup(bool)\n
* *
* <b>File Handling</b> * <b>File Handling</b>\n
* * Core/CurrentDir The current Directory of the Application * * Core/CurrentDir The current Directory of the Application \n
* * Core/File/RecentFiles List of Recent Files * * Core/File/RecentFiles List of Recent Files \n
* * Core/File/RecentTypes DataTypes of Recent Files * * Core/File/RecentTypes DataTypes of Recent Files \n
* * Core/File/MaxRecent Maximum entries in recent File list * * Core/File/MaxRecent Maximum entries in recent File list \n
* * Core/File/UseLoadDefaults Use the defaults saved in the file plugins * * Core/File/UseLoadDefaults Use the defaults saved in the file plugins \n
* *
* <b>Log Settings</b> * <b>Log Settings</b>\n
* * Core/Log/Logfile This is the location of the log file * * Core/Log/Logfile This is the location of the log file \n
* * Core/Log/logFileEnabled This controls, if logging to file is enabled * * Core/Log/logFileEnabled This controls, if logging to file is enabled(bool)\n
* *
* <b>Mouse Controls<b>\n * <b>Mouse Controls<b>\n
* * Core/Mouse/Wheel/ZoomFactor Zoom factor used when turning the mouse wheel (double)\n * * Core/Mouse/Wheel/ZoomFactor Zoom factor used when turning the mouse wheel (double)\n
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment