Skip to content

Commit fbe2d99

Browse files
alexbruyalexbruy
committed
follow up 2e7867a 
1 parent 7747d1f commit fbe2d99

20 files changed

+47
-187
lines changed

‎src/plugins/delimited_text/qgsdelimitedtextplugingui.cpp‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,8 @@ QgsDelimitedTextPluginGui::QgsDelimitedTextPluginGui( QgisInterface * _qI, QWidg
9191

9292
QgsDelimitedTextPluginGui::~QgsDelimitedTextPluginGui()
9393
{
94+
QSettings settings;
95+
settings.setValue( "/Plugin-DelimitedText/geometry", saveGeometry() );
9496
}
9597

9698
void QgsDelimitedTextPluginGui::on_btnBrowseForFile_clicked()
@@ -144,8 +146,6 @@ void QgsDelimitedTextPluginGui::on_buttonBox_accepted()
144146
emit drawVectorLayer( QString::fromAscii( url.toEncoded() ), txtLayerName->text(), "delimitedtext" );
145147

146148
// store the settings
147-
saveState();
148-
149149
QSettings settings;
150150
QString key = "/Plugin-DelimitedText";
151151
settings.setValue( key + "/geometry", saveGeometry() );
@@ -172,7 +172,6 @@ void QgsDelimitedTextPluginGui::on_buttonBox_accepted()
172172

173173
void QgsDelimitedTextPluginGui::on_buttonBox_rejected()
174174
{
175-
saveState();
176175
reject();
177176
}
178177

@@ -504,9 +503,3 @@ QString QgsDelimitedTextPluginGui::readLine( QTextStream &stream )
504503
}
505504
return buffer;
506505
}
507-
508-
void QgsDelimitedTextPluginGui::saveState()
509-
{
510-
QSettings settings;
511-
settings.setValue( "/Plugin-DelimitedText/geometry", saveGeometry() );
512-
}

‎src/plugins/delimited_text/qgsdelimitedtextplugingui.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ class QgsDelimitedTextPluginGui : public QDialog, private Ui::QgsDelimitedTextPl
3838
void updateFieldLists();
3939
void getOpenFileName();
4040
QString selectedChars();
41-
void saveState();
4241

4342
QgisInterface * qI;
4443
QAbstractButton *pbnOK;

‎src/plugins/dxf2shp_converter/dxf2shpconvertergui.cpp‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ dxf2shpConverterGui::dxf2shpConverterGui( QWidget *parent, Qt::WFlags fl ):
3737

3838
dxf2shpConverterGui::~dxf2shpConverterGui()
3939
{
40+
QSettings settings;
41+
settings.setValue( "/Plugin-DXF/geometry", saveGeometry() );
4042
}
4143

4244
void dxf2shpConverterGui::on_buttonBox_accepted()
4345
{
44-
saveState();
45-
4646
QString inf = name->text();
4747
QString outd = dirout->text();
4848

@@ -120,7 +120,6 @@ void dxf2shpConverterGui::on_buttonBox_accepted()
120120

121121
void dxf2shpConverterGui::on_buttonBox_rejected()
122122
{
123-
saveState();
124123
reject();
125124
}
126125

@@ -185,12 +184,6 @@ void dxf2shpConverterGui::getOutputDir()
185184
}
186185
}
187186

