Navigation Menu

Skip to content

Commit

Permalink
use native file selection in new shapefile dialog (implements #9637)
Browse files Browse the repository at this point in the history
  • Loading branch information
@jef-n
jef-n committed Feb 24, 2014
1 parent 5db13ab commit 5fd8567
Show file tree
Hide file tree
Showing 3 changed files with 81 additions and 60 deletions.
66 changes: 33 additions & 33 deletions src/gui/qgsnewvectorlayerdialog.cpp
View file
Expand Up @@ -21,12 +21,15 @@
#include "qgslogger.h"
#include "qgscoordinatereferencesystem.h"
#include "qgsgenericprojectionselector.h"
#include <QPushButton>
#include "qgsproviderregistry.h"
#include "qgsvectordataprovider.h"
#include "qgsvectorfilewriter.h"

#include <QPushButton>
#include <QComboBox>
#include <QLibrary>
#include <QSettings>
#include "qgsencodingfiledialog.h"
#include "qgsproviderregistry.h"
#include <QFileDialog>


QgsNewVectorLayerDialog::QgsNewVectorLayerDialog( QWidget *parent, Qt::WFlags fl )
Expand Down Expand Up @@ -61,6 +64,21 @@ QgsNewVectorLayerDialog::QgsNewVectorLayerDialog( QWidget *parent, Qt::WFlags fl
mFileFormatLabel->setVisible( false );
}

mFileEncoding->addItems( QgsVectorDataProvider::availableEncodings() );

// Use default encoding if none supplied
QString enc = QSettings().value( "/UI/encoding", "System" ).toString();

// The specified decoding is added if not existing alread, and then set current.
// This should select it.
int encindex = mFileEncoding->findText( enc );
if ( encindex < 0 )
{
mFileEncoding->insertItem( 0, enc );
encindex = 0;
}
mFileEncoding->setCurrentIndex( encindex );

mOkButton = buttonBox->button( QDialogButtonBox::Ok );

mAttributeView->addTopLevelItem( new QTreeWidgetItem( QStringList() << "id" << "Integer" << "10" << "" ) );
Expand Down Expand Up @@ -203,6 +221,11 @@ QString QgsNewVectorLayerDialog::selectedFileFormat() const
return myType;
}

QString QgsNewVectorLayerDialog::selectedFileEncoding() const
{
return mFileEncoding->currentText();
}

