Skip to content

Commit bbc849d

Browse files
elpasoelpaso
authored
Merge pull request #4235 from boundlessgeo/qgssettings-housekeeping
QgsSettings housekeeping
2 parents f5d0ba1 + 5739478 commit bbc849d

File tree

169 files changed

+841
-841
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

169 files changed

+841
-841
lines changed

‎src/app/composer/qgsattributeselectiondialog.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ QgsAttributeSelectionDialog::QgsAttributeSelectionDialog( QgsComposerAttributeTa
284284
setupUi( this );
285285

286286
QgsSettings settings;
287-
restoreGeometry( settings.value( QStringLiteral( "/Windows/AttributeSelectionDialog/geometry" ) ).toByteArray() );
287+
restoreGeometry( settings.value( QStringLiteral( "Windows/AttributeSelectionDialog/geometry" ) ).toByteArray() );
288288

289289
if ( mComposerTable )
290290
{
@@ -323,7 +323,7 @@ QgsAttributeSelectionDialog::QgsAttributeSelectionDialog( QgsComposerAttributeTa
323323
QgsAttributeSelectionDialog::~QgsAttributeSelectionDialog()
324324
{
325325
QgsSettings settings;
326-
settings.setValue( QStringLiteral( "/Windows/AttributeSelectionDialog/geometry" ), saveGeometry() );
326+
settings.setValue( QStringLiteral( "Windows/AttributeSelectionDialog/geometry" ), saveGeometry() );
327327
}
328328

329329
void QgsAttributeSelectionDialog::on_mRemoveColumnPushButton_clicked()

‎src/app/composer/qgscomposer.cpp

+19-19
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString &title )
123123
QgsSettings settings;
124124
setStyleSheet( mQgis->styleSheet() );
125125

126-
int size = settings.value( QStringLiteral( "/IconSize" ), QGIS_ICON_SIZE ).toInt();
126+
int size = settings.value( QStringLiteral( "IconSize" ), QGIS_ICON_SIZE ).toInt();
127127
setIconSize( QSize( size, size ) );
128128

129129
QToolButton *orderingToolButton = new QToolButton( this );
@@ -537,7 +537,7 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString &title )
537537

538538
//initial state of rulers
539539
QgsSettings myQSettings;
540-
bool showRulers = myQSettings.value( QStringLiteral( "/Composer/showRulers" ), true ).toBool();
540+
bool showRulers = myQSettings.value( QStringLiteral( "Composer/showRulers" ), true ).toBool();
541541
mActionShowRulers->blockSignals( true );
542542
mActionShowRulers->setChecked( showRulers );
543543
mHorizontalRuler->setVisible( showRulers );
@@ -1420,7 +1420,7 @@ void QgsComposer::toggleRulers( bool checked )
14201420
mRulerLayoutFix->setVisible( checked );
14211421

14221422
QgsSettings myQSettings;
1423-
myQSettings.setValue( QStringLiteral( "/Composer/showRulers" ), checked );
1423+
myQSettings.setValue( QStringLiteral( "Composer/showRulers" ), checked );
14241424
}
14251425

14261426
void QgsComposer::on_mActionAtlasSettings_triggered()
@@ -1670,7 +1670,7 @@ void QgsComposer::exportCompositionAsPDF( QgsComposer::OutputMode mode )
16701670
if ( mode == QgsComposer::Single || ( mode == QgsComposer::Atlas && atlasOnASingleFile ) )
16711671
{
16721672
QgsSettings myQSettings; // where we keep last used filter in persistent state
1673-
QString lastUsedFile = myQSettings.value( QStringLiteral( "/UI/lastSaveAsPdfFile" ), "qgis.pdf" ).toString();
1673+
QString lastUsedFile = myQSettings.value( QStringLiteral( "UI/lastSaveAsPdfFile" ), "qgis.pdf" ).toString();
16741674
QFileInfo file( lastUsedFile );
16751675

16761676
if ( hasAnAtlas && !atlasOnASingleFile &&
@@ -1702,7 +1702,7 @@ void QgsComposer::exportCompositionAsPDF( QgsComposer::OutputMode mode )
17021702
outputFileName += QLatin1String( ".pdf" );
17031703
}
17041704

1705-
myQSettings.setValue( QStringLiteral( "/UI/lastSaveAsPdfFile" ), outputFileName );
1705+
myQSettings.setValue( QStringLiteral( "UI/lastSaveAsPdfFile" ), outputFileName );
17061706
}
17071707
// else, we need to choose a directory
17081708
else
@@ -1721,7 +1721,7 @@ void QgsComposer::exportCompositionAsPDF( QgsComposer::OutputMode mode )
17211721
}
17221722

