Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #4235 from boundlessgeo/qgssettings-housekeeping
QgsSettings housekeeping
  • Loading branch information
elpaso committed Mar 9, 2017
2 parents f5d0ba1 + 5739478 commit bbc849d
Show file tree
Hide file tree
Showing 169 changed files with 841 additions and 841 deletions.
4 changes: 2 additions & 2 deletions src/app/composer/qgsattributeselectiondialog.cpp
Expand Up @@ -284,7 +284,7 @@ QgsAttributeSelectionDialog::QgsAttributeSelectionDialog( QgsComposerAttributeTa
setupUi( this );

QgsSettings settings;
restoreGeometry( settings.value( QStringLiteral( "/Windows/AttributeSelectionDialog/geometry" ) ).toByteArray() );
restoreGeometry( settings.value( QStringLiteral( "Windows/AttributeSelectionDialog/geometry" ) ).toByteArray() );

if ( mComposerTable )
{
Expand Down Expand Up @@ -323,7 +323,7 @@ QgsAttributeSelectionDialog::QgsAttributeSelectionDialog( QgsComposerAttributeTa
QgsAttributeSelectionDialog::~QgsAttributeSelectionDialog()
{
QgsSettings settings;
settings.setValue( QStringLiteral( "/Windows/AttributeSelectionDialog/geometry" ), saveGeometry() );
settings.setValue( QStringLiteral( "Windows/AttributeSelectionDialog/geometry" ), saveGeometry() );
}

void QgsAttributeSelectionDialog::on_mRemoveColumnPushButton_clicked()
Expand Down
38 changes: 19 additions & 19 deletions src/app/composer/qgscomposer.cpp
Expand Up @@ -123,7 +123,7 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString &title )
QgsSettings settings;
setStyleSheet( mQgis->styleSheet() );

int size = settings.value( QStringLiteral( "/IconSize" ), QGIS_ICON_SIZE ).toInt();
int size = settings.value( QStringLiteral( "IconSize" ), QGIS_ICON_SIZE ).toInt();
setIconSize( QSize( size, size ) );

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

//initial state of rulers
QgsSettings myQSettings;
bool showRulers = myQSettings.value( QStringLiteral( "/Composer/showRulers" ), true ).toBool();
bool showRulers = myQSettings.value( QStringLiteral( "Composer/showRulers" ), true ).toBool();
mActionShowRulers->blockSignals( true );
mActionShowRulers->setChecked( showRulers );
mHorizontalRuler->setVisible( showRulers );
Expand Down Expand Up @@ -1420,7 +1420,7 @@ void QgsComposer::toggleRulers( bool checked )
mRulerLayoutFix->setVisible( checked );

QgsSettings myQSettings;
myQSettings.setValue( QStringLiteral( "/Composer/showRulers" ), checked );
myQSettings.setValue( QStringLiteral( "Composer/showRulers" ), checked );
}

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

if ( hasAnAtlas && !atlasOnASingleFile &&
Expand Down Expand Up @@ -1702,7 +1702,7 @@ void QgsComposer::exportCompositionAsPDF( QgsComposer::OutputMode mode )
outputFileName += QLatin1String( ".pdf" );
}

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

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

myQSettings.setValue( QStringLiteral( "/UI/lastSaveAtlasAsPdfDir" ), outputDir );
myQSettings.setValue( QStringLiteral( "UI/lastSaveAtlasAsPdfDir" ), outputDir );
}

mView->setPaintingEnabled( false );
Expand Down Expand Up @@ -2064,7 +2064,7 @@ void QgsComposer::exportCompositionAsImage( QgsComposer::OutputMode mode )

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

Expand Down Expand Up @@ -2215,8 +2215,8 @@ void QgsComposer::exportCompositionAsImage( QgsComposer::OutputMode mode )
}

