[QGIS Commit] r12217 - trunk/qgis/src/ui
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Sat Nov 21 15:48:51 EST 2009
Author: timlinux
Date: 2009-11-21 15:48:49 -0500 (Sat, 21 Nov 2009)
New Revision: 12217
Modified:
trunk/qgis/src/ui/qgsoptionsbase.ui
trunk/qgis/src/ui/qgsrasterlayerpropertiesbase.ui
trunk/qgis/src/ui/qgsvectorlayerpropertiesbase.ui
Log:
Property list updates so they work nicely when icons are ready
Modified: trunk/qgis/src/ui/qgsoptionsbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsoptionsbase.ui 2009-11-21 19:56:47 UTC (rev 12216)
+++ trunk/qgis/src/ui/qgsoptionsbase.ui 2009-11-21 20:48:49 UTC (rev 12217)
@@ -20,52 +20,11 @@
<bool>true</bool>
</property>
<layout class="QGridLayout" name="gridLayout_3">
- <item row="0" column="0">
- <widget class="QListWidget" name="listWidget">
- <item>
- <property name="text">
- <string>General</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Rendering & 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 & Proxy</string>
- </property>
- </item>
- </widget>
- </item>
<item row="0" column="1">
<widget class="QStackedWidget" name="stackedWidget">
+ <property name="currentIndex">
+ <number>0</number>
+ </property>
<widget class="QWidget" name="stackedWidgetPage1">
<layout class="QGridLayout">
<property name="margin">
@@ -1288,6 +1247,148 @@
</property>
</widget>
</item>
+ <item row="0" column="0">
+ <widget class="QListWidget" name="listWidget">
+ <property name="minimumSize">
+ <size>
+ <width>110</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>110</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Plain</enum>
+ </property>
+ <property name="horizontalScrollBarPolicy">
+ <enum>Qt::ScrollBarAlwaysOff</enum>
+ </property>
+ <property name="editTriggers">
+ <set>QAbstractItemView::NoEditTriggers</set>
+ </property>
+ <property name="showDropIndicator" stdset="0">
+ <bool>false</bool>
+ </property>
+ <property name="alternatingRowColors">
+ <bool>false</bool>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>64</width>
+ <height>64</height>
+ </size>
+ </property>
+ <property name="textElideMode">
+ <enum>Qt::ElideNone</enum>
+ </property>
+ <property name="flow">
+ <enum>QListView::TopToBottom</enum>
+ </property>
+ <property name="isWrapping" stdset="0">
+ <bool>false</bool>
+ </property>
+ <property name="resizeMode">
+ <enum>QListView::Adjust</enum>
+ </property>
+ <property name="spacing">
+ <number>9</number>
+ </property>
+ <property name="viewMode">
+ <enum>QListView::IconMode</enum>
+ </property>
+ <property name="uniformItemSizes">
+ <bool>false</bool>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ <item>
+ <property name="text">
+ <string>General</string>
+ </property>
+ <property name="textAlignment">
+ <set>AlignHCenter|AlignVCenter|AlignCenter</set>
+ </property>
+ <property name="icon">
+ <iconset>
+ <normaloff>../../../../../../../tmp/info.png</normaloff>../../../../../../../tmp/info.png</iconset>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Rendering & SVG</string>
+ </property>
+ <property name="textAlignment">
+ <set>AlignHCenter|AlignVCenter|AlignCenter</set>
+ </property>
+ <property name="icon">
+ <iconset>
+ <normaloff>../../../../../../../tmp/info.png</normaloff>../../../../../../../tmp/info.png</iconset>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Map tools</string>
+ </property>
+ <property name="icon">
+ <iconset>
+ <normaloff>../../../../../../../tmp/info.png</normaloff>../../../../../../../tmp/info.png</iconset>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Overlay</string>
+ </property>
+ <property name="icon">
+ <iconset>
+ <normaloff>../../../../../../../tmp/info.png</normaloff>../../../../../../../tmp/info.png</iconset>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Digitising</string>
+ </property>
+ <property name="icon">
+ <iconset>
+ <normaloff>../../../../../../../tmp/info.png</normaloff>../../../../../../../tmp/info.png</iconset>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>CRS</string>
+ </property>
+ <property name="icon">
+ <iconset>
+ <normaloff>../../../../../../../tmp/info.png</normaloff>../../../../../../../tmp/info.png</iconset>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Locale</string>
+ </property>
+ <property name="icon">
+ <iconset>
+ <normaloff>../../../../../../../tmp/info.png</normaloff>../../../../../../../tmp/info.png</iconset>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Network & Proxy</string>
+ </property>
+ <property name="icon">
+ <iconset>
+ <normaloff>../../../../../../../tmp/info.png</normaloff>../../../../../../../tmp/info.png</iconset>
+ </property>
+ </item>
+ </widget>
+ </item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11"/>
Modified: trunk/qgis/src/ui/qgsrasterlayerpropertiesbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsrasterlayerpropertiesbase.ui 2009-11-21 19:56:47 UTC (rev 12216)
+++ trunk/qgis/src/ui/qgsrasterlayerpropertiesbase.ui 2009-11-21 20:48:49 UTC (rev 12217)
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>757</width>
- <height>648</height>
+ <height>608</height>
</rect>
</property>
<property name="windowTitle">
@@ -27,49 +27,137 @@
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QListWidget" name="listWidget">
+ <property name="minimumSize">
+ <size>
+ <width>110</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>110</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Plain</enum>
+ </property>
+ <property name="horizontalScrollBarPolicy">
+ <enum>Qt::ScrollBarAlwaysOff</enum>
+ </property>
+ <property name="editTriggers">
+ <set>QAbstractItemView::NoEditTriggers</set>
+ </property>
+ <property name="showDropIndicator" stdset="0">
+ <bool>false</bool>
+ </property>
+ <property name="alternatingRowColors">
+ <bool>false</bool>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>64</width>
+ <height>64</height>
+ </size>
+ </property>
+ <property name="textElideMode">
+ <enum>Qt::ElideNone</enum>
+ </property>
+ <property name="flow">
+ <enum>QListView::TopToBottom</enum>
+ </property>
+ <property name="isWrapping" stdset="0">
+ <bool>false</bool>
+ </property>
+ <property name="resizeMode">
+ <enum>QListView::Adjust</enum>
+ </property>
+ <property name="spacing">
+ <number>9</number>
+ </property>
+ <property name="viewMode">
+ <enum>QListView::IconMode</enum>
+ </property>
+ <property name="uniformItemSizes">
+ <bool>false</bool>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
<item>
<property name="text">
<string>Symbology</string>
</property>
+ <property name="icon">
+ <iconset>
+ <normaloff>../../../../../../../tmp/info.png</normaloff>../../../../../../../tmp/info.png</iconset>
+ </property>
</item>
<item>
<property name="text">
<string>Transparency</string>
</property>
+ <property name="icon">
+ <iconset>
+ <normaloff>../../../../../../../tmp/info.png</normaloff>../../../../../../../tmp/info.png</iconset>
+ </property>
</item>
<item>
<property name="text">
<string>Colormap</string>
</property>
+ <property name="icon">
+ <iconset>
+ <normaloff>../../../../../../../tmp/info.png</normaloff>../../../../../../../tmp/info.png</iconset>
+ </property>
</item>
<item>
<property name="text">
<string>General</string>
</property>
+ <property name="icon">
+ <iconset>
+ <normaloff>../../../../../../../tmp/info.png</normaloff>../../../../../../../tmp/info.png</iconset>
+ </property>
</item>
<item>
<property name="text">
<string>Metadata</string>
</property>
+ <property name="icon">
+ <iconset>
+ <normaloff>../../../../../../../tmp/info.png</normaloff>../../../../../../../tmp/info.png</iconset>
+ </property>
</item>
<item>
<property name="text">
<string>Pyramids</string>
</property>
+ <property name="icon">
+ <iconset>
+ <normaloff>../../../../../../../tmp/info.png</normaloff>../../../../../../../tmp/info.png</iconset>
+ </property>
</item>
<item>
<property name="text">
<string>Histogram</string>
</property>
+ <property name="icon">
+ <iconset>
+ <normaloff>../../../../../../../tmp/info.png</normaloff>../../../../../../../tmp/info.png</iconset>
+ </property>
</item>
</widget>
</item>
- <item row="0" column="1" rowspan="2" colspan="4">
+ <item row="0" column="1" colspan="4">
<widget class="QStackedWidget" name="tabBar">
<property name="currentIndex">
<number>2</number>
</property>
- <widget class="QWidget" name="tabPageSymbology" native="true">
+ <widget class="QWidget" name="tabPageSymbology">
<layout class="QGridLayout">
<property name="margin">
<number>0</number>
@@ -914,7 +1002,7 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="tabPageTransparency" native="true">
+ <widget class="QWidget" name="tabPageTransparency">
<layout class="QGridLayout">
<property name="margin">
<number>0</number>
@@ -1195,7 +1283,7 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="tabPageColormap" native="true">
+ <widget class="QWidget" name="tabPageColormap">
<layout class="QGridLayout">
<property name="margin">
<number>0</number>
@@ -1397,7 +1485,7 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="tabPageGeneral" native="true">
+ <widget class="QWidget" name="tabPageGeneral">
<layout class="QGridLayout">
<property name="margin">
<number>0</number>
@@ -1695,7 +1783,7 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="tabPageMetadata" native="true">
+ <widget class="QWidget" name="tabPageMetadata">
<layout class="QGridLayout">
<property name="margin">
<number>0</number>
@@ -1705,7 +1793,7 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="tabPagePyramids" native="true">
+ <widget class="QWidget" name="tabPagePyramids">
<layout class="QGridLayout">
<property name="margin">
<number>0</number>
@@ -1804,7 +1892,7 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="tabPageHistogram" native="true">
+ <widget class="QWidget" name="tabPageHistogram">
<layout class="QGridLayout">
<property name="margin">
<number>0</number>
@@ -1968,35 +2056,35 @@
</widget>
</widget>
</item>
- <item row="1" column="2" rowspan="2">
- <widget class="QPushButton" name="pbnSaveDefaultStyle">
+ <item row="1" column="0" colspan="2">
+ <widget class="QPushButton" name="pbnLoadDefaultStyle">
<property name="text">
- <string>Save As Default</string>
+ <string>Restore Default Style</string>
</property>
</widget>
</item>
- <item row="2" column="0">
- <widget class="QPushButton" name="pbnLoadDefaultStyle">
+ <item row="1" column="2">
+ <widget class="QPushButton" name="pbnSaveDefaultStyle">
<property name="text">
- <string>Restore Default Style</string>
+ <string>Save As Default</string>
</property>
</widget>
</item>
- <item row="2" column="3">
+ <item row="1" column="3">
<widget class="QPushButton" name="pbnLoadStyle">
<property name="text">
<string>Load Style ...</string>
</property>
</widget>
</item>
- <item row="2" column="4">
+ <item row="1" column="4">
<widget class="QPushButton" name="pbnSaveStyleAs">
<property name="text">
<string>Save Style ...</string>
</property>
</widget>
</item>
- <item row="3" column="0" colspan="5">
+ <item row="2" column="0" colspan="5">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@@ -2056,8 +2144,8 @@
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
- <x>467</x>
- <y>638</y>
+ <x>476</x>
+ <y>620</y>
</hint>
<hint type="destinationlabel">
<x>3</x>
@@ -2072,12 +2160,12 @@
<slot>setCurrentIndex(int)</slot>
<hints>
<hint type="sourcelabel">
- <x>110</x>
- <y>52</y>
+ <x>59</x>
+ <y>12</y>
</hint>
<hint type="destinationlabel">
- <x>736</x>
- <y>11</y>
+ <x>722</x>
+ <y>14</y>
</hint>
</hints>
</connection>
Modified: trunk/qgis/src/ui/qgsvectorlayerpropertiesbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsvectorlayerpropertiesbase.ui 2009-11-21 19:56:47 UTC (rev 12216)
+++ trunk/qgis/src/ui/qgsvectorlayerpropertiesbase.ui 2009-11-21 20:48:49 UTC (rev 12217)
@@ -21,60 +21,10 @@
<bool>true</bool>
</property>
<layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0">
- <widget class="QListWidget" name="listWidget">
- <property name="iconSize">
- <size>
- <width>64</width>
- <height>64</height>
- </size>
- </property>
- <item>
- <property name="text">
- <string>Symbology</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Labels</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Attributes</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>General</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Metadata</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Actions</string>
- </property>
- </item>
- </widget>
- </item>
- <item row="0" column="1">
- <layout class="QHBoxLayout">
- <property name="spacing">
- <number>3</number>
- </property>
- <property name="margin">
- <number>1</number>
- </property>
- </layout>
- </item>
<item row="0" column="2" colspan="3">
<widget class="QStackedWidget" name="stackedWidget">
<property name="currentIndex">
- <number>3</number>
+ <number>0</number>
</property>
<widget class="QWidget" name="page_3">
<layout class="QGridLayout" name="gridLayout_4">
@@ -355,8 +305,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>554</width>
- <height>397</height>
+ <width>605</width>
+ <height>425</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_3">
@@ -652,6 +602,124 @@
</property>
</widget>
</item>
+ <item row="0" column="0">
+ <widget class="QListWidget" name="listWidget">
+ <property name="minimumSize">
+ <size>
+ <width>110</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>110</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Plain</enum>
+ </property>
+ <property name="horizontalScrollBarPolicy">
+ <enum>Qt::ScrollBarAlwaysOff</enum>
+ </property>
+ <property name="editTriggers">
+ <set>QAbstractItemView::NoEditTriggers</set>
+ </property>
+ <property name="showDropIndicator" stdset="0">
+ <bool>false</bool>
+ </property>
+ <property name="alternatingRowColors">
+ <bool>false</bool>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>64</width>
+ <height>64</height>
+ </size>
+ </property>
+ <property name="textElideMode">
+ <enum>Qt::ElideNone</enum>
+ </property>
+ <property name="flow">
+ <enum>QListView::TopToBottom</enum>
+ </property>
+ <property name="isWrapping" stdset="0">
+ <bool>false</bool>
+ </property>
+ <property name="resizeMode">
+ <enum>QListView::Adjust</enum>
+ </property>
+ <property name="spacing">
+ <number>9</number>
+ </property>
+ <property name="viewMode">
+ <enum>QListView::IconMode</enum>
+ </property>
+ <property name="uniformItemSizes">
+ <bool>false</bool>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ <item>
+ <property name="text">
+ <string>Symbology</string>
+ </property>
+ <property name="icon">
+ <iconset>
+ <normaloff>../../../../../../../tmp/info.png</normaloff>../../../../../../../tmp/info.png</iconset>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Labels</string>
+ </property>
+ <property name="icon">
+ <iconset>
+ <normaloff>../../../../../../../tmp/info.png</normaloff>../../../../../../../tmp/info.png</iconset>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Attributes</string>
+ </property>
+ <property name="icon">
+ <iconset>
+ <normaloff>../../../../../../../tmp/info.png</normaloff>../../../../../../../tmp/info.png</iconset>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>General</string>
+ </property>
+ <property name="icon">
+ <iconset>
+ <normaloff>../../../../../../../tmp/info.png</normaloff>../../../../../../../tmp/info.png</iconset>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Metadata</string>
+ </property>
+ <property name="icon">
+ <iconset>
+ <normaloff>../../../../../../../tmp/info.png</normaloff>../../../../../../../tmp/info.png</iconset>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Actions</string>
+ </property>
+ <property name="icon">
+ <iconset>
+ <normaloff>../../../../../../../tmp/info.png</normaloff>../../../../../../../tmp/info.png</iconset>
+ </property>
+ </item>
+ </widget>
+ </item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11"/>
@@ -691,12 +759,12 @@
<slot>setCurrentIndex(int)</slot>
<hints>
<hint type="sourcelabel">
- <x>93</x>
- <y>19</y>
+ <x>99</x>
+ <y>10</y>
</hint>
<hint type="destinationlabel">
- <x>119</x>
- <y>16</y>
+ <x>754</x>
+ <y>12</y>
</hint>
</hints>
</connection>
More information about the QGIS-commit
mailing list