Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add consistency to attribute's dialogs #2327

Merged
merged 5 commits into from
Nov 21, 2015
Merged

Add consistency to attribute's dialogs #2327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
11f683d
Use consistent terms
DelazJ Jun 20, 2015
c381a88
Merge remote-tracking branch 'upstream/master' into ConsistentTerms2
DelazJ Sep 18, 2015
f748c12
enforces consistency
DelazJ Sep 20, 2015
b600de7
fix options alignment
DelazJ Sep 20, 2015
a4b61fb
fix typo
DelazJ Nov 6, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions resources/customization.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
<widget objectName="label" class="QLabel" label="-"/>
<widget objectName="label_2" class="QLabel" label="%"/>
<widget objectName="mMinMaxRadioButton" class="QRadioButton" label="Min / max"/>
<widget objectName="mStdDevRadioButton" class="QRadioButton" label="Mean +/-&#xa;standard deviation �"/>
<widget objectName="mStdDevRadioButton" class="QRadioButton" label="Mean +/-&#xa;standard deviation ×"/>
<widget objectName="mExtentGroupBox" class="QGroupBox" label="">
<widget objectName="mFullExtentRadioButton" class="QRadioButton" label="Full"/>
<widget objectName="mCurrentExtentRadioButton" class="QRadioButton" label="Current"/>
Expand Down Expand Up @@ -1369,8 +1369,8 @@
<widget objectName="leDefaultLabel" class="QLineEdit" label=""/>
<widget objectName="textLabel5_2_2_3_2" class="QLabel" label="Font size"/>
<widget objectName="textLabel1_2_2_2_2_2" class="QLabel" label="Angle (deg)"/>
<widget objectName="spinAngle" class="QSpinBox" label="0�">
<widget objectName="qt_spinbox_lineedit" class="QLineEdit" label="0�"/>
<widget objectName="spinAngle" class="QSpinBox" label="0°">
<widget objectName="qt_spinbox_lineedit" class="QLineEdit" label="0°"/>
</widget>
<widget objectName="cboFontSizeUnits" class="QComboBox" label=""/>
<widget objectName="btnDefaultFont" class="QPushButton" label="Font"/>
Expand Down Expand Up @@ -1569,10 +1569,10 @@
<widget objectName="leUncheckedState" class="QLineEdit" label=""/>
</widget>
<widget objectName="hiddenPage" class="QWidget" label="">
<widget objectName="hiddenLabel" class="QLabel" label="A hidden attribute will be invisible - the user is not able to see it's contents."/>
<widget objectName="hiddenLabel" class="QLabel" label="A hidden field will be invisible - the user is not able to see its contents."/>
</widget>
<widget objectName="immutablePage" class="QWidget" label="">
<widget objectName="immutableLabel" class="QLabel" label="An immutable attribute is read-only - the user is not able to modify the contents."/>
<widget objectName="immutableLabel" class="QLabel" label="An immutable field is read-only - the user is not able to modify the contents."/>
</widget>
<widget objectName="enumerationPage" class="QWidget" label="">
<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."/>
Expand All @@ -1588,7 +1588,7 @@
<widget objectName="fileNameLabel" class="QLabel" label="Simplifies file selection by adding a file chooser dialog."/>
</widget>
<widget objectName="uniqueValuesPage" class="QWidget" label="">
<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."/>
<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."/>
<widget objectName="editableUniqueValues" class="QCheckBox" label="Editable"/>
</widget>
<widget objectName="rangePage" class="QWidget" label="">
Expand Down Expand Up @@ -1617,7 +1617,7 @@
<widget objectName="classificationLabel" class="QLabel" label="Displays combo box containing values of attribute used for classification."/>
</widget>
<widget objectName="lineEditPage" class="QWidget" label="">
<widget objectName="lineEditLabel" class="QLabel" label="Simple edit box. This is the default editation widget."/>
<widget objectName="lineEditLabel" class="QLabel" label="Simple edit box. This is the default edit widget."/>
</widget>
<widget objectName="calendarPage" class="QWidget" label="">
<widget objectName="label_10" class="QLabel" label="Date format"/>
Expand Down
2 changes: 1 addition & 1 deletion src/gui/editorwidgets/qgshiddenwidgetfactory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@ QgsEditorWidgetWrapper* QgsHiddenWidgetFactory::create( QgsVectorLayer* vl, int

QgsEditorConfigWidget* QgsHiddenWidgetFactory::configWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) const
{
return new QgsDummyConfigDlg( vl, fieldIdx, parent, QObject::tr( "A hidden attribute will be invisible - the user is not able to see it's contents." ) );
return new QgsDummyConfigDlg( vl, fieldIdx, parent, QObject::tr( "A hidden field will be invisible - the user is not able to see its contents." ) );
}
2 changes: 1 addition & 1 deletion src/ui/editorwidgets/qgsuniquevaluesconfigdlgbase.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="label">
<property name="text">
<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>
<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>
</property>
<property name="wordWrap">
<bool>true</bool>
Expand Down
6 changes: 3 additions & 3 deletions src/ui/qgsaddattrdialogbase.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
<rect>
<x>0</x>
<y>0</y>
<width>243</width>
<width>245</width>
<height>201</height>
</rect>
</property>
<property name="windowTitle">
<string>Add column</string>
<string>Add field</string>
</property>
<property name="modal">
<bool>true</bool>
Expand Down Expand Up @@ -86,7 +86,7 @@
<item row="4" column="0">
<widget class="QLabel" name="mLengthLabel">
<property name="text">
<string>Width</string>
<string>Length</string>
</property>
<property name="buddy">
<cstring>mLength</cstring>
Expand Down
4 changes: 2 additions & 2 deletions src/ui/qgsattributeactiondialogbase.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,8 +499,8 @@
<widget class="QLabel" name="label">
<property name="geometry">
<rect>
<x>15</x>
<y>33</y>
<x>10</x>
<y>20</y>
<width>41</width>
<height>31</height>
</rect>
Expand Down
6 changes: 3 additions & 3 deletions src/ui/qgsattributetabledialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@
<item>
<widget class="QToolButton" name="mRemoveAttribute">
<property name="toolTip">
<string>Delete column (Ctrl+L)</string>
<string>Delete field (Ctrl+L)</string>
</property>
<property name="text">
<string/>
Expand All @@ -413,7 +413,7 @@
<item>
<widget class="QToolButton" name="mAddAttribute">
<property name="toolTip">
<string>New column (Ctrl+W)</string>
<string>New field (Ctrl+W)</string>
</property>
<property name="text">
<string/>
Expand Down Expand Up @@ -746,7 +746,7 @@
</action>
<action name="mActionFilterColumnsMenu">
<property name="text">
<string>Column Filter</string>
<string>Field Filter</string>
</property>
</action>
<action name="mActionEditedFilter">
Expand Down
4 changes: 2 additions & 2 deletions src/ui/qgsdelattrdialogbase.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Delete Attributes</string>
<string>Delete fields</string>
</property>
<layout class="QGridLayout">
<property name="leftMargin">
Expand Down Expand Up @@ -53,7 +53,7 @@
<item row="2" column="0">
<widget class="QLabel" name="mCanDeleteAttributesInfo">
<property name="text">
<string>Provider does not support deleting attributes.</string>
<string>Provider does not support deleting fields.</string>
</property>
</widget>
</item>
Expand Down
4 changes: 2 additions & 2 deletions src/ui/qgsfieldcalculatorbase.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@
<item row="5" column="0">
<widget class="QLabel" name="mOutputFieldWidthLabel">
<property name="text">
<string>Output field width</string>
<string>Output field length</string>
</property>
<property name="buddy">
<cstring>mOutputFieldWidthSpinBox</cstring>
Expand All @@ -200,7 +200,7 @@
<item row="5" column="1">
<widget class="QSpinBox" name="mOutputFieldWidthSpinBox">
<property name="toolTip">
<string>Width of complete output. For example 123,456 means 6 as field width.</string>
<string>Length of complete output. For example 123,456 means 6 as field length.</string>
</property>
<property name="minimum">
<number>0</number>
Expand Down
4 changes: 2 additions & 2 deletions src/ui/qgsfieldspropertiesbase.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ MyForms.py must live on PYTHONPATH, .qgis/python, or inside the project folder.<
<item row="0" column="1">
<widget class="QToolButton" name="mDeleteAttributeButton">
<property name="toolTip">
<string>Delete column</string>
<string>Delete field</string>
</property>
<property name="text">
<string/>
Expand Down Expand Up @@ -201,7 +201,7 @@ MyForms.py must live on PYTHONPATH, .qgis/python, or inside the project folder.<
</sizepolicy>
</property>
<property name="toolTip">
<string>New column</string>
<string>New field</string>
</property>
<property name="text">
<string/>
Expand Down
14 changes: 7 additions & 7 deletions src/ui/qgsnewspatialitelayerdialogbase.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@
<item>
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>New attribute</string>
<string>New field</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
Expand Down Expand Up @@ -284,7 +284,7 @@
</sizepolicy>
</property>
<property name="toolTip">
<string>An attribute name</string>
<string>A field name</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -323,13 +323,13 @@
</sizepolicy>
</property>
<property name="toolTip">
<string>Add attribute to list</string>
<string>Add field to list</string>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</property>
<property name="text">
<string>Add to attributes list</string>
<string>Add to fields list</string>
</property>
<property name="icon">
<iconset>
Expand All @@ -346,7 +346,7 @@
<item>
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Attributes list</string>
<string>Fields list</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="1" column="0" colspan="3">
Expand Down Expand Up @@ -400,10 +400,10 @@
</sizepolicy>
</property>
<property name="toolTip">
<string>Delete selected attribute</string>
<string>Delete selected field</string>
</property>
<property name="text">
<string>Remove attribute</string>
<string>Remove field</string>
</property>
<property name="icon">
<iconset>
Expand Down
16 changes: 8 additions & 8 deletions src/ui/qgsnewvectorlayerdialogbase.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
<item row="10" column="0" colspan="3">
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>New attribute</string>
<string>New field</string>
</property>
<layout class="QGridLayout">
<item row="0" column="0">
Expand Down Expand Up @@ -139,7 +139,7 @@
<item row="2" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Width</string>
<string>Length</string>
</property>
<property name="buddy">
<cstring>mWidth</cstring>
Expand Down Expand Up @@ -171,13 +171,13 @@
</sizepolicy>
</property>
<property name="toolTip">
<string>Add attribute to list</string>
<string>Add field to list</string>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</property>
<property name="text">
<string>Add to attributes list</string>
<string>Add to fields list</string>
</property>
<property name="icon">
<iconset>
Expand All @@ -194,7 +194,7 @@
<item row="12" column="0" colspan="3">
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Attributes list</string>
<string>Fields list</string>
</property>
<layout class="QGridLayout">
<item row="2" column="0" colspan="2">
Expand Down Expand Up @@ -226,7 +226,7 @@
</column>
<column>
<property name="text">
<string>Width</string>
<string>Length</string>
</property>
</column>
<column>
Expand Down Expand Up @@ -258,10 +258,10 @@
</sizepolicy>
</property>
<property name="toolTip">
<string>Delete selected attribute</string>
<string>Delete selected field</string>
</property>
<property name="text">
<string>Remove attribute</string>
<string>Remove field</string>
</property>
<property name="icon">
<iconset>
Expand Down