QgsSettings myQSettings;
QString lastUsedDir = myQSettings.value( QStringLiteral( "/UI/lastSaveAtlasAsImagesDir" ), QDir::homePath() ).toString();
QString lastUsedFormat = myQSettings.value( QStringLiteral( "/UI/lastSaveAtlasAsImagesFormat" ), "jpg" ).toString();
QString lastUsedDir = myQSettings.value( QStringLiteral( "UI/lastSaveAtlasAsImagesDir" ), QDir::homePath() ).toString();
QString lastUsedFormat = myQSettings.value( QStringLiteral( "UI/lastSaveAtlasAsImagesFormat" ), "jpg" ).toString();

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

myQSettings.setValue( QStringLiteral( "/UI/lastSaveAtlasAsImagesDir" ), dir );
myQSettings.setValue( QStringLiteral( "UI/lastSaveAtlasAsImagesDir" ), dir );

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

if ( mode == QgsComposer::Single )
{
QString lastUsedFile = settings.value( QStringLiteral( "/UI/lastSaveAsSvgFile" ), "qgis.svg" ).toString();
QString lastUsedFile = settings.value( QStringLiteral( "UI/lastSaveAsSvgFile" ), "qgis.svg" ).toString();
QFileInfo file( lastUsedFile );

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

settings.setValue( QStringLiteral( "/UI/lastSaveAsSvgFile" ), outputFileName );
settings.setValue( QStringLiteral( "UI/lastSaveAsSvgFile" ), outputFileName );
}
else
{
Expand All @@ -2577,7 +2577,7 @@ void QgsComposer::exportCompositionAsSVG( QgsComposer::OutputMode mode )
}

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

// open file dialog
outputDir = QFileDialog::getExistingDirectory( this,
Expand All @@ -2598,7 +2598,7 @@ void QgsComposer::exportCompositionAsSVG( QgsComposer::OutputMode mode )
QMessageBox::Ok );
return;
}
myQSettings.setValue( QStringLiteral( "/UI/lastSaveAtlasAsSvgDir" ), outputDir );
myQSettings.setValue( QStringLiteral( "UI/lastSaveAtlasAsSvgDir" ), outputDir );
}

// open options dialog
Expand Down Expand Up @@ -3443,9 +3443,9 @@ void QgsComposer::showEvent( QShowEvent *event )
void QgsComposer::saveWindowState()
{
QgsSettings settings;
settings.setValue( QStringLiteral( "/Composer/geometry" ), saveGeometry() );
settings.setValue( QStringLiteral( "Composer/geometry" ), saveGeometry() );
// store the toolbar/dock widget settings using Qt4 settings API
settings.setValue( QStringLiteral( "/ComposerUI/state" ), saveState() );
settings.setValue( QStringLiteral( "ComposerUI/state" ), saveState() );
}

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

if ( !restoreState( settings.value( QStringLiteral( "/ComposerUI/state" ), QByteArray::fromRawData( ( char * )defaultComposerUIstate, sizeof defaultComposerUIstate ) ).toByteArray() ) )
if ( !restoreState( settings.value( QStringLiteral( "ComposerUI/state" ), QByteArray::fromRawData( ( char * )defaultComposerUIstate, sizeof defaultComposerUIstate ) ).toByteArray() ) )
{
QgsDebugMsg( "restore of composer UI state failed" );
}
// restore window geometry
if ( !restoreGeometry( settings.value( QStringLiteral( "/Composer/geometry" ), QByteArray::fromRawData( ( char * )defaultComposerUIgeometry, sizeof defaultComposerUIgeometry ) ).toByteArray() ) )
if ( !restoreGeometry( settings.value( QStringLiteral( "Composer/geometry" ), QByteArray::fromRawData( ( char * )defaultComposerUIgeometry, sizeof defaultComposerUIgeometry ) ).toByteArray() ) )
{
QgsDebugMsg( "restore of composer UI geometry failed" );
}
Expand Down
4 changes: 2 additions & 2 deletions src/app/composer/qgscomposerimageexportoptionsdialog.cpp
Expand Up @@ -30,13 +30,13 @@ QgsComposerImageExportOptionsDialog::QgsComposerImageExportOptionsDialog( QWidge
connect( mClipToContentGroupBox, SIGNAL( toggled( bool ) ), this, SLOT( clipToContentsToggled( bool ) ) );

QgsSettings settings;
restoreGeometry( settings.value( QStringLiteral( "/Windows/ComposerImageExportOptionsDialog/geometry" ) ).toByteArray() );
restoreGeometry( settings.value( QStringLiteral( "Windows/ComposerImageExportOptionsDialog/geometry" ) ).toByteArray() );
}

