Skip to content

Commit 20d40bf

Browse files
ccrookccrook
committedApr 23, 2013
Post merge fixes
·
ltr-3_40archive/master_2
1 parent d835194 commit 20d40bf

File tree

1 file changed

+76
-21
lines changed

1 file changed

+76
-21
lines changed
 

‎src/ui/qgsdelimitedtextsourceselectbase.ui

Lines changed: 76 additions & 21 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 separator</string>
22+
<string/>
2323
</property>
2424
<property name="statusTip">
25-
<string>Number fields use comma for a decimal separator</string>
25+
<string/>
2626
</property>
2727
<property name="whatsThis">
28-
<string>Number fields use comma for a decimal separator</string>
28+
<string/>
2929
</property>
3030
<layout class="QGridLayout" name="gridLayout_3">
3131
<item row="1" column="0">
@@ -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 defined by the specified delimiter, quote, and escape characters</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 defined by the specified delimiter, quote, and escape characters</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 defined by the specified delimiter, quote, and escape characters</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,20 @@
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+
<property name="insertPolicy">
798+
<enum>QComboBox::InsertAtTop</enum>
799+
</property>
800+
</widget>
746801
</item>
747802
</layout>
748803
</item>
@@ -829,13 +884,13 @@
829884
</size>
830885
</property>
831886
<property name="toolTip">
832-
<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>
833888
</property>
834889
<property name="statusTip">
835-
<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>
836891
</property>
837892
<property name="whatsThis">
838-
<string>The number of lines at the beginning of the file to ignore</string>
893+
<string>The number of lines to discard from the beginning of the file</string>
839894
</property>
840895
<property name="wrapping">
841896
<bool>false</bool>
@@ -851,13 +906,13 @@
851906
<item>
852907
<widget class="QCheckBox" name="cbxUseHeader">
853908
<property name="toolTip">
854-
<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>
855910
</property>
856911
<property name="statusTip">
857-
<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>
858913
</property>
859914
<property name="whatsThis">
860-
<string>Field names are read from the first line. If not selected then fields are numbered</string>
915+
<string>Field names are read from the first record. If not selected then fields are numbered</string>
861916
</property>
862917
<property name="text">
863918
<string>First record has field names</string>
@@ -919,7 +974,7 @@
919974
<string>Discard empty fields in each record</string>
920975
</property>
921976
<property name="text">
922-
<string>Discard empty fields</string>
977+
<string>Discard empty fields</string>
923978
</property>
924979
</widget>
925980
</item>
@@ -929,16 +984,16 @@
929984
<bool>true</bool>
930985
</property>
931986
<property name="toolTip">
932-
<string>X and Y coordinates have comma for decimal point</string>
987+
<string>Number fields use comma for a decimal separator</string>
933988
</property>
934989
<property name="statusTip">
935-
<string>X and Y coordinates have comma for decimal point</string>
990+
<string>Number fields use comma for a decimal separator</string>
936991
</property>
937992
<property name="whatsThis">
938-
<string>X and Y coordinates have comma for decimal point</string>
993+
<string>Number fields use comma for a decimal separator</string>
939994
</property>
940995
<property name="text">
941-
<string>Decimal point is comma</string>
996+
<string>Decimal separator is comma</string>
942997
</property>
943998
</widget>
944999
</item>
@@ -966,7 +1021,7 @@
9661021
<tabstop>txtFilePath</tabstop>
9671022
<tabstop>btnBrowseForFile</tabstop>
9681023
<tabstop>txtLayerName</tabstop>
969-
<tabstop>cbxEncoding</tabstop>
1024+
<tabstop>cmbEncoding</tabstop>
9701025
<tabstop>delimiterCSV</tabstop>
9711026
<tabstop>delimiterChars</tabstop>
9721027
<tabstop>cbxDelimComma</tabstop>

0 commit comments

Comments
 (0)
Please sign in to comment.