Skip to content

Commit 504c252

Browse files
m-kuhnm-kuhn
committed
Merge pull request #2327 from DelazJ/ConsistentTerms2
Add consistency to attribute's dialogs
2 parents 531fec0 + a4b61fb commit 504c252

11 files changed

+38
-38
lines changed

‎resources/customization.xml

+7-7
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
<widget objectName="label" class="QLabel" label="-"/>
7979
<widget objectName="label_2" class="QLabel" label="%"/>
8080
<widget objectName="mMinMaxRadioButton" class="QRadioButton" label="Min / max"/>
81-
<widget objectName="mStdDevRadioButton" class="QRadioButton" label="Mean +/-&#xa;standard deviation ×"/>
81+
<widget objectName="mStdDevRadioButton" class="QRadioButton" label="Mean +/-&#xa;standard deviation ×"/>
8282
<widget objectName="mExtentGroupBox" class="QGroupBox" label="">
8383
<widget objectName="mFullExtentRadioButton" class="QRadioButton" label="Full"/>
8484
<widget objectName="mCurrentExtentRadioButton" class="QRadioButton" label="Current"/>
@@ -1369,8 +1369,8 @@
13691369
<widget objectName="leDefaultLabel" class="QLineEdit" label=""/>
13701370
<widget objectName="textLabel5_2_2_3_2" class="QLabel" label="Font size"/>
13711371
<widget objectName="textLabel1_2_2_2_2_2" class="QLabel" label="Angle (deg)"/>
1372-
<widget objectName="spinAngle" class="QSpinBox" label="0°">
1373-
<widget objectName="qt_spinbox_lineedit" class="QLineEdit" label="0°"/>
1372+
<widget objectName="spinAngle" class="QSpinBox" label="0°">
1373+
<widget objectName="qt_spinbox_lineedit" class="QLineEdit" label="0°"/>
13741374
</widget>
13751375
<widget objectName="cboFontSizeUnits" class="QComboBox" label=""/>
13761376
<widget objectName="btnDefaultFont" class="QPushButton" label="Font"/>
@@ -1569,10 +1569,10 @@
15691569
<widget objectName="leUncheckedState" class="QLineEdit" label=""/>
15701570
</widget>
15711571
<widget objectName="hiddenPage" class="QWidget" label="">
1572-
<widget objectName="hiddenLabel" class="QLabel" label="A hidden attribute will be invisible - the user is not able to see it's contents."/>
1572+
<widget objectName="hiddenLabel" class="QLabel" label="A hidden field will be invisible - the user is not able to see its contents."/>
15731573
</widget>
15741574
<widget objectName="immutablePage" class="QWidget" label="">
1575-
<widget objectName="immutableLabel" class="QLabel" label="An immutable attribute is read-only - the user is not able to modify the contents."/>
1575+
<widget objectName="immutableLabel" class="QLabel" label="An immutable field is read-only - the user is not able to modify the contents."/>
15761576
</widget>
15771577
<widget objectName="enumerationPage" class="QWidget" label="">
15781578
<widget objectName="enumerationLabel" class="QLabel" label="Combo box with values that can be used within the column's type. Must be supported by the provider."/>
@@ -1588,7 +1588,7 @@
15881588
<widget objectName="fileNameLabel" class="QLabel" label="Simplifies file selection by adding a file chooser dialog."/>
15891589
</widget>
15901590
<widget objectName="uniqueValuesPage" class="QWidget" label="">
1591-
<widget objectName="label" class="QLabel" label="The user can select one of the values already used in the attribute. If editable, a line edit is shown with autocompletion support, otherwise a combo box is used."/>
1591+
<widget objectName="label" class="QLabel" label="The user can select one of the values already used in the field. If editable, a line edit is shown with autocompletion support, otherwise a combo box is used."/>
15921592
<widget objectName="editableUniqueValues" class="QCheckBox" label="Editable"/>
15931593
</widget>
15941594
<widget objectName="rangePage" class="QWidget" label="">
@@ -1617,7 +1617,7 @@
16171617
<widget objectName="classificationLabel" class="QLabel" label="Displays combo box containing values of attribute used for classification."/>
16181618
</widget>
16191619
<widget objectName="lineEditPage" class="QWidget" label="">
1620-
<widget objectName="lineEditLabel" class="QLabel" label="Simple edit box. This is the default editation widget."/>
1620+
<widget objectName="lineEditLabel" class="QLabel" label="Simple edit box. This is the default edit widget."/>
16211621
</widget>
16221622
<widget objectName="calendarPage" class="QWidget" label="">
16231623
<widget objectName="label_10" class="QLabel" label="Date format"/>

