Commit 025616ee authored by Jan Möbius's avatar Jan Möbius
Browse files

Dennis:

 Show all logger states in options dialog.

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@5207 383ad7c9-94d9-4d36-a494-682f7c89f535
parent e4709a2c
...@@ -127,8 +127,10 @@ void OptionsWidget::showEvent ( QShowEvent * /*event*/ ) { ...@@ -127,8 +127,10 @@ void OptionsWidget::showEvent ( QShowEvent * /*event*/ ) {
fullscreen->setChecked( OpenFlipper::Options::fullScreen() ); fullscreen->setChecked( OpenFlipper::Options::fullScreen() );
splash->setChecked( OpenFlipper::Options::splash() ); splash->setChecked( OpenFlipper::Options::splash() );
toolbox->setChecked( !OpenFlipper::Options::hideToolbox() ); toolbox->setChecked( !OpenFlipper::Options::hideToolbox() );
#warning FIXME
logger->setChecked( OpenFlipper::Options::loggerState() != OpenFlipper::Options::Hidden); loggerHidden->setChecked( OpenFlipper::Options::loggerState() == OpenFlipper::Options::Hidden);
loggerNormal->setChecked( OpenFlipper::Options::loggerState() == OpenFlipper::Options::Normal);
loggerInScene->setChecked( OpenFlipper::Options::loggerState() == OpenFlipper::Options::InScene);
enableLogFile->setChecked( OpenFlipper::Options::logFileEnabled() ); enableLogFile->setChecked( OpenFlipper::Options::logFileEnabled() );
//paths //paths
...@@ -360,10 +362,12 @@ void OptionsWidget::slotApply() { ...@@ -360,10 +362,12 @@ void OptionsWidget::slotApply() {
OpenFlipper::Options::fullScreen( fullscreen->isChecked() ); OpenFlipper::Options::fullScreen( fullscreen->isChecked() );
OpenFlipper::Options::splash( splash->isChecked() ); OpenFlipper::Options::splash( splash->isChecked() );
OpenFlipper::Options::hideToolbox( !toolbox->isChecked() ); OpenFlipper::Options::hideToolbox( !toolbox->isChecked() );
if (logger->isChecked()) if (loggerHidden->isChecked())
OpenFlipper::Options::loggerState( OpenFlipper::Options::Normal );
else
OpenFlipper::Options::loggerState( OpenFlipper::Options::Hidden ); OpenFlipper::Options::loggerState( OpenFlipper::Options::Hidden );
else if (loggerInScene->isChecked())
OpenFlipper::Options::loggerState( OpenFlipper::Options::InScene );
else
OpenFlipper::Options::loggerState( OpenFlipper::Options::Normal );
OpenFlipper::Options::logFileEnabled( enableLogFile->isChecked() ); OpenFlipper::Options::logFileEnabled( enableLogFile->isChecked() );
//paths //paths
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<string/> <string/>
</property> </property>
<property name="currentIndex" > <property name="currentIndex" >
<number>2</number> <number>0</number>
</property> </property>
<property name="usesScrollButtons" > <property name="usesScrollButtons" >
<bool>true</bool> <bool>true</bool>
...@@ -71,19 +71,6 @@ ...@@ -71,19 +71,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QCheckBox" name="logger" >
<property name="toolTip" >
<string>Show the Logger window at the bottom</string>
</property>
<property name="statusTip" >
<string>Show the Logger window at the bottom</string>
</property>
<property name="text" >
<string>Show Logger (CTRL+L)</string>
</property>
</widget>
</item>
<item> <item>
<widget class="Line" name="line" > <widget class="Line" name="line" >
<property name="orientation" > <property name="orientation" >
...@@ -104,6 +91,36 @@ ...@@ -104,6 +91,36 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QGroupBox" name="groupBox_4" >
<property name="title" >
<string>Logger (CTRL+L)</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_13" >
<item>
<widget class="QRadioButton" name="loggerHidden" >
<property name="text" >
<string>Hidden</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="loggerNormal" >
<property name="text" >
<string>Normal</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="loggerInScene" >
<property name="text" >
<string>Embedded into GL scene</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item> <item>
<spacer name="verticalSpacer" > <spacer name="verticalSpacer" >
<property name="orientation" > <property name="orientation" >
......
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