[QGIS Commit] r13519 - in trunk/qgis/src: app ui

svn_qgis at osgeo.org svn_qgis at osgeo.org
Mon May 17 18:31:16 EDT 2010


Author: jef
Date: 2010-05-17 18:31:16 -0400 (Mon, 17 May 2010)
New Revision: 13519

Modified:
   trunk/qgis/src/app/qgsvectorlayerproperties.cpp
   trunk/qgis/src/ui/qgsoptionsbase.ui
   trunk/qgis/src/ui/qgsrasterlayerpropertiesbase.ui
   trunk/qgis/src/ui/qgsvectorlayerpropertiesbase.ui
Log:
append space to list widgets in options and vector and raster layer property dialogs (fixes #2554)

Modified: trunk/qgis/src/app/qgsvectorlayerproperties.cpp
===================================================================
--- trunk/qgis/src/app/qgsvectorlayerproperties.cpp	2010-05-17 22:20:07 UTC (rev 13518)
+++ trunk/qgis/src/app/qgsvectorlayerproperties.cpp	2010-05-17 22:31:16 UTC (rev 13519)
@@ -145,7 +145,7 @@
     mOverlayDialogs.push_back( d );
     //shamelessly hard coded - what will we do if other types of layer plugins exist? TS
     QListWidgetItem * mypItem = new QListWidgetItem( QgisApp::getThemeIcon( "propertyicons/diagram.png" ), ( *it )->name() );
-    listWidget->insertItem( stackedWidget->count(), mypItem );
+    listWidget->insertItem( stackedWidget->count()-1, mypItem );
   }
 
   stackedWidget->setCurrentIndex( 0 );

Modified: trunk/qgis/src/ui/qgsoptionsbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsoptionsbase.ui	2010-05-17 22:20:07 UTC (rev 13518)
+++ trunk/qgis/src/ui/qgsoptionsbase.ui	2010-05-17 22:31:16 UTC (rev 13519)
@@ -49,9 +49,6 @@
      <property name="showDropIndicator" stdset="0">
       <bool>false</bool>
      </property>
-     <property name="alternatingRowColors">
-      <bool>false</bool>
-     </property>
      <property name="iconSize">
       <size>
        <width>64</width>
@@ -76,12 +73,12 @@
      <property name="viewMode">
       <enum>QListView::IconMode</enum>
      </property>
-     <property name="uniformItemSizes">
-      <bool>false</bool>
-     </property>
      <property name="wordWrap">
       <bool>true</bool>
      </property>
+     <property name="currentRow">
+      <number>0</number>
+     </property>
      <item>
       <property name="text">
        <string>General</string>
@@ -93,6 +90,9 @@
        <iconset resource="../../images/images.qrc">
         <normaloff>:/images/themes/default/propertyicons/general.png</normaloff>:/images/themes/default/propertyicons/general.png</iconset>
       </property>
+      <property name="flags">
+       <set>ItemIsSelectable|ItemIsUserCheckable|ItemIsEnabled</set>
+      </property>
      </item>
      <item>
       <property name="text">
@@ -105,61 +105,111 @@
        <iconset resource="../../images/images.qrc">
         <normaloff>:/images/themes/default/propertyicons/rendering.png</normaloff>:/images/themes/default/propertyicons/rendering.png</iconset>
       </property>
+      <property name="flags">
+       <set>ItemIsSelectable|ItemIsUserCheckable|ItemIsEnabled</set>
+      </property>
      </item>
      <item>
       <property name="text">
        <string>Map tools</string>
       </property>
+      <property name="textAlignment">
+       <set>AlignHCenter|AlignVCenter|AlignCenter</set>
+      </property>
       <property name="icon">
        <iconset resource="../../images/images.qrc">
         <normaloff>:/images/themes/default/propertyicons/map_tools.png</normaloff>:/images/themes/default/propertyicons/map_tools.png</iconset>
       </property>
+      <property name="flags">
+       <set>ItemIsSelectable|ItemIsUserCheckable|ItemIsEnabled</set>
+      </property>
      </item>
      <item>
       <property name="text">
        <string>Overlay</string>
       </property>
+      <property name="textAlignment">
+       <set>AlignHCenter|AlignVCenter|AlignCenter</set>
+      </property>
       <property name="icon">
        <iconset resource="../../images/images.qrc">
         <normaloff>:/images/themes/default/propertyicons/overlay.png</normaloff>:/images/themes/default/propertyicons/overlay.png</iconset>
       </property>
