Skip to content

Commit fbe2d99

Browse files
alexbruyalexbruy
committedJan 18, 2012
follow up 2e7867a
·
ltr-3_40Before-merge-new_vector_api
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-
}

‎src/plugins/interpolation/qgsinterpolationdialog.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ class QgsInterpolationDialog: public QDialog, private Ui::QgsInterpolationDialog
3535

3636
private slots:
3737
void on_buttonBox_accepted();
38-
void on_buttonBox_rejected();
3938
void on_mInputLayerComboBox_currentIndexChanged( const QString& text );
4039
void on_mOutputFileButton_clicked();
4140
void on_mOutputFileLineEdit_textChanged();
@@ -78,8 +77,6 @@ class QgsInterpolationDialog: public QDialog, private Ui::QgsInterpolationDialog
7877
void setNewCellsizeYOnNRowschange();
7978
void setNColsOnCellsizeXChange();
8079
void setNRowsOnCellsizeYChange();
81-
82-
void saveState();
8380
};
8481

8582
#endif

‎src/plugins/offline_editing/offline_editing_plugin_gui.cpp

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ QgsOfflineEditingPluginGui::QgsOfflineEditingPluginGui( QWidget* parent /*= 0*/,
3434
setupUi( this );
3535

3636
restoreState();
37+
3738
mOfflineDbFile = "offline.sqlite";
3839
ui_offlineDataPath->setText( QDir( mOfflineDataPath ).absoluteFilePath( mOfflineDbFile ) );
3940

@@ -42,6 +43,10 @@ QgsOfflineEditingPluginGui::QgsOfflineEditingPluginGui( QWidget* parent /*= 0*/,
4243

4344
QgsOfflineEditingPluginGui::~QgsOfflineEditingPluginGui()
4445
{
46+
QSettings settings;
47+
settings.setValue( "Plugin-OfflineEditing/geometry", saveGeometry() );
48+
settings.setValue( "Plugin-OfflineEditing/offline_data_path", mOfflineDataPath );
49+
settings.setValue( "Plugin-OfflineEditing/onlyEditableLayers", checkboxShowEditableLayers->isChecked() );
4550
}
4651

4752
QString QgsOfflineEditingPluginGui::offlineDataPath()
@@ -138,14 +143,11 @@ void QgsOfflineEditingPluginGui::on_buttonBox_accepted()
138143
mSelectedLayerIds.append(( *it )->data( Qt::UserRole ).toString() );
139144
}
140145

141-
saveState();
142-
143146
accept();
144147
}
145148

146149
void QgsOfflineEditingPluginGui::on_buttonBox_rejected()
147150
{
148-
saveState();
149151
reject();
150152
}
151153

@@ -155,14 +157,6 @@ void QgsOfflineEditingPluginGui::on_buttonBox_helpRequested()
155157
QgsContextHelp::run( context_id );
156158
}
157159

