Skip to content

Commit ae33b58

Browse files
m-kuhnm-kuhn
authoredNov 6, 2017
Merge pull request #5533 from DelazJ/pluginlist
[bugfix]Remember the c++ plugins folders in Options dialog
·
ltr-3_40final-3_0_0
2 parents ee59abf + 67dc318 commit ae33b58

File tree

1 file changed

+30
-35
lines changed

1 file changed

+30
-35
lines changed
 

‎src/app/qgsoptions.cpp

Lines changed: 30 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,8 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl, const QList<QgsOpti
171171
mRemoveCustomVarBtn->setEnabled( false );
172172
mCustomVariablesTable->setEnabled( false );
173173
}
174-
QStringList customVarsList = mSettings->value( QStringLiteral( "qgis/customEnvVars" ) ).toStringList();
175-
Q_FOREACH ( const QString &varStr, customVarsList )
174+
const QStringList customVarsList = mSettings->value( QStringLiteral( "qgis/customEnvVars" ) ).toStringList();
175+
for ( const QString &varStr : customVarsList )
176176
{
177177
int pos = varStr.indexOf( QLatin1Char( '|' ) );
178178
if ( pos == -1 )
@@ -204,9 +204,9 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl, const QList<QgsOpti
204204
// current environment variables
205205
mCurrentVariablesTable->horizontalHeader()->setFixedHeight( fmCustomVarH );
206206
QMap<QString, QString> sysVarsMap = QgsApplication::systemEnvVars();
207-
QStringList currentVarsList = QProcess::systemEnvironment();
207+
const QStringList currentVarsList = QProcess::systemEnvironment();
208208

209-
Q_FOREACH ( const QString &varStr, currentVarsList )
209+
for ( const QString &varStr : currentVarsList )
210210
{
211211
int pos = varStr.indexOf( QLatin1Char( '=' ) );
212212
if ( pos == -1 )
@@ -254,49 +254,44 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl, const QList<QgsOpti
254254
mCurrentVariablesTable->resizeColumnToContents( 0 );
255255

256256
//local directories to search when loading c++ plugins
257-
QStringList pathList = mSettings->value( QStringLiteral( "plugins/searchPathsForPlugins" ) ).toStringList();
258-
Q_FOREACH ( const QString &path, pathList )
257+
const QStringList pluginsPathList = mSettings->value( QStringLiteral( "plugins/searchPathsForPlugins" ) ).toStringList();
258+
for ( const QString &path : pluginsPathList )
259259
{
260260
QListWidgetItem *newItem = new QListWidgetItem( mListPluginPaths );
261261
newItem->setText( path );
262262
newItem->setFlags( Qt::ItemIsEditable | Qt::ItemIsEnabled | Qt::ItemIsSelectable );
263263
mListPluginPaths->addItem( newItem );
264264
}
265265
connect( mBtnAddPluginPath, &QAbstractButton::clicked, this, &QgsOptions::addPluginPath );
266+
connect( mBtnRemovePluginPath, &QAbstractButton::clicked, this, &QgsOptions::removePluginPath );
266267

267268
//local directories to search when looking for an SVG with a given basename
268-
pathList = QgsApplication::svgPaths();
269-
if ( !pathList.isEmpty() )
269+
const QStringList svgPathList = QgsApplication::svgPaths();
270+
for ( const QString &path : svgPathList )
270271
{
271-
Q_FOREACH ( const QString &path, pathList )
272-
{
273-
QListWidgetItem *newItem = new QListWidgetItem( mListSVGPaths );
274-
newItem->setText( path );
275-
newItem->setFlags( Qt::ItemIsEditable | Qt::ItemIsEnabled | Qt::ItemIsSelectable );
276-
mListSVGPaths->addItem( newItem );
277-
}
272+
QListWidgetItem *newItem = new QListWidgetItem( mListSVGPaths );
273+
newItem->setText( path );
274+
newItem->setFlags( Qt::ItemIsEditable | Qt::ItemIsEnabled | Qt::ItemIsSelectable );
275+
mListSVGPaths->addItem( newItem );
278276
}
279277
connect( mBtnAddSVGPath, &QAbstractButton::clicked, this, &QgsOptions::addSVGPath );
280278
connect( mBtnRemoveSVGPath, &QAbstractButton::clicked, this, &QgsOptions::removeSVGPath );
281279

282280
//local directories to search when looking for a composer templates
283-
pathList = QgsApplication::composerTemplatePaths();
284-
if ( !pathList.isEmpty() )
281+
const QStringList composerTemplatePathList = QgsApplication::composerTemplatePaths();
282+
for ( const QString &path : composerTemplatePathList )
285283
{
286-
Q_FOREACH ( const QString &path, pathList )
287-
{
288-
QListWidgetItem *newItem = new QListWidgetItem( mListComposerTemplatePaths );
289-
newItem->setText( path );
290-
newItem->setFlags( Qt::ItemIsEditable | Qt::ItemIsEnabled | Qt::ItemIsSelectable );
291-
mListComposerTemplatePaths->addItem( newItem );
292-
}
284+
QListWidgetItem *newItem = new QListWidgetItem( mListComposerTemplatePaths );
285+
newItem->setText( path );
286+
newItem->setFlags( Qt::ItemIsEditable | Qt::ItemIsEnabled | Qt::ItemIsSelectable );
287+
mListComposerTemplatePaths->addItem( newItem );
293288
}
294289
connect( mBtnAddTemplatePath, &QAbstractButton::clicked, this, &QgsOptions::addTemplatePath );
295290
connect( mBtnRemoveTemplatePath, &QAbstractButton::clicked, this, &QgsOptions::removeTemplatePath );
296291

297292
//paths hidden from browser
298-
pathList = mSettings->value( QStringLiteral( "/browser/hiddenPaths" ) ).toStringList();
299-
Q_FOREACH ( const QString &path, pathList )
293+
const QStringList hiddenPathList = mSettings->value( QStringLiteral( "/browser/hiddenPaths" ) ).toStringList();
294+
for ( const QString &path : hiddenPathList )
300295
{
301296
QListWidgetItem *newItem = new QListWidgetItem( mListHiddenBrowserPaths );
302297
newItem->setText( path );
@@ -305,8 +300,8 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl, const QList<QgsOpti
305300
connect( mBtnRemoveHiddenPath, &QAbstractButton::clicked, this, &QgsOptions::removeHiddenPath );
306301

307302
//locations of the QGIS help
308-
QStringList helpPathList = mSettings->value( QStringLiteral( "help/helpSearchPath" ), "http://docs.qgis.org/$qgis_short_version/$qgis_locale/docs/user_manual/" ).toStringList();
309-
Q_FOREACH ( const QString &path, helpPathList )
303+
const QStringList helpPathList = mSettings->value( QStringLiteral( "help/helpSearchPath" ), "http://docs.qgis.org/$qgis_short_version/$qgis_locale/docs/user_manual/" ).toStringList();
304+
for ( const QString &path : helpPathList )
310305
{
311306
QTreeWidgetItem *item = new QTreeWidgetItem();
312307
item->setText( 0, path );
@@ -355,8 +350,8 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl, const QList<QgsOpti
355350
mProxyTypeComboBox->setCurrentIndex( mProxyTypeComboBox->findText( settingProxyType ) );
356351

357352
//URLs excluded not going through proxies
358-
pathList = mSettings->value( QStringLiteral( "proxy/proxyExcludedUrls" ) ).toStringList();
359-
Q_FOREACH ( const QString &path, pathList )
353+
const QStringList excludedUrlPathList = mSettings->value( QStringLiteral( "proxy/proxyExcludedUrls" ) ).toStringList();
354+
for ( const QString &path : excludedUrlPathList )
360355
{
361356
QListWidgetItem *newItem = new QListWidgetItem( mExcludeUrlListWidget );
362357
newItem->setText( path );
@@ -787,11 +782,11 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl, const QList<QgsOpti
787782
setZoomFactorValue();
788783

789784
// predefined scales for scale combobox
790-
QString myPaths = mSettings->value( QStringLiteral( "Map/scales" ), PROJECT_SCALES ).toString();
791-
if ( !myPaths.isEmpty() )
785+
QString scalePaths = mSettings->value( QStringLiteral( "Map/scales" ), PROJECT_SCALES ).toString();
786+
if ( !scalePaths.isEmpty() )
792787
{
793-
QStringList myScalesList = myPaths.split( ',' );
794-
Q_FOREACH ( const QString &scale, myScalesList )
788+
const QStringList ScalesList = scalePaths.split( ',' );
789+
for ( const QString &scale : ScalesList )
795790
{
796791
addScaleToScaleList( scale );
797792
}
@@ -1182,7 +1177,7 @@ void QgsOptions::saveOptions()
11821177
{
11831178
pathsList << mListPluginPaths->item( i )->text();
11841179
}
1185-
mSettings->setValue( QStringLiteral( "help/helpSearchPath" ), pathsList );
1180+
mSettings->setValue( QStringLiteral( "plugins/searchPathsForPlugins" ), pathsList );
11861181

11871182
//search directories for svgs
11881183
pathsList.clear();

0 commit comments

Comments
 (0)
Please sign in to comment.