+      <property name="flags">
+       <set>ItemIsSelectable|ItemIsUserCheckable|ItemIsEnabled</set>
+      </property>
      </item>
      <item>
       <property name="text">
        <string>Digitising</string>
       </property>
+      <property name="textAlignment">
+       <set>AlignHCenter|AlignVCenter|AlignCenter</set>
+      </property>
       <property name="icon">
        <iconset resource="../../images/images.qrc">
         <normaloff>:/images/themes/default/propertyicons/digitising.png</normaloff>:/images/themes/default/propertyicons/digitising.png</iconset>
       </property>
+      <property name="flags">
+       <set>ItemIsSelectable|ItemIsUserCheckable|ItemIsEnabled</set>
+      </property>
      </item>
      <item>
       <property name="text">
        <string>CRS</string>
       </property>
+      <property name="textAlignment">
+       <set>AlignHCenter|AlignVCenter|AlignCenter</set>
+      </property>
       <property name="icon">
        <iconset resource="../../images/images.qrc">
         <normaloff>:/images/themes/default/propertyicons/CRS.png</normaloff>:/images/themes/default/propertyicons/CRS.png</iconset>
       </property>
+      <property name="flags">
+       <set>ItemIsSelectable|ItemIsUserCheckable|ItemIsEnabled</set>
+      </property>
      </item>
      <item>
       <property name="text">
        <string>Locale</string>
       </property>
+      <property name="textAlignment">
+       <set>AlignHCenter|AlignVCenter|AlignCenter</set>
+      </property>
       <property name="icon">
        <iconset resource="../../images/images.qrc">
         <normaloff>:/images/themes/default/propertyicons/locale.png</normaloff>:/images/themes/default/propertyicons/locale.png</iconset>
       </property>
+      <property name="flags">
+       <set>ItemIsSelectable|ItemIsUserCheckable|ItemIsEnabled</set>
+      </property>
      </item>
      <item>
       <property name="text">
        <string>Network &amp; Proxy</string>
       </property>
+      <property name="textAlignment">
+       <set>AlignHCenter|AlignVCenter|AlignCenter</set>
+      </property>
       <property name="icon">
        <iconset resource="../../images/images.qrc">
         <normaloff>:/images/themes/default/propertyicons/network_and_proxy.png</normaloff>:/images/themes/default/propertyicons/network_and_proxy.png</iconset>
       </property>
+      <property name="flags">
+       <set>ItemIsSelectable|ItemIsUserCheckable|ItemIsEnabled</set>
+      </property>
      </item>
+     <item>
+      <property name="text">
+       <string notr="true"/>
+      </property>
+      <property name="textAlignment">
+       <set>AlignHCenter|AlignVCenter|AlignCenter</set>
+      </property>
+      <property name="flags">
+       <set>NoItemFlags</set>
+      </property>
+     </item>
     </widget>
    </item>
    <item row="0" column="1">
@@ -168,19 +218,13 @@
       <number>7</number>
      </property>
      <widget class="QWidget" name="stackedWidgetPage1">
-      <layout class="QGridLayout">
-       <property name="margin">
-        <number>0</number>
-       </property>
-       <item row="0" column="0">
+      <layout class="QVBoxLayout" name="verticalLayout_10">
+       <item>
         <widget class="QGroupBox" name="groupBox_11">
          <property name="title">
           <string>Project files</string>
          </property>
          <layout class="QVBoxLayout">
-          <property name="margin">
-           <number>11</number>
-          </property>
           <item>
            <widget class="QCheckBox" name="chbAskToSaveProjectChanges">
             <property name="text">
@@ -198,7 +242,7 @@
          </layout>
         </widget>
        </item>
-       <item row="1" column="0">
+       <item>
         <widget class="QGroupBox" name="groupBox_9">
          <property name="title">
           <string>Default Map Appearance (overridden by project properties)</string>
@@ -273,96 +317,97 @@
          </layout>
         </widget>
        </item>
-       <item row="2" column="0">
+       <item>
         <widget class="QGroupBox" name="groupBox">
          <property name="title">
           <string>&amp;Application</string>
          </property>