‎src/gui/editorwidgets/qgshiddenwidgetfactory.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@ QgsEditorWidgetWrapper* QgsHiddenWidgetFactory::create( QgsVectorLayer* vl, int
3030

3131
QgsEditorConfigWidget* QgsHiddenWidgetFactory::configWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) const
3232
{
33-
return new QgsDummyConfigDlg( vl, fieldIdx, parent, QObject::tr( "A hidden attribute will be invisible - the user is not able to see it's contents." ) );
33+
return new QgsDummyConfigDlg( vl, fieldIdx, parent, QObject::tr( "A hidden field will be invisible - the user is not able to see its contents." ) );
3434
}

‎src/ui/editorwidgets/qgsuniquevaluesconfigdlgbase.ui

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<item row="0" column="0" colspan="2">
2121
<widget class="QLabel" name="label">
2222
<property name="text">
23-
<string>The user can select one of the values already used in the attribute. If editable, a line edit is shown with autocompletion support, otherwise a combo box is used.</string>
23+
<string>The user can select one of the values already used in the field. If editable, a line edit is shown with autocompletion support, otherwise a combo box is used.</string>
2424
</property>
2525
<property name="wordWrap">
2626
<bool>true</bool>

‎src/ui/qgsaddattrdialogbase.ui

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>243</width>
9+
<width>245</width>
1010
<height>201</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
14-
<string>Add column</string>
14+
<string>Add field</string>
1515
</property>
1616
<property name="modal">
1717
<bool>true</bool>
@@ -86,7 +86,7 @@
8686
<item row="4" column="0">
8787
<widget class="QLabel" name="mLengthLabel">
8888
<property name="text">
89-
<string>Width</string>
89+
<string>Length</string>
9090
</property>
9191
<property name="buddy">
9292
<cstring>mLength</cstring>

‎src/ui/qgsattributeactiondialogbase.ui

+2-2
Original file line numberDiff line numberDiff line change
@@ -499,8 +499,8 @@
499499
<widget class="QLabel" name="label">
500500
<property name="geometry">
501501
<rect>
502-
<x>15</x>
503-
<y>33</y>
502+
<x>10</x>
503+
<y>20</y>
504504
<width>41</width>
505505
<height>31</height>
506506
</rect>

‎src/ui/qgsattributetabledialog.ui

+3-3
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@
413413
<item>
414414
<widget class="QToolButton" name="mRemoveAttribute">
415415
<property name="toolTip">
416-
<string>Delete column (Ctrl+L)</string>
416+
<string>Delete field (Ctrl+L)</string>
417417
</property>
418418
<property name="text">
419419
<string/>
@@ -439,7 +439,7 @@
439439
<item>
440440
<widget class="QToolButton" name="mAddAttribute">
441441
<property name="toolTip">
442-
<string>New column (Ctrl+W)</string>
442+
<string>New field (Ctrl+W)</string>
443443
</property>
444444
<property name="text">
445445
<string/>
@@ -772,7 +772,7 @@
772772
</action>
773773
<action name="mActionFilterColumnsMenu">
774774
<property name="text">
775-
<string>Column Filter</string>
775+
<string>Field Filter</string>
776776
</property>
777777
</action>
778778
<action name="mActionEditedFilter">

‎src/ui/qgsdelattrdialogbase.ui

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
14-
<string>Delete Attributes</string>
14+
<string>Delete fields</string>
1515
</property>
1616
<layout class="QGridLayout">
1717
<property name="leftMargin">
@@ -53,7 +53,7 @@
5353
<item row="2" column="0">
5454
<widget class="QLabel" name="mCanDeleteAttributesInfo">
5555
<property name="text">
56-
<string>Provider does not support deleting attributes.</string>
56+
<string>Provider does not support deleting fields.</string>
5757
</property>
5858
</widget>
5959
</item>

‎src/ui/qgsfieldcalculatorbase.ui

+2-2
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@
187187
<item row="5" column="0">
188188
<widget class="QLabel" name="mOutputFieldWidthLabel">
189189
<property name="text">
190-
<string>Output field width</string>
190+
<string>Output field length</string>
191191
</property>
192192
<property name="buddy">
193193
<cstring>mOutputFieldWidthSpinBox</cstring>
@@ -200,7 +200,7 @@
200200
<item row="5" column="1">
201201
<widget class="QSpinBox" name="mOutputFieldWidthSpinBox">
202202
<property name="toolTip">
203-
<string>Width of complete output. For example 123,456 means 6 as field width.</string>
203+
<string>Length of complete output. For example 123,456 means 6 as field length.</string>
204204
</property>
205205
<property name="minimum">
206206
<number>0</number>

