sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-28 00:17:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #84 from mbernasocchi/android

Browse Source 
FIX #4201
This commit is contained in:
Nathan Woodrow 2012-01-10 16:23:09 -08:00
commit 255f997240
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/app/qgsoptions.cpp
View File

@ -67,6 +67,11 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :
cmbSize->addItem( "16" ); cmbSize->addItem( "16" );
cmbSize->addItem( "24" ); cmbSize->addItem( "24" );
cmbSize->addItem( "32" ); cmbSize->addItem( "32" );
#ifdef ANDROID
int defaultCmbSize = 32;
#else
int defaultCmbSize = 24;
#endif
QStringList styles = QStyleFactory::keys(); QStringList styles = QStyleFactory::keys();
foreach( QString style, styles ) foreach( QString style, styles )
@ -281,7 +286,7 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :
// set the theme combo // set the theme combo
cmbTheme->setCurrentIndex( cmbTheme->findText( settings.value( "/Themes", "default" ).toString() ) ); 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(); QString name = QApplication::style()->objectName();
cmbStyle->setCurrentIndex( cmbStyle->findText( name, Qt::MatchFixedString ) ); cmbStyle->setCurrentIndex( cmbStyle->findText( name, Qt::MatchFixedString ) );
//set the state of the checkboxes //set the state of the checkboxes