-         <layout class="QGridLayout">
-          <item row="0" column="0">
-           <widget class="QLabel" name="textLabel1_4">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="text">
-             <string>Icon theme</string>
-            </property>
-           </widget>
+         <layout class="QVBoxLayout" name="verticalLayout_9">
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayout_3">
+            <item>
+             <widget class="QLabel" name="textLabel1_4">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="text">
+               <string>Icon theme</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="horizontalSpacer_2">
+              <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>
+             <widget class="QComboBox" name="cmbTheme">
+              <property name="duplicatesEnabled">
+               <bool>false</bool>
+              </property>
+              <item>
+               <property name="text">
+                <string/>
+               </property>
+              </item>
+             </widget>
+            </item>
+           </layout>
           </item>
-          <item row="1" column="0" colspan="2">
-           <spacer>
-            <property name="orientation">
-             <enum>Qt::Vertical</enum>
-            </property>
-            <property name="sizeType">
-             <enum>QSizePolicy::Fixed</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>20</width>
-              <height>10</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item row="2" column="0" colspan="2">
+          <item>
            <widget class="QCheckBox" name="capitaliseCheckBox">
             <property name="text">
              <string>Capitalise layer names in legend</string>
             </property>
            </widget>
           </item>
-          <item row="3" column="0" colspan="2">
+          <item>
            <widget class="QCheckBox" name="cbxLegendClassifiers">
             <property name="text">
              <string>Display classification attribute names in legend</string>
             </property>
            </widget>
           </item>
-          <item row="4" column="0" colspan="2">
+          <item>
            <widget class="QCheckBox" name="cbxHideSplash">
             <property name="text">
              <string>Hide splash screen at startup</string>
             </property>
            </widget>
           </item>
-          <item row="5" column="0">
+          <item>
            <widget class="QCheckBox" name="cbxIdentifyResultsDocked">
             <property name="text">
              <string>Open identify results in a dock window (QGIS restart required)</string>
             </property>
            </widget>
           </item>
-          <item row="6" column="0" colspan="2">
+          <item>
            <widget class="QCheckBox" name="cbxAttributeTableDocked">
             <property name="text">
              <string>Open attribute table in a dock window</string>
             </property>
            </widget>
           </item>
-          <item row="7" column="0" colspan="2">
+          <item>
            <widget class="QCheckBox" name="cbxAddPostgisDC">
             <property name="text">
              <string>Add PostGIS layers with double click and select in extended mode</string>
             </property>
            </widget>
           </item>
-          <item row="0" column="1">
-           <widget class="QComboBox" name="cmbTheme">
-            <property name="duplicatesEnabled">
-             <bool>false</bool>
-            </property>
-            <item>
-             <property name="text">
-              <string/>
-             </property>
-            </item>
-           </widget>
-          </item>
-          <item row="8" column="0">
+          <item>
            <widget class="QCheckBox" name="cbxAddNewLayersToCurrentGroup">
             <property name="text">
              <string>Add new layers to selected group</string>
@@ -372,14 +417,24 @@
          </layout>
         </widget>
        </item>
+       <item>
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="stackedWidgetPage2">
-      <layout class="QGridLayout">
-       <property name="margin">
-        <number>0</number>
-       </property>
-       <item row="0" column="0">
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <item>
         <widget class="QGroupBox" name="groupBox_5">
          <property name="title">
           <string>Rendering behavior</string>
@@ -429,7 +484,7 @@
          </layout>
         </widget>
        </item>
-       <item row="1" column="0">
+       <item>
         <widget class="QGroupBox" name="groupBox_8">
          <property name="title">
           <string>Rendering quality</string>
@@ -458,7 +513,23 @@
          </layout>
         </widget>
        </item>
-       <item row="3" column="0">
+       <item>
+        <widget class="QGroupBox" name="groupBox_3">
+         <property name="title">
+          <string>Compatibility</string>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout">
+          <item>
+           <widget class="QCheckBox" name="chkUseSymbologyNG">
+            <property name="text">
+             <string>Use new generation symbology for rendering</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
         <widget class="QGroupBox" name="groupBox_2">
          <property name="title">
           <string>SVG paths</string>
@@ -504,27 +575,11 @@
          </layout>
         </widget>
        </item>
-       <item row="2" column="0">
-        <widget class="QGroupBox" name="groupBox_3">
-         <property name="title">
-          <string>Compatibility</string>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout">
-          <item>
-           <widget class="QCheckBox" name="chkUseSymbologyNG">
-            <property name="text">
-             <string>Use new generation symbology for rendering</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="stackedWidgetPage3">
-      <layout class="QGridLayout" name="gridLayout_4">
-       <item row="0" column="0">
+      <layout class="QVBoxLayout" name="verticalLayout_3">
+       <item>
         <widget class="QGroupBox" name="groupBox_7">
          <property name="title">
           <string>Identify</string>