17231723
QgsSettings myQSettings;
1724-
QString lastUsedDir = myQSettings.value( QStringLiteral( "/UI/lastSaveAtlasAsPdfDir" ), QDir::homePath() ).toString();
1724+
QString lastUsedDir = myQSettings.value( QStringLiteral( "UI/lastSaveAtlasAsPdfDir" ), QDir::homePath() ).toString();
17251725
outputDir = QFileDialog::getExistingDirectory( this,
17261726
tr( "Export atlas to directory" ),
17271727
lastUsedDir,
@@ -1740,7 +1740,7 @@ void QgsComposer::exportCompositionAsPDF( QgsComposer::OutputMode mode )
17401740
return;
17411741
}
17421742

1743-
myQSettings.setValue( QStringLiteral( "/UI/lastSaveAtlasAsPdfDir" ), outputDir );
1743+
myQSettings.setValue( QStringLiteral( "UI/lastSaveAtlasAsPdfDir" ), outputDir );
17441744
}
17451745

17461746
mView->setPaintingEnabled( false );
@@ -2064,7 +2064,7 @@ void QgsComposer::exportCompositionAsImage( QgsComposer::OutputMode mode )
20642064

20652065
if ( atlasMap->enabled() && mComposition->atlasMode() == QgsComposition::PreviewAtlas )
20662066
{
2067-
QString lastUsedDir = settings.value( QStringLiteral( "/UI/lastSaveAsImageDir" ), QDir::homePath() ).toString();
2067+
QString lastUsedDir = settings.value( QStringLiteral( "UI/lastSaveAsImageDir" ), QDir::homePath() ).toString();
20682068
outputFileName = QDir( lastUsedDir ).filePath( atlasMap->currentFilename() );
20692069
}
20702070

@@ -2215,8 +2215,8 @@ void QgsComposer::exportCompositionAsImage( QgsComposer::OutputMode mode )
22152215
}
22162216

22172217
QgsSettings myQSettings;
2218-
QString lastUsedDir = myQSettings.value( QStringLiteral( "/UI/lastSaveAtlasAsImagesDir" ), QDir::homePath() ).toString();
2219-
QString lastUsedFormat = myQSettings.value( QStringLiteral( "/UI/lastSaveAtlasAsImagesFormat" ), "jpg" ).toString();
2218+
QString lastUsedDir = myQSettings.value( QStringLiteral( "UI/lastSaveAtlasAsImagesDir" ), QDir::homePath() ).toString();
2219+
QString lastUsedFormat = myQSettings.value( QStringLiteral( "UI/lastSaveAtlasAsImagesFormat" ), "jpg" ).toString();
22202220

22212221
QFileDialog dlg( this, tr( "Export atlas to directory" ) );
22222222
dlg.setFileMode( QFileDialog::Directory );
@@ -2286,7 +2286,7 @@ void QgsComposer::exportCompositionAsImage( QgsComposer::OutputMode mode )
22862286
mComposition->setCustomProperty( QStringLiteral( "imageCropMarginBottom" ), marginBottom );
22872287
mComposition->setCustomProperty( QStringLiteral( "imageCropMarginLeft" ), marginLeft );
22882288

2289-
myQSettings.setValue( QStringLiteral( "/UI/lastSaveAtlasAsImagesDir" ), dir );
2289+
myQSettings.setValue( QStringLiteral( "UI/lastSaveAtlasAsImagesDir" ), dir );
22902290

22912291
// So, now we can render the atlas
22922292
mView->setPaintingEnabled( false );
@@ -2526,7 +2526,7 @@ void QgsComposer::exportCompositionAsSVG( QgsComposer::OutputMode mode )
25262526

25272527
if ( mode == QgsComposer::Single )
25282528
{
2529-
QString lastUsedFile = settings.value( QStringLiteral( "/UI/lastSaveAsSvgFile" ), "qgis.svg" ).toString();
2529+
QString lastUsedFile = settings.value( QStringLiteral( "UI/lastSaveAsSvgFile" ), "qgis.svg" ).toString();
25302530
QFileInfo file( lastUsedFile );
25312531

25322532
if ( atlasMap->enabled() && mComposition->atlasMode() == QgsComposition::PreviewAtlas )
@@ -2558,7 +2558,7 @@ void QgsComposer::exportCompositionAsSVG( QgsComposer::OutputMode mode )
25582558
outputFileName += QLatin1String( ".svg" );
25592559
}
25602560

