[QGIS Commit] r13568 - in trunk/qgis/src/ui: . symbollayer
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Tue May 25 01:13:59 EDT 2010
Author: timlinux
Date: 2010-05-25 01:13:58 -0400 (Tue, 25 May 2010)
New Revision: 13568
Modified:
trunk/qgis/src/ui/qgsattributeactiondialogbase.ui
trunk/qgis/src/ui/qgsattributeloadfrommap.ui
trunk/qgis/src/ui/qgsattributetabledialog.ui
trunk/qgis/src/ui/qgscategorizedsymbolrendererv2widget.ui
trunk/qgis/src/ui/qgscomposerlabelwidgetbase.ui
trunk/qgis/src/ui/qgscomposerlegendwidgetbase.ui
trunk/qgis/src/ui/qgscomposermanagerbase.ui
trunk/qgis/src/ui/qgscomposertablewidgetbase.ui
trunk/qgis/src/ui/qgscomposervectorlegendbase.ui
trunk/qgis/src/ui/qgscompositionwidgetbase.ui
trunk/qgis/src/ui/qgsgraduatedsymboldialogbase.ui
trunk/qgis/src/ui/qgsgraduatedsymbolrendererv2widget.ui
trunk/qgis/src/ui/qgslabeldialogbase.ui
trunk/qgis/src/ui/qgsmessageviewer.ui
trunk/qgis/src/ui/qgsnewogrconnectionbase.ui
trunk/qgis/src/ui/qgsnewspatialitelayerdialogbase.ui
trunk/qgis/src/ui/qgsnewvectorlayerdialogbase.ui
trunk/qgis/src/ui/qgsopenvectorlayerdialogbase.ui
trunk/qgis/src/ui/qgspgsourceselectbase.ui
trunk/qgis/src/ui/qgsprojectionselectorbase.ui
trunk/qgis/src/ui/qgsquerybuilderbase.ui
trunk/qgis/src/ui/qgsrasterlayerpropertiesbase.ui
trunk/qgis/src/ui/qgsrendererv2propsdialogbase.ui
trunk/qgis/src/ui/qgsspatialitesridsdialogbase.ui
trunk/qgis/src/ui/qgsstylev2managerdialogbase.ui
trunk/qgis/src/ui/qgssymbolv2propertiesdialogbase.ui
trunk/qgis/src/ui/qgssymbolv2selectordialogbase.ui
trunk/qgis/src/ui/qgsuniquevaluedialogbase.ui
trunk/qgis/src/ui/qgsvectorcolorbrewercolorrampv2dialogbase.ui
trunk/qgis/src/ui/qgsvectorgradientcolorrampv2dialogbase.ui
trunk/qgis/src/ui/qgsvectorlayersaveasdialogbase.ui
trunk/qgis/src/ui/qgswmssourceselectbase.ui
trunk/qgis/src/ui/symbollayer/widget_linedecoration.ui
trunk/qgis/src/ui/symbollayer/widget_markerline.ui
trunk/qgis/src/ui/symbollayer/widget_simplefill.ui
trunk/qgis/src/ui/symbollayer/widget_simpleline.ui
trunk/qgis/src/ui/symbollayer/widget_simplemarker.ui
trunk/qgis/src/ui/symbollayer/widget_svgfill.ui
trunk/qgis/src/ui/symbollayer/widget_svgmarker.ui
Log:
UI updates from Milena Nowotarska
Modified: trunk/qgis/src/ui/qgsattributeactiondialogbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsattributeactiondialogbase.ui 2010-05-24 21:36:30 UTC (rev 13567)
+++ trunk/qgis/src/ui/qgsattributeactiondialogbase.ui 2010-05-25 05:13:58 UTC (rev 13568)
@@ -282,6 +282,7 @@
<tabstop>moveUpButton</tabstop>
<tabstop>moveDownButton</tabstop>
<tabstop>removeButton</tabstop>
+ <tabstop>actionType</tabstop>
<tabstop>actionName</tabstop>
<tabstop>actionAction</tabstop>
<tabstop>browseButton</tabstop>
Modified: trunk/qgis/src/ui/qgsattributeloadfrommap.ui
===================================================================
--- trunk/qgis/src/ui/qgsattributeloadfrommap.ui 2010-05-24 21:36:30 UTC (rev 13567)
+++ trunk/qgis/src/ui/qgsattributeloadfrommap.ui 2010-05-25 05:13:58 UTC (rev 13568)
@@ -100,6 +100,14 @@
</layout>
</widget>
</widget>
+ <tabstops>
+ <tabstop>layerComboBox</tabstop>
+ <tabstop>valueComboBox</tabstop>
+ <tabstop>keyComboBox</tabstop>
+ <tabstop>previewButton</tabstop>
+ <tabstop>previewTableWidget</tabstop>
+ <tabstop>buttonBox</tabstop>
+ </tabstops>
<resources/>
<connections>
<connection>
Modified: trunk/qgis/src/ui/qgsattributetabledialog.ui
===================================================================
--- trunk/qgis/src/ui/qgsattributetabledialog.ui 2010-05-24 21:36:30 UTC (rev 13567)
+++ trunk/qgis/src/ui/qgsattributetabledialog.ui 2010-05-25 05:13:58 UTC (rev 13568)
@@ -347,9 +347,23 @@
</customwidgets>
<tabstops>
<tabstop>mView</tabstop>
+ <tabstop>columnBox</tabstop>
+ <tabstop>query</tabstop>
<tabstop>searchButton</tabstop>
- <tabstop>query</tabstop>
- <tabstop>columnBox</tabstop>
+ <tabstop>cbxShowSelectedOnly</tabstop>
+ <tabstop>cbxSearchSelectedOnly</tabstop>
+ <tabstop>mAdvancedSearchButton</tabstop>
+ <tabstop>mHelpButton</tabstop>
+ <tabstop>mRemoveSelectionButton</tabstop>
+ <tabstop>mSelectedToTopButton</tabstop>
+ <tabstop>mInvertSelectionButton</tabstop>
+ <tabstop>mCopySelectedRowsButton</tabstop>
+ <tabstop>mZoomMapToSelectedRowsButton</tabstop>
+ <tabstop>mToggleEditingButton</tabstop>
+ <tabstop>mDeleteSelectedButton</tabstop>
+ <tabstop>mAddAttribute</tabstop>
+ <tabstop>mRemoveAttribute</tabstop>
+ <tabstop>mOpenFieldCalculator</tabstop>
</tabstops>
<resources/>
<connections/>
Modified: trunk/qgis/src/ui/qgscategorizedsymbolrendererv2widget.ui
===================================================================
--- trunk/qgis/src/ui/qgscategorizedsymbolrendererv2widget.ui 2010-05-24 21:36:30 UTC (rev 13567)
+++ trunk/qgis/src/ui/qgscategorizedsymbolrendererv2widget.ui 2010-05-25 05:13:58 UTC (rev 13568)
@@ -16,7 +16,7 @@
<item>
<widget class="QLabel" name="label_3">
<property name="text">
- <string>Column:</string>
+ <string>Column</string>
</property>
</widget>
</item>
@@ -53,7 +53,7 @@
<item>
<widget class="QLabel" name="label_9">
<property name="text">
- <string>Symbol:</string>
+ <string>Symbol</string>
</property>
</widget>
</item>
@@ -73,7 +73,7 @@
<item>
<widget class="QLabel" name="label_10">
<property name="text">
- <string>Color ramp:</string>
+ <string>Color ramp</string>
</property>
</widget>
</item>
Modified: trunk/qgis/src/ui/qgscomposerlabelwidgetbase.ui
===================================================================
--- trunk/qgis/src/ui/qgscomposerlabelwidgetbase.ui 2010-05-24 21:36:30 UTC (rev 13567)
+++ trunk/qgis/src/ui/qgscomposerlabelwidgetbase.ui 2010-05-25 05:13:58 UTC (rev 13568)
@@ -31,7 +31,7 @@
<x>0</x>
<y>0</y>
<width>185</width>
- <height>318</height>
+ <height>317</height>
</rect>
</property>
<attribute name="label">
@@ -88,6 +88,7 @@
<tabstops>
<tabstop>mTextEdit</tabstop>
<tabstop>mFontButton</tabstop>
+ <tabstop>mFontColorButton</tabstop>
<tabstop>mMarginDoubleSpinBox</tabstop>
</tabstops>
<resources/>
Modified: trunk/qgis/src/ui/qgscomposerlegendwidgetbase.ui
===================================================================
--- trunk/qgis/src/ui/qgscomposerlegendwidgetbase.ui 2010-05-24 21:36:30 UTC (rev 13567)
+++ trunk/qgis/src/ui/qgscomposerlegendwidgetbase.ui 2010-05-25 05:13:58 UTC (rev 13568)
@@ -33,8 +33,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>365</width>
- <height>467</height>
+ <width>367</width>
+ <height>469</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_3">
@@ -48,8 +48,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>347</width>
- <height>393</height>
+ <width>349</width>
+ <height>397</height>
</rect>
</property>
<attribute name="label">
@@ -183,8 +183,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>347</width>
- <height>393</height>
+ <width>349</width>
+ <height>397</height>
</rect>
</property>
<attribute name="label">
@@ -265,8 +265,10 @@
</widget>
<layoutdefault spacing="6" margin="11"/>
<tabstops>
+ <tabstop>scrollArea</tabstop>
<tabstop>mTitleLineEdit</tabstop>
<tabstop>mTitleFontButton</tabstop>
+ <tabstop>mGroupFontButton</tabstop>
<tabstop>mLayerFontButton</tabstop>
<tabstop>mItemFontButton</tabstop>
<tabstop>mSymbolWidthSpinBox</tabstop>
@@ -276,6 +278,13 @@
<tabstop>mIconLabelSpaceSpinBox</tabstop>
<tabstop>mBoxSpaceSpinBox</tabstop>
<tabstop>mItemTreeView</tabstop>
+ <tabstop>mMoveDownToolButton</tabstop>
+ <tabstop>mMoveUpToolButton</tabstop>
+ <tabstop>mRemoveToolButton</tabstop>
+ <tabstop>mEditPushButton</tabstop>
+ <tabstop>mUpdatePushButton</tabstop>
+ <tabstop>mUpdateAllPushButton</tabstop>
+ <tabstop>mAddGroupButton</tabstop>
</tabstops>
<resources/>
<connections/>
Modified: trunk/qgis/src/ui/qgscomposermanagerbase.ui
===================================================================
--- trunk/qgis/src/ui/qgscomposermanagerbase.ui 2010-05-24 21:36:30 UTC (rev 13567)
+++ trunk/qgis/src/ui/qgscomposermanagerbase.ui 2010-05-25 05:13:58 UTC (rev 13568)
@@ -39,6 +39,12 @@
</item>
</layout>
</widget>
+ <tabstops>
+ <tabstop>mComposerListWidget</tabstop>
+ <tabstop>mTemplate</tabstop>
+ <tabstop>mAddButton</tabstop>
+ <tabstop>mButtonBox</tabstop>
+ </tabstops>
<resources/>
<connections>
<connection>
@@ -48,8 +54,8 @@
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
- <x>251</x>
- <y>193</y>
+ <x>260</x>
+ <y>185</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
@@ -64,8 +70,8 @@
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
- <x>251</x>
- <y>193</y>
+ <x>260</x>
+ <y>185</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
Modified: trunk/qgis/src/ui/qgscomposertablewidgetbase.ui
===================================================================
--- trunk/qgis/src/ui/qgscomposertablewidgetbase.ui 2010-05-24 21:36:30 UTC (rev 13567)
+++ trunk/qgis/src/ui/qgscomposertablewidgetbase.ui 2010-05-25 05:13:58 UTC (rev 13568)
@@ -25,7 +25,7 @@
<x>0</x>
<y>0</y>
<width>251</width>
- <height>302</height>
+ <height>301</height>
</rect>
</property>
<attribute name="label">
@@ -39,6 +39,9 @@
<property name="text">
<string>Layer</string>
</property>
+ <property name="buddy">
+ <cstring>mLayerComboBox</cstring>
+ </property>
</widget>
</item>
<item>
@@ -80,6 +83,9 @@
<property name="text">
<string>Composer map</string>
</property>
+ <property name="buddy">
+ <cstring>mComposerMapComboBox</cstring>
+ </property>
</widget>
</item>
<item>
@@ -94,6 +100,9 @@
<property name="text">
<string>Maximum columns</string>
</property>
+ <property name="buddy">
+ <cstring>mMaximumColumnsSpinBox</cstring>
+ </property>
</widget>
</item>
<item>
@@ -108,6 +117,9 @@
<property name="text">
<string>Margin</string>
</property>
+ <property name="buddy">
+ <cstring>mMarginSpinBox</cstring>
+ </property>
</widget>
</item>
<item>
@@ -129,6 +141,9 @@
<property name="text">
<string>Grid stroke width</string>
</property>
+ <property name="buddy">
+ <cstring>mGridStrokeWidthSpinBox</cstring>
+ </property>
</widget>
</item>
<item>
@@ -141,6 +156,9 @@
<property name="text">
<string>Grid color</string>
</property>
+ <property name="buddy">
+ <cstring>mGridColorButton</cstring>
+ </property>
</widget>
</item>
<item row="8" column="1">
Modified: trunk/qgis/src/ui/qgscomposervectorlegendbase.ui
===================================================================
--- trunk/qgis/src/ui/qgscomposervectorlegendbase.ui 2010-05-24 21:36:30 UTC (rev 13567)
+++ trunk/qgis/src/ui/qgscomposervectorlegendbase.ui 2010-05-25 05:13:58 UTC (rev 13568)
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>QgsComposerVectorLegendBase</class>
- <widget class="QWidget" name="QgsComposerVectorLegendBase" >
- <property name="geometry" >
+ <widget class="QWidget" name="QgsComposerVectorLegendBase">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -9,123 +10,111 @@
<height>419</height>
</rect>
</property>
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>7</vsizetype>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>Vector Legend Options</string>
</property>
- <layout class="QGridLayout" >
- <property name="margin" >
+ <layout class="QGridLayout">
+ <property name="margin">
<number>9</number>
</property>
- <property name="spacing" >
+ <property name="spacing">
<number>6</number>
</property>
- <item row="5" column="2" >
- <widget class="QComboBox" name="mPreviewModeComboBox" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>0</vsizetype>
+ <item row="5" column="2">
+ <widget class="QComboBox" name="mPreviewModeComboBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
- <item row="5" column="0" colspan="2" >
- <widget class="QLabel" name="textLabel1_5" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>1</hsizetype>
- <vsizetype>0</vsizetype>
+ <item row="5" column="0" colspan="2">
+ <widget class="QLabel" name="textLabel1_5">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="text" >
+ <property name="text">
<string>Preview</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>true</bool>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>mPreviewModeComboBox</cstring>
</property>
</widget>
</item>
- <item row="1" column="1" colspan="2" >
- <widget class="QComboBox" name="mMapComboBox" >
- <property name="enabled" >
+ <item row="1" column="1" colspan="2">
+ <widget class="QComboBox" name="mMapComboBox">
+ <property name="enabled">
<bool>true</bool>
</property>
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>5</hsizetype>
- <vsizetype>0</vsizetype>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
- <item row="0" column="1" colspan="2" >
- <widget class="QLineEdit" name="mTitleLineEdit" />
+ <item row="0" column="1" colspan="2">
+ <widget class="QLineEdit" name="mTitleLineEdit"/>
</item>
- <item row="1" column="0" >
- <widget class="QLabel" name="textLabel1" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>1</hsizetype>
- <vsizetype>0</vsizetype>
+ <item row="1" column="0">
+ <widget class="QLabel" name="textLabel1">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="text" >
+ <property name="text">
<string>Map</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>true</bool>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>mMapComboBox</cstring>
</property>
</widget>
</item>
- <item row="0" column="0" >
- <widget class="QLabel" name="textLabel1_2" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>1</hsizetype>
- <vsizetype>5</vsizetype>
+ <item row="0" column="0">
+ <widget class="QLabel" name="textLabel1_2">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="text" >
+ <property name="text">
<string>Title</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>true</bool>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>mTitleLineEdit</cstring>
</property>
</widget>
</item>
- <item row="6" column="2" >
+ <item row="6" column="2">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
@@ -133,64 +122,63 @@
</property>
</spacer>
</item>
- <item row="4" column="0" colspan="3" >
- <widget class="QTreeWidget" name="mLayersListView" >
- <property name="selectionMode" >
+ <item row="4" column="0" colspan="3">
+ <widget class="QTreeWidget" name="mLayersListView">
+ <property name="selectionMode">
<enum>QAbstractItemView::ExtendedSelection</enum>
</property>
- <property name="rootIsDecorated" >
+ <property name="rootIsDecorated">
<bool>false</bool>
</property>
- <property name="columnCount" >
+ <property name="columnCount">
<number>3</number>
</property>
<column>
- <property name="text" >
+ <property name="text">
<string>Layers</string>
</property>
</column>
<column>
- <property name="text" >
+ <property name="text">
<string>Group</string>
</property>
</column>
<column>
- <property name="text" >
+ <property name="text">
<string>ID</string>
</property>
</column>
</widget>
</item>
- <item row="3" column="0" colspan="3" >
- <widget class="QCheckBox" name="mFrameCheckBox" >
- <property name="text" >
+ <item row="3" column="0" colspan="3">
+ <widget class="QCheckBox" name="mFrameCheckBox">
+ <property name="text">
<string>Box</string>
</property>
</widget>
</item>
- <item row="2" column="0" colspan="3" >
- <widget class="QPushButton" name="mFontButton" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>5</hsizetype>
- <vsizetype>0</vsizetype>
+ <item row="2" column="0" colspan="3">
+ <widget class="QPushButton" name="mFontButton">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="text" >
+ <property name="text">
<string>Font</string>
</property>
</widget>
</item>
</layout>
</widget>
- <layoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="6" margin="11"/>
<tabstops>
<tabstop>mTitleLineEdit</tabstop>
<tabstop>mMapComboBox</tabstop>
<tabstop>mFontButton</tabstop>
<tabstop>mFrameCheckBox</tabstop>
+ <tabstop>mLayersListView</tabstop>
<tabstop>mPreviewModeComboBox</tabstop>
</tabstops>
<resources/>
Modified: trunk/qgis/src/ui/qgscompositionwidgetbase.ui
===================================================================
--- trunk/qgis/src/ui/qgscompositionwidgetbase.ui 2010-05-24 21:36:30 UTC (rev 13567)
+++ trunk/qgis/src/ui/qgscompositionwidgetbase.ui 2010-05-25 05:13:58 UTC (rev 13568)
@@ -32,9 +32,9 @@
<property name="geometry">
<rect>
<x>0</x>
- <y>0</y>
- <width>393</width>
- <height>707</height>
+ <y>-11</y>
+ <width>397</width>
+ <height>579</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_3">
@@ -315,7 +315,10 @@
<tabstop>scrollArea</tabstop>
<tabstop>mPaperSizeComboBox</tabstop>
<tabstop>mPaperUnitsComboBox</tabstop>
+ <tabstop>mPaperWidthDoubleSpinBox</tabstop>
+ <tabstop>mPaperHeightDoubleSpinBox</tabstop>
<tabstop>mPaperOrientationComboBox</tabstop>
+ <tabstop>mResolutionSpinBox</tabstop>
<tabstop>mPrintAsRasterCheckBox</tabstop>
<tabstop>mSnapToGridCheckBox</tabstop>
<tabstop>mGridResolutionSpinBox</tabstop>
Modified: trunk/qgis/src/ui/qgsgraduatedsymboldialogbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsgraduatedsymboldialogbase.ui 2010-05-24 21:36:30 UTC (rev 13567)
+++ trunk/qgis/src/ui/qgsgraduatedsymboldialogbase.ui 2010-05-25 05:13:58 UTC (rev 13568)
@@ -50,6 +50,9 @@
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
+ <property name="buddy">
+ <cstring>classificationComboBox</cstring>
+ </property>
</widget>
</item>
<item row="0" column="1">
@@ -88,6 +91,9 @@
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
+ <property name="buddy">
+ <cstring>modeComboBox</cstring>
+ </property>
</widget>
</item>
<item row="1" column="1">
@@ -126,6 +132,9 @@
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
+ <property name="buddy">
+ <cstring>numberofclassesspinbox</cstring>
+ </property>
</widget>
</item>
<item row="2" column="1">
Modified: trunk/qgis/src/ui/qgsgraduatedsymbolrendererv2widget.ui
===================================================================
--- trunk/qgis/src/ui/qgsgraduatedsymbolrendererv2widget.ui 2010-05-24 21:36:30 UTC (rev 13567)
+++ trunk/qgis/src/ui/qgsgraduatedsymbolrendererv2widget.ui 2010-05-25 05:13:58 UTC (rev 13568)
@@ -16,8 +16,11 @@
<item row="0" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
- <string>Column:</string>
+ <string>Column</string>
</property>
+ <property name="buddy">
+ <cstring>cboGraduatedColumn</cstring>
+ </property>
</widget>
</item>
<item row="0" column="1" colspan="2">
@@ -26,8 +29,11 @@
<item row="1" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
- <string>Symbol:</string>
+ <string>Symbol</string>
</property>
+ <property name="buddy">
+ <cstring>btnChangeGraduatedSymbol</cstring>
+ </property>
</widget>
</item>
<item row="1" column="1">
@@ -46,11 +52,14 @@
<item row="1" column="3">
<widget class="QLabel" name="label_5">
<property name="text">
- <string>Classes:</string>
+ <string>Classes</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
+ <property name="buddy">
+ <cstring>spinGraduatedClasses</cstring>
+ </property>
</widget>
</item>
<item row="1" column="4">
@@ -69,8 +78,11 @@
<item row="2" column="0">
<widget class="QLabel" name="label_7">
<property name="text">
- <string>Color ramp:</string>
+ <string>Color ramp</string>
</property>
+ <property name="buddy">
+ <cstring>cboGraduatedColorRamp</cstring>
+ </property>
</widget>
</item>
<item row="2" column="1">
@@ -79,11 +91,14 @@
<item row="2" column="3">
<widget class="QLabel" name="label_8">
<property name="text">
- <string>Mode:</string>
+ <string>Mode</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
+ <property name="buddy">
+ <cstring>cboGraduatedMode</cstring>
+ </property>
</widget>
</item>
<item row="2" column="4">
Modified: trunk/qgis/src/ui/qgslabeldialogbase.ui
===================================================================
--- trunk/qgis/src/ui/qgslabeldialogbase.ui 2010-05-24 21:36:30 UTC (rev 13567)
+++ trunk/qgis/src/ui/qgslabeldialogbase.ui 2010-05-25 05:13:58 UTC (rev 13568)
@@ -43,8 +43,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>525</width>
- <height>510</height>
+ <width>524</width>
+ <height>468</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_2">
@@ -489,9 +489,9 @@
<property name="geometry">
<rect>
<x>0</x>
- <y>0</y>
- <width>525</width>
- <height>592</height>
+ <y>-183</y>
+ <width>524</width>
+ <height>560</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_7">
@@ -894,11 +894,13 @@
<tabstop>btnDefaultFont</tabstop>
<tabstop>spinAngle</tabstop>
<tabstop>pbnDefaultFontColor</tabstop>
- <tabstop>radioOver</tabstop>
+ <tabstop>chkUseMultiline</tabstop>
+ <tabstop>chkSelectedOnly</tabstop>
<tabstop>radioAboveLeft</tabstop>
<tabstop>radioAbove</tabstop>
<tabstop>radioAboveRight</tabstop>
<tabstop>radioLeft</tabstop>
+ <tabstop>radioOver</tabstop>
<tabstop>radioRight</tabstop>
<tabstop>radioBelowLeft</tabstop>
<tabstop>radioBelow</tabstop>
@@ -914,6 +916,7 @@
<tabstop>spinXOffset</tabstop>
<tabstop>spinYOffset</tabstop>
<tabstop>cboOffsetUnits</tabstop>
+ <tabstop>scrollArea_2</tabstop>
<tabstop>cboAlignmentField</tabstop>
<tabstop>cboAngleField</tabstop>
<tabstop>cboFontField</tabstop>
@@ -930,7 +933,6 @@
<tabstop>cboYCoordinateField</tabstop>
<tabstop>cboXOffsetField</tabstop>
<tabstop>cboYOffsetField</tabstop>
- <tabstop>scrollArea_2</tabstop>
</tabstops>
<resources/>
<connections/>
Modified: trunk/qgis/src/ui/qgsmessageviewer.ui
===================================================================
--- trunk/qgis/src/ui/qgsmessageviewer.ui 2010-05-24 21:36:30 UTC (rev 13567)
+++ trunk/qgis/src/ui/qgsmessageviewer.ui 2010-05-25 05:13:58 UTC (rev 13568)
@@ -55,6 +55,8 @@
<layoutdefault spacing="6" margin="11"/>
<tabstops>
<tabstop>txtMessage</tabstop>
+ <tabstop>checkBox</tabstop>
+ <tabstop>buttonBox</tabstop>
</tabstops>
<resources/>
<connections>
Modified: trunk/qgis/src/ui/qgsnewogrconnectionbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsnewogrconnectionbase.ui 2010-05-24 21:36:30 UTC (rev 13567)
+++ trunk/qgis/src/ui/qgsnewogrconnectionbase.ui 2010-05-25 05:13:58 UTC (rev 13568)
@@ -93,6 +93,9 @@
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Type</span></p></body></html></string>
</property>
+ <property name="buddy">
+ <cstring>cmbDatabaseTypes</cstring>
+ </property>
</widget>
</item>
<item>
Modified: trunk/qgis/src/ui/qgsnewspatialitelayerdialogbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsnewspatialitelayerdialogbase.ui 2010-05-24 21:36:30 UTC (rev 13567)
+++ trunk/qgis/src/ui/qgsnewspatialitelayerdialogbase.ui 2010-05-25 05:13:58 UTC (rev 13568)
@@ -82,6 +82,9 @@
<property name="text">
<string>Layer name</string>
</property>
+ <property name="buddy">
+ <cstring>leLayerName</cstring>
+ </property>
</widget>
</item>
<item>
@@ -106,6 +109,9 @@
<property name="text">
<string>Geometry column</string>
</property>
+ <property name="buddy">
+ <cstring>leGeometryColumn</cstring>
+ </property>
</widget>
</item>
<item>
@@ -413,7 +419,7 @@
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
- <set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok|QDialogButtonBox::Apply</set>
+ <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
@@ -422,11 +428,21 @@
<layoutdefault spacing="6" margin="11"/>
<tabstops>
<tabstop>mDatabaseComboBox</tabstop>
+ <tabstop>toolButtonNewDatabase</tabstop>
+ <tabstop>leLayerName</tabstop>
+ <tabstop>leGeometryColumn</tabstop>
<tabstop>mPointRadioButton</tabstop>
<tabstop>mLineRadioButton</tabstop>
<tabstop>mPolygonRadioButton</tabstop>
+ <tabstop>mMultipointRadioButton</tabstop>
+ <tabstop>mMultilineRadioButton</tabstop>
+ <tabstop>mMultipolygonRadioButton</tabstop>
+ <tabstop>leSRID</tabstop>
+ <tabstop>pbnFindSRID</tabstop>
+ <tabstop>checkBoxPrimaryKey</tabstop>
<tabstop>mNameEdit</tabstop>
<tabstop>mTypeBox</tabstop>
+ <tabstop>mAddAttributeButton</tabstop>
<tabstop>mAttributeView</tabstop>
<tabstop>mRemoveAttributeButton</tabstop>
<tabstop>buttonBox</tabstop>
Modified: trunk/qgis/src/ui/qgsnewvectorlayerdialogbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsnewvectorlayerdialogbase.ui 2010-05-24 21:36:30 UTC (rev 13567)
+++ trunk/qgis/src/ui/qgsnewvectorlayerdialogbase.ui 2010-05-25 05:13:58 UTC (rev 13568)
@@ -306,10 +306,13 @@
<tabstop>mPointRadioButton</tabstop>
<tabstop>mLineRadioButton</tabstop>
<tabstop>mPolygonRadioButton</tabstop>
+ <tabstop>leSpatialRefSys</tabstop>
+ <tabstop>pbnChangeSpatialRefSys</tabstop>
<tabstop>mNameEdit</tabstop>
<tabstop>mTypeBox</tabstop>
<tabstop>mWidth</tabstop>
<tabstop>mPrecision</tabstop>
+ <tabstop>mAddAttributeButton</tabstop>
<tabstop>mAttributeView</tabstop>
<tabstop>mRemoveAttributeButton</tabstop>
<tabstop>buttonBox</tabstop>
Modified: trunk/qgis/src/ui/qgsopenvectorlayerdialogbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsopenvectorlayerdialogbase.ui 2010-05-24 21:36:30 UTC (rev 13567)
+++ trunk/qgis/src/ui/qgsopenvectorlayerdialogbase.ui 2010-05-25 05:13:58 UTC (rev 13568)
@@ -77,7 +77,7 @@
<item row="1" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
- <string>Encoding :</string>
+ <string>Encoding</string>
</property>
</widget>
</item>
@@ -278,7 +278,6 @@
</widget>
<layoutdefault spacing="6" margin="11"/>
<tabstops>
- <tabstop>buttonSelectSrc</tabstop>
<tabstop>radioSrcFile</tabstop>
<tabstop>radioSrcDirectory</tabstop>
<tabstop>radioSrcDatabase</tabstop>
@@ -288,6 +287,7 @@
<tabstop>protocolURI</tabstop>
<tabstop>cmbDirectoryTypes</tabstop>
<tabstop>inputSrcDataset</tabstop>
+ <tabstop>buttonSelectSrc</tabstop>
<tabstop>cmbDatabaseTypes</tabstop>
<tabstop>cmbConnections</tabstop>
<tabstop>btnNew</tabstop>
@@ -304,8 +304,8 @@
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
- <x>442</x>
- <y>673</y>
+ <x>451</x>
+ <y>699</y>
</hint>
<hint type="destinationlabel">
<x>481</x>
@@ -320,8 +320,8 @@
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
- <x>383</x>
- <y>673</y>
+ <x>392</x>
+ <y>699</y>
</hint>
<hint type="destinationlabel">
<x>281</x>
@@ -336,8 +336,8 @@
<slot>setVisible(bool)</slot>
<hints>
<hint type="sourcelabel">
- <x>352</x>
- <y>75</y>
+ <x>351</x>
+ <y>85</y>
</hint>
<hint type="destinationlabel">
<x>245</x>
Modified: trunk/qgis/src/ui/qgspgsourceselectbase.ui
===================================================================
--- trunk/qgis/src/ui/qgspgsourceselectbase.ui 2010-05-24 21:36:30 UTC (rev 13567)
+++ trunk/qgis/src/ui/qgspgsourceselectbase.ui 2010-05-25 05:13:58 UTC (rev 13568)
@@ -115,7 +115,7 @@
<bool>true</bool>
</property>
<property name="text">
- <string>Search:</string>
+ <string>Search</string>
</property>
<property name="buddy">
<cstring>mSearchTableEdit</cstring>
@@ -128,7 +128,7 @@
<bool>true</bool>
</property>
<property name="text">
- <string>Search mode:</string>
+ <string>Search mode</string>
</property>
<property name="buddy">
<cstring>mSearchModeComboBox</cstring>
@@ -148,7 +148,7 @@
<bool>true</bool>
</property>
<property name="text">
- <string>Search in columns:</string>
+ <string>Search in columns</string>
</property>
<property name="buddy">
<cstring>mSearchColumnComboBox</cstring>
@@ -190,6 +190,7 @@
<tabstop>btnDelete</tabstop>
<tabstop>mTablesTreeView</tabstop>
<tabstop>btnBuildQuery</tabstop>
+ <tabstop>mSearchGroupBox</tabstop>
<tabstop>mSearchTableEdit</tabstop>
<tabstop>mSearchColumnComboBox</tabstop>
<tabstop>mSearchModeComboBox</tabstop>
@@ -220,8 +221,8 @@
<slot>setVisible(bool)</slot>
<hints>
<hint type="sourcelabel">
- <x>85</x>
- <y>324</y>
+ <x>94</x>
+ <y>437</y>
</hint>
<hint type="destinationlabel">
<x>177</x>
@@ -236,12 +237,12 @@
<slot>setVisible(bool)</slot>
<hints>
<hint type="sourcelabel">
- <x>88</x>
- <y>325</y>
+ <x>97</x>
+ <y>437</y>
</hint>
<hint type="destinationlabel">
- <x>254</x>
- <y>381</y>
+ <x>343</x>
+ <y>402</y>
</hint>
</hints>
</connection>
@@ -252,8 +253,8 @@
<slot>setVisible(bool)</slot>
<hints>
<hint type="sourcelabel">
- <x>106</x>
- <y>333</y>
+ <x>115</x>
+ <y>437</y>
</hint>
<hint type="destinationlabel">
<x>281</x>
@@ -268,8 +269,8 @@
<slot>setVisible(bool)</slot>
<hints>
<hint type="sourcelabel">
- <x>124</x>
- <y>327</y>
+ <x>133</x>
+ <y>437</y>
</hint>
<hint type="destinationlabel">
<x>58</x>
@@ -284,12 +285,12 @@
<slot>setVisible(bool)</slot>
<hints>
<hint type="sourcelabel">
- <x>42</x>
- <y>327</y>
+ <x>51</x>
+ <y>437</y>
</hint>
<hint type="destinationlabel">
- <x>39</x>
- <y>379</y>
+ <x>57</x>
+ <y>402</y>
</hint>
</hints>
</connection>
@@ -300,8 +301,8 @@
<slot>setVisible(bool)</slot>
<hints>
<hint type="sourcelabel">
- <x>73</x>
- <y>322</y>
+ <x>82</x>
+ <y>437</y>
</hint>
<hint type="destinationlabel">
<x>68</x>
Modified: trunk/qgis/src/ui/qgsprojectionselectorbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsprojectionselectorbase.ui 2010-05-24 21:36:30 UTC (rev 13567)
+++ trunk/qgis/src/ui/qgsprojectionselectorbase.ui 2010-05-25 05:13:58 UTC (rev 13568)
@@ -245,6 +245,16 @@
</layout>
</widget>
<layoutdefault spacing="6" margin="11"/>
+ <tabstops>
+ <tabstop>lstCoordinateSystems</tabstop>
+ <tabstop>teProjection</tabstop>
+ <tabstop>cbxAuthority</tabstop>
+ <tabstop>cbxMode</tabstop>
+ <tabstop>cbxHideDeprecated</tabstop>
+ <tabstop>leSearch</tabstop>
+ <tabstop>pbnFind</tabstop>
+ <tabstop>lstRecent</tabstop>
+ </tabstops>
<resources/>
<connections>
<connection>
@@ -254,12 +264,12 @@
<slot>click()</slot>
<hints>
<hint type="sourcelabel">
- <x>362</x>
- <y>276</y>
+ <x>376</x>
+ <y>217</y>
</hint>
<hint type="destinationlabel">
- <x>453</x>
- <y>277</y>
+ <x>575</x>
+ <y>219</y>
</hint>
</hints>
</connection>
Modified: trunk/qgis/src/ui/qgsquerybuilderbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsquerybuilderbase.ui 2010-05-24 21:36:30 UTC (rev 13567)
+++ trunk/qgis/src/ui/qgsquerybuilderbase.ui 2010-05-25 05:13:58 UTC (rev 13568)
@@ -270,10 +270,10 @@
</widget>
<layoutdefault spacing="6" margin="11"/>
<tabstops>
+ <tabstop>lstFields</tabstop>
+ <tabstop>lstValues</tabstop>
<tabstop>btnSampleValues</tabstop>
<tabstop>btnGetAllValues</tabstop>
- <tabstop>lstFields</tabstop>
- <tabstop>lstValues</tabstop>
<tabstop>btnEqual</tabstop>
<tabstop>btnLessThan</tabstop>
<tabstop>btnGreaterThan</tabstop>
Modified: trunk/qgis/src/ui/qgsrasterlayerpropertiesbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsrasterlayerpropertiesbase.ui 2010-05-24 21:36:30 UTC (rev 13567)
+++ trunk/qgis/src/ui/qgsrasterlayerpropertiesbase.ui 2010-05-25 05:13:58 UTC (rev 13568)
@@ -199,7 +199,7 @@
<item row="0" column="1" colspan="4">
<widget class="QStackedWidget" name="tabBar">
<property name="currentIndex">
- <number>2</number>
+ <number>0</number>
</property>
<widget class="QWidget" name="tabPageSymbology">
<layout class="QGridLayout">
@@ -289,7 +289,7 @@
<property name="title">
<string>RGB mode band selection and scaling</string>
</property>
- <layout class="QGridLayout">
+ <layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<widget class="QLabel" name="lblRed">
<property name="text">
@@ -381,6 +381,12 @@
<layout class="QHBoxLayout">
<item>
<widget class="QToolButton" name="pbtnMakeBandCombinationDefault">
+ <property name="toolTip">
+ <string>Save current RGB composition as default. This setting will be persistent between QGIS sessions.</string>
+ </property>
+ <property name="whatsThis">
+ <string>Save current RGB composition as default. This setting will be persistent between QGIS sessions.</string>
+ </property>
<property name="text">
<string>...</string>
</property>
@@ -399,7 +405,7 @@
</item>
</layout>
</item>
- <item row="4" column="0" colspan="5">
+ <item row="4" column="0" colspan="2">
<widget class="QRadioButton" name="rbtnThreeBandMinMax">
<property name="text">
<string>Custom min / max values</string>
@@ -655,23 +661,50 @@
</widget>
</item>
<item row="8" column="4">
- <widget class="QDoubleSpinBox" name="sboxThreeBandStdDev">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="maximum">
- <double>10.000000000000000</double>
- </property>
- <property name="singleStep">
- <double>0.100000000000000</double>
- </property>
- <property name="value">
- <double>0.000000000000000</double>
- </property>
- </widget>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QDoubleSpinBox" name="sboxThreeBandStdDev">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>75</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="maximum">
+ <double>10.000000000000000</double>
+ </property>
+ <property name="singleStep">
+ <double>0.100000000000000</double>
+ </property>
+ <property name="value">
+ <double>0.000000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QToolButton" name="pbtnMakeStandardDeviationDefault">
+ <property name="toolTip">
+ <string>Save current standard deviation value as default. This setting will be persistent between QGIS sessions.</string>
+ </property>
+ <property name="whatsThis">
+ <string>Save current standard deviation value as default. This setting will be persistent between QGIS sessions.</string>
+ </property>
+ <property name="text">
+ <string>...</string>
+ </property>
+ <property name="icon">
+ <iconset>
+ <normaloff>../../images/themes/default/mActionFileSave.png</normaloff>../../images/themes/default/mActionFileSave.png</iconset>
+ </property>
+ </widget>
+ </item>
+ </layout>
</item>
</layout>
</widget>
@@ -1854,8 +1887,11 @@
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
-<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></body></html></string>
+</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
+<table style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;">
+<tr>
+<td style="border: none;">
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;"></p></td></tr></table></body></html></string>
</property>
</widget>
</item>
Modified: trunk/qgis/src/ui/qgsrendererv2propsdialogbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsrendererv2propsdialogbase.ui 2010-05-24 21:36:30 UTC (rev 13567)
+++ trunk/qgis/src/ui/qgsrendererv2propsdialogbase.ui 2010-05-25 05:13:58 UTC (rev 13568)
@@ -19,8 +19,11 @@
<item>
<widget class="QLabel" name="label_2">
<property name="text">
- <string>Renderer:</string>
+ <string>Renderer</string>
</property>
+ <property name="buddy">
+ <cstring>cboRenderers</cstring>
+ </property>
</widget>
</item>
<item>
Modified: trunk/qgis/src/ui/qgsspatialitesridsdialogbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsspatialitesridsdialogbase.ui 2010-05-24 21:36:30 UTC (rev 13567)
+++ trunk/qgis/src/ui/qgsspatialitesridsdialogbase.ui 2010-05-25 05:13:58 UTC (rev 13568)
@@ -110,6 +110,10 @@
<layoutdefault spacing="6" margin="11"/>
<tabstops>
<tabstop>twSrids</tabstop>
+ <tabstop>leSearch</tabstop>
+ <tabstop>pbnFilter</tabstop>
+ <tabstop>radioButtonSrid</tabstop>
+ <tabstop>radioButtonName</tabstop>
<tabstop>buttonBox</tabstop>
</tabstops>
<resources/>
@@ -121,8 +125,8 @@
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
- <x>217</x>
- <y>327</y>
+ <x>226</x>
+ <y>322</y>
</hint>
<hint type="destinationlabel">
<x>274</x>
Modified: trunk/qgis/src/ui/qgsstylev2managerdialogbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsstylev2managerdialogbase.ui 2010-05-24 21:36:30 UTC (rev 13567)
+++ trunk/qgis/src/ui/qgsstylev2managerdialogbase.ui 2010-05-25 05:13:58 UTC (rev 13568)
@@ -17,8 +17,11 @@
<item>
<widget class="QLabel" name="label">
<property name="text">
- <string>Style item type:</string>
+ <string>Style item type</string>
</property>
+ <property name="buddy">
+ <cstring>cboItemType</cstring>
+ </property>
</widget>
</item>
<item>
Modified: trunk/qgis/src/ui/qgssymbolv2propertiesdialogbase.ui
===================================================================
--- trunk/qgis/src/ui/qgssymbolv2propertiesdialogbase.ui 2010-05-24 21:36:30 UTC (rev 13567)
+++ trunk/qgis/src/ui/qgssymbolv2propertiesdialogbase.ui 2010-05-25 05:13:58 UTC (rev 13568)
@@ -17,7 +17,7 @@
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
- <string>Symbol preview:</string>
+ <string>Symbol preview</string>
</property>
</widget>
</item>
@@ -28,7 +28,7 @@
<item>
<widget class="QLabel" name="label_2">
<property name="text">
- <string>Symbol layer type:</string>
+ <string>Symbol layer type</string>
</property>
</widget>
</item>
@@ -97,7 +97,7 @@
<item row="2" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
- <string>Symbol layers:</string>
+ <string>Symbol layers</string>
</property>
</widget>
</item>
@@ -246,8 +246,8 @@
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
- <x>248</x>
- <y>254</y>
+ <x>257</x>
+ <y>386</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
@@ -262,8 +262,8 @@
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
- <x>316</x>
- <y>260</y>
+ <x>325</x>
+ <y>386</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
Modified: trunk/qgis/src/ui/qgssymbolv2selectordialogbase.ui
===================================================================
--- trunk/qgis/src/ui/qgssymbolv2selectordialogbase.ui 2010-05-24 21:36:30 UTC (rev 13567)
+++ trunk/qgis/src/ui/qgssymbolv2selectordialogbase.ui 2010-05-25 05:13:58 UTC (rev 13568)
@@ -51,6 +51,9 @@
<property name="text">
<string>Unit</string>
</property>
+ <property name="buddy">
+ <cstring>mSymbolUnitComboBox</cstring>
+ </property>
</widget>
</item>
<item row="0" column="1">
@@ -72,6 +75,9 @@
<property name="text">
<string>Opacity</string>
</property>
+ <property name="buddy">
+ <cstring>mTransparencySlider</cstring>
+ </property>
</widget>
</item>
<item row="1" column="1">
@@ -95,6 +101,9 @@
<property name="text">
<string>Color</string>
</property>
+ <property name="buddy">
+ <cstring>btnColor</cstring>
+ </property>
</widget>
</item>
<item row="2" column="1">
@@ -240,7 +249,7 @@
<item row="2" column="0">
<widget class="QLabel" name="label">
<property name="text">
- <string>Symbols from style:</string>
+ <string>Symbols from style</string>
</property>
</widget>
</item>
@@ -295,11 +304,13 @@
<tabstop>btnSymbolProperties</tabstop>
<tabstop>mSymbolUnitComboBox</tabstop>
<tabstop>mTransparencySlider</tabstop>
+ <tabstop>btnColor</tabstop>
<tabstop>spinSize</tabstop>
<tabstop>spinAngle</tabstop>
- <tabstop>spinWidth</tabstop>
+ <tabstop>btnAdvanced</tabstop>
<tabstop>btnAddToStyle</tabstop>
<tabstop>viewSymbols</tabstop>
+ <tabstop>spinWidth</tabstop>
<tabstop>buttonBox</tabstop>
</tabstops>
<resources/>
@@ -311,8 +322,8 @@
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
- <x>248</x>
- <y>254</y>
+ <x>257</x>
+ <y>406</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
@@ -327,8 +338,8 @@
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
- <x>316</x>
- <y>260</y>
+ <x>325</x>
+ <y>406</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
Modified: trunk/qgis/src/ui/qgsuniquevaluedialogbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsuniquevaluedialogbase.ui 2010-05-24 21:36:30 UTC (rev 13567)
+++ trunk/qgis/src/ui/qgsuniquevaluedialogbase.ui 2010-05-25 05:13:58 UTC (rev 13568)
@@ -143,6 +143,9 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
+ <property name="currentIndex">
+ <number>1</number>
+ </property>
<widget class="QWidget" name="page"/>
<widget class="QWidget" name="page_2"/>
</widget>
@@ -176,8 +179,12 @@
<tabstops>
<tabstop>mClassificationComboBox</tabstop>
<tabstop>mClassifyButton</tabstop>
+ <tabstop>mAddButton</tabstop>
<tabstop>mDeletePushButton</tabstop>
+ <tabstop>mRandomizeColors</tabstop>
+ <tabstop>mResetColors</tabstop>
<tabstop>mClassListWidget</tabstop>
+ <tabstop>mCommonPropertyLock</tabstop>
</tabstops>
<resources/>
<connections/>
Modified: trunk/qgis/src/ui/qgsvectorcolorbrewercolorrampv2dialogbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsvectorcolorbrewercolorrampv2dialogbase.ui 2010-05-24 21:36:30 UTC (rev 13567)
+++ trunk/qgis/src/ui/qgsvectorcolorbrewercolorrampv2dialogbase.ui 2010-05-25 05:13:58 UTC (rev 13568)
@@ -19,8 +19,11 @@
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
- <string>Scheme name:</string>
+ <string>Scheme name</string>
</property>
+ <property name="buddy">
+ <cstring>cboSchemeName</cstring>
+ </property>
</widget>
</item>
<item row="0" column="2" rowspan="2">
@@ -42,8 +45,11 @@
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
- <string>Colors:</string>
+ <string>Colors</string>
</property>
+ <property name="buddy">
+ <cstring>cboColors</cstring>
+ </property>
</widget>
</item>
<item row="0" column="1">
Modified: trunk/qgis/src/ui/qgsvectorgradientcolorrampv2dialogbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsvectorgradientcolorrampv2dialogbase.ui 2010-05-24 21:36:30 UTC (rev 13567)
+++ trunk/qgis/src/ui/qgsvectorgradientcolorrampv2dialogbase.ui 2010-05-25 05:13:58 UTC (rev 13568)
@@ -19,8 +19,11 @@
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
- <string>Color 1:</string>
+ <string>Color 1</string>
</property>
+ <property name="buddy">
+ <cstring>btnColor1</cstring>
+ </property>
</widget>
</item>
<item row="0" column="1">
@@ -49,8 +52,11 @@
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
- <string>Color 2:</string>
+ <string>Color 2</string>
</property>
+ <property name="buddy">
+ <cstring>btnColor2</cstring>
+ </property>
</widget>
</item>
<item row="1" column="1">
@@ -152,6 +158,15 @@
<header>qgscolorbutton.h</header>
</customwidget>
</customwidgets>
+ <tabstops>
+ <tabstop>btnColor1</tabstop>
+ <tabstop>btnColor2</tabstop>
+ <tabstop>groupStops</tabstop>
+ <tabstop>treeStops</tabstop>
+ <tabstop>btnAddStop</tabstop>
+ <tabstop>btnRemoveStop</tabstop>
+ <tabstop>buttonBox</tabstop>
+ </tabstops>
<resources/>
<connections>
<connection>
@@ -161,8 +176,8 @@
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
- <x>258</x>
- <y>281</y>
+ <x>267</x>
+ <y>354</y>
</hint>
<hint type="destinationlabel">
<x>168</x>
@@ -177,8 +192,8 @@
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
- <x>363</x>
- <y>273</y>
+ <x>372</x>
+ <y>354</y>
</hint>
<hint type="destinationlabel">
<x>371</x>
Modified: trunk/qgis/src/ui/qgsvectorlayersaveasdialogbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsvectorlayersaveasdialogbase.ui 2010-05-24 21:36:30 UTC (rev 13567)
+++ trunk/qgis/src/ui/qgsvectorlayersaveasdialogbase.ui 2010-05-25 05:13:58 UTC (rev 13568)
@@ -26,6 +26,9 @@
<property name="text">
<string>CRS</string>
</property>
+ <property name="buddy">
+ <cstring>leCRS</cstring>
+ </property>
</widget>
</item>
<item row="5" column="1">
@@ -50,6 +53,9 @@
<property name="text">
<string>Save as</string>
</property>
+ <property name="buddy">
+ <cstring>leFilename</cstring>
+ </property>
</widget>
</item>
<item row="1" column="2">
@@ -77,6 +83,9 @@
<property name="text">
<string>Encoding</string>
</property>
+ <property name="buddy">
+ <cstring>mEncodingComboBox</cstring>
+ </property>
</widget>
</item>
<item row="0" column="0">
@@ -84,6 +93,9 @@
<property name="text">
<string>Format</string>
</property>
+ <property name="buddy">
+ <cstring>mFormatComboBox</cstring>
+ </property>
</widget>
</item>
<item row="0" column="1" colspan="2">
@@ -91,6 +103,15 @@
</item>
</layout>
</widget>
+ <tabstops>
+ <tabstop>mFormatComboBox</tabstop>
+ <tabstop>leFilename</tabstop>
+ <tabstop>browseFilename</tabstop>
+ <tabstop>mEncodingComboBox</tabstop>
+ <tabstop>leCRS</tabstop>
+ <tabstop>browseCRS</tabstop>
+ <tabstop>buttonBox</tabstop>
+ </tabstops>
<resources/>
<connections>
<connection>
@@ -100,8 +121,8 @@
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
- <x>248</x>
- <y>254</y>
+ <x>257</x>
+ <y>181</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
@@ -116,8 +137,8 @@
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
- <x>316</x>
- <y>260</y>
+ <x>325</x>
+ <y>181</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
Modified: trunk/qgis/src/ui/qgswmssourceselectbase.ui
===================================================================
--- trunk/qgis/src/ui/qgswmssourceselectbase.ui 2010-05-24 21:36:30 UTC (rev 13567)
+++ trunk/qgis/src/ui/qgswmssourceselectbase.ui 2010-05-25 05:13:58 UTC (rev 13568)
@@ -299,6 +299,9 @@
<attribute name="verticalHeaderVisible">
<bool>false</bool>
</attribute>
+ <attribute name="verticalHeaderVisible">
+ <bool>false</bool>
+ </attribute>
<column>
<property name="text">
<string>Layers</string>
@@ -360,6 +363,9 @@
<attribute name="verticalHeaderVisible">
<bool>false</bool>
</attribute>
+ <attribute name="verticalHeaderVisible">
+ <bool>false</bool>
+ </attribute>
<column>
<property name="text">
<string>Title</string>
@@ -415,12 +421,27 @@
</widget>
<layoutdefault spacing="6" margin="11"/>
<tabstops>
+ <tabstop>tabServers</tabstop>
<tabstop>cmbConnections</tabstop>
<tabstop>btnConnect</tabstop>
<tabstop>btnNew</tabstop>
<tabstop>btnEdit</tabstop>
<tabstop>btnDelete</tabstop>
+ <tabstop>btnAddDefault</tabstop>
+ <tabstop>lstLayers</tabstop>
+ <tabstop>leLayerName</tabstop>
<tabstop>btnChangeSpatialRefSys</tabstop>
+ <tabstop>cbxIgnoreGetMap</tabstop>
+ <tabstop>cbxIgnoreGetFeatureInfo</tabstop>
+ <tabstop>mLayerUpButton</tabstop>
+ <tabstop>mLayerDownButton</tabstop>
+ <tabstop>mLayerOrderTreeWidget</tabstop>
+ <tabstop>lstTilesets</tabstop>
+ <tabstop>leSearchTerm</tabstop>
+ <tabstop>btnSearch</tabstop>
+ <tabstop>tableWidgetWMSList</tabstop>
+ <tabstop>btnAddWMS</tabstop>
+ <tabstop>buttonBox</tabstop>
</tabstops>
<resources/>
<connections>
@@ -431,8 +452,8 @@
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
- <x>509</x>
- <y>461</y>
+ <x>518</x>
+ <y>510</y>
</hint>
<hint type="destinationlabel">
<x>551</x>
Modified: trunk/qgis/src/ui/symbollayer/widget_linedecoration.ui
===================================================================
--- trunk/qgis/src/ui/symbollayer/widget_linedecoration.ui 2010-05-24 21:36:30 UTC (rev 13567)
+++ trunk/qgis/src/ui/symbollayer/widget_linedecoration.ui 2010-05-25 05:13:58 UTC (rev 13568)
@@ -19,7 +19,7 @@
<item>
<widget class="QLabel" name="label">
<property name="text">
- <string>Color:</string>
+ <string>Color</string>
</property>
</widget>
</item>
Modified: trunk/qgis/src/ui/symbollayer/widget_markerline.ui
===================================================================
--- trunk/qgis/src/ui/symbollayer/widget_markerline.ui 2010-05-24 21:36:30 UTC (rev 13567)
+++ trunk/qgis/src/ui/symbollayer/widget_markerline.ui 2010-05-25 05:13:58 UTC (rev 13568)
@@ -19,7 +19,7 @@
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
- <string>Marker:</string>
+ <string>Marker</string>
</property>
</widget>
</item>
@@ -49,7 +49,7 @@
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
- <string>Marker interval:</string>
+ <string>Marker interval</string>
</property>
</widget>
</item>
@@ -63,7 +63,7 @@
<item row="3" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
- <string>Line offset:</string>
+ <string>Line offset</string>
</property>
</widget>
</item>
Modified: trunk/qgis/src/ui/symbollayer/widget_simplefill.ui
===================================================================
--- trunk/qgis/src/ui/symbollayer/widget_simplefill.ui 2010-05-24 21:36:30 UTC (rev 13567)
+++ trunk/qgis/src/ui/symbollayer/widget_simplefill.ui 2010-05-25 05:13:58 UTC (rev 13568)
@@ -19,7 +19,7 @@
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
- <string>Color:</string>
+ <string>Color</string>
</property>
</widget>
</item>
@@ -49,7 +49,7 @@
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
- <string>Fill style:</string>
+ <string>Fill style</string>
</property>
</widget>
</item>
@@ -59,7 +59,7 @@
<item row="2" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
- <string>Border color:</string>
+ <string>Border color</string>
</property>
</widget>
</item>
@@ -73,7 +73,7 @@
<item row="3" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
- <string>Border style:</string>
+ <string>Border style</string>
</property>
</widget>
</item>
@@ -83,7 +83,7 @@
<item row="4" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
- <string>Border width:</string>
+ <string>Border width</string>
</property>
</widget>
</item>
@@ -100,7 +100,7 @@
<item row="5" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
- <string>Offset X,Y:</string>
+ <string>Offset X,Y</string>
</property>
</widget>
</item>
Modified: trunk/qgis/src/ui/symbollayer/widget_simpleline.ui
===================================================================
--- trunk/qgis/src/ui/symbollayer/widget_simpleline.ui 2010-05-24 21:36:30 UTC (rev 13567)
+++ trunk/qgis/src/ui/symbollayer/widget_simpleline.ui 2010-05-25 05:13:58 UTC (rev 13568)
@@ -19,7 +19,7 @@
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
- <string>Color:</string>
+ <string>Color</string>
</property>
</widget>
</item>
@@ -55,7 +55,7 @@
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
- <string>Pen width:</string>
+ <string>Pen width</string>
</property>
</widget>
</item>
@@ -84,7 +84,7 @@
<item row="2" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
- <string>Offset:</string>
+ <string>Offset</string>
</property>
</widget>
</item>
@@ -107,7 +107,7 @@
<item row="3" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
- <string>Pen style:</string>
+ <string>Pen style</string>
</property>
</widget>
</item>
@@ -148,7 +148,7 @@
<item row="0" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
- <string>Join style:</string>
+ <string>Join style</string>
</property>
</widget>
</item>
@@ -174,7 +174,7 @@
<item row="1" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
- <string>Cap style:</string>
+ <string>Cap style</string>
</property>
</widget>
</item>
Modified: trunk/qgis/src/ui/symbollayer/widget_simplemarker.ui
===================================================================
--- trunk/qgis/src/ui/symbollayer/widget_simplemarker.ui 2010-05-24 21:36:30 UTC (rev 13567)
+++ trunk/qgis/src/ui/symbollayer/widget_simplemarker.ui 2010-05-25 05:13:58 UTC (rev 13568)
@@ -19,7 +19,7 @@
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
- <string>Border color:</string>
+ <string>Border color</string>
</property>
</widget>
</item>
@@ -49,7 +49,7 @@
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
- <string>Fill color:</string>
+ <string>Fill color</string>
</property>
</widget>
</item>
@@ -63,14 +63,14 @@
<item row="2" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
- <string>Size:</string>
+ <string>Size</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
- <string>Angle:</string>
+ <string>Angle</string>
</property>
</widget>
</item>
@@ -90,7 +90,7 @@
<item row="4" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
- <string>Offset X,Y:</string>
+ <string>Offset X,Y</string>
</property>
</widget>
</item>
@@ -198,6 +198,15 @@
<header>qgscolorbutton.h</header>
</customwidget>
</customwidgets>
+ <tabstops>
+ <tabstop>lstNames</tabstop>
+ <tabstop>btnChangeColorBorder</tabstop>
+ <tabstop>btnChangeColorFill</tabstop>
+ <tabstop>spinSize</tabstop>
+ <tabstop>spinAngle</tabstop>
+ <tabstop>spinOffsetX</tabstop>
+ <tabstop>spinOffsetY</tabstop>
+ </tabstops>
<resources/>
<connections/>
</ui>
Modified: trunk/qgis/src/ui/symbollayer/widget_svgfill.ui
===================================================================
--- trunk/qgis/src/ui/symbollayer/widget_svgfill.ui 2010-05-24 21:36:30 UTC (rev 13567)
+++ trunk/qgis/src/ui/symbollayer/widget_svgfill.ui 2010-05-25 05:13:58 UTC (rev 13568)
@@ -19,7 +19,7 @@
<item>
<widget class="QLabel" name="mTextureWidthLabel">
<property name="text">
- <string>Texture width:</string>
+ <string>Texture width</string>
</property>
</widget>
</item>
@@ -37,7 +37,7 @@
<item>
<widget class="QLabel" name="mOutlineLabel">
<property name="text">
- <string>Outline:</string>
+ <string>Outline</string>
</property>
</widget>
</item>
Modified: trunk/qgis/src/ui/symbollayer/widget_svgmarker.ui
===================================================================
--- trunk/qgis/src/ui/symbollayer/widget_svgmarker.ui 2010-05-24 21:36:30 UTC (rev 13567)
+++ trunk/qgis/src/ui/symbollayer/widget_svgmarker.ui 2010-05-25 05:13:58 UTC (rev 13568)
@@ -25,7 +25,7 @@
</sizepolicy>
</property>
<property name="text">
- <string>Size:</string>
+ <string>Size</string>
</property>
</widget>
</item>
@@ -45,7 +45,7 @@
<item row="1" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
- <string>Angle:</string>
+ <string>Angle</string>
</property>
</widget>
</item>
@@ -95,7 +95,7 @@
<item row="2" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
- <string>Offset X,Y:</string>
+ <string>Offset X,Y</string>
</property>
</widget>
</item>
@@ -123,7 +123,7 @@
<item>
<widget class="QLabel" name="label">
<property name="text">
- <string>SVG Image:</string>
+ <string>SVG Image</string>
</property>
</widget>
</item>
@@ -176,6 +176,8 @@
<tabstops>
<tabstop>spinSize</tabstop>
<tabstop>spinAngle</tabstop>
+ <tabstop>spinOffsetX</tabstop>
+ <tabstop>spinOffsetY</tabstop>
<tabstop>viewImages</tabstop>
</tabstops>
<resources/>
More information about the QGIS-commit
mailing list