@@ -586,7 +641,7 @@
          </layout>
         </widget>
        </item>
-       <item row="1" column="0">
+       <item>
         <widget class="QGroupBox" name="groupBox_6">
          <property name="title">
           <string>Measure tool</string>
@@ -687,7 +742,7 @@
          </layout>
         </widget>
        </item>
-       <item row="2" column="0">
+       <item>
         <widget class="QGroupBox" name="groupBox_10">
          <property name="title">
           <string>Panning and zooming</string>
@@ -750,7 +805,7 @@
          </layout>
         </widget>
        </item>
-       <item row="3" column="0">
+       <item>
         <spacer>
          <property name="orientation">
           <enum>Qt::Vertical</enum>
@@ -766,27 +821,21 @@
       </layout>
      </widget>
      <widget class="QWidget" name="stackedWidgetPage4">
-      <layout class="QGridLayout">
-       <property name="margin">
-        <number>0</number>
-       </property>
-       <item row="0" column="0">
+      <layout class="QVBoxLayout" name="verticalLayout_4">
+       <item>
         <widget class="QGroupBox" name="mPositionGroupBox">
          <property name="title">
           <string>Position</string>
          </property>
-         <layout class="QGridLayout">
-          <item row="0" column="0">
+         <layout class="QHBoxLayout" name="horizontalLayout_4">
+          <item>
            <widget class="QLabel" name="mAlgorithmLabel">
             <property name="text">
              <string>Placement algorithm:</string>
             </property>
            </widget>
           </item>
-          <item row="0" column="1">
-           <widget class="QComboBox" name="mOverlayAlgorithmComboBox"/>
-          </item>
-          <item row="0" column="2">
+          <item>
            <spacer>
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
@@ -799,10 +848,13 @@
             </property>
            </spacer>
           </item>
+          <item>
+           <widget class="QComboBox" name="mOverlayAlgorithmComboBox"/>
+          </item>
          </layout>
         </widget>
        </item>
-       <item row="1" column="0">
+       <item>
         <spacer>
          <property name="orientation">
           <enum>Qt::Vertical</enum>
@@ -818,11 +870,8 @@
       </layout>
      </widget>
      <widget class="QWidget" name="stackedWidgetPage5">
-      <layout class="QGridLayout">
-       <property name="margin">
-        <number>0</number>
-       </property>
-       <item row="0" column="0">
+      <layout class="QVBoxLayout" name="verticalLayout_5">
+       <item>
         <widget class="QGroupBox" name="mRubberBandGroupBox">
          <property name="title">
           <string>Rubberband</string>
@@ -868,7 +917,7 @@
          </layout>
         </widget>
        </item>
-       <item row="1" column="0">
+       <item>
         <widget class="QGroupBox" name="mSnappingGroupBox">
          <property name="title">
           <string>Snapping</string>
@@ -881,19 +930,6 @@
             </property>
            </widget>
           </item>
-          <item row="0" column="1" colspan="3">
-           <spacer>
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>311</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
           <item row="0" column="4" colspan="2">
            <widget class="QComboBox" name="mDefaultSnapModeComboBox">
             <property name="sizePolicy">
@@ -911,19 +947,6 @@
             </property>
            </widget>
           </item>
-          <item row="1" column="2" colspan="2">
-           <spacer>
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>241</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
           <item row="1" column="4">
            <widget class="QDoubleSpinBox" name="mDefaultSnappingToleranceSpinBox">
             <property name="decimals">
@@ -941,19 +964,6 @@
             </property>
            </widget>
           </item>
-          <item row="2" column="3">
-           <spacer>
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>61</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
           <item row="2" column="4">
            <widget class="QDoubleSpinBox" name="mSearchRadiusVertexEditSpinBox">
             <property name="decimals">
@@ -998,10 +1008,49 @@
             </item>
            </widget>
           </item>
+          <item row="2" column="3">
+           <spacer>
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>61</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item row="1" column="2" colspan="2">
+           <spacer>
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>241</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item row="0" column="1" colspan="3">
+           <spacer>
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>311</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
          </layout>
         </widget>
        </item>
