[QGIS Commit] r8489 - trunk/qgis/src/ui
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Wed May 21 13:45:57 EDT 2008
Author: timlinux
Date: 2008-05-21 13:45:57 -0400 (Wed, 21 May 2008)
New Revision: 8489
Modified:
trunk/qgis/src/ui/qgscustomprojectiondialogbase.ui
trunk/qgis/src/ui/qgsprojectionselectorbase.ui
Log:
Revisions to improve gui layout and useability. Note the custom projection navigation buttons are temporary and will be updated shortly with icons.
Modified: trunk/qgis/src/ui/qgscustomprojectiondialogbase.ui
===================================================================
--- trunk/qgis/src/ui/qgscustomprojectiondialogbase.ui 2008-05-21 17:42:24 UTC (rev 8488)
+++ trunk/qgis/src/ui/qgscustomprojectiondialogbase.ui 2008-05-21 17:45:57 UTC (rev 8489)
@@ -5,8 +5,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>718</width>
- <height>323</height>
+ <width>474</width>
+ <height>548</height>
</rect>
</property>
<property name="windowTitle" >
@@ -16,306 +16,237 @@
<iconset/>
</property>
<layout class="QGridLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
<item row="0" column="0" >
- <widget class="QTabWidget" name="tabWidget2" >
- <property name="currentIndex" >
- <number>0</number>
+ <widget class="QGroupBox" name="groupBox" >
+ <property name="title" >
+ <string>Define</string>
</property>
- <widget class="QWidget" name="tab1" >
- <attribute name="title" >
- <string>Define</string>
- </attribute>
- <layout class="QGridLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item row="1" column="0" colspan="2" >
- <widget class="QTextBrowser" name="textBrowser" >
- <property name="html" >
- <string>You can define your own custom projection here. The definition must conform to the proj4 format for specifying a Spatial Reference System.</string>
- </property>
- </widget>
- </item>
- <item row="0" column="0" colspan="2" >
- <widget class="QLabel" name="textLabel5" >
- <property name="font" >
- <font>
- <family>Arial</family>
- <pointsize>18</pointsize>
- <weight>50</weight>
- <italic>false</italic>
- <bold>false</bold>
- <underline>false</underline>
- <strikeout>false</strikeout>
- </font>
- </property>
- <property name="text" >
- <string>Custom Projection Definition</string>
- </property>
- </widget>
- </item>
- <item row="3" column="1" >
- <widget class="QLineEdit" name="leParameters" />
- </item>
- <item row="3" column="0" >
- <widget class="QLabel" name="textLabel3_2" >
- <property name="text" >
- <string>Parameters:</string>
- </property>
- </widget>
- </item>
- <item row="4" column="0" colspan="2" >
- <layout class="QHBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <widget class="QPushButton" name="pbnFirst" >
- <property name="text" >
- <string>|<</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="pbnPrevious" >
- <property name="text" >
- <string><</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="lblRecordNo" >
- <property name="text" >
- <string>1 of 1</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignCenter</set>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="pbnNext" >
- <property name="text" >
- <string>></string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="pbnLast" >
- <property name="text" >
- <string>>|</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="pbnNew" >
- <property name="text" >
- <string>New</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="pbnSave" >
- <property name="text" >
- <string>Save</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="pbnDelete" >
- <property name="text" >
- <string>Delete</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="pbnClose" >
- <property name="text" >
- <string>Close</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item row="2" column="0" >
- <widget class="QLabel" name="textLabel1" >
- <property name="text" >
- <string>Name:</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1" >
- <widget class="QLineEdit" name="leName" />
- </item>
- </layout>
- </widget>
- <widget class="QWidget" name="tab2" >
- <attribute name="title" >
- <string>Test</string>
- </attribute>
- <layout class="QGridLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item row="0" column="0" colspan="3" >
- <widget class="QLabel" name="textLabel1_2" >
- <property name="font" >
- <font>
- <family>Arial</family>
- <pointsize>18</pointsize>
- <weight>50</weight>
- <italic>false</italic>
- <bold>false</bold>
- <underline>false</underline>
- <strikeout>false</strikeout>
- </font>
- </property>
- <property name="text" >
- <string>Transform from WGS84 to the chosen projection</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0" colspan="3" >
- <widget class="QTextBrowser" name="textBrowser_2" >
- <property name="html" >
- <string>Use the text boxes below to test the projection definition you are creating. Enter a coordinate where both the lat/long and the projected result are known (for example by reading off a map). Then press the calculate button to see if the projection definition you are creating is accurate.</string>
- </property>
- </widget>
- </item>
- <item row="2" column="0" >
- <widget class="QLabel" name="textLabel3_2_2" >
- <property name="text" >
- <string>Parameters:</string>
- </property>
- <property name="buddy" >
- <cstring>leTestParameters</cstring>
- </property>
- </widget>
- </item>
- <item row="2" column="1" colspan="2" >
- <widget class="QLineEdit" name="leTestParameters" />
- </item>
- <item row="3" column="0" >
- <spacer>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>41</width>
- <height>21</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="3" column="2" >
- <widget class="QLabel" name="textLabel2_3" >
- <property name="text" >
- <string>Projected Coordinate System</string>
- </property>
- </widget>
- </item>
- <item row="3" column="1" >
- <widget class="QLabel" name="textLabel1_3" >
- <property name="text" >
- <string>Geographic / WGS84</string>
- </property>
- </widget>
- </item>
- <item row="5" column="2" >
- <widget class="QLabel" name="projectedY" >
- <property name="enabled" >
- <bool>true</bool>
- </property>
- <property name="frameShape" >
- <enum>QFrame::Box</enum>
- </property>
- <property name="text" >
- <string/>
- </property>
- <property name="margin" >
- <number>1</number>
- </property>
- </widget>
- </item>
- <item row="5" column="1" >
- <widget class="QLineEdit" name="eastWGS84" />
- </item>
- <item row="5" column="0" >
- <widget class="QLabel" name="textLabel2_2_2" >
- <property name="text" >
- <string>East:</string>
- </property>
- <property name="buddy" >
- <cstring>eastWGS84</cstring>
- </property>
- </widget>
- </item>
- <item row="4" column="0" >
- <widget class="QLabel" name="textLabel2_2" >
- <property name="text" >
- <string>North:</string>
- </property>
- <property name="buddy" >
- <cstring>northWGS84</cstring>
- </property>
- </widget>
- </item>
- <item row="4" column="1" >
- <widget class="QLineEdit" name="northWGS84" >
- <property name="enabled" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="4" column="2" >
- <widget class="QLabel" name="projectedX" >
- <property name="enabled" >
- <bool>true</bool>
- </property>
- <property name="frameShape" >
- <enum>QFrame::Box</enum>
- </property>
- <property name="text" >
- <string/>
- </property>
- </widget>
- </item>
- <item row="6" column="0" colspan="3" >
- <widget class="QPushButton" name="pbnCalculate" >
- <property name="text" >
- <string>Calculate</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
+ <layout class="QGridLayout" >
+ <item row="0" column="0" colspan="2" >
+ <widget class="QLabel" name="label" >
+ <property name="text" >
+ <string>You can define your own custom projection here. The definition must conform to the proj4 format for specifying a Spatial Reference System.</string>
+ </property>
+ <property name="wordWrap" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0" >
+ <widget class="QLabel" name="textLabel1" >
+ <property name="text" >
+ <string>Name</string>
+ </property>
+ <property name="buddy" >
+ <cstring>leName</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1" >
+ <widget class="QLineEdit" name="leName" />
+ </item>
+ <item row="2" column="0" >
+ <widget class="QLabel" name="textLabel3_2" >
+ <property name="text" >
+ <string>Parameters</string>
+ </property>
+ <property name="buddy" >
+ <cstring>leParameters</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1" >
+ <widget class="QLineEdit" name="leParameters" />
+ </item>
+ <item row="3" column="1" >
+ <layout class="QHBoxLayout" >
+ <item>
+ <widget class="QToolButton" name="pbnFirst" >
+ <property name="text" >
+ <string>|<</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QToolButton" name="pbnPrevious" >
+ <property name="text" >
+ <string><</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="lblRecordNo" >
+ <property name="text" >
+ <string>1 of 1</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QToolButton" name="pbnNext" >
+ <property name="text" >
+ <string>></string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QToolButton" name="pbnLast" >
+ <property name="text" >
+ <string>>|</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QToolButton" name="pbnNew" >
+ <property name="text" >
+ <string>*</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QToolButton" name="pbnSave" >
+ <property name="text" >
+ <string>S</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QToolButton" name="pbnDelete" >
+ <property name="text" >
+ <string>X</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
</widget>
</item>
+ <item row="1" column="0" >
+ <widget class="QGroupBox" name="groupBox_2" >
+ <property name="title" >
+ <string>Test</string>
+ </property>
+ <layout class="QGridLayout" >
+ <item row="0" column="0" colspan="3" >
+ <widget class="QLabel" name="label_2" >
+ <property name="text" >
+ <string>Use the text boxes below to test the projection definition you are creating. Enter a coordinate where both the lat/long and the projected result are known (for example by reading off a map). Then press the calculate button to see if the projection definition you are creating is accurate.</string>
+ </property>
+ <property name="wordWrap" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0" >
+ <widget class="QLabel" name="textLabel3_2_2" >
+ <property name="text" >
+ <string>Parameters</string>
+ </property>
+ <property name="buddy" >
+ <cstring>leTestParameters</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1" colspan="2" >
+ <widget class="QLineEdit" name="leTestParameters" />
+ </item>
+ <item row="2" column="1" >
+ <widget class="QLabel" name="textLabel1_3" >
+ <property name="text" >
+ <string>Geographic / WGS84</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="2" >
+ <widget class="QLabel" name="textLabel2_3" >
+ <property name="text" >
+ <string>Projected Coordinate System</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0" >
+ <widget class="QLabel" name="textLabel2_2" >
+ <property name="text" >
+ <string>North</string>
+ </property>
+ <property name="buddy" >
+ <cstring>northWGS84</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1" >
+ <widget class="QLineEdit" name="northWGS84" >
+ <property name="enabled" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="2" >
+ <widget class="QLabel" name="projectedX" >
+ <property name="enabled" >
+ <bool>true</bool>
+ </property>
+ <property name="frameShape" >
+ <enum>QFrame::Box</enum>
+ </property>
+ <property name="text" >
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="0" >
+ <widget class="QLabel" name="textLabel2_2_2" >
+ <property name="text" >
+ <string>East</string>
+ </property>
+ <property name="buddy" >
+ <cstring>eastWGS84</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1" >
+ <widget class="QLineEdit" name="eastWGS84" />
+ </item>
+ <item row="4" column="2" >
+ <widget class="QLabel" name="projectedY" >
+ <property name="enabled" >
+ <bool>true</bool>
+ </property>
+ <property name="frameShape" >
+ <enum>QFrame::Box</enum>
+ </property>
+ <property name="text" >
+ <string/>
+ </property>
+ <property name="margin" >
+ <number>1</number>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="0" colspan="3" >
+ <widget class="QPushButton" name="pbnCalculate" >
+ <property name="text" >
+ <string>Calculate</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="2" column="0" >
+ <widget class="QDialogButtonBox" name="buttonBox" >
+ <property name="standardButtons" >
+ <set>QDialogButtonBox::Ok</set>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11" />
<tabstops>
- <tabstop>tabWidget2</tabstop>
- <tabstop>textBrowser</tabstop>
<tabstop>leName</tabstop>
<tabstop>leParameters</tabstop>
<tabstop>pbnFirst</tabstop>
@@ -325,13 +256,29 @@
<tabstop>pbnNew</tabstop>
<tabstop>pbnSave</tabstop>
<tabstop>pbnDelete</tabstop>
- <tabstop>pbnClose</tabstop>
- <tabstop>textBrowser_2</tabstop>
<tabstop>leTestParameters</tabstop>
<tabstop>northWGS84</tabstop>
<tabstop>eastWGS84</tabstop>
<tabstop>pbnCalculate</tabstop>
+ <tabstop>buttonBox</tabstop>
</tabstops>
<resources/>
- <connections/>
+ <connections>
+ <connection>
+ <sender>buttonBox</sender>
+ <signal>accepted()</signal>
+ <receiver>QgsCustomProjectionDialogBase</receiver>
+ <slot>accept()</slot>
+ <hints>
+ <hint type="sourcelabel" >
+ <x>436</x>
+ <y>522</y>
+ </hint>
+ <hint type="destinationlabel" >
+ <x>471</x>
+ <y>501</y>
+ </hint>
+ </hints>
+ </connection>
+ </connections>
</ui>
Modified: trunk/qgis/src/ui/qgsprojectionselectorbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsprojectionselectorbase.ui 2008-05-21 17:42:24 UTC (rev 8488)
+++ trunk/qgis/src/ui/qgsprojectionselectorbase.ui 2008-05-21 17:45:57 UTC (rev 8489)
@@ -1,7 +1,4 @@
<ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
<class>QgsProjectionSelectorBase</class>
<widget class="QWidget" name="QgsProjectionSelectorBase" >
<property name="geometry" >
@@ -13,9 +10,7 @@
</rect>
</property>
<property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>5</vsizetype>
+ <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -27,18 +22,28 @@
<iconset/>
</property>
<layout class="QGridLayout" >
- <property name="margin" >
- <number>9</number>
+ <property name="leftMargin" >
+ <number>0</number>
</property>
- <property name="spacing" >
- <number>6</number>
+ <property name="topMargin" >
+ <number>0</number>
</property>
+ <property name="rightMargin" >
+ <number>0</number>
+ </property>
+ <property name="bottomMargin" >
+ <number>0</number>
+ </property>
+ <property name="horizontalSpacing" >
+ <number>0</number>
+ </property>
+ <property name="verticalSpacing" >
+ <number>0</number>
+ </property>
<item row="0" column="0" >
<widget class="QGroupBox" name="groupBox_2" >
<property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>7</vsizetype>
+ <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -47,18 +52,28 @@
<string>Projection</string>
</property>
<layout class="QGridLayout" >
- <property name="margin" >
- <number>9</number>
+ <property name="leftMargin" >
+ <number>12</number>
</property>
- <property name="spacing" >
- <number>6</number>
+ <property name="topMargin" >
+ <number>12</number>
</property>
+ <property name="rightMargin" >
+ <number>12</number>
+ </property>
+ <property name="bottomMargin" >
+ <number>12</number>
+ </property>
+ <property name="horizontalSpacing" >
+ <number>0</number>
+ </property>
+ <property name="verticalSpacing" >
+ <number>0</number>
+ </property>
<item row="2" column="0" >
<widget class="QGroupBox" name="groupBox" >
<property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>3</hsizetype>
- <vsizetype>1</vsizetype>
+ <sizepolicy vsizetype="Minimum" hsizetype="MinimumExpanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -67,12 +82,24 @@
<string>Search</string>
</property>
<layout class="QGridLayout" >
- <property name="margin" >
+ <property name="leftMargin" >
<number>2</number>
</property>
- <property name="spacing" >
- <number>0</number>
+ <property name="topMargin" >
+ <number>2</number>
</property>
+ <property name="rightMargin" >
+ <number>2</number>
+ </property>
+ <property name="bottomMargin" >
+ <number>2</number>
+ </property>
+ <property name="horizontalSpacing" >
+ <number>3</number>
+ </property>
+ <property name="verticalSpacing" >
+ <number>3</number>
+ </property>
<item row="1" column="3" >
<widget class="QPushButton" name="pbnFind" >
<property name="maximumSize" >
@@ -153,9 +180,7 @@
<item row="1" column="0" >
<widget class="QTextEdit" name="teProjection" >
<property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>7</vsizetype>
+ <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -209,7 +234,6 @@
</layout>
</widget>
<layoutdefault spacing="6" margin="11" />
- <pixmapfunction></pixmapfunction>
<resources/>
<connections/>
</ui>
More information about the QGIS-commit
mailing list