Skip to content

Commit cd24f54

Browse files
ccrookccrook
committedApr 17, 2013
Fixed tooltip text throughout. Renamced combo box named cbxEncoding to cmbEncoding
1 parent e1421f5 commit cd24f54

File tree

2 files changed

+80
-28
lines changed

2 files changed

+80
-28
lines changed
 

‎src/providers/delimitedtext/qgsdelimitedtextsourceselect.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ QgsDelimitedTextSourceSelect::QgsDelimitedTextSourceSelect( QWidget * parent, Qt
5050
buttonBox->button( QDialogButtonBox::Ok )->hide();
5151
}
5252

53-
cbxEncoding->clear();
53+
cmbEncoding->clear();
5454
foreach ( QByteArray codec, QTextCodec::availableCodecs() )
5555
{
56-
cbxEncoding->addItem( codec );
56+
cmbEncoding->addItem( codec );
5757
}
58-
cbxEncoding->setCurrentIndex( cbxEncoding->findText( "UTF-8" ) );
58+
cmbEncoding->setCurrentIndex( cmbEncoding->findText( "UTF-8" ) );
5959
loadSettings();
6060

6161
updateFieldsAndEnable();
@@ -249,7 +249,7 @@ void QgsDelimitedTextSourceSelect::loadSettings( QString subkey, bool loadGeomSe
249249
}
250250

251251
QString encoding = settings.value( key + "/encoding", "" ).toString();
252-
if ( ! encoding.isEmpty() ) cbxEncoding->setCurrentIndex( cbxEncoding->findText( encoding ) );
252+
if ( ! encoding.isEmpty() ) cmbEncoding->setCurrentIndex( cmbEncoding->findText( encoding ) );
253253
QString delimiters = settings.value( key + "/delimiters", "" ).toString();
254254
if ( ! delimiters.isEmpty() ) setSelectedChars( delimiters );
255255

