Skip to content

Commit

Permalink
Merge pull request #84 from mbernasocchi/android
Browse files Browse the repository at this point in the history
FIX #4201
  • Loading branch information
NathanW2 committed Jan 11, 2012
2 parents 325df26 + f7d80e5 commit 255f997
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion src/app/qgsoptions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,11 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :
cmbSize->addItem( "16" );
cmbSize->addItem( "24" );
cmbSize->addItem( "32" );
#ifdef ANDROID
int defaultCmbSize = 32;
#else
int defaultCmbSize = 24;
#endif

QStringList styles = QStyleFactory::keys();
foreach( QString style, styles )
Expand Down Expand Up @@ -281,7 +286,7 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :

// set the theme combo
cmbTheme->setCurrentIndex( cmbTheme->findText( settings.value( "/Themes", "default" ).toString() ) );
cmbSize->setCurrentIndex( cmbSize->findText( settings.value( "/IconSize", 24 ).toString() ) );
cmbSize->setCurrentIndex( cmbSize->findText( settings.value( "/IconSize", defaultCmbSize ).toString() ) );
QString name = QApplication::style()->objectName();
cmbStyle->setCurrentIndex( cmbStyle->findText( name, Qt::MatchFixedString ) );
//set the state of the checkboxes
Expand Down

0 comments on commit 255f997

Please sign in to comment.