Skip to content

Commit 3df0d4a

Browse files
committed
Standardise mix of deselect/unselect to "deselect", unify
keyboard shortcuts for deselect all (to Ctrl+Shift+A)
1 parent adae4d6 commit 3df0d4a

4 files changed

+157
-40
lines changed

src/ui/qgsattributetabledialog.ui

+23-5
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,16 @@
1414
<string>Attribute Table</string>
1515
</property>
1616
<layout class="QGridLayout" name="gridLayout">
17-
<property name="margin">
17+
<property name="leftMargin">
18+
<number>0</number>
19+
</property>
20+
<property name="topMargin">
21+
<number>0</number>
22+
</property>
23+
<property name="rightMargin">
24+
<number>0</number>
25+
</property>
26+
<property name="bottomMargin">
1827
<number>0</number>
1928
</property>
2029
<property name="spacing">
@@ -209,7 +218,7 @@
209218
<item>
210219
<widget class="QToolButton" name="mRemoveSelectionButton">
211220
<property name="toolTip">
212-
<string>Unselect all (Ctrl+U)</string>
221+
<string>Deselect all (Ctrl+Shift+A)</string>
213222
</property>
214223
<property name="text">
215224
<string/>
@@ -225,7 +234,7 @@
225234
</size>
226235
</property>
227236
<property name="shortcut">
228-
<string>Ctrl+U</string>
237+
<string>Ctrl+Shift+A</string>
229238
</property>
230239
<property name="autoRaise">
231240
<bool>true</bool>
@@ -618,7 +627,16 @@
618627
<property name="sizeConstraint">
619628
<enum>QLayout::SetDefaultConstraint</enum>
620629
</property>
621-
<property name="margin">
630+
<property name="leftMargin">
631+
<number>0</number>
632+
</property>
633+
<property name="topMargin">
634+
<number>0</number>
635+
</property>
636+
<property name="rightMargin">
637+
<number>0</number>
638+
</property>
639+
<property name="bottomMargin">
622640
<number>0</number>
623641
</property>
624642
<item row="0" column="0">
@@ -727,7 +745,7 @@
727745
</widget>
728746
</item>
729747
<item>
730-
<widget class="QgsFieldExpressionWidget" name="mUpdateExpressionText">
748+
<widget class="QgsFieldExpressionWidget" name="mUpdateExpressionText" native="true">
731749
<property name="sizePolicy">
732750
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
733751
<horstretch>0</horstretch>

src/ui/qgsdxfexportdialogbase.ui

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>394</width>
9+
<width>402</width>
1010
<height>534</height>
1111
</rect>
1212
</property>
@@ -15,8 +15,8 @@
1515
</property>
1616
<layout class="QGridLayout" name="gridLayout_2">
1717
<item row="2" column="1" colspan="2">
18-
<widget class="QgsScaleWidget" name="mScaleWidget">
19-
<property name="showCurrentScaleButton">
18+
<widget class="QgsScaleWidget" name="mScaleWidget" native="true">
19+
<property name="showCurrentScaleButton" stdset="0">
2020
<bool>true</bool>
2121
</property>
2222
</widget>
@@ -93,7 +93,7 @@
9393
<item row="0" column="2">
9494
<widget class="QPushButton" name="mUnSelectAllButton">
9595
<property name="text">
96-
<string>Unselect all</string>
96+
<string>Deselect all</string>
9797
</property>
9898
</widget>
9999
</item>

src/ui/qgsosmexportdialog.ui

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
<item>
117117
<widget class="QPushButton" name="btnUnselectAll">
118118
<property name="text">
119-
<string>Unselect All</string>
119+
<string>Deselect All</string>
120120
</property>
121121
</widget>
122122
</item>

0 commit comments

Comments
 (0)