Remove deprecated labeling tab

qgis · Jul 21, 2016 · c0ac9b18e4de65c011e98d896cdc4ea422f18976 · c0ac9b1
1 parent df2ca2e
commit c0ac9b18e4de65c011e98d896cdc4ea422f18976
Unified Split

Showing with 11 additions and 25 deletions.

+11 −25 src/ui/qgsvectorlayerpropertiesbase.ui
diff --git a/src/ui/qgsvectorlayerpropertiesbase.ui b/src/ui/qgsvectorlayerpropertiesbase.ui
@@ -129,18 +129,6 @@
             <normaloff>:/images/themes/default/propertyicons/labels.svg</normaloff>:/images/themes/default/propertyicons/labels.svg</iconset>
           </property>
          </item>
-         <item>
-          <property name="text">
-           <string>Labels (deprecated)</string>
-          </property>
-          <property name="toolTip">
-           <string>Labels (deprecated)</string>
-          </property>
-          <property name="icon">
-           <iconset resource="../../images/images.qrc">
-            <normaloff>:/images/themes/default/propertyicons/labels.png</normaloff>:/images/themes/default/propertyicons/labels.png</iconset>
-          </property>
-         </item>
          <item>
           <property name="text">
            <string>Fields</string>
@@ -282,7 +270,7 @@
           </sizepolicy>
          </property>
          <property name="currentIndex">
-          <number>12</number>
+          <number>0</number>
          </property>
          <widget class="QWidget" name="mOptsPage_General">
           <layout class="QVBoxLayout" name="verticalLayout_14">
@@ -311,8 +299,8 @@
                <rect>
                 <x>0</x>
                 <y>0</y>
-                <width>362</width>
-                <height>472</height>
+                <width>730</width>
+                <height>537</height>
                </rect>
               </property>
               <layout class="QVBoxLayout" name="verticalLayout_13">
@@ -770,8 +758,8 @@
                <rect>
                 <x>0</x>
                 <y>0</y>
-                <width>806</width>
-                <height>258</height>
+                <width>721</width>
+                <height>232</height>
                </rect>
               </property>
               <layout class="QVBoxLayout" name="verticalLayout_32">
@@ -945,8 +933,8 @@
                <rect>
                 <x>0</x>
                 <y>0</y>
-                <width>732</width>
-                <height>536</height>
+                <width>487</width>
+                <height>182</height>
                </rect>
               </property>
               <layout class="QVBoxLayout" name="verticalLayout_26">
@@ -1190,8 +1178,8 @@
                <rect>
                 <x>0</x>
                 <y>0</y>
-                <width>104</width>
-                <height>102</height>
+                <width>134</width>
+                <height>113</height>
                </rect>
               </property>
               <layout class="QVBoxLayout" name="verticalLayout_23">
@@ -1359,8 +1347,8 @@
                <rect>
                 <x>0</x>
                 <y>0</y>
-                <width>424</width>
-                <height>697</height>
+                <width>393</width>
+                <height>641</height>
                </rect>
               </property>
               <layout class="QGridLayout" name="gridLayout_3">
@@ -1902,8 +1890,6 @@
   <tabstop>txtSubsetSQL</tabstop>
   <tabstop>pbnQueryBuilder</tabstop>
   <tabstop>scrollArea_3</tabstop>
-  <tabstop>scrollArea_9</tabstop>
-  <tabstop>labelCheckBox</tabstop>
   <tabstop>scrollArea_5</tabstop>
   <tabstop>scrollArea_19</tabstop>
   <tabstop>mSimplifyDrawingGroupBox</tabstop>