2561-
settings.setValue( QStringLiteral( "/UI/lastSaveAsSvgFile" ), outputFileName );
2561+
settings.setValue( QStringLiteral( "UI/lastSaveAsSvgFile" ), outputFileName );
25622562
}
25632563
else
25642564
{
@@ -2577,7 +2577,7 @@ void QgsComposer::exportCompositionAsSVG( QgsComposer::OutputMode mode )
25772577
}
25782578

25792579
QgsSettings myQSettings;
2580-
QString lastUsedDir = myQSettings.value( QStringLiteral( "/UI/lastSaveAtlasAsSvgDir" ), QDir::homePath() ).toString();
2580+
QString lastUsedDir = myQSettings.value( QStringLiteral( "UI/lastSaveAtlasAsSvgDir" ), QDir::homePath() ).toString();
25812581

25822582
// open file dialog
25832583
outputDir = QFileDialog::getExistingDirectory( this,
@@ -2598,7 +2598,7 @@ void QgsComposer::exportCompositionAsSVG( QgsComposer::OutputMode mode )
25982598
QMessageBox::Ok );
25992599
return;
26002600
}
2601-
myQSettings.setValue( QStringLiteral( "/UI/lastSaveAtlasAsSvgDir" ), outputDir );
2601+
myQSettings.setValue( QStringLiteral( "UI/lastSaveAtlasAsSvgDir" ), outputDir );
26022602
}
26032603

26042604
// open options dialog
@@ -3443,9 +3443,9 @@ void QgsComposer::showEvent( QShowEvent *event )
34433443
void QgsComposer::saveWindowState()
34443444
{
34453445
QgsSettings settings;
3446-
settings.setValue( QStringLiteral( "/Composer/geometry" ), saveGeometry() );
3446+
settings.setValue( QStringLiteral( "Composer/geometry" ), saveGeometry() );
34473447
// store the toolbar/dock widget settings using Qt4 settings API
3448-
settings.setValue( QStringLiteral( "/ComposerUI/state" ), saveState() );
3448+
settings.setValue( QStringLiteral( "ComposerUI/state" ), saveState() );
34493449
}
34503450

34513451
#include "ui_defaults.h"
@@ -3455,12 +3455,12 @@ void QgsComposer::restoreWindowState()
34553455
// restore the toolbar and dock widgets positions using Qt4 settings API
34563456
QgsSettings settings;
34573457

3458-
if ( !restoreState( settings.value( QStringLiteral( "/ComposerUI/state" ), QByteArray::fromRawData( ( char * )defaultComposerUIstate, sizeof defaultComposerUIstate ) ).toByteArray() ) )
3458+
if ( !restoreState( settings.value( QStringLiteral( "ComposerUI/state" ), QByteArray::fromRawData( ( char * )defaultComposerUIstate, sizeof defaultComposerUIstate ) ).toByteArray() ) )
34593459
{
34603460
QgsDebugMsg( "restore of composer UI state failed" );
34613461
}
34623462
// restore window geometry
3463-
if ( !restoreGeometry( settings.value( QStringLiteral( "/Composer/geometry" ), QByteArray::fromRawData( ( char * )defaultComposerUIgeometry, sizeof defaultComposerUIgeometry ) ).toByteArray() ) )
3463+
if ( !restoreGeometry( settings.value( QStringLiteral( "Composer/geometry" ), QByteArray::fromRawData( ( char * )defaultComposerUIgeometry, sizeof defaultComposerUIgeometry ) ).toByteArray() ) )
34643464
{
34653465
QgsDebugMsg( "restore of composer UI geometry failed" );
34663466
}

‎src/app/composer/qgscomposerimageexportoptionsdialog.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ QgsComposerImageExportOptionsDialog::QgsComposerImageExportOptionsDialog( QWidge
3030
connect( mClipToContentGroupBox, SIGNAL( toggled( bool ) ), this, SLOT( clipToContentsToggled( bool ) ) );
3131

3232
QgsSettings settings;
33-
restoreGeometry( settings.value( QStringLiteral( "/Windows/ComposerImageExportOptionsDialog/geometry" ) ).toByteArray() );
33+
restoreGeometry( settings.value( QStringLiteral( "Windows/ComposerImageExportOptionsDialog/geometry" ) ).toByteArray() );
3434
}
3535

