Standardise mix of deselect/unselect to "deselect", unify

keyboard shortcuts for deselect all (to Ctrl+Shift+A)
qgis · Feb 1, 2016 · 3df0d4a · 3df0d4a
1 parent adae4d6
commit 3df0d4a
Show file tree

Hide file tree

Showing 4 changed files with 157 additions and 40 deletions.
diff --git a/src/ui/qgsattributetabledialog.ui b/src/ui/qgsattributetabledialog.ui
@@ -14,7 +14,16 @@
    <string>Attribute Table</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <property name="margin">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
     <number>0</number>
    </property>
    <property name="spacing">
@@ -209,7 +218,7 @@
      <item>
       <widget class="QToolButton" name="mRemoveSelectionButton">
        <property name="toolTip">
-        <string>Unselect all (Ctrl+U)</string>
+        <string>Deselect all (Ctrl+Shift+A)</string>
        </property>
        <property name="text">
         <string/>
@@ -225,7 +234,7 @@
         </size>
        </property>
        <property name="shortcut">
-        <string>Ctrl+U</string>
+        <string>Ctrl+Shift+A</string>
        </property>
        <property name="autoRaise">
         <bool>true</bool>
@@ -618,7 +627,16 @@
         <property name="sizeConstraint">
          <enum>QLayout::SetDefaultConstraint</enum>
         </property>
-        <property name="margin">
+        <property name="leftMargin">
+         <number>0</number>
+        </property>
+        <property name="topMargin">
+         <number>0</number>
+        </property>
+        <property name="rightMargin">
+         <number>0</number>
+        </property>
+        <property name="bottomMargin">
          <number>0</number>
         </property>
         <item row="0" column="0">
@@ -727,7 +745,7 @@
        </widget>
       </item>
       <item>
-       <widget class="QgsFieldExpressionWidget" name="mUpdateExpressionText">
+       <widget class="QgsFieldExpressionWidget" name="mUpdateExpressionText" native="true">
         <property name="sizePolicy">
          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
           <horstretch>0</horstretch>

diff --git a/src/ui/qgsdxfexportdialogbase.ui b/src/ui/qgsdxfexportdialogbase.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>394</width>
+    <width>402</width>
     <height>534</height>
    </rect>
   </property>
@@ -15,8 +15,8 @@
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
    <item row="2" column="1" colspan="2">
-    <widget class="QgsScaleWidget" name="mScaleWidget">
-     <property name="showCurrentScaleButton">
+    <widget class="QgsScaleWidget" name="mScaleWidget" native="true">
+     <property name="showCurrentScaleButton" stdset="0">
       <bool>true</bool>
      </property>
     </widget>
@@ -93,7 +93,7 @@
      <item row="0" column="2">
       <widget class="QPushButton" name="mUnSelectAllButton">
        <property name="text">
-        <string>Unselect all</string>
+        <string>Deselect all</string>
        </property>
       </widget>
      </item>

diff --git a/src/ui/qgsosmexportdialog.ui b/src/ui/qgsosmexportdialog.ui
@@ -116,7 +116,7 @@
         <item>
          <widget class="QPushButton" name="btnUnselectAll">
           <property name="text">
-           <string>Unselect All</string>
+           <string>Deselect All</string>
           </property>
          </widget>
         </item>