[QGIS Commit] r12196 - trunk/qgis/src/ui

svn_qgis at osgeo.org svn_qgis at osgeo.org
Thu Nov 19 12:08:58 EST 2009


Author: timlinux
Date: 2009-11-19 12:08:56 -0500 (Thu, 19 Nov 2009)
New Revision: 12196

Modified:
   trunk/qgis/src/ui/qgsoptionsbase.ui
Log:
[Feature] Implement property list ui for qgsoptions dialog

Modified: trunk/qgis/src/ui/qgsoptionsbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsoptionsbase.ui	2009-11-19 16:58:10 UTC (rev 12195)
+++ trunk/qgis/src/ui/qgsoptionsbase.ui	2009-11-19 17:08:56 UTC (rev 12196)
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>722</width>
-    <height>529</height>
+    <width>833</width>
+    <height>532</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -19,17 +19,58 @@
   <property name="modal">
    <bool>true</bool>
   </property>
-  <layout class="QGridLayout">
+  <layout class="QGridLayout" name="gridLayout_3">
    <item row="0" column="0">
-    <widget class="QTabWidget" name="tabWidget">
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
-     <widget class="QWidget" name="tabGeneral">
-      <attribute name="title">
-       <string>&amp;General</string>
-      </attribute>
+    <widget class="QListWidget" name="listWidget">
+     <item>
+      <property name="text">
+       <string>General</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Rendering &amp; SVG</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Map tools</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Overlay</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Digitising</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>CRS</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Locale</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Network &amp; Proxy</string>
+      </property>
+     </item>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <widget class="QStackedWidget" name="stackedWidget">
+     <widget class="QWidget" name="stackedWidgetPage1" native="true">
       <layout class="QGridLayout">
+       <property name="margin">
+        <number>0</number>
+       </property>
        <item row="0" column="0">
         <widget class="QGroupBox" name="groupBox_11">
          <property name="title">
@@ -67,9 +108,6 @@
             <property name="text">
              <string>Selection color</string>
             </property>
-            <property name="buddy">
-             <cstring>pbnSelectionColour</cstring>
-            </property>
            </widget>
           </item>
           <item row="0" column="3">
@@ -90,9 +128,6 @@
             <property name="text">
              <string>Background color</string>
             </property>
-            <property name="buddy">
-             <cstring>pbnCanvasColor</cstring>
-            </property>
            </widget>
           </item>
           <item row="1" column="2">
@@ -154,9 +189,6 @@
             <property name="text">
              <string>Icon theme</string>
             </property>
-            <property name="buddy">
-             <cstring>cmbTheme</cstring>
-            </property>
            </widget>
           </item>
           <item row="1" column="0" colspan="2">
@@ -234,11 +266,11 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="tabRendering">
-      <attribute name="title">
-       <string>&amp;Rendering and SVG</string>
-      </attribute>
+     <widget class="QWidget" name="stackedWidgetPage2" native="true">
       <layout class="QGridLayout">
+       <property name="margin">
+        <number>0</number>
+       </property>
        <item row="0" column="0">
         <widget class="QGroupBox" name="groupBox_5">
          <property name="title">
@@ -257,9 +289,6 @@
             <property name="text">
              <string>Number of features to draw before updating the display</string>
             </property>
-            <property name="buddy">
-             <cstring>spinBoxUpdateThreshold</cstring>
-            </property>
            </widget>
           </item>
           <item row="1" column="1">
@@ -385,13 +414,10 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="tabMap">
-      <attribute name="title">
-       <string>&amp;Map tools</string>
-      </attribute>
+     <widget class="QWidget" name="stackedWidgetPage3" native="true">
       <layout class="QGridLayout">
        <property name="margin">
-        <number>11</number>
+        <number>0</number>
        </property>
        <item row="2" column="0">
         <widget class="QGroupBox" name="groupBox_10">
@@ -431,9 +457,6 @@
             <property name="text">
              <string>Zoom factor</string>
             </property>
-            <property name="buddy">
-             <cstring>spinZoomFactor</cstring>
-            </property>
            </widget>
           </item>
           <item row="0" column="0">
@@ -441,9 +464,6 @@
             <property name="text">
              <string>Mouse wheel action</string>
             </property>
-            <property name="buddy">
-             <cstring>cmbWheelAction</cstring>
-            </property>
            </widget>
           </item>
           <item row="1" column="1">
@@ -486,9 +506,6 @@
             <property name="text">
              <string>Search radius for identifying features and displaying map tips</string>
             </property>
