@@ -83,10 +83,6 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl ) :
83
83
mStyleSheetNewOpts = mStyleSheetBuilder ->defaultOptions ();
84
84
mStyleSheetOldOpts = QMap<QString, QVariant>( mStyleSheetNewOpts );
85
85
86
- connect ( cmbTheme, SIGNAL ( activated ( const QString& ) ), this , SLOT ( themeChanged ( const QString& ) ) );
87
- connect ( cmbTheme, SIGNAL ( highlighted ( const QString& ) ), this , SLOT ( themeChanged ( const QString& ) ) );
88
- connect ( cmbTheme, SIGNAL ( textChanged ( const QString& ) ), this , SLOT ( themeChanged ( const QString& ) ) );
89
-
90
86
connect ( mFontFamilyRadioCustom , SIGNAL ( toggled ( bool ) ), mFontFamilyComboBox , SLOT ( setEnabled ( bool ) ) );
91
87
92
88
connect ( cmbIconSize, SIGNAL ( activated ( const QString& ) ), this , SLOT ( iconSizeChanged ( const QString& ) ) );
@@ -301,9 +297,6 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl ) :
301
297
// wms search server
302
298
leWmsSearch->setText ( settings.value ( " /qgis/WMSSearchUrl" , " http://geopole.org/wms/search?search=%1&type=rss" ).toString () );
303
299
304
- // set the current theme
305
- cmbTheme->setItemText ( cmbTheme->currentIndex (), settings.value ( " /Themes" ).toString () );
306
-
307
300
// set the attribute table default filter
308
301
cmbAttrTableBehaviour->clear ();
309
302
cmbAttrTableBehaviour->addItem ( tr ( " Show all features" ), QgsAttributeTableFilterModel::ShowAll );
@@ -488,22 +481,6 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl ) :
488
481
mKeepBaseUnitCheckBox ->setChecked ( false );
489
482
}
490
483
491
-
492
- // add the themes to the combo box on the option dialog
493
- QDir myThemeDir ( " :/images/themes/" );
494
- myThemeDir.setFilter ( QDir::Dirs );
495
- QStringList myDirList = myThemeDir.entryList ( QStringList ( " *" ) );
496
- cmbTheme->clear ();
497
- for ( int i = 0 ; i < myDirList.count (); i++ )
498
- {
499
- if ( myDirList[i] != " ." && myDirList[i] != " .." )
500
- {
501
- cmbTheme->addItem ( myDirList[i] );
502
- }
503
- }
504
-
505
- // set the theme combo
506
- cmbTheme->setCurrentIndex ( cmbTheme->findText ( settings.value ( " /Themes" , " default" ).toString () ) );
507
484
cmbIconSize->setCurrentIndex ( cmbIconSize->findText ( settings.value ( " /IconSize" , QGIS_ICON_SIZE ).toString () ) );
508
485
509
486
// set font size and family
@@ -945,12 +922,6 @@ void QgsOptions::on_pbnTemplateFolderReset_pressed()
945
922
leTemplateFolder->setText ( QgsApplication::qgisSettingsDirPath () + QString ( " project_templates" ) );
946
923
}
947
924
948
- void QgsOptions::themeChanged ( const QString &newThemeName )
949
- {
950
- // Slot to change the theme as user scrolls through the choices
951
- QgisApp::instance ()->setTheme ( newThemeName );
952
- }
953
-
954
925
void QgsOptions::iconSizeChanged ( const QString &iconSize )
955
926
{
956
927
QgisApp::instance ()->setIconSizes ( iconSize.toInt () );
@@ -978,12 +949,6 @@ void QgsOptions::on_mProjectOnLaunchPushBtn_pressed()
978
949
}
979
950
}
980
951
981
- QString QgsOptions::theme ()
982
- {
983
- // returns the current theme (as selected in the cmbTheme combo box)
984
- return cmbTheme->currentText ();
985
- }
986
-
987
952
void QgsOptions::saveOptions ()
988
953
{
989
954
QSettings settings;
@@ -1142,16 +1107,6 @@ void QgsOptions::saveOptions()
1142
1107
1143
1108
settings.setValue ( " /qgis/nullValue" , leNullValue->text () );
1144
1109
settings.setValue ( " /qgis/style" , cmbStyle->currentText () );
1145
-
1146
- if ( cmbTheme->currentText ().length () == 0 )
1147
- {
1148
- settings.setValue ( " /Themes" , " default" );
1149
- }
1150
- else
1151
- {
1152
- settings.setValue ( " /Themes" , cmbTheme->currentText () );
1153
- }
1154
-
1155
1110
settings.setValue ( " /IconSize" , cmbIconSize->currentText () );
1156
1111
1157
1112
settings.setValue ( " /qgis/messageTimeout" , mMessageTimeoutSpnBx ->value () );
0 commit comments