‎src/ui/qgsfieldspropertiesbase.ui

+2-2
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ directly in this dialog.
157157
<item row="0" column="1">
158158
<widget class="QToolButton" name="mDeleteAttributeButton">
159159
<property name="toolTip">
160-
<string>Delete column</string>
160+
<string>Delete field</string>
161161
</property>
162162
<property name="text">
163163
<string/>
@@ -212,7 +212,7 @@ directly in this dialog.
212212
</sizepolicy>
213213
</property>
214214
<property name="toolTip">
215-
<string>New column</string>
215+
<string>New field</string>
216216
</property>
217217
<property name="text">
218218
<string/>

‎src/ui/qgsnewspatialitelayerdialogbase.ui

+7-7
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@
256256
<item>
257257
<widget class="QGroupBox" name="groupBox">
258258
<property name="title">
259-
<string>New attribute</string>
259+
<string>New field</string>
260260
</property>
261261
<layout class="QGridLayout" name="gridLayout">
262262
<item row="0" column="0">
@@ -284,7 +284,7 @@
284284
</sizepolicy>
285285
</property>
286286
<property name="toolTip">
287-
<string>An attribute name</string>
287+
<string>A field name</string>
288288
</property>
289289
</widget>
290290
</item>
@@ -323,13 +323,13 @@
323323
</sizepolicy>
324324
</property>
325325
<property name="toolTip">
326-
<string>Add attribute to list</string>
326+
<string>Add field to list</string>
327327
</property>
328328
<property name="layoutDirection">
329329
<enum>Qt::LeftToRight</enum>
330330
</property>
331331
<property name="text">
332-
<string>Add to attributes list</string>
332+
<string>Add to fields list</string>
333333
</property>
334334
<property name="icon">
335335
<iconset>
@@ -346,7 +346,7 @@
346346
<item>
347347
<widget class="QGroupBox" name="groupBox_2">
348348
<property name="title">
349-
<string>Attributes list</string>
349+
<string>Fields list</string>
350350
</property>
351351
<layout class="QGridLayout" name="gridLayout_3">
352352
<item row="1" column="0" colspan="3">
@@ -400,10 +400,10 @@
400400
</sizepolicy>
401401
</property>
402402
<property name="toolTip">
403-
<string>Delete selected attribute</string>
403+
<string>Delete selected field</string>
404404
</property>
405405
<property name="text">
406-
<string>Remove attribute</string>
406+
<string>Remove field</string>
407407
</property>
408408
<property name="icon">
409409
<iconset>

‎src/ui/qgsnewvectorlayerdialogbase.ui

+8-8
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
<item row="10" column="0" colspan="3">
108108
<widget class="QGroupBox" name="groupBox">
109109
<property name="title">
110-
<string>New attribute</string>
110+
<string>New field</string>
111111
</property>
112112
<layout class="QGridLayout">
113113
<item row="0" column="0">
@@ -139,7 +139,7 @@
139139
<item row="2" column="0">
140140
<widget class="QLabel" name="label">
141141
<property name="text">
142-
<string>Width</string>
142+
<string>Length</string>
143143
</property>
144144
<property name="buddy">
145145
<cstring>mWidth</cstring>
@@ -171,13 +171,13 @@
171171
</sizepolicy>
172172
</property>
173173
<property name="toolTip">
174-
<string>Add attribute to list</string>
174+
<string>Add field to list</string>
175175
</property>
176176
<property name="layoutDirection">
177177
<enum>Qt::LeftToRight</enum>
178178
</property>
179179
<property name="text">
180-
<string>Add to attributes list</string>
180+
<string>Add to fields list</string>
181181
</property>
182182
<property name="icon">
183183
<iconset>
@@ -194,7 +194,7 @@
194194
<item row="12" column="0" colspan="3">
195195
<widget class="QGroupBox" name="groupBox_2">
196196
<property name="title">
197-
<string>Attributes list</string>
197+
<string>Fields list</string>
198198
</property>
199199
<layout class="QGridLayout">
200200
<item row="2" column="0" colspan="2">
@@ -226,7 +226,7 @@
226226
</column>
227227
<column>
228228
<property name="text">
229-
<string>Width</string>
229+
<string>Length</string>
230230
</property>
231231
</column>
232232
<column>
@@ -258,10 +258,10 @@
258258
</sizepolicy>
259259
</property>
260260
<property name="toolTip">
261-
<string>Delete selected attribute</string>
261+
<string>Delete selected field</string>
262262
</property>
263263
<property name="text">
264-
<string>Remove attribute</string>
264+
<string>Remove field</string>
265265
</property>
266266
<property name="icon">
267267
<iconset>

0 commit comments

Comments
 (0)