[BACKORT] move Add attribute button in New vector layer dialog (fix #…

…2749) and some other minor UI fixes

src/ui/qgsnewvectorlayerdialogbase.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>444</width>
-    <height>488</height>
+    <height>543</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -125,6 +125,32 @@
       <item row="2" column="4">
        <widget class="QLineEdit" name="mPrecision"/>
       </item>
+      <item row="4" column="4">
+       <widget class="QToolButton" name="mAddAttributeButton">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="toolTip">
+         <string>Add attribute to list</string>
+        </property>
+        <property name="layoutDirection">
+         <enum>Qt::LeftToRight</enum>
+        </property>
+        <property name="text">
+         <string>Add to attributes list</string>
+        </property>
+        <property name="icon">
+         <iconset>
+          <normaloff>../../images/themes/default/mActionNewAttribute.png</normaloff>../../images/themes/default/mActionNewAttribute.png</iconset>
+        </property>
+        <property name="toolButtonStyle">
+         <enum>Qt::ToolButtonTextBesideIcon</enum>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
@@ -189,7 +215,7 @@
       <item row="3" column="1">
        <widget class="QToolButton" name="mRemoveAttributeButton">
         <property name="sizePolicy">
-         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
@@ -198,7 +224,7 @@
          <string>Delete selected attribute</string>
         </property>
         <property name="text">
-         <string>Remove selected attribute</string>
+         <string>Remove attribute</string>
         </property>
         <property name="icon">
          <iconset>
@@ -209,49 +235,10 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="0">
-       <spacer name="horizontalSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="1" column="1">
-       <widget class="QToolButton" name="mAddAttributeButton">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="toolTip">
-         <string>Add attribute to list</string>
-        </property>
-        <property name="layoutDirection">
-         <enum>Qt::LeftToRight</enum>
-        </property>
-        <property name="text">
-         <string>Add to attributes list</string>
-        </property>
-        <property name="icon">
-         <iconset>
-          <normaloff>../../images/themes/default/mActionNewAttribute.png</normaloff>../../images/themes/default/mActionNewAttribute.png</iconset>
-        </property>
-        <property name="toolButtonStyle">
-         <enum>Qt::ToolButtonTextBesideIcon</enum>
-        </property>
-       </widget>
-      </item>
      </layout>
     </widget>
    </item>
-   <item row="7" column="0" colspan="3">
+   <item row="8" column="0" colspan="3">
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
@@ -261,23 +248,6 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="0">
-    <widget class="QLabel" name="label_3">
-     <property name="text">
-      <string>CRS ID</string>
-     </property>
-     <property name="buddy">
-      <cstring>leSpatialRefSys</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="1">
-    <widget class="QLineEdit" name="leSpatialRefSys">
-     <property name="readOnly">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
    <item row="3" column="2">
     <widget class="QPushButton" name="pbnChangeSpatialRefSys">
      <property name="toolTip">
@@ -291,6 +261,13 @@
      </property>
     </widget>
    </item>
+   <item row="3" column="0" colspan="2">
+    <widget class="QLineEdit" name="leSpatialRefSys">
+     <property name="readOnly">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
@@ -305,9 +282,7 @@
   <tabstop>mTypeBox</tabstop>
   <tabstop>mWidth</tabstop>
   <tabstop>mPrecision</tabstop>
-  <tabstop>mAddAttributeButton</tabstop>
   <tabstop>mAttributeView</tabstop>
-  <tabstop>mRemoveAttributeButton</tabstop>
   <tabstop>buttonBox</tabstop>
  </tabstops>
  <resources/>