188-
void dxf2shpConverterGui::saveState()
189-
{
190-
QSettings settings;
191-
settings.setValue( "/Plugin-DXF/geometry", saveGeometry() );
192-
}
193-
194187
void dxf2shpConverterGui::restoreState()
195188
{
196189
QSettings settings;

‎src/plugins/dxf2shp_converter/dxf2shpconvertergui.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ class dxf2shpConverterGui: public QDialog, private Ui::dxf2shpConverterGui
3434
void getOutputFileName();
3535
void getOutputDir();
3636

37-
void saveState();
3837
void restoreState();
3938

4039
private slots:

‎src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.cpp‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ eVisDatabaseConnectionGui::eVisDatabaseConnectionGui( QList<QTemporaryFile*>* th
5151
{
5252
setupUi( this );
5353

54-
restoreState();
54+
QSettings settings;
55+
restoreGeometry( settings.value( "/eVis/db-geometry" ).toByteArray() );
5556

5657
mTempOutputFileList = theTemoraryFileList;
5758

@@ -88,9 +89,10 @@ eVisDatabaseConnectionGui::eVisDatabaseConnectionGui( QList<QTemporaryFile*>* th
8889
*/
8990
eVisDatabaseConnectionGui::~eVisDatabaseConnectionGui( )
9091
{
92+
QSettings settings;
93+
settings.setValue( "/eVis/db-geometry", saveGeometry() );
9194
}
9295

93-
9496
/*
9597
*
9698
* Public and Private Slots
@@ -126,8 +128,6 @@ void eVisDatabaseConnectionGui::drawNewVectorLayer( QString layerName, QString x
126128
*/
127129
void eVisDatabaseConnectionGui::on_buttonBox_accepted( )
128130
{
129-
saveState();
130-
131131
//Deallocate memory, basically a predescructor
132132
if ( 0 != mDatabaseConnection )
133133
{
@@ -538,15 +538,3 @@ void eVisDatabaseConnectionGui::on_pbtnRunQuery_clicked( )
538538
}
539539
}
540540
}
541-
542-
void eVisDatabaseConnectionGui::saveState()
543-
{
544-
QSettings settings;
545-
settings.setValue( "/eVis/db-geometry", saveGeometry() );
546-
}
547-
548-
void eVisDatabaseConnectionGui::restoreState()
549-
{
550-
QSettings settings;
551-
restoreGeometry( settings.value( "/eVis/db-geometry" ).toByteArray() );
552-
}

‎src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,6 @@ class eVisDatabaseConnectionGui : public QDialog, private Ui::eVisDatabaseConnec
6868
/** \brief Pointer to a QMap which will hold the definition of preexisting query that can be loaded from an xml file */
6969
QMap<int, eVisQueryDefinition>* mQueryDefinitionMap;
7070

71-
void saveState();
72-
void restoreState();
73-
7471
private slots:
7572
/** \brief Slot called after the user selects the x, y fields in the field selection gui component */
7673
void drawNewVectorLayer( QString, QString, QString );

‎src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.cpp‎

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ eVisGenericEventBrowserGui::eVisGenericEventBrowserGui( QWidget* parent, QgisInt
5555
{
5656
setupUi( this );
5757

58-
restoreState();
58+
QSettings settings;
59+
restoreGeometry( settings.value( "/eVis/browser-geometry" ).toByteArray() );
5960

6061
mCurrentFeatureIndex = 0;
6162
mInterface = interface;
@@ -112,6 +113,9 @@ eVisGenericEventBrowserGui::eVisGenericEventBrowserGui( QWidget* parent, QgsMapC
112113
*/
113114
eVisGenericEventBrowserGui::~eVisGenericEventBrowserGui( )
114115
{
116+
QSettings settings;
117+
settings.setValue( "/eVis/browser-geometry", saveGeometry() );
118+
115119
//Clean up, disconnect the highlighting routine and refesh the canvase to clear highlighting symbol
116120
if ( 0 != mCanvas )
117121
{
@@ -457,8 +461,6 @@ void eVisGenericEventBrowserGui::accept( )
457461
myQSettings.setValue( "/eVis/applypathrulestodocs", chkboxApplyPathRulesToDocs->isChecked( ) );
458462
}
459463

460-
saveState();
461-
462464
myQSettings.remove( "/eVis/filetypeassociations" );
463465
myQSettings.beginWriteArray( "/eVis/filetypeassociations" );
464466
int myIterator = 0;
@@ -1181,16 +1183,3 @@ void eVisGenericEventBrowserGui::renderSymbol( QPainter* thePainter )
11811183
}
11821184
}
11831185
}
1184-
1185-
void eVisGenericEventBrowserGui::saveState()
1186-
{
1187-
QSettings settings;
1188-
settings.setValue( "/eVis/browser-geometry", saveGeometry() );
1189-
}
1190-
1191-
void eVisGenericEventBrowserGui::restoreState()
1192-
{
1193-
QSettings settings;
1194-
restoreGeometry( settings.value( "/eVis/browser-geometry" ).toByteArray() );
1195-
}
1196-

‎src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,9 +152,6 @@ class eVisGenericEventBrowserGui : public QDialog, private Ui::eVisGenericEventB
152152
/** \brief Sets the base path to the path of the data source */
153153
void setBasePathToDataSource( );
154154

155-
void saveState();
156-
void restoreState();
157-
158155
private slots:
159156
void launchExternalApplication( QTreeWidgetItem *, int );
160157
void on_buttonboxOptions_clicked( QAbstractButton* );

‎src/plugins/gps_importer/qgsgpsplugingui.cpp‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,13 @@ QgsGPSPluginGui::QgsGPSPluginGui( const BabelMap& importers,
8080

8181
QgsGPSPluginGui::~QgsGPSPluginGui()
8282
{
83+
QSettings settings;
84+
settings.setValue( "/Plugin-GPS/geometry", saveGeometry() );
85+
settings.setValue( "/Plugin-GPS/lastTab", tabWidget->currentIndex() );
8386
}
8487

8588
void QgsGPSPluginGui::on_buttonBox_accepted()
8689
{
87-
saveState();
88-
8990
// what should we do?
9091
switch ( tabWidget->currentIndex() )
9192
{
@@ -243,7 +244,6 @@ void QgsGPSPluginGui::enableRelevantControls()
243244

244245
void QgsGPSPluginGui::on_buttonBox_rejected()
245246
{
246-
saveState();
247247
reject();
248248
}
249249

@@ -444,13 +444,6 @@ void QgsGPSPluginGui::devicesUpdated()
444444
populateIMPBabelFormats();
445445
}
446446

447-
void QgsGPSPluginGui::saveState()
448-
{
449-
QSettings settings;
450-
settings.setValue( "/Plugin-GPS/geometry", saveGeometry() );
451-
settings.setValue( "/Plugin-GPS/lastTab", tabWidget->currentIndex() );
452-
}
453-
454447
void QgsGPSPluginGui::restoreState()
455448
{
456449
QSettings settings;

‎src/plugins/interpolation/qgsinterpolationdialog.cpp‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@ QgsInterpolationDialog::QgsInterpolationDialog( QWidget* parent, QgisInterface*
6666

6767
QgsInterpolationDialog::~QgsInterpolationDialog()
6868
{
69+
QSettings settings;
70+
settings.setValue( "/Interpolation/geometry", saveGeometry() );
71+
settings.setValue( "/Interpolation/lastMethod", mInterpolationMethodComboBox->currentIndex() );
6972
}
7073

7174
void QgsInterpolationDialog::enableOrDisableOkButton()
@@ -92,8 +95,6 @@ void QgsInterpolationDialog::enableOrDisableOkButton()
9295

9396
void QgsInterpolationDialog::on_buttonBox_accepted()
9497
{
95-
saveState();
96-
9798
if ( !mInterpolatorDialog )
9899
{
99100
return;
@@ -207,12 +208,6 @@ void QgsInterpolationDialog::on_buttonBox_accepted()
207208
delete theInterpolator;
208209
}
209210

210-
void QgsInterpolationDialog::on_buttonBox_rejected()
211-
{
212-
saveState();
213-
reject();
214-
}
215-
216211
void QgsInterpolationDialog::on_mInputLayerComboBox_currentIndexChanged( const QString& text )
217212
{
218213
Q_UNUSED( text );
@@ -594,10 +589,3 @@ QgsRectangle QgsInterpolationDialog::currentBoundingBox()
594589

595590
return QgsRectangle( xMin, yMin, xMax, yMax );
596591
}
597-
598-
void QgsInterpolationDialog::saveState()
599-
{
600-
QSettings settings;
601-
settings.setValue( "/Interpolation/geometry", saveGeometry() );
602-
settings.setValue( "/Interpolation/lastMethod", mInterpolationMethodComboBox->currentIndex() );
603-
}

0 commit comments

Comments
 (0)