[QGIS Commit] r12029 - in trunk/qgis/src: app ui
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Sun Nov 8 13:18:52 EST 2009
Author: macho
Date: 2009-11-08 13:18:52 -0500 (Sun, 08 Nov 2009)
New Revision: 12029
Modified:
trunk/qgis/src/app/qgspgsourceselect.cpp
trunk/qgis/src/app/qgspgsourceselect.h
trunk/qgis/src/ui/qgspgsourceselectbase.ui
trunk/qgis/src/ui/qgsprojectionselectorbase.ui
trunk/qgis/src/ui/qgsprojectpropertiesbase.ui
Log:
another few ui cleanups
Modified: trunk/qgis/src/app/qgspgsourceselect.cpp
===================================================================
--- trunk/qgis/src/app/qgspgsourceselect.cpp 2009-11-08 17:59:45 UTC (rev 12028)
+++ trunk/qgis/src/app/qgspgsourceselect.cpp 2009-11-08 18:18:52 UTC (rev 12029)
@@ -43,7 +43,12 @@
: QDialog( parent, fl ), mColumnTypeThread( NULL ), pd( 0 )
{
setupUi( this );
- btnAdd->setEnabled( false );
+ mAddButton = new QPushButton( tr( "&Add" ) );
+ buttonBox->addButton( mAddButton, QDialogButtonBox::ActionRole );
+ connect( mAddButton,SIGNAL( clicked() ), this, SLOT( addClicked() ) );
+ connect( buttonBox,SIGNAL( helpRequested() ), this, SLOT( helpClicked() ) );
+
+ mAddButton->setEnabled( false );
populateConnectionList();
mSearchModeComboBox->addItem( tr( "Wildcard" ) );
@@ -92,7 +97,7 @@
deleteConnection();
}
// Slot for performing action when the Add button is clicked
-void QgsPgSourceSelect::on_btnAdd_clicked()
+void QgsPgSourceSelect::addClicked()
{
addTables();
}
@@ -104,7 +109,7 @@
}
// Slot for showing help
-void QgsPgSourceSelect::on_btnHelp_clicked()
+void QgsPgSourceSelect::helpClicked()
{
showHelp();
}
@@ -466,7 +471,7 @@
}
// BEGIN CHANGES ECOS
if ( cmbConnections->count() > 0 )
- btnAdd->setEnabled( true );
+ mAddButton->setEnabled( true );
// END CHANGES ECOS
}
else
Modified: trunk/qgis/src/app/qgspgsourceselect.h
===================================================================
--- trunk/qgis/src/app/qgspgsourceselect.h 2009-11-08 17:59:45 UTC (rev 12028)
+++ trunk/qgis/src/app/qgspgsourceselect.h 2009-11-08 18:18:52 UTC (rev 12029)
@@ -21,6 +21,7 @@
#include "qgisgui.h"
#include "qgsdbfilterproxymodel.h"
#include "qgsdbtablemodel.h"
+#include <QPushButton>
extern "C"
{
@@ -124,11 +125,14 @@
void dbChanged();
public slots:
+
+ void helpClicked();
+ void addClicked();
+
/*! Connects to the database using the stored connection parameters.
* Once connected, available layers are displayed.
*/
void on_btnConnect_clicked();
- void on_btnAdd_clicked();
void on_btnNew_clicked();
void on_btnEdit_clicked();
void on_btnBuildQuery_clicked();
@@ -138,7 +142,6 @@
void on_mSearchColumnComboBox_currentIndexChanged( const QString & text );
void on_mSearchModeComboBox_currentIndexChanged( const QString & text );
void setSql( const QModelIndex& index );
- void on_btnHelp_clicked();
void on_cmbConnections_activated( int );
void setLayerType( QString schema, QString table, QString column,
QString type );
@@ -188,6 +191,7 @@
QgsDbFilterProxyModel mProxyModel;
QString layerURI( const QModelIndex &index );
+ QPushButton * mAddButton;
};
Modified: trunk/qgis/src/ui/qgspgsourceselectbase.ui
===================================================================
--- trunk/qgis/src/ui/qgspgsourceselectbase.ui 2009-11-08 17:59:45 UTC (rev 12028)
+++ trunk/qgis/src/ui/qgspgsourceselectbase.ui 2009-11-08 18:18:52 UTC (rev 12029)
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>672</width>
- <height>687</height>
+ <width>406</width>
+ <height>470</height>
</rect>
</property>
<property name="windowTitle">
@@ -24,21 +24,8 @@
<property name="modal">
<bool>true</bool>
</property>
- <layout class="QGridLayout">
- <property name="margin">
- <number>9</number>
- </property>
- <property name="spacing">
- <number>6</number>
- </property>
- <item row="1" column="0" colspan="6">
- <widget class="QTreeView" name="mTablesTreeView">
- <property name="selectionMode">
- <enum>QAbstractItemView::ExtendedSelection</enum>
- </property>
- </widget>
- </item>
- <item row="0" column="0" colspan="6">
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>PostgreSQL Connections</string>
@@ -84,78 +71,44 @@
</layout>
</widget>
</item>
- <item row="4" column="0" colspan="6">
- <layout class="QHBoxLayout">
- <property name="spacing">
- <number>6</number>
+ <item>
+ <widget class="QTreeView" name="mTablesTreeView">
+ <property name="selectionMode">
+ <enum>QAbstractItemView::ExtendedSelection</enum>
</property>
- <property name="margin">
- <number>11</number>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="btnBuildQuery">
+ <property name="enabled">
+ <bool>false</bool>
</property>
- <item>
- <widget class="QPushButton" name="btnHelp">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="text">
- <string>Help</string>
- </property>
- <property name="shortcut">
- <string>F1</string>
- </property>
- <property name="autoDefault">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <spacer>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>141</width>
- <height>21</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QPushButton" name="btnAdd">
- <property name="text">
- <string>Add</string>
- </property>
- <property name="shortcut">
- <string/>
- </property>
- <property name="autoDefault">
- <bool>true</bool>
- </property>
- <property name="default">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="btnCancel">
- <property name="text">
- <string>Close</string>
- </property>
- <property name="shortcut">
- <string/>
- </property>
- <property name="autoDefault">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- </layout>
+ <property name="text">
+ <string>Build query</string>
+ </property>
+ </widget>
</item>
- <item row="3" column="0" colspan="6">
+ <item>
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>271</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="mSearchOptionsButton">
+ <property name="text">
+ <string>Search options...</string>
+ </property>
+ </widget>
+ </item>
+ <item>
<widget class="QGroupBox" name="mSearchGroupBox">
<property name="title">
<string/>
@@ -172,6 +125,9 @@
<property name="text">
<string>Search:</string>
</property>
+ <property name="buddy">
+ <cstring>mSearchTableEdit</cstring>
+ </property>
</widget>
</item>
<item row="2" column="0" colspan="2">
@@ -179,6 +135,9 @@
<property name="text">
<string>Search mode:</string>
</property>
+ <property name="buddy">
+ <cstring>mSearchModeComboBox</cstring>
+ </property>
</widget>
</item>
<item row="2" column="2">
@@ -189,6 +148,9 @@
<property name="text">
<string>Search in columns:</string>
</property>
+ <property name="buddy">
+ <cstring>mSearchColumnComboBox</cstring>
+ </property>
</widget>
</item>
<item row="1" column="2">
@@ -200,36 +162,13 @@
</layout>
</widget>
</item>
- <item row="2" column="4">
- <widget class="QPushButton" name="btnBuildQuery">
- <property name="enabled">
- <bool>false</bool>
+ <item>
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="standardButtons">
+ <set>QDialogButtonBox::Close|QDialogButtonBox::Help</set>
</property>
- <property name="text">
- <string>Build query</string>
- </property>
</widget>
</item>
- <item row="2" column="2">
- <widget class="QPushButton" name="mSearchOptionsButton">
- <property name="text">
- <string>Search options...</string>
- </property>
- </widget>
- </item>
- <item row="2" column="3">
- <spacer>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>271</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11"/>
@@ -239,25 +178,29 @@
<tabstop>btnNew</tabstop>
<tabstop>btnEdit</tabstop>
<tabstop>btnDelete</tabstop>
- <tabstop>btnHelp</tabstop>
- <tabstop>btnAdd</tabstop>
- <tabstop>btnCancel</tabstop>
+ <tabstop>mTablesTreeView</tabstop>
+ <tabstop>btnBuildQuery</tabstop>
+ <tabstop>mSearchOptionsButton</tabstop>
+ <tabstop>mSearchTableEdit</tabstop>
+ <tabstop>mSearchColumnComboBox</tabstop>
+ <tabstop>mSearchModeComboBox</tabstop>
+ <tabstop>buttonBox</tabstop>
</tabstops>
<resources/>
<connections>
<connection>
- <sender>btnCancel</sender>
- <signal>clicked()</signal>
+ <sender>buttonBox</sender>
+ <signal>rejected()</signal>
<receiver>QgsPgSourceSelectBase</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
- <x>404</x>
+ <x>353</x>
<y>446</y>
</hint>
<hint type="destinationlabel">
- <x>229</x>
- <y>236</y>
+ <x>404</x>
+ <y>421</y>
</hint>
</hints>
</connection>
Modified: trunk/qgis/src/ui/qgsprojectionselectorbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsprojectionselectorbase.ui 2009-11-08 17:59:45 UTC (rev 12028)
+++ trunk/qgis/src/ui/qgsprojectionselectorbase.ui 2009-11-08 18:18:52 UTC (rev 12029)
@@ -1,140 +1,132 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>QgsProjectionSelectorBase</class>
- <widget class="QWidget" name="QgsProjectionSelectorBase" >
- <property name="geometry" >
+ <widget class="QWidget" name="QgsProjectionSelectorBase">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>466</width>
- <height>416</height>
+ <width>428</width>
+ <height>313</height>
</rect>
</property>
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>Coordinate Reference System Selector</string>
</property>
- <property name="windowIcon" >
+ <property name="windowIcon">
<iconset>
<normaloff/>
</iconset>
</property>
- <layout class="QGridLayout" >
- <property name="leftMargin" >
+ <layout class="QGridLayout">
+ <property name="verticalSpacing">
<number>3</number>
</property>
- <property name="topMargin" >
+ <property name="margin">
<number>3</number>
</property>
- <property name="rightMargin" >
- <number>3</number>
- </property>
- <property name="bottomMargin" >
- <number>3</number>
- </property>
- <property name="verticalSpacing" >
- <number>3</number>
- </property>
- <item row="0" column="0" >
- <widget class="QTreeWidget" name="lstCoordinateSystems" >
- <property name="alternatingRowColors" >
+ <item row="0" column="0">
+ <widget class="QTreeWidget" name="lstCoordinateSystems">
+ <property name="alternatingRowColors">
<bool>true</bool>
</property>
- <property name="uniformRowHeights" >
+ <property name="uniformRowHeights">
<bool>true</bool>
</property>
- <property name="columnCount" >
+ <property name="columnCount">
<number>3</number>
</property>
<column>
- <property name="text" >
+ <property name="text">
<string>Coordinate Reference System</string>
</property>
</column>
<column>
- <property name="text" >
+ <property name="text">
<string>EPSG</string>
</property>
</column>
<column>
- <property name="text" >
+ <property name="text">
<string>ID</string>
</property>
</column>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QTextEdit" name="teProjection" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Minimum" hsizetype="Expanding" >
+ <item row="1" column="0">
+ <widget class="QTextEdit" name="teProjection">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize" >
+ <property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
- <property name="maximumSize" >
+ <property name="maximumSize">
<size>
<width>16777215</width>
<height>50</height>
</size>
</property>
- <property name="baseSize" >
+ <property name="baseSize">
<size>
<width>0</width>
<height>50</height>
</size>
</property>
- <property name="autoFormatting" >
+ <property name="autoFormatting">
<set>QTextEdit::AutoBulletList</set>
</property>
- <property name="readOnly" >
+ <property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
- <item row="2" column="0" >
- <widget class="QGroupBox" name="groupBox" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Minimum" hsizetype="MinimumExpanding" >
+ <item row="2" column="0">
+ <widget class="QGroupBox" name="groupBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="title" >
+ <property name="title">
<string>Search</string>
</property>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="QRadioButton" name="radEpsgCrsId" >
- <property name="text" >
+ <layout class="QGridLayout">
+ <item row="0" column="0">
+ <widget class="QRadioButton" name="radEpsgCrsId">
+ <property name="text">
<string>EPSG ID</string>
</property>
- <property name="iconSize" >
+ <property name="iconSize">
<size>
<width>16</width>
<height>10</height>
</size>
</property>
- <property name="checked" >
+ <property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
- <item row="0" column="1" >
- <widget class="QRadioButton" name="radName" >
- <property name="text" >
+ <item row="0" column="1">
+ <widget class="QRadioButton" name="radName">
+ <property name="text">
<string>Name</string>
</property>
- <property name="iconSize" >
+ <property name="iconSize">
<size>
<width>16</width>
<height>10</height>
@@ -142,21 +134,21 @@
</property>
</widget>
</item>
- <item row="0" column="2" >
- <widget class="QLineEdit" name="leSearch" />
+ <item row="0" column="2">
+ <widget class="QLineEdit" name="leSearch"/>
</item>
- <item row="0" column="3" >
- <widget class="QPushButton" name="pbnFind" >
- <property name="maximumSize" >
+ <item row="0" column="3">
+ <widget class="QPushButton" name="pbnFind">
+ <property name="maximumSize">
<size>
<width>100</width>
<height>16777215</height>
</size>
</property>
- <property name="text" >
+ <property name="text">
<string>Find</string>
</property>
- <property name="default" >
+ <property name="default">
<bool>true</bool>
</property>
</widget>
@@ -164,25 +156,21 @@
</layout>
</widget>
</item>
- <item row="3" column="0" >
- <widget class="QPushButton" name="pbnPopular1">
- </widget>
- </item>
- <item row="4" column="0" >
- <widget class="QPushButton" name="pbnPopular2">
- </widget>
- </item>
- <item row="5" column="0" >
- <widget class="QPushButton" name="pbnPopular3">
- </widget>
- </item>
- <item row="6" column="0" >
- <widget class="QPushButton" name="pbnPopular4">
- </widget>
- </item>
+ <item row="3" column="0">
+ <widget class="QPushButton" name="pbnPopular1"/>
+ </item>
+ <item row="4" column="0">
+ <widget class="QPushButton" name="pbnPopular2"/>
+ </item>
+ <item row="5" column="0">
+ <widget class="QPushButton" name="pbnPopular3"/>
+ </item>
+ <item row="6" column="0">
+ <widget class="QPushButton" name="pbnPopular4"/>
+ </item>
</layout>
</widget>
- <layoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="6" margin="11"/>
<resources/>
<connections>
<connection>
@@ -191,13 +179,13 @@
<receiver>pbnFind</receiver>
<slot>click()</slot>
<hints>
- <hint type="sourcelabel" >
- <x>292</x>
- <y>380</y>
+ <hint type="sourcelabel">
+ <x>362</x>
+ <y>276</y>
</hint>
- <hint type="destinationlabel" >
- <x>375</x>
- <y>373</y>
+ <hint type="destinationlabel">
+ <x>453</x>
+ <y>277</y>
</hint>
</hints>
</connection>
Modified: trunk/qgis/src/ui/qgsprojectpropertiesbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsprojectpropertiesbase.ui 2009-11-08 17:59:45 UTC (rev 12028)
+++ trunk/qgis/src/ui/qgsprojectpropertiesbase.ui 2009-11-08 18:18:52 UTC (rev 12029)
@@ -1,76 +1,80 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>QgsProjectPropertiesBase</class>
- <widget class="QDialog" name="QgsProjectPropertiesBase" >
- <property name="geometry" >
+ <widget class="QDialog" name="QgsProjectPropertiesBase">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>500</width>
- <height>557</height>
+ <width>552</width>
+ <height>525</height>
</rect>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>Project Properties</string>
</property>
- <property name="sizeGripEnabled" >
+ <property name="sizeGripEnabled">
<bool>true</bool>
</property>
- <property name="modal" >
+ <property name="modal">
<bool>true</bool>
</property>
- <layout class="QGridLayout" name="gridLayout_2" >
- <item row="0" column="0" >
- <widget class="QTabWidget" name="tabWidget" >
- <property name="currentIndex" >
+ <layout class="QGridLayout" name="gridLayout_2">
+ <item row="0" column="0">
+ <widget class="QTabWidget" name="tabWidget">
+ <property name="currentIndex">
<number>0</number>
</property>
- <widget class="QWidget" name="tab1" >
- <attribute name="title" >
+ <widget class="QWidget" name="tab1">
+ <attribute name="title">
<string>General</string>
</attribute>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="QGroupBox" name="titleBox" >
- <property name="title" >
+ <layout class="QGridLayout">
+ <item row="0" column="0">
+ <widget class="QGroupBox" name="titleBox">
+ <property name="title">
<string>General settings</string>
</property>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="QLabel" name="label_2" >
- <property name="text" >
+ <layout class="QGridLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_2">
+ <property name="text">
<string>Project title</string>
</property>
+ <property name="buddy">
+ <cstring>titleEdit</cstring>
+ </property>
</widget>
</item>
- <item row="0" column="1" colspan="3" >
- <widget class="QLineEdit" name="titleEdit" >
- <property name="toolTip" >
+ <item row="0" column="1" colspan="3">
+ <widget class="QLineEdit" name="titleEdit">
+ <property name="toolTip">
<string>Descriptive project name</string>
</property>
- <property name="text" >
+ <property name="text">
<string>Default project title</string>
</property>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QLabel" name="textLabel1" >
- <property name="text" >
+ <item row="1" column="0">
+ <widget class="QLabel" name="textLabel1">
+ <property name="text">
<string>Selection color</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>pbnSelectionColour</cstring>
</property>
</widget>
</item>
- <item row="1" column="2" >
+ <item row="1" column="2">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
@@ -78,35 +82,35 @@
</property>
</spacer>
</item>
- <item row="1" column="3" >
- <widget class="QgsColorButton" name="pbnSelectionColour" >
- <property name="minimumSize" >
+ <item row="1" column="3">
+ <widget class="QgsColorButton" name="pbnSelectionColour">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
- <property name="text" >
+ <property name="text">
<string/>
</property>
</widget>
</item>
- <item row="2" column="0" colspan="2" >
- <widget class="QLabel" name="label" >
- <property name="text" >
+ <item row="2" column="0" colspan="2">
+ <widget class="QLabel" name="label">
+ <property name="text">
<string>Background color</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>pbnCanvasColor</cstring>
</property>
</widget>
</item>
- <item row="2" column="2" >
+ <item row="2" column="2">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
@@ -114,46 +118,49 @@
</property>
</spacer>
</item>
- <item row="2" column="3" >
- <widget class="QgsColorButton" name="pbnCanvasColor" >
- <property name="minimumSize" >
+ <item row="2" column="3">
+ <widget class="QgsColorButton" name="pbnCanvasColor">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
- <property name="text" >
+ <property name="text">
<string/>
</property>
</widget>
</item>
- <item row="3" column="3" >
- <widget class="QComboBox" name="cbxAbsolutePath" >
+ <item row="3" column="3">
+ <widget class="QComboBox" name="cbxAbsolutePath">
<item>
- <property name="text" >
+ <property name="text">
<string>absolute</string>
</property>
</item>
<item>
- <property name="text" >
+ <property name="text">
<string>relative</string>
</property>
</item>
</widget>
</item>
- <item row="3" column="0" >
- <widget class="QLabel" name="label_3" >
- <property name="text" >
+ <item row="3" column="0">
+ <widget class="QLabel" name="label_3">
+ <property name="text">
<string>Save paths</string>
</property>
+ <property name="buddy">
+ <cstring>cbxAbsolutePath</cstring>
+ </property>
</widget>
</item>
- <item row="3" column="2" >
+ <item row="3" column="2">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
@@ -164,39 +171,39 @@
</layout>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QGroupBox" name="btnGrpMapUnits" >
- <property name="title" >
+ <item row="1" column="0">
+ <widget class="QGroupBox" name="btnGrpMapUnits">
+ <property name="title">
<string>Layer units (only used when CRS transformation is disabled)</string>
</property>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="QRadioButton" name="radMeters" >
- <property name="text" >
+ <layout class="QGridLayout">
+ <item row="0" column="0">
+ <widget class="QRadioButton" name="radMeters">
+ <property name="text">
<string>Meters</string>
</property>
- <property name="checked" >
+ <property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
- <item row="0" column="1" >
- <widget class="QRadioButton" name="radFeet" >
- <property name="text" >
+ <item row="0" column="1">
+ <widget class="QRadioButton" name="radFeet">
+ <property name="text">
<string>Feet</string>
</property>
</widget>
</item>
- <item row="0" column="2" >
- <widget class="QRadioButton" name="radDecimalDegrees" >
- <property name="text" >
+ <item row="0" column="2">
+ <widget class="QRadioButton" name="radDecimalDegrees">
+ <property name="text">
<string>Decimal degrees</string>
</property>
</widget>
</item>
- <item row="0" column="3" >
- <widget class="QRadioButton" name="radDMS" >
- <property name="text" >
+ <item row="0" column="3">
+ <widget class="QRadioButton" name="radDMS">
+ <property name="text">
<string>Degrees, Minutes, Seconds</string>
</property>
</widget>
@@ -204,96 +211,99 @@
</layout>
</widget>
</item>
- <item row="2" column="0" >
- <widget class="QGroupBox" name="btnGrpPrecision" >
- <property name="title" >
+ <item row="2" column="0">
+ <widget class="QGroupBox" name="btnGrpPrecision">
+ <property name="title">
<string>Precision</string>
</property>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="QRadioButton" name="radAutomatic" >
- <property name="toolTip" >
+ <layout class="QGridLayout">
+ <item row="0" column="0">
+ <widget class="QRadioButton" name="radAutomatic">
+ <property name="toolTip">
<string>Automatically sets the number of decimal places in the mouse position display</string>
</property>
- <property name="whatsThis" >
+ <property name="whatsThis">
<string>The number of decimal places that are used when displaying the mouse position is automatically set to be enough so that moving the mouse by one pixel gives a change in the position display</string>
</property>
- <property name="text" >
+ <property name="text">
<string>Automatic</string>
</property>
- <property name="checked" >
+ <property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
- <item row="0" column="1" >
- <widget class="QRadioButton" name="radManual" >
- <property name="toolTip" >
+ <item row="0" column="1">
+ <widget class="QRadioButton" name="radManual">
+ <property name="toolTip">
<string>Sets the number of decimal places to use for the mouse position display</string>
</property>
- <property name="whatsThis" >
+ <property name="whatsThis">
<string>Sets the number of decimal places to use for the mouse position display</string>
</property>
- <property name="text" >
+ <property name="text">
<string>Manual</string>
</property>
</widget>
</item>
- <item row="0" column="2" >
- <widget class="QSpinBox" name="spinBoxDP" >
- <property name="toolTip" >
+ <item row="0" column="2">
+ <widget class="QSpinBox" name="spinBoxDP">
+ <property name="toolTip">
<string>The number of decimal places for the manual option</string>
</property>
- <property name="whatsThis" >
+ <property name="whatsThis">
<string>The number of decimal places for the manual option</string>
</property>
</widget>
</item>
- <item row="0" column="3" >
- <widget class="QLabel" name="textLabel3" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+ <item row="0" column="3">
+ <widget class="QLabel" name="textLabel3">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="text" >
+ <property name="text">
<string>decimal places</string>
</property>
+ <property name="buddy">
+ <cstring>spinBoxDP</cstring>
+ </property>
</widget>
</item>
</layout>
</widget>
</item>
- <item row="3" column="0" >
- <widget class="QGroupBox" name="grpDigitizing" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Expanding" hsizetype="Preferred" >
+ <item row="3" column="0">
+ <widget class="QGroupBox" name="grpDigitizing">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="title" >
+ <property name="title">
<string>Digitizing</string>
</property>
- <layout class="QGridLayout" name="gridLayout" >
- <item row="0" column="0" >
- <widget class="QCheckBox" name="mEnableTopologicalEditingCheckBox" >
- <property name="text" >
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QCheckBox" name="mEnableTopologicalEditingCheckBox">
+ <property name="text">
<string>Enable topological editing</string>
</property>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QPushButton" name="mAvoidIntersectionsPushButton" >
- <property name="text" >
+ <item row="1" column="0">
+ <widget class="QPushButton" name="mAvoidIntersectionsPushButton">
+ <property name="text">
<string>Avoid intersections of new polygons...</string>
</property>
</widget>
</item>
- <item row="2" column="0" >
- <widget class="QPushButton" name="mSnappingOptionsPushButton" >
- <property name="text" >
+ <item row="2" column="0">
+ <widget class="QPushButton" name="mSnappingOptionsPushButton">
+ <property name="text">
<string>Snapping options...</string>
</property>
</widget>
@@ -303,57 +313,57 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="tab2" >
- <attribute name="title" >
+ <widget class="QWidget" name="tab2">
+ <attribute name="title">
<string>Coordinate Reference System (CRS)</string>
</attribute>
- <layout class="QGridLayout" >
- <property name="leftMargin" >
+ <layout class="QGridLayout">
+ <property name="leftMargin">
<number>3</number>
</property>
- <property name="topMargin" >
+ <property name="topMargin">
<number>11</number>
</property>
- <property name="rightMargin" >
+ <property name="rightMargin">
<number>3</number>
</property>
- <property name="bottomMargin" >
+ <property name="bottomMargin">
<number>11</number>
</property>
- <item row="0" column="0" >
- <widget class="QCheckBox" name="cbxProjectionEnabled" >
- <property name="text" >
+ <item row="0" column="0">
+ <widget class="QCheckBox" name="cbxProjectionEnabled">
+ <property name="text">
<string>Enable 'on the fly' CRS transformation</string>
</property>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QgsProjectionSelector" native="1" name="projectionSelector" />
+ <item row="1" column="0">
+ <widget class="QgsProjectionSelector" name="projectionSelector" native="true"/>
</item>
</layout>
</widget>
- <widget class="QWidget" name="tab3" >
- <attribute name="title" >
+ <widget class="QWidget" name="tab3">
+ <attribute name="title">
<string>Identifiable layers</string>
</attribute>
- <layout class="QHBoxLayout" >
+ <layout class="QHBoxLayout">
<item>
- <widget class="QTableWidget" name="twIdentifyLayers" >
- <property name="sortingEnabled" >
+ <widget class="QTableWidget" name="twIdentifyLayers">
+ <property name="sortingEnabled">
<bool>true</bool>
</property>
<column>
- <property name="text" >
+ <property name="text">
<string>Layer</string>
</property>
</column>
<column>
- <property name="text" >
+ <property name="text">
<string>Type</string>
</property>
</column>
<column>
- <property name="text" >
+ <property name="text">
<string>Identifiable</string>
</property>
</column>
@@ -363,19 +373,19 @@
</widget>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QDialogButtonBox" name="buttonBox" >
- <property name="orientation" >
+ <item row="1" column="0">
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="standardButtons" >
+ <property name="standardButtons">
<set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</widget>
- <layoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="6" margin="11"/>
<customwidgets>
<customwidget>
<class>QgsColorButton</class>
@@ -402,11 +412,12 @@
<tabstop>radManual</tabstop>
<tabstop>spinBoxDP</tabstop>
<tabstop>mEnableTopologicalEditingCheckBox</tabstop>
+ <tabstop>mAvoidIntersectionsPushButton</tabstop>
<tabstop>mSnappingOptionsPushButton</tabstop>
- <tabstop>buttonBox</tabstop>
<tabstop>cbxProjectionEnabled</tabstop>
<tabstop>twIdentifyLayers</tabstop>
<tabstop>tabWidget</tabstop>
+ <tabstop>buttonBox</tabstop>
</tabstops>
<resources/>
<connections>
@@ -416,13 +427,13 @@
<receiver>spinBoxDP</receiver>
<slot>setEnabled(bool)</slot>
<hints>
- <hint type="sourcelabel" >
- <x>229</x>
- <y>280</y>
+ <hint type="sourcelabel">
+ <x>289</x>
+ <y>322</y>
</hint>
- <hint type="destinationlabel" >
- <x>416</x>
- <y>286</y>
+ <hint type="destinationlabel">
+ <x>418</x>
+ <y>325</y>
</hint>
</hints>
</connection>
@@ -432,13 +443,13 @@
<receiver>textLabel3</receiver>
<slot>setEnabled(bool)</slot>
<hints>
- <hint type="sourcelabel" >
- <x>240</x>
- <y>281</y>
+ <hint type="sourcelabel">
+ <x>289</x>
+ <y>322</y>
</hint>
- <hint type="destinationlabel" >
- <x>583</x>
- <y>290</y>
+ <hint type="destinationlabel">
+ <x>522</x>
+ <y>320</y>
</hint>
</hints>
</connection>
@@ -448,13 +459,13 @@
<receiver>spinBoxDP</receiver>
<slot>setDisabled(bool)</slot>
<hints>
- <hint type="sourcelabel" >
- <x>100</x>
- <y>290</y>
+ <hint type="sourcelabel">
+ <x>128</x>
+ <y>322</y>
</hint>
- <hint type="destinationlabel" >
- <x>395</x>
- <y>285</y>
+ <hint type="destinationlabel">
+ <x>418</x>
+ <y>325</y>
</hint>
</hints>
</connection>
@@ -464,13 +475,13 @@
<receiver>textLabel3</receiver>
<slot>setDisabled(bool)</slot>
<hints>
- <hint type="sourcelabel" >
- <x>87</x>
- <y>284</y>
+ <hint type="sourcelabel">
+ <x>115</x>
+ <y>322</y>
</hint>
- <hint type="destinationlabel" >
- <x>589</x>
- <y>285</y>
+ <hint type="destinationlabel">
+ <x>522</x>
+ <y>320</y>
</hint>
</hints>
</connection>
More information about the QGIS-commit
mailing list