Skip to content

Commit

Permalink
Finish refactoring that caused build error
Browse files Browse the repository at this point in the history
  • Loading branch information
dakcarto committed Jan 13, 2013
1 parent 906c7a1 commit ccbd3e2
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions src/app/qgsoptions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :
}
blockSignals( false );

mInfoBarTimeoutSpnBx->setValue( settings.value( "/qgis/messageTimeout", 5 ).toInt() );
mMessageTimeoutSpnBx->setValue( settings.value( "/qgis/messageTimeout", 5 ).toInt() );

QString name = QApplication::style()->objectName();
cmbStyle->setCurrentIndex( cmbStyle->findText( name, Qt::MatchFixedString ) );
Expand Down Expand Up @@ -1080,8 +1080,8 @@ void QgsOptions::saveOptions()
settings.setValue( "/fontFamily", fontFamily );
QgisApp::instance()->setAppStyleSheet();

settings.setValue( "/qgis/messageTimeout", mInfoBarTimeoutSpnBx->value() );
QgisApp::instance()->setMessageTimeout( mInfoBarTimeoutSpnBx->value() );
settings.setValue( "/qgis/messageTimeout", mMessageTimeoutSpnBx->value() );
QgisApp::instance()->setMessageTimeout( mMessageTimeoutSpnBx->value() );

// rasters settings
settings.setValue( "/Raster/defaultRedBand", spnRed->value() );
Expand Down
4 changes: 2 additions & 2 deletions src/ui/qgsoptionsbase.ui
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@
<item>
<layout class="QHBoxLayout" name="horizontalLayout_28">
<item>
<widget class="QLabel" name="mInfoBarTimeoutLabel">
<widget class="QLabel" name="mMessageTimeoutLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
Expand All @@ -494,7 +494,7 @@
</spacer>
</item>
<item>
<widget class="QSpinBox" name="mInfoBarTimeoutSpnBx">
<widget class="QSpinBox" name="mMessageTimeoutSpnBx">
<property name="suffix">
<string> s</string>
</property>
Expand Down

0 comments on commit ccbd3e2

Please sign in to comment.