[QGIS Commit] r11753 - in trunk/qgis/src/plugins: copyright_label
delimited_text north_arrow
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Sat Oct 3 19:04:38 EDT 2009
Author: timlinux
Date: 2009-10-03 19:04:37 -0400 (Sat, 03 Oct 2009)
New Revision: 11753
Modified:
trunk/qgis/src/plugins/copyright_label/pluginguibase.ui
trunk/qgis/src/plugins/delimited_text/qgsdelimitedtextpluginguibase.ui
trunk/qgis/src/plugins/north_arrow/plugingui.cpp
trunk/qgis/src/plugins/north_arrow/pluginguibase.ui
Log:
User interface cleanups to copyright, delim text and n-arrow plugins
Modified: trunk/qgis/src/plugins/copyright_label/pluginguibase.ui
===================================================================
--- trunk/qgis/src/plugins/copyright_label/pluginguibase.ui 2009-10-03 22:40:23 UTC (rev 11752)
+++ trunk/qgis/src/plugins/copyright_label/pluginguibase.ui 2009-10-03 23:04:37 UTC (rev 11753)
@@ -13,85 +13,10 @@
<string>Copyright Label Plugin</string>
</property>
<property name="windowIcon" >
- <iconset>
- <normaloff/>
- </iconset>
+ <iconset/>
</property>
<layout class="QGridLayout" >
- <property name="leftMargin" >
- <number>9</number>
- </property>
- <property name="topMargin" >
- <number>9</number>
- </property>
- <property name="rightMargin" >
- <number>9</number>
- </property>
- <property name="bottomMargin" >
- <number>9</number>
- </property>
- <property name="horizontalSpacing" >
- <number>6</number>
- </property>
- <property name="verticalSpacing" >
- <number>6</number>
- </property>
- <item row="3" column="2" >
- <layout class="QHBoxLayout" >
- <property name="spacing" >
- <number>6</number>
- </property>
- <property name="leftMargin" >
- <number>0</number>
- </property>
- <property name="topMargin" >
- <number>0</number>
- </property>
- <property name="rightMargin" >
- <number>0</number>
- </property>
- <property name="bottomMargin" >
- <number>0</number>
- </property>
- <item>
- <widget class="QLabel" name="label" >
- <property name="text" >
- <string>Color</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QgsColorButton" name="pbnColorChooser" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Expanding" hsizetype="Fixed" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize" >
- <size>
- <width>100</width>
- <height>0</height>
- </size>
- </property>
- </widget>
- </item>
- <item>
- <spacer>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- <item row="0" column="2" >
+ <item row="0" column="0" colspan="4" >
<widget class="QTextEdit" name="textEdit3" >
<property name="readOnly" >
<bool>true</bool>
@@ -99,178 +24,121 @@
<property name="html" >
<string><html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Verdana'; font-size:10pt; 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; font-family:'Sans Serif'; font-size:9pt;"><span style=" font-size:12pt;">Description</span></p>
-<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>
-<p style=" 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;">Enter your copyright label below. This plugin supports basic html markup tags for formatting the label. For example:</p>
-<p style=" 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;"><span style=" font-weight:600;">&lt;B&gt; Bold text &lt;/B&gt; </span></p>
-<p style=" 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; font-weight:600;"><span style=" font-weight:400; font-style:italic;">&lt;I&gt; Italics &lt;/I&gt;</span></p>
-<p style=" 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; font-style:italic;"><span style=" font-style:normal;">(note: &amp;copy; gives a copyright symbol)</span></p></body></html></string>
+</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; 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; font-size:9pt;"><span style=" font-size:12pt;">Description</span></p>
+<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-size:9pt;"></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;">Enter your copyright label below. This plugin supports basic html markup tags for formatting the label. For example:</p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;"><span style=" font-weight:600;">&lt;b&gt; Bold text &lt;/b&gt; </span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt; font-weight:600;"><span style=" font-weight:400; font-style:italic;">&lt;i&gt; Italics &lt;/i&gt;</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt; font-style:italic;"><span style=" font-style:normal;">(note: &amp;copy; gives a copyright symbol)</span></p></body></html></string>
</property>
</widget>
</item>
- <item row="4" column="2" >
- <layout class="QHBoxLayout" >
- <property name="spacing" >
- <number>6</number>
- </property>
- <property name="leftMargin" >
- <number>0</number>
- </property>
- <property name="topMargin" >
- <number>0</number>
- </property>
- <property name="rightMargin" >
- <number>0</number>
- </property>
- <property name="bottomMargin" >
- <number>0</number>
- </property>
- <item>
- <spacer>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>131</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QCheckBox" name="cboxEnabled" >
- <property name="text" >
- <string>Enable Copyright Label</string>
- </property>
- <property name="checked" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item row="1" column="2" >
+ <item row="1" column="0" colspan="4" >
<widget class="QTextEdit" name="txtCopyrightText" >
<property name="html" >
<string><html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Verdana'; font-size:10pt; 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;">© QGIS 2009</p></body></html></string>
+</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; 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; font-family:'Verdana';">© QGIS 2009</p></body></html></string>
</property>
</widget>
</item>
- <item row="2" column="2" >
- <layout class="QHBoxLayout" >
- <property name="spacing" >
- <number>6</number>
+ <item row="2" column="0" >
+ <widget class="QLabel" name="textLabel16" >
+ <property name="text" >
+ <string>Placement</string>
</property>
- <property name="leftMargin" >
- <number>0</number>
+ <property name="buddy" >
+ <cstring>cboPlacement</cstring>
</property>
- <property name="topMargin" >
- <number>0</number>
- </property>
- <property name="rightMargin" >
- <number>0</number>
- </property>
- <property name="bottomMargin" >
- <number>0</number>
- </property>
+ </widget>
+ </item>
+ <item row="2" column="1" >
+ <widget class="QComboBox" name="cboPlacement" >
<item>
- <widget class="QLabel" name="textLabel16" >
- <property name="text" >
- <string>Placement</string>
- </property>
- </widget>
+ <property name="text" >
+ <string>Bottom Left</string>
+ </property>
</item>
<item>
- <widget class="QComboBox" name="cboPlacement" >
- <item>
- <property name="text" >
- <string>Bottom Left</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>Top Left</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>Bottom Right</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>Top Right</string>
- </property>
- </item>
- </widget>
+ <property name="text" >
+ <string>Top Left</string>
+ </property>
</item>
<item>
- <widget class="QLabel" name="textLabel15" >
- <property name="text" >
- <string>Orientation</string>
- </property>
- </widget>
+ <property name="text" >
+ <string>Bottom Right</string>
+ </property>
</item>
<item>
- <widget class="QComboBox" name="cboOrientation" >
- <item>
- <property name="text" >
- <string>Horizontal</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>Vertical</string>
- </property>
- </item>
- </widget>
+ <property name="text" >
+ <string>Top Right</string>
+ </property>
</item>
- </layout>
+ </widget>
</item>
- <item rowspan="5" row="0" column="1" >
- <widget class="Line" name="line1" >
- <property name="maximumSize" >
- <size>
- <width>2</width>
- <height>32767</height>
- </size>
+ <item row="2" column="2" >
+ <widget class="QLabel" name="textLabel15" >
+ <property name="text" >
+ <string>Orientation</string>
</property>
- <property name="frameShape" >
- <enum>QFrame::VLine</enum>
+ <property name="buddy" >
+ <cstring>cboOrientation</cstring>
</property>
- <property name="frameShadow" >
- <enum>QFrame::Sunken</enum>
+ </widget>
+ </item>
+ <item row="2" column="3" >
+ <widget class="QComboBox" name="cboOrientation" >
+ <item>
+ <property name="text" >
+ <string>Horizontal</string>
+ </property>
+ </item>
+ <item>
+ <property name="text" >
+ <string>Vertical</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item row="3" column="0" >
+ <widget class="QLabel" name="label" >
+ <property name="text" >
+ <string>Color</string>
</property>
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
+ <property name="buddy" >
+ <cstring>pbnColorChooser</cstring>
</property>
</widget>
</item>
- <item rowspan="5" row="0" column="0" >
- <widget class="QLabel" name="pixmapLabel2" >
- <property name="maximumSize" >
+ <item row="3" column="1" >
+ <widget class="QgsColorButton" name="pbnColorChooser" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Expanding" hsizetype="Fixed" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize" >
<size>
- <width>150</width>
- <height>32767</height>
+ <width>100</width>
+ <height>0</height>
</size>
</property>
- <property name="pixmap" >
- <pixmap resource="copyright_plugin.qrc" >:/copyright.png</pixmap>
+ </widget>
+ </item>
+ <item row="3" column="2" colspan="2" >
+ <widget class="QCheckBox" name="cboxEnabled" >
+ <property name="text" >
+ <string>Enable copyright label</string>
</property>
- <property name="scaledContents" >
- <bool>false</bool>
+ <property name="checked" >
+ <bool>true</bool>
</property>
</widget>
</item>
- <item row="5" column="0" colspan="3" >
+ <item row="4" column="0" colspan="4" >
<widget class="QDialogButtonBox" name="buttonBox" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
@@ -290,6 +158,15 @@
<header>qgscolorbutton.h</header>
</customwidget>
</customwidgets>
+ <tabstops>
+ <tabstop>textEdit3</tabstop>
+ <tabstop>txtCopyrightText</tabstop>
+ <tabstop>cboPlacement</tabstop>
+ <tabstop>cboOrientation</tabstop>
+ <tabstop>pbnColorChooser</tabstop>
+ <tabstop>cboxEnabled</tabstop>
+ <tabstop>buttonBox</tabstop>
+ </tabstops>
<resources>
<include location="copyright_plugin.qrc" />
</resources>
Modified: trunk/qgis/src/plugins/delimited_text/qgsdelimitedtextpluginguibase.ui
===================================================================
--- trunk/qgis/src/plugins/delimited_text/qgsdelimitedtextpluginguibase.ui 2009-10-03 22:40:23 UTC (rev 11752)
+++ trunk/qgis/src/plugins/delimited_text/qgsdelimitedtextpluginguibase.ui 2009-10-03 23:04:37 UTC (rev 11753)
@@ -5,7 +5,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>701</width>
+ <width>522</width>
<height>547</height>
</rect>
</property>
@@ -13,30 +13,10 @@
<string>Create a Layer from a Delimited Text File</string>
</property>
<property name="windowIcon" >
- <iconset>
- <normaloff/>
- </iconset>
+ <iconset/>
</property>
<layout class="QGridLayout" >
- <property name="leftMargin" >
- <number>9</number>
- </property>
- <property name="topMargin" >
- <number>9</number>
- </property>
- <property name="rightMargin" >
- <number>9</number>
- </property>
- <property name="bottomMargin" >
- <number>9</number>
- </property>
- <property name="horizontalSpacing" >
- <number>6</number>
- </property>
- <property name="verticalSpacing" >
- <number>6</number>
- </property>
- <item row="0" column="0" colspan="3" >
+ <item row="0" column="0" colspan="7" >
<widget class="QLabel" name="txtHeading" >
<property name="font" >
<font>
@@ -57,7 +37,7 @@
</property>
</widget>
</item>
- <item row="1" column="2" >
+ <item row="1" column="0" colspan="7" >
<widget class="QTextEdit" name="teInstructions" >
<property name="readOnly" >
<bool>true</bool>
@@ -65,364 +45,260 @@
<property name="html" >
<string><html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Verdana'; font-size:10pt; 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 Serif'; font-size:10pt; 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; font-family:'Verdana';"></p></body></html></string>
</property>
</widget>
</item>
- <item row="5" column="2" >
- <layout class="QHBoxLayout" >
- <property name="spacing" >
- <number>6</number>
+ <item row="2" column="0" >
+ <widget class="QLabel" name="textLabel1" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
- <property name="leftMargin" >
- <number>0</number>
+ <property name="text" >
+ <string>Delimited text file</string>
</property>
- <property name="topMargin" >
- <number>0</number>
+ <property name="buddy" >
+ <cstring>txtFilePath</cstring>
</property>
- <property name="rightMargin" >
- <number>0</number>
+ </widget>
+ </item>
+ <item row="2" column="1" colspan="5" >
+ <widget class="QgsFileDropEdit" name="txtFilePath" >
+ <property name="toolTip" >
+ <string>Full path to the delimited text file</string>
</property>
- <property name="bottomMargin" >
- <number>0</number>
+ <property name="whatsThis" >
+ <string>Full path to the delimited text file. In order to properly parse the fields in the file, the delimiter must be defined prior to entering the file name. Use the Browse button to the right of this field to choose the input file.</string>
</property>
- <item>
- <widget class="QLabel" name="textLabel2" >
- <property name="text" >
- <string><p align="right">X field</p></string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QComboBox" name="cmbXField" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize" >
- <size>
- <width>120</width>
- <height>0</height>
- </size>
- </property>
- <property name="toolTip" >
- <string>Name of the field containing x values</string>
- </property>
- <property name="whatsThis" >
- <string>Name of the field containing x values. Choose a field from the list. The list is generated by parsing the header row of the delimited text file.</string>
- </property>
- <property name="editable" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="textLabel2_2" >
- <property name="text" >
- <string><p align="right">Y field</p></string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QComboBox" name="cmbYField" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize" >
- <size>
- <width>120</width>
- <height>0</height>
- </size>
- </property>
- <property name="toolTip" >
- <string>Name of the field containing y values</string>
- </property>
- <property name="whatsThis" >
- <string>Name of the field containing y values. Choose a field from the list. The list is generated by parsing the header row of the delimited text file.</string>
- </property>
- <property name="editable" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- </layout>
+ <property name="readOnly" >
+ <bool>true</bool>
+ </property>
+ </widget>
</item>
- <item row="2" column="2" >
- <layout class="QHBoxLayout" >
- <property name="spacing" >
- <number>6</number>
+ <item row="2" column="6" >
+ <widget class="QPushButton" name="btnBrowseForFile" >
+ <property name="enabled" >
+ <bool>true</bool>
</property>
- <property name="leftMargin" >
- <number>0</number>
+ <property name="toolTip" >
+ <string>Browse to find the delimited text file to be processed</string>
</property>
- <property name="topMargin" >
- <number>0</number>
+ <property name="whatsThis" >
+ <string>Use this button to browse to the location of the delimited text file. This button will not be enabled until a delimiter has been entered in the <i>Delimiter</i> box. Once a file is chosen, the X and Y field drop-down boxes will be populated with the fields from the delimited text file.</string>
</property>
- <property name="rightMargin" >
- <number>0</number>
+ <property name="text" >
+ <string>...</string>
</property>
- <property name="bottomMargin" >
- <number>0</number>
+ </widget>
+ </item>
+ <item row="3" column="0" >
+ <widget class="QLabel" name="textLabel1_2" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
- <item>
- <widget class="QLabel" name="textLabel1" >
- <property name="text" >
- <string>Delimited text file</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QgsFileDropEdit" name="txtFilePath" >
- <property name="toolTip" >
- <string>Full path to the delimited text file</string>
- </property>
- <property name="whatsThis" >
- <string>Full path to the delimited text file. In order to properly parse the fields in the file, the delimiter must be defined prior to entering the file name. Use the Browse button to the right of this field to choose the input file.</string>
- </property>
- <property name="readOnly" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="btnBrowseForFile" >
- <property name="enabled" >
- <bool>true</bool>
- </property>
- <property name="toolTip" >
- <string>Browse to find the delimited text file to be processed</string>
- </property>
- <property name="whatsThis" >
- <string>Use this button to browse to the location of the delimited text file. This button will not be enabled until a delimiter has been entered in the <i>Delimiter</i> box. Once a file is chosen, the X and Y field drop-down boxes will be populated with the fields from the delimited text file.</string>
- </property>
- <property name="text" >
- <string>Browse...</string>
- </property>
- </widget>
- </item>
- </layout>
+ <property name="text" >
+ <string>Layer name</string>
+ </property>
+ <property name="buddy" >
+ <cstring>txtLayerName</cstring>
+ </property>
+ </widget>
</item>
- <item row="3" column="2" >
- <layout class="QHBoxLayout" >
- <property name="spacing" >
- <number>6</number>
+ <item row="3" column="1" colspan="6" >
+ <widget class="QLineEdit" name="txtLayerName" >
+ <property name="toolTip" >
+ <string>Name to display in the map legend</string>
</property>
- <property name="leftMargin" >
- <number>0</number>
+ <property name="whatsThis" >
+ <string>Name displayed in the map legend</string>
</property>
- <property name="topMargin" >
- <number>0</number>
+ </widget>
+ </item>
+ <item row="4" column="0" >
+ <widget class="QLabel" name="textLabel3" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
- <property name="rightMargin" >
- <number>0</number>
+ <property name="text" >
+ <string>Delimiter</string>
</property>
- <property name="bottomMargin" >
- <number>0</number>
+ <property name="buddy" >
+ <cstring>txtDelimiter</cstring>
</property>
- <item>
- <widget class="QLabel" name="textLabel1_2" >
- <property name="text" >
- <string>Layer name</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLineEdit" name="txtLayerName" >
- <property name="toolTip" >
- <string>Name to display in the map legend</string>
- </property>
- <property name="whatsThis" >
- <string>Name displayed in the map legend</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>20</width>
- <height>21</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
+ </widget>
</item>
- <item row="7" column="2" >
- <widget class="QDialogButtonBox" name="buttonBox" >
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
+ <item row="4" column="1" colspan="6" >
+ <widget class="QLineEdit" name="txtDelimiter" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
- <property name="standardButtons" >
- <set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
+ <property name="maximumSize" >
+ <size>
+ <width>32767</width>
+ <height>32767</height>
+ </size>
</property>
+ <property name="toolTip" >
+ <string>Delimiter to use when splitting fields in the text file. The delimiter can be more than one character.</string>
+ </property>
+ <property name="whatsThis" >
+ <string>Delimiter to use when splitting fields in the delimited text file. The delimiter can be 1 or more characters in length.</string>
+ </property>
</widget>
</item>
- <item rowspan="7" row="1" column="0" >
- <widget class="QLabel" name="pixmapLabel1" >
- <property name="pixmap" >
- <pixmap resource="delimited_text.qrc" >:/delimited_text.png</pixmap>
+ <item row="5" column="0" colspan="2" >
+ <widget class="QLabel" name="label_2" >
+ <property name="text" >
+ <string>Delimeter type</string>
</property>
- <property name="scaledContents" >
- <bool>false</bool>
+ <property name="buddy" >
+ <cstring>delimiterPlain</cstring>
</property>
</widget>
</item>
- <item row="6" column="2" >
- <widget class="QGroupBox" name="groupBox" >
- <property name="title" >
- <string>Sample text</string>
+ <item row="5" column="2" colspan="3" >
+ <widget class="QRadioButton" name="delimiterPlain" >
+ <property name="toolTip" >
+ <string>The delimiter is taken as is</string>
</property>
- <layout class="QGridLayout" >
- <property name="leftMargin" >
- <number>9</number>
- </property>
- <property name="topMargin" >
- <number>9</number>
- </property>
- <property name="rightMargin" >
- <number>9</number>
- </property>
- <property name="bottomMargin" >
- <number>9</number>
- </property>
- <property name="horizontalSpacing" >
- <number>6</number>
- </property>
- <property name="verticalSpacing" >
- <number>6</number>
- </property>
- <item row="0" column="0" >
- <widget class="QTextEdit" name="txtSample" >
- <property name="readOnly" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- </layout>
+ <property name="whatsThis" >
+ <string>The delimiter is taken as is</string>
+ </property>
+ <property name="text" >
+ <string>Plain characters</string>
+ </property>
</widget>
</item>
- <item rowspan="7" row="1" column="1" >
- <widget class="Line" name="line1" >
- <property name="frameShape" >
- <enum>QFrame::VLine</enum>
+ <item row="5" column="5" colspan="2" >
+ <widget class="QRadioButton" name="delimiterRegexp" >
+ <property name="toolTip" >
+ <string>The delimiter is a regular expression</string>
</property>
- <property name="frameShadow" >
- <enum>QFrame::Sunken</enum>
+ <property name="whatsThis" >
+ <string>The delimiter is a regular expression</string>
</property>
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
+ <property name="text" >
+ <string>Regular expression</string>
</property>
</widget>
</item>
- <item row="4" column="2" >
- <layout class="QHBoxLayout" >
- <property name="spacing" >
- <number>6</number>
+ <item row="6" column="0" >
+ <widget class="QLabel" name="label_3" >
+ <property name="text" >
+ <string>Geometry</string>
</property>
- <property name="leftMargin" >
- <number>0</number>
+ </widget>
+ </item>
+ <item row="6" column="1" colspan="2" >
+ <widget class="QLabel" name="textLabel2" >
+ <property name="text" >
+ <string><p align="right">X field</p></string>
</property>
- <property name="topMargin" >
- <number>0</number>
+ <property name="buddy" >
+ <cstring>cmbXField</cstring>
</property>
- <property name="rightMargin" >
- <number>0</number>
+ </widget>
+ </item>
+ <item row="6" column="3" >
+ <widget class="QComboBox" name="cmbXField" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
- <property name="bottomMargin" >
- <number>0</number>
+ <property name="minimumSize" >
+ <size>
+ <width>120</width>
+ <height>0</height>
+ </size>
</property>
- <item>
- <widget class="QLabel" name="textLabel3" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text" >
- <string>Delimiter</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLineEdit" name="txtDelimiter" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="maximumSize" >
- <size>
- <width>32767</width>
- <height>32767</height>
- </size>
- </property>
- <property name="toolTip" >
- <string>Delimiter to use when splitting fields in the text file. The delimiter can be more than one character.</string>
- </property>
- <property name="whatsThis" >
- <string>Delimiter to use when splitting fields in the delimited text file. The delimiter can be 1 or more characters in length.</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QRadioButton" name="delimiterPlain" >
- <property name="toolTip" >
- <string>The delimiter is taken as is</string>
- </property>
- <property name="whatsThis" >
- <string>The delimiter is taken as is</string>
- </property>
- <property name="text" >
- <string>Plain characters</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QRadioButton" name="delimiterRegexp" >
- <property name="toolTip" >
- <string>The delimiter is a regular expression</string>
- </property>
- <property name="whatsThis" >
- <string>The delimiter is a regular expression</string>
- </property>
- <property name="text" >
- <string>Regular expression</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Minimum</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>61</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
+ <property name="toolTip" >
+ <string>Name of the field containing x values</string>
+ </property>
+ <property name="whatsThis" >
+ <string>Name of the field containing x values. Choose a field from the list. The list is generated by parsing the header row of the delimited text file.</string>
+ </property>
+ <property name="editable" >
+ <bool>true</bool>
+ </property>
+ </widget>
</item>
+ <item row="6" column="4" >
+ <widget class="QLabel" name="textLabel2_2" >
+ <property name="text" >
+ <string><p align="right">Y field</p></string>
+ </property>
+ <property name="buddy" >
+ <cstring>cmbYField</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="5" colspan="2" >
+ <widget class="QComboBox" name="cmbYField" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize" >
+ <size>
+ <width>120</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="toolTip" >
+ <string>Name of the field containing y values</string>
+ </property>
+ <property name="whatsThis" >
+ <string>Name of the field containing y values. Choose a field from the list. The list is generated by parsing the header row of the delimited text file.</string>
+ </property>
+ <property name="editable" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="7" column="0" >
+ <widget class="QLabel" name="label" >
+ <property name="text" >
+ <string>Sample text</string>
+ </property>
+ <property name="buddy" >
+ <cstring>txtSample</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="8" column="0" colspan="7" >
+ <widget class="QTextEdit" name="txtSample" >
+ <property name="readOnly" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="9" column="0" colspan="7" >
+ <widget class="QDialogButtonBox" name="buttonBox" >
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="standardButtons" >
+ <set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11" />
@@ -434,12 +310,17 @@
</customwidget>
</customwidgets>
<tabstops>
- <tabstop>txtLayerName</tabstop>
- <tabstop>txtDelimiter</tabstop>
+ <tabstop>teInstructions</tabstop>
<tabstop>txtFilePath</tabstop>
<tabstop>btnBrowseForFile</tabstop>
+ <tabstop>txtLayerName</tabstop>
+ <tabstop>txtDelimiter</tabstop>
+ <tabstop>delimiterPlain</tabstop>
+ <tabstop>delimiterRegexp</tabstop>
<tabstop>cmbXField</tabstop>
<tabstop>cmbYField</tabstop>
+ <tabstop>txtSample</tabstop>
+ <tabstop>buttonBox</tabstop>
</tabstops>
<resources>
<include location="delimited_text.qrc" />
Modified: trunk/qgis/src/plugins/north_arrow/plugingui.cpp
===================================================================
--- trunk/qgis/src/plugins/north_arrow/plugingui.cpp 2009-10-03 22:40:23 UTC (rev 11752)
+++ trunk/qgis/src/plugins/north_arrow/plugingui.cpp 2009-10-03 23:04:37 UTC (rev 11753)
@@ -22,8 +22,6 @@
: QDialog( parent, fl )
{
setupUi( this );
- //temporary hack until this is implemented
- tabNorthArrowOptions->removeTab( tabNorthArrowOptions->indexOf( tabIcon ) );
}
QgsNorthArrowPluginGui::~QgsNorthArrowPluginGui()
Modified: trunk/qgis/src/plugins/north_arrow/pluginguibase.ui
===================================================================
--- trunk/qgis/src/plugins/north_arrow/pluginguibase.ui 2009-10-03 22:40:23 UTC (rev 11752)
+++ trunk/qgis/src/plugins/north_arrow/pluginguibase.ui 2009-10-03 23:04:37 UTC (rev 11753)
@@ -5,219 +5,21 @@
<rect>
<x>0</x>
<y>0</y>
- <width>457</width>
- <height>424</height>
+ <width>433</width>
+ <height>387</height>
</rect>
</property>
<property name="windowTitle" >
<string>North Arrow Plugin</string>
</property>
<property name="windowIcon" >
- <iconset>
- <normaloff/>
- </iconset>
+ <iconset/>
</property>
<layout class="QGridLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item row="1" column="2" >
- <widget class="QTabWidget" name="tabNorthArrowOptions" >
- <property name="enabled" >
- <bool>true</bool>
- </property>
- <property name="tabShape" >
- <enum>QTabWidget::Rounded</enum>
- </property>
- <widget class="QWidget" name="tabProperties" >
- <attribute name="title" >
- <string>Properties</string>
- </attribute>
- <layout class="QVBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <layout class="QGridLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item row="1" column="0" >
- <widget class="QLabel" name="textLabel6" >
- <property name="text" >
- <string>Angle</string>
- </property>
- </widget>
- </item>
- <item row="2" column="0" >
- <widget class="QLabel" name="textLabel8" >
- <property name="text" >
- <string>Placement</string>
- </property>
- </widget>
- </item>
- <item row="4" column="1" >
- <widget class="QCheckBox" name="cboxAutomatic" >
- <property name="toolTip" >
- <string/>
- </property>
- <property name="whatsThis" >
- <string/>
- </property>
- <property name="text" >
- <string>Set direction automatically</string>
- </property>
- <property name="checked" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="3" column="1" >
- <widget class="QCheckBox" name="cboxShow" >
- <property name="text" >
- <string>Enable North Arrow</string>
- </property>
- <property name="checked" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="1" column="1" >
- <layout class="QGridLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item row="0" column="0" >
- <widget class="QSlider" name="sliderRotation" >
- <property name="toolTip" >
- <string/>
- </property>
- <property name="maximum" >
- <number>360</number>
- </property>
- <property name="singleStep" >
- <number>1</number>
- </property>
- <property name="pageStep" >
- <number>10</number>
- </property>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- </widget>
- </item>
- <item row="0" column="1" >
- <widget class="QSpinBox" name="spinAngle" >
- <property name="maximum" >
- <number>360</number>
- </property>
- <property name="singleStep" >
- <number>1</number>
- </property>
- <property name="value" >
- <number>0</number>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item row="2" column="1" >
- <widget class="QComboBox" name="cboPlacement" >
- <property name="toolTip" >
- <string>Placement on screen</string>
- </property>
- <item>
- <property name="text" >
- <string>Top Left</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>Top Right</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>Bottom Left</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>Bottom Right</string>
- </property>
- </item>
- </widget>
- </item>
- <item row="0" column="0" colspan="2" >
- <widget class="QLabel" name="pixmapLabel" >
- <property name="toolTip" >
- <string>Preview of north arrow</string>
- </property>
- <property name="frameShape" >
- <enum>QFrame::Box</enum>
- </property>
- <property name="scaledContents" >
- <bool>false</bool>
- </property>
- <property name="alignment" >
- <set>Qt::AlignCenter</set>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- <widget class="QWidget" name="tabIcon" >
- <attribute name="title" >
- <string>Icon</string>
- </attribute>
- <layout class="QGridLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item row="0" column="0" >
- <widget class="QLineEdit" name="txtDirectory" />
- </item>
- <item row="0" column="1" >
- <widget class="QPushButton" name="btnBrowse" >
- <property name="text" >
- <string>Browse...</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0" colspan="2" >
- <widget class="QListView" name="iconView" >
- <property name="viewMode" >
- <enum>QListView::IconMode</enum>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </widget>
- </item>
- <item row="0" column="2" >
+ <item row="0" column="0" colspan="3" >
<widget class="QLabel" name="txtHeading" >
<property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>5</hsizetype>
- <vsizetype>1</vsizetype>
+ <sizepolicy vsizetype="Minimum" hsizetype="Preferred" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -241,36 +43,134 @@
</property>
</widget>
</item>
- <item rowspan="2" row="0" column="1" >
- <widget class="Line" name="line1" >
- <property name="maximumSize" >
- <size>
- <width>2</width>
- <height>32767</height>
- </size>
+ <item row="1" column="0" colspan="3" >
+ <widget class="QLabel" name="pixmapLabel" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="MinimumExpanding" hsizetype="Preferred" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
+ <property name="toolTip" >
+ <string>Preview of north arrow</string>
+ </property>
<property name="frameShape" >
- <enum>QFrame::VLine</enum>
+ <enum>QFrame::Box</enum>
</property>
- <property name="frameShadow" >
- <enum>QFrame::Sunken</enum>
+ <property name="scaledContents" >
+ <bool>false</bool>
</property>
+ <property name="alignment" >
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0" >
+ <widget class="QLabel" name="textLabel6" >
+ <property name="text" >
+ <string>Angle</string>
+ </property>
+ <property name="buddy" >
+ <cstring>sliderRotation</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1" >
+ <widget class="QSlider" name="sliderRotation" >
+ <property name="toolTip" >
+ <string/>
+ </property>
+ <property name="maximum" >
+ <number>360</number>
+ </property>
+ <property name="singleStep" >
+ <number>1</number>
+ </property>
+ <property name="pageStep" >
+ <number>10</number>
+ </property>
<property name="orientation" >
- <enum>Qt::Vertical</enum>
+ <enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
- <item rowspan="2" row="0" column="0" >
- <widget class="QLabel" name="label" >
+ <item row="2" column="2" >
+ <widget class="QSpinBox" name="spinAngle" >
+ <property name="maximum" >
+ <number>360</number>
+ </property>
+ <property name="singleStep" >
+ <number>1</number>
+ </property>
+ <property name="value" >
+ <number>0</number>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0" >
+ <widget class="QLabel" name="textLabel8" >
<property name="text" >
+ <string>Placement</string>
+ </property>
+ <property name="buddy" >
+ <cstring>cboPlacement</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1" colspan="2" >
+ <widget class="QComboBox" name="cboPlacement" >
+ <property name="toolTip" >
+ <string>Placement on screen</string>
+ </property>
+ <item>
+ <property name="text" >
+ <string>Top Left</string>
+ </property>
+ </item>
+ <item>
+ <property name="text" >
+ <string>Top Right</string>
+ </property>
+ </item>
+ <item>
+ <property name="text" >
+ <string>Bottom Left</string>
+ </property>
+ </item>
+ <item>
+ <property name="text" >
+ <string>Bottom Right</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item row="4" column="1" colspan="2" >
+ <widget class="QCheckBox" name="cboxShow" >
+ <property name="text" >
+ <string>Enable North Arrow</string>
+ </property>
+ <property name="checked" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="1" colspan="2" >
+ <widget class="QCheckBox" name="cboxAutomatic" >
+ <property name="toolTip" >
<string/>
</property>
- <property name="pixmap" >
- <pixmap resource="northarrow_plugin.qrc" >:/northarrow.png</pixmap>
+ <property name="whatsThis" >
+ <string/>
</property>
+ <property name="text" >
+ <string>Set direction automatically</string>
+ </property>
+ <property name="checked" >
+ <bool>true</bool>
+ </property>
</widget>
</item>
- <item row="2" column="0" colspan="3" >
+ <item row="6" column="0" colspan="3" >
<widget class="QDialogButtonBox" name="buttonBox" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
@@ -283,6 +183,14 @@
</layout>
</widget>
<layoutdefault spacing="6" margin="11" />
+ <tabstops>
+ <tabstop>sliderRotation</tabstop>
+ <tabstop>spinAngle</tabstop>
+ <tabstop>cboPlacement</tabstop>
+ <tabstop>cboxShow</tabstop>
+ <tabstop>cboxAutomatic</tabstop>
+ <tabstop>buttonBox</tabstop>
+ </tabstops>
<resources>
<include location="northarrow_plugin.qrc" />
</resources>
More information about the QGIS-commit
mailing list