-       <item row="2" column="0">
+       <item>
         <widget class="QGroupBox" name="mVertexMarkerGroupBox">
          <property name="title">
           <string>Vertex markers</string>
@@ -1080,7 +1129,7 @@
          </layout>
         </widget>
        </item>
-       <item row="3" column="0">
+       <item>
         <widget class="QGroupBox" name="mEnterAttributeValuesGroupBox">
          <property name="title">
           <string>Enter attribute values</string>
@@ -1099,7 +1148,7 @@
          </layout>
         </widget>
        </item>
-       <item row="4" column="0">
+       <item>
         <spacer>
          <property name="orientation">
           <enum>Qt::Vertical</enum>
@@ -1115,34 +1164,8 @@
       </layout>
      </widget>
      <widget class="QWidget" name="stackedWidgetPage6">
-      <layout class="QGridLayout">
-       <property name="margin">
-        <number>0</number>
-       </property>
-       <item row="3" column="0">
-        <spacer>
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>51</width>
-           <height>31</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item row="2" column="0">
-        <widget class="QPushButton" name="pbnSelectProjection">
-         <property name="text">
-          <string>Select Global Default ...</string>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="0">
-        <widget class="QTextBrowser" name="txtGlobalWkt"/>
-       </item>
-       <item row="0" column="0">
+      <layout class="QVBoxLayout" name="verticalLayout_6">
+       <item>
         <widget class="QGroupBox" name="grpProjectionBehaviour">
          <property name="title">
           <string>Default Coordinate Reference System</string>
@@ -1185,14 +1208,34 @@
          </layout>
         </widget>
        </item>
+       <item>
+        <widget class="QTextBrowser" name="txtGlobalWkt"/>
+       </item>
+       <item>
+        <widget class="QPushButton" name="pbnSelectProjection">
+         <property name="text">
+          <string>Select Global Default ...</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer>
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>51</width>
+           <height>31</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="stackedWidgetPage7">
-      <layout class="QGridLayout">
-       <property name="margin">
-        <number>0</number>
-       </property>
-       <item row="0" column="0">
+      <layout class="QVBoxLayout" name="verticalLayout_7">
+       <item>
         <widget class="QGroupBox" name="grpLocale">
          <property name="title">
           <string>Override system locale</string>
@@ -1224,20 +1267,7 @@
          </layout>
         </widget>
        </item>
-       <item row="2" column="0">
-        <spacer>
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>501</width>
-           <height>51</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item row="1" column="0">
+       <item>
         <widget class="QGroupBox" name="groupBox_12">
          <property name="title">
           <string>Additional Info</string>
@@ -1253,29 +1283,24 @@
          </layout>
         </widget>
        </item>
+       <item>
+        <spacer>
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>501</width>
+           <height>51</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="stackedWidgetPage8">
-      <layout class="QVBoxLayout" name="verticalLayout_3">
+      <layout class="QVBoxLayout" name="verticalLayout_8">
        <item>
-        <layout class="QHBoxLayout" name="horizontalLayout">
-         <item>
-          <widget class="QLabel" name="mNetworkTimeoutLabel">
-           <property name="text">
-            <string>Timeout for network requests (ms):</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QSpinBox" name="mNetworkTimeoutSpinBox">
-           <property name="maximum">
-            <number>100000000</number>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item>
         <widget class="QGroupBox" name="grpProxy">
          <property name="title">
           <string>Use proxy for web access</string>
@@ -1466,6 +1491,37 @@
          </item>
         </layout>
        </item>
+       <item>
+        <spacer name="verticalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout">
+         <item>
+          <widget class="QLabel" name="mNetworkTimeoutLabel">
+           <property name="text">
+            <string>Timeout for network requests (ms):</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QSpinBox" name="mNetworkTimeoutSpinBox">
+           <property name="maximum">
+            <number>100000000</number>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
       </layout>
      </widget>
     </widget>

Modified: trunk/qgis/src/ui/qgsrasterlayerpropertiesbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsrasterlayerpropertiesbase.ui	2010-05-17 22:20:07 UTC (rev 13518)
+++ trunk/qgis/src/ui/qgsrasterlayerpropertiesbase.ui	2010-05-17 22:31:16 UTC (rev 13519)
@@ -54,9 +54,6 @@
      <property name="showDropIndicator" stdset="0">
       <bool>false</bool>
      </property>
