From cd24f5405cdec4eb86b60beff47e975be53602f1 Mon Sep 17 00:00:00 2001 From: Chris Crook Date: Wed, 17 Apr 2013 15:36:29 +1200 Subject: [PATCH] Fixed tooltip text throughout. Renamced combo box named cbxEncoding to cmbEncoding --- .../qgsdelimitedtextsourceselect.cpp | 12 +-- src/ui/qgsdelimitedtextsourceselectbase.ui | 96 ++++++++++++++----- 2 files changed, 80 insertions(+), 28 deletions(-) diff --git a/src/providers/delimitedtext/qgsdelimitedtextsourceselect.cpp b/src/providers/delimitedtext/qgsdelimitedtextsourceselect.cpp index cff44bcd10c..19b053051a5 100644 --- a/src/providers/delimitedtext/qgsdelimitedtextsourceselect.cpp +++ b/src/providers/delimitedtext/qgsdelimitedtextsourceselect.cpp @@ -50,12 +50,12 @@ QgsDelimitedTextSourceSelect::QgsDelimitedTextSourceSelect( QWidget * parent, Qt buttonBox->button( QDialogButtonBox::Ok )->hide(); } - cbxEncoding->clear(); + cmbEncoding->clear(); foreach ( QByteArray codec, QTextCodec::availableCodecs() ) { - cbxEncoding->addItem( codec ); + cmbEncoding->addItem( codec ); } - cbxEncoding->setCurrentIndex( cbxEncoding->findText( "UTF-8" ) ); + cmbEncoding->setCurrentIndex( cmbEncoding->findText( "UTF-8" ) ); loadSettings(); updateFieldsAndEnable(); @@ -249,7 +249,7 @@ void QgsDelimitedTextSourceSelect::loadSettings( QString subkey, bool loadGeomSe } QString encoding = settings.value( key + "/encoding", "" ).toString(); - if ( ! encoding.isEmpty() ) cbxEncoding->setCurrentIndex( cbxEncoding->findText( encoding ) ); + if ( ! encoding.isEmpty() ) cmbEncoding->setCurrentIndex( cmbEncoding->findText( encoding ) ); QString delimiters = settings.value( key + "/delimiters", "" ).toString(); if ( ! delimiters.isEmpty() ) setSelectedChars( delimiters ); @@ -281,7 +281,7 @@ void QgsDelimitedTextSourceSelect::saveSettings( QString subkey, bool saveGeomSe QSettings settings; QString key = mPluginKey; if ( ! subkey.isEmpty() ) key.append( "/" ).append( subkey ); - settings.setValue( key + "/encoding", cbxEncoding->currentText() ); + settings.setValue( key + "/encoding", cmbEncoding->currentText() ); settings.setValue( key + "/geometry", saveGeometry() ); if ( delimiterCSV->isChecked() ) @@ -331,7 +331,7 @@ void QgsDelimitedTextSourceSelect::saveSettingsForFile( QString filename ) bool QgsDelimitedTextSourceSelect::loadDelimitedFileDefinition() { mFile->setFileName( txtFilePath->text() ); - mFile->setEncoding( cbxEncoding->currentText() ); + mFile->setEncoding( cmbEncoding->currentText() ); if ( delimiterChars->isChecked() ) { mFile->setTypeCSV( selectedChars(), txtQuoteChars->text(), txtEscapeChars->text() ); diff --git a/src/ui/qgsdelimitedtextsourceselectbase.ui b/src/ui/qgsdelimitedtextsourceselectbase.ui index 270e344d696..61d2bbdac5e 100644 --- a/src/ui/qgsdelimitedtextsourceselectbase.ui +++ b/src/ui/qgsdelimitedtextsourceselectbase.ui @@ -19,13 +19,13 @@ - Number fields use comma for a decimal point + - Number fields use comma for a decimal point + - Number fields use comma for a decimal point + @@ -52,13 +52,13 @@ - Each line in the file is split using a regular expression to define the end of each field + A regular expression defines the end of each field. Each line is a separate record - Each line in the file is split using a regular expression to define the end of each field + A regular expression defines the end of each field. Each line is a separate record - Each line in the file is split using a regular expression to define the end of each field + A regular expression defines the end of each field. Each line is a separate record Regular expression @@ -68,13 +68,13 @@ - Fields are delimited by specified delimiters with quote and escape characters + Fields are delimited by specified delimiters with quote and escape characters which allow delimiters and new lines within a field - Fields are delimited by specified delimiters with quote and escape characters + Fields are delimited by specified delimiters with quote and escape characters which allow delimiters and new lines within a field - <html><head/><body><p>Fields are delimited by specified delimiters with quote and escape characters</p><p>Fields quoted using a quote characters may contain delimiters and new lines</p><p>The escape character can escape new lines and quotes within quoted fields</p></body></html> + Fields are delimited by specified delimiters with quote and escape characters which allow delimiters and new lines within a field Selected delimiters @@ -122,6 +122,15 @@ + + Comma character is one of the delimiters + + + Comma character is one of the delimiters + + + Comma character is one of the delimiters + Comma @@ -132,6 +141,12 @@ Tab character is one of the delimiters + + Tab character is one of the delimiters + + + Tab character is one of the delimiters + Tab @@ -145,6 +160,12 @@ Space character is one of the delimiters + + Space character is one of the delimiters + + + Space character is one of the delimiters + Space @@ -155,6 +176,15 @@ + + Colon character is one of the delimiters + + + Colon character is one of the delimiters + + + Colon character is one of the delimiters + Colon @@ -162,6 +192,15 @@ + + Semicolon character is one of the delimiters + + + Semicolon character is one of the delimiters + + + Semicolon character is one of the delimiters + Semicolon @@ -545,10 +584,13 @@ - Name of the field containing y values + Name of the field containing well known text value + + + Name of the field containing well known text value - Name of the field containing y values. Choose a field from the list. The list is generated by parsing the header row of the delimited text file. + Name of the field containing well known text value false @@ -742,7 +784,17 @@ - + + + Select the file encoding + + + Select the file encoding + + + Select the file encoding + + @@ -829,13 +881,13 @@ - The number of lines at the beginning of the file to ignore + The number of lines to discard from the beginning of the file - The number of lines at the beginning of the file to ignore + The number of lines to discard from the beginning of the file - The number of lines at the beginning of the file to ignore + The number of lines to discard from the beginning of the file false @@ -851,13 +903,13 @@ - Field names are read from the first line. If not selected then fields are numbered + Field names are read from the first record. If not selected then fields are numbered - Field names are read from the first line. If not selected then fields are numbered + Field names are read from the first record. If not selected then fields are numbered - Field names are read from the first line. If not selected then fields are numbered + Field names are read from the first record. If not selected then fields are numbered First record has field names @@ -929,13 +981,13 @@ true - X and Y coordinates have comma for decimal point + Number fields use comma for a decimal point - X and Y coordinates have comma for decimal point + Number fields use comma for a decimal point - X and Y coordinates have comma for decimal point + Number fields use comma for a decimal point Decimal point is comma @@ -966,7 +1018,7 @@ txtFilePath btnBrowseForFile txtLayerName - cbxEncoding + cmbEncoding delimiterCSV delimiterChars cbxDelimComma