QgsComposerImageExportOptionsDialog::~QgsComposerImageExportOptionsDialog()
{
QgsSettings settings;
settings.setValue( QStringLiteral( "/Windows/ComposerImageExportOptionsDialog/geometry" ), saveGeometry() );
settings.setValue( QStringLiteral( "Windows/ComposerImageExportOptionsDialog/geometry" ), saveGeometry() );
}

void QgsComposerImageExportOptionsDialog::setResolution( int resolution )
Expand Down
8 changes: 4 additions & 4 deletions src/app/composer/qgscomposermanager.cpp
Expand Up @@ -37,7 +37,7 @@ QgsComposerManager::QgsComposerManager( QWidget *parent, Qt::WindowFlags f ): QD
setupUi( this );

QgsSettings settings;
restoreGeometry( settings.value( QStringLiteral( "/Windows/ComposerManager/geometry" ) ).toByteArray() );
restoreGeometry( settings.value( QStringLiteral( "Windows/ComposerManager/geometry" ) ).toByteArray() );

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

Expand Down Expand Up @@ -77,15 +77,15 @@ QgsComposerManager::QgsComposerManager( QWidget *parent, Qt::WindowFlags f ): QD
this->addTemplates( defaultTemplateMap );
this->addTemplates( this->otherTemplates() );

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

refreshComposers();
}

QgsComposerManager::~QgsComposerManager()
{
QgsSettings settings;
settings.setValue( QStringLiteral( "/Windows/ComposerManager/geometry" ), saveGeometry() );
settings.setValue( QStringLiteral( "Windows/ComposerManager/geometry" ), saveGeometry() );
}

void QgsComposerManager::refreshComposers()
Expand Down Expand Up @@ -313,7 +313,7 @@ void QgsComposerManager::on_mTemplate_currentIndexChanged( int indx )
void QgsComposerManager::on_mTemplatePathBtn_pressed()
{
QgsSettings settings;
QString lastTmplDir = settings.value( QStringLiteral( "/UI/lastComposerTemplateDir" ), QDir::homePath() ).toString();
QString lastTmplDir = settings.value( QStringLiteral( "UI/lastComposerTemplateDir" ), QDir::homePath() ).toString();
QString tmplPath = QFileDialog::getOpenFileName( this,
tr( "Choose template" ),
lastTmplDir,
Expand Down
4 changes: 2 additions & 2 deletions src/app/composer/qgscomposertablebackgroundcolorsdialog.cpp
Expand Up @@ -52,15 +52,15 @@ QgsComposerTableBackgroundColorsDialog::QgsComposerTableBackgroundColorsDialog(
connect( buttonBox->button( QDialogButtonBox::Apply ), SIGNAL( clicked() ), this, SLOT( apply() ) );

QgsSettings settings;
restoreGeometry( settings.value( QStringLiteral( "/Windows/ComposerTableBackgroundColorsDialog/geometry" ) ).toByteArray() );
restoreGeometry( settings.value( QStringLiteral( "Windows/ComposerTableBackgroundColorsDialog/geometry" ) ).toByteArray() );

setGuiElementValues();
}

QgsComposerTableBackgroundColorsDialog::~QgsComposerTableBackgroundColorsDialog()
{
QgsSettings settings;
settings.setValue( QStringLiteral( "/Windows/ComposerTableBackgroundColorsDialog/geometry" ), saveGeometry() );
settings.setValue( QStringLiteral( "Windows/ComposerTableBackgroundColorsDialog/geometry" ), saveGeometry() );
}

void QgsComposerTableBackgroundColorsDialog::apply()
Expand Down

0 comments on commit bbc849d

Please sign in to comment.