-     <property name="alternatingRowColors">
-      <bool>false</bool>
-     </property>
      <property name="iconSize">
       <size>
        <width>64</width>
@@ -81,9 +78,6 @@
      <property name="viewMode">
       <enum>QListView::IconMode</enum>
      </property>
-     <property name="uniformItemSizes">
-      <bool>false</bool>
-     </property>
      <property name="wordWrap">
       <bool>true</bool>
      </property>
@@ -91,65 +85,115 @@
       <property name="text">
        <string>Symbology</string>
       </property>
+      <property name="textAlignment">
+       <set>AlignHCenter|AlignVCenter|AlignCenter</set>
+      </property>
       <property name="icon">
        <iconset resource="../../images/images.qrc">
         <normaloff>:/images/themes/default/propertyicons/symbology.png</normaloff>:/images/themes/default/propertyicons/symbology.png</iconset>
       </property>
+      <property name="flags">
+       <set>ItemIsSelectable|ItemIsUserCheckable|ItemIsEnabled</set>
+      </property>
      </item>
      <item>
       <property name="text">
        <string>Transparency</string>
       </property>
+      <property name="textAlignment">
+       <set>AlignHCenter|AlignVCenter|AlignCenter</set>
+      </property>
       <property name="icon">
        <iconset resource="../../images/images.qrc">
         <normaloff>:/images/themes/default/propertyicons/transparency.png</normaloff>:/images/themes/default/propertyicons/transparency.png</iconset>
       </property>
+      <property name="flags">
+       <set>ItemIsSelectable|ItemIsUserCheckable|ItemIsEnabled</set>
+      </property>
      </item>
      <item>
       <property name="text">
        <string>Colormap</string>
       </property>
+      <property name="textAlignment">
+       <set>AlignHCenter|AlignVCenter|AlignCenter</set>
+      </property>
       <property name="icon">
        <iconset resource="../../images/images.qrc">
         <normaloff>:/images/themes/default/propertyicons/colormap.png</normaloff>:/images/themes/default/propertyicons/colormap.png</iconset>
       </property>
+      <property name="flags">
+       <set>ItemIsSelectable|ItemIsUserCheckable|ItemIsEnabled</set>
+      </property>
      </item>
      <item>
       <property name="text">
        <string>General</string>
       </property>
+      <property name="textAlignment">
+       <set>AlignHCenter|AlignVCenter|AlignCenter</set>
+      </property>
       <property name="icon">
        <iconset resource="../../images/images.qrc">
         <normaloff>:/images/themes/default/propertyicons/general.png</normaloff>:/images/themes/default/propertyicons/general.png</iconset>
       </property>
+      <property name="flags">
+       <set>ItemIsSelectable|ItemIsUserCheckable|ItemIsEnabled</set>
+      </property>
      </item>
      <item>
       <property name="text">
        <string>Metadata</string>
       </property>
+      <property name="textAlignment">
+       <set>AlignHCenter|AlignVCenter|AlignCenter</set>
+      </property>
       <property name="icon">
        <iconset resource="../../images/images.qrc">
         <normaloff>:/images/themes/default/propertyicons/metadata.png</normaloff>:/images/themes/default/propertyicons/metadata.png</iconset>
       </property>
+      <property name="flags">
+       <set>ItemIsSelectable|ItemIsUserCheckable|ItemIsEnabled</set>
+      </property>
      </item>
      <item>
       <property name="text">
        <string>Pyramids</string>
       </property>
+      <property name="textAlignment">
+       <set>AlignHCenter|AlignVCenter|AlignCenter</set>
+      </property>
       <property name="icon">
        <iconset resource="../../images/images.qrc">
         <normaloff>:/images/themes/default/propertyicons/pyramids.png</normaloff>:/images/themes/default/propertyicons/pyramids.png</iconset>
       </property>
+      <property name="flags">
+       <set>ItemIsSelectable|ItemIsUserCheckable|ItemIsEnabled</set>
+      </property>
      </item>
      <item>
       <property name="text">
        <string>Histogram</string>
       </property>
+      <property name="textAlignment">
+       <set>AlignHCenter|AlignVCenter|AlignCenter</set>
+      </property>
       <property name="icon">
        <iconset resource="../../images/images.qrc">
         <normaloff>:/images/themes/default/propertyicons/histogram.png</normaloff>:/images/themes/default/propertyicons/histogram.png</iconset>
       </property>