-            <property name="buddy">
-             <cstring>spinBoxIdentifyValue</cstring>
-            </property>
            </widget>
           </item>
           <item row="2" column="1">
@@ -515,9 +532,6 @@
             <property name="text">
              <string>Mode</string>
             </property>
-            <property name="buddy">
-             <cstring>cmbIdentifyMode</cstring>
-            </property>
            </widget>
           </item>
           <item row="1" column="0" colspan="2">
@@ -586,9 +600,6 @@
             <property name="text">
              <string>Rubberband color</string>
             </property>
-            <property name="buddy">
-             <cstring>pbnMeasureColour</cstring>
-            </property>
            </widget>
           </item>
           <item row="0" column="0">
@@ -596,9 +607,6 @@
             <property name="text">
              <string>Ellipsoid for distance calculations</string>
             </property>
-            <property name="buddy">
-             <cstring>cmbEllipsoid</cstring>
-            </property>
            </widget>
           </item>
           <item row="2" column="0">
@@ -606,9 +614,6 @@
             <property name="text">
              <string>Preferred measurements units</string>
             </property>
-            <property name="buddy">
-             <cstring>radMeters</cstring>
-            </property>
            </widget>
           </item>
           <item row="2" column="1">
@@ -630,11 +635,11 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="mOverlayTab">
-      <attribute name="title">
-       <string>Overlay</string>
-      </attribute>
+     <widget class="QWidget" name="stackedWidgetPage4" native="true">
       <layout class="QGridLayout">
+       <property name="margin">
+        <number>0</number>
+       </property>
        <item row="0" column="0">
         <widget class="QGroupBox" name="mPositionGroupBox">
          <property name="title">
@@ -646,9 +651,6 @@
             <property name="text">
              <string>Placement algorithm:</string>
             </property>
-            <property name="buddy">
-             <cstring>mOverlayAlgorithmComboBox</cstring>
-            </property>
            </widget>
           </item>
           <item row="0" column="1">
@@ -685,11 +687,11 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="tabDigitizing">
-      <attribute name="title">
-       <string>Digitizing</string>
-      </attribute>
+     <widget class="QWidget" name="stackedWidgetPage5" native="true">
       <layout class="QGridLayout">
+       <property name="margin">
+        <number>0</number>
+       </property>
        <item row="0" column="0">
         <widget class="QGroupBox" name="mRubberBandGroupBox">
          <property name="title">
@@ -701,9 +703,6 @@
             <property name="text">
              <string>Line width</string>
             </property>
-            <property name="buddy">
-             <cstring>mLineWidthSpinBox</cstring>
-            </property>
            </widget>
           </item>
           <item row="0" column="1">
@@ -721,9 +720,6 @@
             <property name="text">
              <string>Line colour</string>
             </property>
-            <property name="buddy">
-             <cstring>mLineColourToolButton</cstring>
-            </property>
            </widget>
           </item>
           <item row="1" column="1">
@@ -753,9 +749,6 @@
             <property name="text">
              <string>Default snap mode</string>
             </property>
-            <property name="buddy">
-             <cstring>mDefaultSnapModeComboBox</cstring>
-            </property>
            </widget>
           </item>
           <item row="0" column="1" colspan="3">
@@ -786,9 +779,6 @@
             <property name="text">
              <string>Default snapping tolerance</string>
             </property>
-            <property name="buddy">
-             <cstring>mDefaultSnappingToleranceSpinBox</cstring>
-            </property>
            </widget>
           </item>
           <item row="1" column="2" colspan="2">
@@ -819,9 +809,6 @@
             <property name="text">
              <string>Search radius for vertex edits</string>
             </property>
-            <property name="buddy">
-             <cstring>mSearchRadiusVertexEditSpinBox</cstring>
-            </property>
            </widget>
           </item>
           <item row="2" column="3">
@@ -902,9 +889,6 @@
             <property name="text">
              <string>Marker style</string>
             </property>
-            <property name="buddy">
-             <cstring>mMarkerStyleComboBox</cstring>
-            </property>
            </widget>
           </item>
           <item row="1" column="1">
@@ -948,9 +932,6 @@
             <property name="text">
              <string>Marker size</string>
             </property>
-            <property name="buddy">
-             <cstring>mMarkerSizeSpinBox</cstring>
-            </property>
            </widget>
           </item>
           <item row="2" column="1">
@@ -1003,13 +984,10 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="tabCRS">
-      <attribute name="title">
-       <string>CRS</string>
-      </attribute>
+     <widget class="QWidget" name="stackedWidgetPage6" native="true">
       <layout class="QGridLayout">
        <property name="margin">