158-
void QgsOfflineEditingPluginGui::saveState()
159-
{
160-
QSettings settings;
161-
settings.setValue( "Plugin-OfflineEditing/geometry", saveGeometry() );
162-
settings.setValue( "Plugin-OfflineEditing/offline_data_path", mOfflineDataPath );
163-
settings.setValue( "Plugin-OfflineEditing/onlyEditableLayers", checkboxShowEditableLayers->isChecked() );
164-
}
165-
166160
void QgsOfflineEditingPluginGui::restoreState()
167161
{
168162
QSettings settings;

‎src/plugins/oracle_raster/qgsselectgeoraster_ui.cpp

Lines changed: 6 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ QgsOracleSelectGeoraster::QgsOracleSelectGeoraster( QWidget* parent,
3737
{
3838
setupUi( this );
3939

40-
restoreState();
41-
4240
/*
4341
* Load the list of connection from the registry
4442
*/
@@ -51,6 +49,9 @@ QgsOracleSelectGeoraster::QgsOracleSelectGeoraster( QWidget* parent,
5149

5250
QSettings settings;
5351
QString selected = settings.value( "/Oracle/connections/selected" ).toString();
52+
53+
restoreGeometry( settings.value( "/Oracle/geometry" ).toByteArray() );
54+
5455
cmbConnections->setCurrentIndex( cmbConnections->findText( selected ) );
5556
if ( selected == cmbConnections->currentText() )
5657
{
@@ -60,6 +61,9 @@ QgsOracleSelectGeoraster::QgsOracleSelectGeoraster( QWidget* parent,
6061

6162
QgsOracleSelectGeoraster::~QgsOracleSelectGeoraster()
6263
{
64+
QSettings settings;
65+
settings.setValue( "/Oracle/geometry", saveGeometry() );
66+
settings.setValue( "/Oracle/connections/selected", cmbConnections->currentText() );
6367
}
6468

6569
void QgsOracleSelectGeoraster::populateConnectionList()
@@ -328,28 +332,3 @@ void QgsOracleSelectGeoraster::setConnectionListPosition()
328332
cmbConnections->setCurrentIndex( cmbConnections->count() - 1 );
329333
}
330334
}
331-
332-
void QgsOracleSelectGeoraster::on_buttonBox_accepted()
333-
{
334-
saveState();
335-
accept();
336-
}
337-
338-
void QgsOracleSelectGeoraster::on_buttonBox_rejected()
339-
{
340-
saveState();
341-
reject();
342-
}
343-
344-
void QgsOracleSelectGeoraster::saveState()
345-
{
346-
QSettings settings;
347-
settings.setValue( "/Oracle/geometry", saveGeometry() );
348-
settings.setValue( "/Oracle/connections/selected", cmbConnections->currentText() );
349-
}
350-
351-
void QgsOracleSelectGeoraster::restoreState()
352-
{
353-
QSettings settings;
354-
restoreGeometry( settings.value( "/Oracle/geometry" ).toByteArray() );
355-
}

‎src/plugins/oracle_raster/qgsselectgeoraster_ui.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,13 @@ class QgsOracleSelectGeoraster : public QDialog, private Ui::SelectGeoRasterBase
4646
void connectToServer();
4747
void setConnectionListPosition();
4848
void showSelection( const QString & line );
49-
void saveState();
50-
void restoreState();
5149

5250
public slots:
5351
void on_btnConnect_clicked() { connectToServer(); }
5452
void on_btnNew_clicked();
5553
void on_btnEdit_clicked();
5654
void on_btnDelete_clicked();
5755
void on_listWidget_clicked( QModelIndex Index );
58-
void on_buttonBox_accepted();
59-
void on_buttonBox_rejected();
6056
void on_buttonBox_helpRequested() { QgsContextHelp::run( metaObject()->className() ); }
6157
};
6258

‎src/plugins/spatialquery/qgsspatialquerydialog.cpp

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ QgsSpatialQueryDialog::QgsSpatialQueryDialog( QWidget* parent, QgisInterface* if
4949

5050
QgsSpatialQueryDialog::~QgsSpatialQueryDialog()
5151
{
52+
QSettings settings;
53+
settings.setValue( "SpatialQuery/geometry", saveGeometry() );
54+
5255
disconnectAll();
5356
delete mRubberSelectId;
5457
mMapIdVectorLayers.clear();
@@ -378,7 +381,6 @@ void QgsSpatialQueryDialog::disconnectAll()
378381

379382
void QgsSpatialQueryDialog::reject()
380383
{
381-
saveState();
382384
disconnectAll();
383385

384386
mRubberSelectId->reset();
@@ -729,7 +731,6 @@ void QgsSpatialQueryDialog::showRubberFeature( QgsVectorLayer* lyr, QgsFeatureId
729731

730732
void QgsSpatialQueryDialog::apply()
731733
{
732-
saveState();
733734
if ( ! mLayerReference )
734735
{
735736
QMessageBox::warning( 0, tr( "Missing reference layer" ), tr( "Select reference layer!" ), QMessageBox::Ok );
@@ -1080,9 +1081,3 @@ void QgsSpatialQueryDialog::MsgDEBUG( QString sMSg )
10801081
{
10811082
QMessageBox::warning( 0, tr( "DEBUG" ), sMSg, QMessageBox::Ok );
10821083
}
1083-
1084-
void QgsSpatialQueryDialog::saveState()
1085-
{
1086-
QSettings settings;
1087-
settings.setValue( "SpatialQuery/geometry", saveGeometry() );
1088-
}

‎src/plugins/spatialquery/qgsspatialquerydialog.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,6 @@ class QgsSpatialQueryDialog : public QDialog, private Ui::QgsSpatialQueryDialogB
135135
void zoomFeature( QgsVectorLayer *lyr, QgsFeatureId fid );
136136
//! Show rubber from feature
137137
void showRubberFeature( QgsVectorLayer *lyr, QgsFeatureId id );
138-
void saveState();
139138

140139
//! Pointer to Interface QGIS
141140
QgisInterface* mIface;

‎src/plugins/spit/qgsspit.cpp

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,10 @@ QgsSpit::QgsSpit( QWidget *parent, Qt::WFlags fl ) : QDialog( parent, fl )
8484

8585
QgsSpit::~QgsSpit()
8686
{
87+
QSettings settings;
88+
settings.setValue( "/Plugin-Spit/geometry", saveGeometry() );
89+
settings.setValue( "/Plugin-Spit/lastDatabase", cmbConnections->currentText() );
90+
8791
if ( conn )
8892
PQfinish( conn );
8993
}
@@ -499,8 +503,6 @@ void QgsSpit::dbConnect()
499503

500504
void QgsSpit::import()
501505
{
502-
saveState();
503-
504506
QList<QTableWidgetItem*> selected = tblShapefiles->selectedItems();
505507
for ( int i = 0; i < selected.count(); ++i )
506508
selected[i]->setSelected( false );
@@ -836,26 +838,13 @@ void QgsSpit::import()
836838
}
837839
}
838840

839-
void QgsSpit::saveState()
840-
{
841-
QSettings settings;
842-
settings.setValue( "/Plugin-Spit/geometry", saveGeometry() );
843-
settings.setValue( "/Plugin-Spit/lastDatabase", cmbConnections->currentText() );
844-
}
845-
846841
void QgsSpit::restoreState()
847842
{
848843
QSettings settings;
849844
restoreGeometry( settings.value( "/Plugin-Spit/geometry" ).toByteArray() );
850845
cmbConnections->setCurrentIndex( cmbConnections->findText( settings.value( "/Plugin-Spit/lastDatabase" ).toString() ) );
851846
}
852847

853-
void QgsSpit::on_buttonBox_rejected()
854-
{
855-
saveState();
856-
reject();
857-
}
858-
859848
QWidget *ShapefileTableDelegate::createEditor( QWidget *parent,
860849
const QStyleOptionViewItem &,
861850
const QModelIndex & index ) const

‎src/plugins/spit/qgsspit.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ class QgsSpit : public QDialog, private Ui::QgsSpitBase
8282
void on_btnRemove_clicked() { removeConnection(); }
8383
void on_buttonBox_accepted() { import(); }
8484
void on_buttonBox_helpRequested() { helpInfo(); }
85-
void on_buttonBox_rejected();
85+
void on_buttonBox_rejected() { reject(); }
8686
void on_btnAddFile_clicked() { addFile(); }
8787
void on_btnRemoveAll_clicked() { removeAllFiles(); }
8888
void on_btnRemoveFile_clicked() { removeFile(); }
@@ -94,7 +94,6 @@ class QgsSpit : public QDialog, private Ui::QgsSpitBase
9494

9595
private:
9696

97-
void saveState();
9897
void restoreState();
9998

10099
// Enum of table columns indexes

‎src/plugins/zonal_statistics/qgszonalstatisticsdialog.cpp

Lines changed: 9 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,26 @@
2626
QgsZonalStatisticsDialog::QgsZonalStatisticsDialog( QgisInterface* iface ): QDialog(), mIface( iface )
2727
{
2828
setupUi( this );
29-
restoreState();
29+
30+
QSettings settings;
31+
restoreGeometry( settings.value( "Plugin-ZonalStatistics/geometry" ).toByteArray() );
32+
3033
insertAvailableLayers();
3134
mColumnPrefixLineEdit->setText( proposeAttributePrefix() );
3235
}
3336

3437
QgsZonalStatisticsDialog::QgsZonalStatisticsDialog(): QDialog( 0 ), mIface( 0 )
3538
{
3639
setupUi( this );
37-
restoreState();
40+
41+
QSettings settings;
42+
restoreGeometry( settings.value( "Plugin-ZonalStatistics/geometry" ).toByteArray() );
3843
}
3944

4045
QgsZonalStatisticsDialog::~QgsZonalStatisticsDialog()
4146
{
47+
QSettings settings;
48+
settings.setValue( "Plugin-ZonalStatistics/geometry", saveGeometry() );
4249
}
4350

4451
void QgsZonalStatisticsDialog::insertAvailableLayers()
@@ -133,27 +140,3 @@ bool QgsZonalStatisticsDialog::prefixIsValid( const QString& prefix ) const
133140
}
134141
return true;
135142
}
136-
137-
void QgsZonalStatisticsDialog::on_buttonBox_accepted()
138-
{
139-
saveState();
140-
accept();
141-
}
142-
143-
void QgsZonalStatisticsDialog::on_buttonBox_rejected()
144-
{
145-
saveState();
146-
reject();
147-
}
148-
149-
void QgsZonalStatisticsDialog::saveState()
150-
{
151-
QSettings settings;
152-
settings.setValue( "Plugin-ZonalStatistics/geometry", saveGeometry() );
153-
}
154-
155-
void QgsZonalStatisticsDialog::restoreState()
156-
{
157-
QSettings settings;
158-
restoreGeometry( settings.value( "Plugin-ZonalStatistics/geometry" ).toByteArray() );
159-
}

‎src/plugins/zonal_statistics/qgszonalstatisticsdialog.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,6 @@ class QgsZonalStatisticsDialog: public QDialog, private Ui::QgsZonalStatisticsDi
3535
QgsVectorLayer* polygonLayer() const;
3636
QString attributePrefix() const;
3737

38-
private slots:
39-
void on_buttonBox_accepted();
40-
void on_buttonBox_rejected();
41-
4238
private:
4339
QgsZonalStatisticsDialog();
4440
/**Fills the available raster and polygon layers into the combo boxes*/
@@ -48,9 +44,6 @@ private slots:
4844
/**Check if a prefix can be used for the count, sum and mean attribute*/
4945
bool prefixIsValid( const QString& prefix ) const;
5046

51-
void saveState();
52-
void restoreState();
53-
5447
QgisInterface* mIface;
5548
};
5649

0 commit comments

Comments
 (0)
Please sign in to comment.