+      <property name="flags">
+       <set>ItemIsSelectable|ItemIsUserCheckable|ItemIsEnabled</set>
+      </property>
      </item>
+     <item>
+      <property name="text">
+       <string notr="true"/>
+      </property>
+      <property name="flags">
+       <set>NoItemFlags</set>
+      </property>
+     </item>
     </widget>
    </item>
    <item row="0" column="1" colspan="4">

Modified: trunk/qgis/src/ui/qgsvectorlayerpropertiesbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsvectorlayerpropertiesbase.ui	2010-05-17 22:20:07 UTC (rev 13518)
+++ trunk/qgis/src/ui/qgsvectorlayerpropertiesbase.ui	2010-05-17 22:31:16 UTC (rev 13519)
@@ -50,9 +50,6 @@
      <property name="showDropIndicator" stdset="0">
       <bool>false</bool>
      </property>
-     <property name="alternatingRowColors">
-      <bool>false</bool>
-     </property>
      <property name="iconSize">
       <size>
        <width>64</width>
@@ -77,9 +74,6 @@
      <property name="viewMode">
       <enum>QListView::IconMode</enum>
      </property>
-     <property name="uniformItemSizes">
-      <bool>false</bool>
-     </property>
      <property name="wordWrap">
       <bool>true</bool>
      </property>
@@ -87,6 +81,9 @@
       <property name="text">
        <string>Symbology</string>
       </property>
+      <property name="textAlignment">
+       <set>AlignHCenter|AlignVCenter|AlignCenter</set>
+      </property>
       <property name="icon">
        <iconset resource="../../images/images.qrc">
         <normaloff>:/images/themes/default/propertyicons/symbology.png</normaloff>:/images/themes/default/propertyicons/symbology.png</iconset>
@@ -96,6 +93,9 @@
       <property name="text">
        <string>Labels</string>
       </property>
+      <property name="textAlignment">
+       <set>AlignHCenter|AlignVCenter|AlignCenter</set>
+      </property>
       <property name="icon">
        <iconset resource="../../images/images.qrc">
         <normaloff>:/images/themes/default/propertyicons/labels.png</normaloff>:/images/themes/default/propertyicons/labels.png</iconset>
@@ -105,6 +105,9 @@
       <property name="text">
        <string>Attributes</string>
       </property>
+      <property name="textAlignment">
+       <set>AlignHCenter|AlignVCenter|AlignCenter</set>
+      </property>
       <property name="icon">
        <iconset resource="../../images/images.qrc">
         <normaloff>:/images/themes/default/propertyicons/attributes.png</normaloff>:/images/themes/default/propertyicons/attributes.png</iconset>
@@ -114,6 +117,9 @@
       <property name="text">
        <string>General</string>
       </property>
+      <property name="textAlignment">
+       <set>AlignHCenter|AlignVCenter|AlignCenter</set>
+      </property>
       <property name="icon">
        <iconset resource="../../images/images.qrc">
         <normaloff>:/images/themes/default/propertyicons/general.png</normaloff>:/images/themes/default/propertyicons/general.png</iconset>
@@ -123,6 +129,9 @@
       <property name="text">
        <string>Metadata</string>
       </property>
+      <property name="textAlignment">
+       <set>AlignHCenter|AlignVCenter|AlignCenter</set>
+      </property>
       <property name="icon">
        <iconset resource="../../images/images.qrc">
         <normaloff>:/images/themes/default/propertyicons/metadata.png</normaloff>:/images/themes/default/propertyicons/metadata.png</iconset>
@@ -132,11 +141,22 @@
       <property name="text">
        <string>Actions</string>
       </property>
+      <property name="textAlignment">
+       <set>AlignHCenter|AlignVCenter|AlignCenter</set>
+      </property>
       <property name="icon">
        <iconset resource="../../images/images.qrc">
         <normaloff>:/images/themes/default/propertyicons/action.png</normaloff>:/images/themes/default/propertyicons/action.png</iconset>
       </property>
      </item>
+     <item>
+      <property name="text">
+       <string notr="true"/>
+      </property>
+      <property name="flags">
+       <set>NoItemFlags</set>
+      </property>
+     </item>
     </widget>
    </item>
    <item row="0" column="1">
@@ -424,7 +444,7 @@
             <x>0</x>
             <y>0</y>
             <width>514</width>
-            <height>428</height>
+            <height>378</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_3">



More information about the QGIS-commit mailing list