3636
QgsComposerImageExportOptionsDialog::~QgsComposerImageExportOptionsDialog()
3737
{
3838
QgsSettings settings;
39-
settings.setValue( QStringLiteral( "/Windows/ComposerImageExportOptionsDialog/geometry" ), saveGeometry() );
39+
settings.setValue( QStringLiteral( "Windows/ComposerImageExportOptionsDialog/geometry" ), saveGeometry() );
4040
}
4141

4242
void QgsComposerImageExportOptionsDialog::setResolution( int resolution )

‎src/app/composer/qgscomposermanager.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ QgsComposerManager::QgsComposerManager( QWidget *parent, Qt::WindowFlags f ): QD
3737
setupUi( this );
3838

3939
QgsSettings settings;
40-
restoreGeometry( settings.value( QStringLiteral( "/Windows/ComposerManager/geometry" ) ).toByteArray() );
40+
restoreGeometry( settings.value( QStringLiteral( "Windows/ComposerManager/geometry" ) ).toByteArray() );
4141

4242
mComposerListWidget->setItemDelegate( new QgsComposerNameDelegate( mComposerListWidget ) );
4343

@@ -77,15 +77,15 @@ QgsComposerManager::QgsComposerManager( QWidget *parent, Qt::WindowFlags f ): QD
7777
this->addTemplates( defaultTemplateMap );
7878
this->addTemplates( this->otherTemplates() );
7979

80-
mTemplatePathLineEdit->setText( settings.value( QStringLiteral( "/UI/ComposerManager/templatePath" ), QString() ).toString() );
80+
mTemplatePathLineEdit->setText( settings.value( QStringLiteral( "UI/ComposerManager/templatePath" ), QString() ).toString() );
8181

8282
refreshComposers();
8383
}
8484

8585
QgsComposerManager::~QgsComposerManager()
8686
{
8787
QgsSettings settings;
88-
settings.setValue( QStringLiteral( "/Windows/ComposerManager/geometry" ), saveGeometry() );
88+
settings.setValue( QStringLiteral( "Windows/ComposerManager/geometry" ), saveGeometry() );
8989
}
9090

9191
void QgsComposerManager::refreshComposers()
@@ -313,7 +313,7 @@ void QgsComposerManager::on_mTemplate_currentIndexChanged( int indx )
313313
void QgsComposerManager::on_mTemplatePathBtn_pressed()
314314
{
315315
QgsSettings settings;
316-
QString lastTmplDir = settings.value( QStringLiteral( "/UI/lastComposerTemplateDir" ), QDir::homePath() ).toString();
316+
QString lastTmplDir = settings.value( QStringLiteral( "UI/lastComposerTemplateDir" ), QDir::homePath() ).toString();
317317
QString tmplPath = QFileDialog::getOpenFileName( this,
318318
tr( "Choose template" ),
319319
lastTmplDir,

‎src/app/composer/qgscomposertablebackgroundcolorsdialog.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,15 @@ QgsComposerTableBackgroundColorsDialog::QgsComposerTableBackgroundColorsDialog(
5252
connect( buttonBox->button( QDialogButtonBox::Apply ), SIGNAL( clicked() ), this, SLOT( apply() ) );
5353

5454
QgsSettings settings;
55-
restoreGeometry( settings.value( QStringLiteral( "/Windows/ComposerTableBackgroundColorsDialog/geometry" ) ).toByteArray() );
55+
restoreGeometry( settings.value( QStringLiteral( "Windows/ComposerTableBackgroundColorsDialog/geometry" ) ).toByteArray() );
5656

5757
setGuiElementValues();
5858
}
5959

6060
QgsComposerTableBackgroundColorsDialog::~QgsComposerTableBackgroundColorsDialog()
6161
{
6262
QgsSettings settings;
63-
settings.setValue( QStringLiteral( "/Windows/ComposerTableBackgroundColorsDialog/geometry" ), saveGeometry() );
63+
settings.setValue( QStringLiteral( "Windows/ComposerTableBackgroundColorsDialog/geometry" ), saveGeometry() );
6464
}
6565

6666
void QgsComposerTableBackgroundColorsDialog::apply()

0 commit comments

Comments
 (0)