@@ -281,7 +281,7 @@ void QgsDelimitedTextSourceSelect::saveSettings( QString subkey, bool saveGeomSe
281281
QSettings settings;
282282
QString key = mPluginKey;
283283
if ( ! subkey.isEmpty() ) key.append( "/" ).append( subkey );
284-
settings.setValue( key + "/encoding", cbxEncoding->currentText() );
284+
settings.setValue( key + "/encoding", cmbEncoding->currentText() );
285285
settings.setValue( key + "/geometry", saveGeometry() );
286286

287287
if ( delimiterCSV->isChecked() )
@@ -331,7 +331,7 @@ void QgsDelimitedTextSourceSelect::saveSettingsForFile( QString filename )
331331
bool QgsDelimitedTextSourceSelect::loadDelimitedFileDefinition()
332332
{
333333
mFile->setFileName( txtFilePath->text() );
334-
mFile->setEncoding( cbxEncoding->currentText() );
334+
mFile->setEncoding( cmbEncoding->currentText() );
335335
if ( delimiterChars->isChecked() )
336336
{
337337
mFile->setTypeCSV( selectedChars(), txtQuoteChars->text(), txtEscapeChars->text() );

‎src/ui/qgsdelimitedtextsourceselectbase.ui

Lines changed: 74 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
</iconset>
2020
</property>
2121
<property name="toolTip">
22-
<string>Number fields use comma for a decimal point</string>
22+
<string/>
2323
</property>
2424
<property name="statusTip">
25-
<string>Number fields use comma for a decimal point</string>
25+
<string/>
2626
</property>
2727
<property name="whatsThis">
28-
<string>Number fields use comma for a decimal point</string>
28+
<string/>
2929
</property>
3030
<layout class="QGridLayout" name="gridLayout_3">
3131
<item row="1" column="0">
@@ -52,13 +52,13 @@
5252
</sizepolicy>
5353
</property>
5454
<property name="toolTip">
55-
<string>Each line in the file is split using a regular expression to define the end of each field</string>
55+
<string>A regular expression defines the end of each field. Each line is a separate record</string>
5656
</property>
5757
<property name="statusTip">
58-
<string>Each line in the file is split using a regular expression to define the end of each field</string>
58+
<string>A regular expression defines the end of each field. Each line is a separate record</string>
5959
</property>
6060
<property name="whatsThis">
61-
<string>Each line in the file is split using a regular expression to define the end of each field</string>
61+
<string>A regular expression defines the end of each field. Each line is a separate record</string>
6262
</property>
6363
<property name="text">
6464
<string>Regular expression</string>
@@ -68,13 +68,13 @@
6868
<item row="2" column="0">
6969
<widget class="QRadioButton" name="delimiterChars">
7070
<property name="toolTip">
71-
<string>Fields are delimited by specified delimiters with quote and escape characters</string>
71+
<string>Fields are delimited by specified delimiters with quote and escape characters which allow delimiters and new lines within a field</string>
7272
</property>
7373
<property name="statusTip">
74-
<string>Fields are delimited by specified delimiters with quote and escape characters</string>
74+
<string>Fields are delimited by specified delimiters with quote and escape characters which allow delimiters and new lines within a field</string>
7575
</property>
7676
<property name="whatsThis">
77-
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Fields are delimited by specified delimiters with quote and escape characters&lt;/p&gt;&lt;p&gt;Fields quoted using a quote characters may contain delimiters and new lines&lt;/p&gt;&lt;p&gt;The escape character can escape new lines and quotes within quoted fields&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
77+
<string>Fields are delimited by specified delimiters with quote and escape characters which allow delimiters and new lines within a field</string>
7878
</property>
7979
<property name="text">
8080
<string>Selected delimiters</string>
@@ -122,6 +122,15 @@
122122
</property>
123123
<item>
124124
<widget class="QCheckBox" name="cbxDelimComma">
125+
<property name="toolTip">
126+
<string>Comma character is one of the delimiters</string>
127+
</property>
128+
<property name="statusTip">
129+
<string>Comma character is one of the delimiters</string>
130+
</property>
131+
<property name="whatsThis">
132+
<string>Comma character is one of the delimiters</string>
133+
</property>
125134
<property name="text">
126135
<string>Comma</string>
127136
</property>
@@ -132,6 +141,12 @@
132141
<property name="toolTip">
133142
<string>Tab character is one of the delimiters</string>
134143
</property>
144+
<property name="statusTip">
145+
<string>Tab character is one of the delimiters</string>
146+
</property>
147+
<property name="whatsThis">
148+
<string>Tab character is one of the delimiters</string>
149+
</property>
135150
<property name="text">
136151
<string>Tab</string>
137152
</property>
@@ -145,6 +160,12 @@
145160
<property name="toolTip">
146161
<string>Space character is one of the delimiters</string>
147162
</property>
163+
<property name="statusTip">
164+
<string>Space character is one of the delimiters</string>
165+
</property>
166+
<property name="whatsThis">
167+
<string>Space character is one of the delimiters</string>
168+
</property>
148169
<property name="text">
149170
<string>Space</string>
150171
</property>
@@ -155,13 +176,31 @@
155176
</item>
156177
<item>
157178
<widget class="QCheckBox" name="cbxDelimColon">
179+
<property name="toolTip">
180+
<string>Colon character is one of the delimiters</string>
181+
</property>
182+
<property name="statusTip">
183+
<string>Colon character is one of the delimiters</string>
184+
</property>
185+
<property name="whatsThis">
186+
<string>Colon character is one of the delimiters</string>
187+
</property>
158188
<property name="text">
159189
<string>Colon</string>
160190
</property>
161191
</widget>
162192
</item>
163193
<item>
164194
<widget class="QCheckBox" name="cbxDelimSemicolon">
195+
<property name="toolTip">
196+
<string>Semicolon character is one of the delimiters</string>
197+
</property>
198+
<property name="statusTip">
199+
<string>Semicolon character is one of the delimiters</string>
200+
</property>
201+
<property name="whatsThis">
202+
<string>Semicolon character is one of the delimiters</string>
203+
</property>
165204
<property name="text">
166205
<string>Semicolon</string>
167206
</property>
@@ -545,10 +584,13 @@
545584
</size>
546585
</property>
547586
<property name="toolTip">
548-
<string>Name of the field containing y values</string>
587+
<string>Name of the field containing well known text value</string>
588+
</property>
589+
<property name="statusTip">
590+
<string>Name of the field containing well known text value</string>
549591
</property>
550592
<property name="whatsThis">
551-
<string>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.</string>
593+
<string>Name of the field containing well known text value</string>
552594
</property>
553595
<property name="editable">
554596
<bool>false</bool>
@@ -742,7 +784,17 @@
742784
</widget>
743785
</item>
744786
<item>
745-
<widget class="QComboBox" name="cbxEncoding"/>
787+
<widget class="QComboBox" name="cmbEncoding">
788+
<property name="toolTip">
789+
<string>Select the file encoding</string>
790+
</property>
791+
<property name="statusTip">
792+
<string>Select the file encoding</string>
793+
</property>
794+
<property name="whatsThis">
795+
<string>Select the file encoding</string>
796+
</property>
797+
</widget>
746798
</item>
747799
</layout>
748800
</item>
@@ -829,13 +881,13 @@
829881
</size>
830882
</property>
831883
<property name="toolTip">
832-
<string>The number of lines at the beginning of the file to ignore</string>
884+
<string>The number of lines to discard from the beginning of the file</string>
833885
</property>
834886
<property name="statusTip">
835-
<string>The number of lines at the beginning of the file to ignore</string>
887+
<string>The number of lines to discard from the beginning of the file</string>
836888
</property>
837889
<property name="whatsThis">
838-
<string>The number of lines at the beginning of the file to ignore</string>
890+
<string>The number of lines to discard from the beginning of the file</string>
839891
</property>
840892
<property name="wrapping">
841893
<bool>false</bool>
@@ -851,13 +903,13 @@
851903
<item>
852904
<widget class="QCheckBox" name="cbxUseHeader">
853905
<property name="toolTip">
854-
<string>Field names are read from the first line. If not selected then fields are numbered</string>
906+
<string>Field names are read from the first record. If not selected then fields are numbered</string>
855907
</property>
856908
<property name="statusTip">
857-
<string>Field names are read from the first line. If not selected then fields are numbered</string>
909+
<string>Field names are read from the first record. If not selected then fields are numbered</string>
858910
</property>
859911
<property name="whatsThis">
860-
<string>Field names are read from the first line. If not selected then fields are numbered</string>
912+
<string>Field names are read from the first record. If not selected then fields are numbered</string>
861913
</property>
862914
<property name="text">
863915
<string>First record has field names</string>
@@ -929,13 +981,13 @@
929981
<bool>true</bool>
930982
</property>
931983
<property name="toolTip">
932-
<string>X and Y coordinates have comma for decimal point</string>
984+
<string>Number fields use comma for a decimal point</string>
933985
</property>
934986
<property name="statusTip">
935-
<string>X and Y coordinates have comma for decimal point</string>
987+
<string>Number fields use comma for a decimal point</string>
936988
</property>
937989
<property name="whatsThis">
938-
<string>X and Y coordinates have comma for decimal point</string>
990+
<string>Number fields use comma for a decimal point</string>
939991
</property>
940992
<property name="text">
941993
<string>Decimal point is comma</string>
@@ -966,7 +1018,7 @@
9661018
<tabstop>txtFilePath</tabstop>
9671019
<tabstop>btnBrowseForFile</tabstop>
9681020
<tabstop>txtLayerName</tabstop>
969-
<tabstop>cbxEncoding</tabstop>
1021+
<tabstop>cmbEncoding</tabstop>
9701022
<tabstop>delimiterCSV</tabstop>
9711023
<tabstop>delimiterChars</tabstop>
9721024
<tabstop>cbxDelimComma</tabstop>

0 commit comments

Comments
 (0)
Please sign in to comment.