void QgsNewVectorLayerDialog::nameChanged( QString name )
{
mAddAttributeButton->setDisabled( name.isEmpty() || mAttributeView->findItems( name, Qt::MatchExactly ).size() > 0 );
Expand All @@ -225,50 +248,27 @@ QString QgsNewVectorLayerDialog::runAndCreateLayer( QWidget* parent, QString* pE

QGis::WkbType geometrytype = geomDialog.selectedType();
QString fileformat = geomDialog.selectedFileFormat();
QString enc = geomDialog.selectedFileEncoding();
int crsId = geomDialog.selectedCrsId();
QgsDebugMsg( QString( "New file format will be: %1" ).arg( fileformat ) );

QList< QPair<QString, QString> > attributes;
geomDialog.attributes( attributes );

QString enc;
QString fileName;

QSettings settings;
QString lastUsedDir = settings.value( "/UI/lastVectorFileFilterDir", "." ).toString();

QgsDebugMsg( "Saving vector file dialog without filters: " );

QgsEncodingFileDialog* openFileDialog =
new QgsEncodingFileDialog( parent, tr( "Save As" ), lastUsedDir, "", QString( "" ) );

openFileDialog->setFileMode( QFileDialog::AnyFile );
openFileDialog->setAcceptMode( QFileDialog::AcceptSave );
openFileDialog->setConfirmOverwrite( true );

if ( settings.contains( "/UI/lastVectorFileFilter" ) )
{
QString lastUsedFilter = settings.value( "/UI/lastVectorFileFilter", QVariant( QString::null ) ).toString();
openFileDialog->selectFilter( lastUsedFilter );
}

if ( openFileDialog->exec() == QDialog::Rejected )
QString filterString = QgsVectorFileWriter::filterForDriver( fileformat );
QString fileName = QFileDialog::getSaveFileName( 0, tr( "Save layer as..." ), lastUsedDir, filterString );
if ( fileName.isNull() )
{
delete openFileDialog;
return QString();
return fileName;
}

fileName = openFileDialog->selectedFiles().first();

if ( fileformat == "ESRI Shapefile" && !fileName.endsWith( ".shp", Qt::CaseInsensitive ) )
fileName += ".shp";

enc = openFileDialog->encoding();

settings.setValue( "/UI/lastVectorFileFilter", openFileDialog->selectedFilter() );
settings.setValue( "/UI/lastVectorFileFilterDir", openFileDialog->directory().absolutePath() );

delete openFileDialog;
settings.setValue( "/UI/lastVectorFileFilterDir", QFileInfo( fileName ).absolutePath() );
settings.setValue( "/UI/encoding", enc );

//try to create the new layer with OGRProvider instead of QgsVectorFileWriter
QgsProviderRegistry * pReg = QgsProviderRegistry::instance();
Expand Down
2 changes: 2 additions & 0 deletions src/gui/qgsnewvectorlayerdialog.h
View file
Expand Up @@ -40,6 +40,8 @@ class GUI_EXPORT QgsNewVectorLayerDialog: public QDialog, private Ui::QgsNewVect
void attributes( QList< QPair<QString, QString> >& at ) const;
/**Returns the file format for storage*/
QString selectedFileFormat() const;
/**Returns the file format for storage*/
QString selectedFileEncoding() const;
/**Returns the selected crs id*/
int selectedCrsId() const;

Expand Down
73 changes: 46 additions & 27 deletions src/ui/qgsnewvectorlayerdialogbase.ui
View file
Expand Up @@ -17,27 +17,7 @@
<bool>true</bool>
</property>
<layout class="QGridLayout">
<item row="0" column="0">
<widget class="QLabel" name="mFileFormatLabel">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string>File format</string>
</property>
<property name="buddy">
<cstring>mFileFormatComboBox</cstring>
</property>
</widget>
</item>
<item row="0" column="1" colspan="2">
<widget class="QComboBox" name="mFileFormatComboBox">
<property name="enabled">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0" colspan="3">
<item row="2" column="0" colspan="3">
<widget class="QGroupBox" name="buttonGroup1">
<property name="title">
<string>Type</string>
Expand Down Expand Up @@ -67,7 +47,7 @@
</layout>
</widget>
</item>
<item row="4" column="0" colspan="3">
<item row="9" column="0" colspan="3">
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>New attribute</string>
Expand Down Expand Up @@ -154,7 +134,7 @@
</layout>
</widget>
</item>
<item row="6" column="0" colspan="3">
<item row="11" column="0" colspan="3">
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Attributes list</string>
Expand Down Expand Up @@ -238,7 +218,7 @@
</layout>
</widget>
</item>
<item row="8" column="0" colspan="3">
<item row="13" column="0" colspan="3">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
Expand All @@ -248,7 +228,7 @@
</property>
</widget>
</item>
<item row="3" column="2">
<item row="8" column="2">
<widget class="QPushButton" name="pbnChangeSpatialRefSys">
<property name="toolTip">
<string>Specify the coordinate reference system of the layer's geometry.</string>
Expand All @@ -261,18 +241,57 @@
</property>
</widget>
</item>
<item row="3" column="0" colspan="2">
<item row="8" column="0" colspan="2">
<widget class="QLineEdit" name="leSpatialRefSys">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="mFileFormatLabel">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string>File format</string>
</property>
<property name="buddy">
<cstring>mFileFormatComboBox</cstring>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="mFileFormatLabel_2">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string>File encoding</string>
</property>
<property name="buddy">
<cstring>mFileFormatComboBox</cstring>
</property>
</widget>
</item>
<item row="4" column="1" colspan="2">
<widget class="QComboBox" name="mFileFormatComboBox">
<property name="enabled">
<bool>true</bool>
</property>
</widget>
</item>
<item row="5" column="1" colspan="2">
<widget class="QComboBox" name="mFileEncoding">
<property name="enabled">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11"/>
<tabstops>
<tabstop>mFileFormatComboBox</tabstop>
<tabstop>mPointRadioButton</tabstop>
<tabstop>mLineRadioButton</tabstop>
<tabstop>mPolygonRadioButton</tabstop>
Expand Down

0 comments on commit 5fd8567

Please sign in to comment.