-        <number>11</number>
+        <number>0</number>
        </property>
        <item row="3" column="0">
         <spacer>
@@ -1069,11 +1047,11 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="tabLocale">
-      <attribute name="title">
-       <string>Locale</string>
-      </attribute>
+     <widget class="QWidget" name="stackedWidgetPage7" native="true">
       <layout class="QGridLayout">
+       <property name="margin">
+        <number>0</number>
+       </property>
        <item row="0" column="0">
         <widget class="QGroupBox" name="grpLocale">
          <property name="title">
@@ -1088,9 +1066,6 @@
             <property name="text">
              <string>Locale to use instead</string>
             </property>
-            <property name="buddy">
-             <cstring>cboLocale</cstring>
-            </property>
            </widget>
           </item>
           <item row="0" column="1">
@@ -1140,11 +1115,11 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="tab">
-      <attribute name="title">
-       <string>Network and Proxy</string>
-      </attribute>
+     <widget class="QWidget" name="stackedWidgetPage8" native="true">
       <layout class="QGridLayout" name="gridLayout_2">
+       <property name="margin">
+        <number>0</number>
+       </property>
        <item row="0" column="0">
         <layout class="QHBoxLayout" name="horizontalLayout">
          <item>
@@ -1152,9 +1127,6 @@
            <property name="text">
             <string>Timeout for network requests (ms):</string>
            </property>
-           <property name="buddy">
-            <cstring>mNetworkTimeoutSpinBox</cstring>
-           </property>
           </widget>
          </item>
          <item>
@@ -1183,9 +1155,6 @@
             <property name="text">
              <string>Host</string>
             </property>
-            <property name="buddy">
-             <cstring>leProxyHost</cstring>
-            </property>
            </widget>
           </item>
           <item row="0" column="1" colspan="5">
@@ -1196,9 +1165,6 @@
             <property name="text">
              <string>Port</string>
             </property>
-            <property name="buddy">
-             <cstring>leProxyPort</cstring>
-            </property>
            </widget>
           </item>
           <item row="1" column="1" colspan="5">
@@ -1209,9 +1175,6 @@
             <property name="text">
              <string>User</string>
             </property>
-            <property name="buddy">
-             <cstring>leProxyUser</cstring>
-            </property>
            </widget>
           </item>
           <item row="2" column="1" colspan="5">
@@ -1226,9 +1189,6 @@
             <property name="text">
              <string>Password</string>
             </property>
-            <property name="buddy">
-             <cstring>leProxyPassword</cstring>
-            </property>
            </widget>
           </item>
           <item row="3" column="1" colspan="5">
@@ -1246,9 +1206,6 @@
             <property name="text">
              <string>Proxy type</string>
             </property>
-            <property name="buddy">
-             <cstring>mProxyTypeComboBox</cstring>
-            </property>
            </widget>
           </item>
           <item row="4" column="1" colspan="2">
@@ -1272,9 +1229,6 @@
             <property name="text">
              <string>Exclude URLs (starting with):</string>
             </property>
-            <property name="buddy">
-             <cstring>mAddUrlPushButton</cstring>
-            </property>
            </widget>
           </item>
           <item row="5" column="2" colspan="2">
@@ -1314,7 +1268,7 @@
      </widget>
     </widget>
    </item>
-   <item row="1" column="0">
+   <item row="1" column="0" colspan="2">
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
@@ -1335,7 +1289,7 @@
   </customwidget>
  </customwidgets>
  <tabstops>
-  <tabstop>tabWidget</tabstop>
+  <tabstop>stackedWidget</tabstop>
   <tabstop>chbAskToSaveProjectChanges</tabstop>
   <tabstop>chbWarnOldProjectVersion</tabstop>
   <tabstop>pbnSelectionColour</tabstop>
@@ -1403,8 +1357,8 @@
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>611</x>
-     <y>531</y>
+     <x>186</x>
+     <y>574</y>
     </hint>
     <hint type="destinationlabel">
      <x>730</x>
@@ -1419,8 +1373,8 @@
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>686</x>
-     <y>525</y>
+     <x>186</x>
+     <y>574</y>
     </hint>
     <hint type="destinationlabel">
      <x>731</x>
@@ -1428,5 +1382,21 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>listWidget</sender>
+   <signal>currentRowChanged(int)</signal>
+   <receiver>stackedWidget</receiver>
+   <slot>setCurrentIndex(int)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>136</x>
+     <y>21</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>864</x>
+     <y>14</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
 </ui>



More information about the QGIS-commit mailing list