[QGIS Commit] r11949 - trunk/qgis/src/plugins/dxf2shp_converter
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Sat Nov 7 06:41:46 EST 2009
Author: timlinux
Date: 2009-11-07 06:41:45 -0500 (Sat, 07 Nov 2009)
New Revision: 11949
Modified:
trunk/qgis/src/plugins/dxf2shp_converter/dxf2shpconvertergui.cpp
trunk/qgis/src/plugins/dxf2shp_converter/dxf2shpconvertergui.ui
Log:
ui cleanups
Modified: trunk/qgis/src/plugins/dxf2shp_converter/dxf2shpconvertergui.cpp
===================================================================
--- trunk/qgis/src/plugins/dxf2shp_converter/dxf2shpconvertergui.cpp 2009-11-07 11:16:44 UTC (rev 11948)
+++ trunk/qgis/src/plugins/dxf2shp_converter/dxf2shpconvertergui.cpp 2009-11-07 11:41:45 UTC (rev 11949)
@@ -65,7 +65,7 @@
{
// if file open failed
QgsDebugMsg( "Aborting: The input file could not be opened." );
- return ;
+ return;
}
Builder *parser = new Builder(
@@ -105,6 +105,7 @@
else
{
QMessageBox::information( this, "Warning", "Please select a file to convert" );
+ return;
}
accept();
Modified: trunk/qgis/src/plugins/dxf2shp_converter/dxf2shpconvertergui.ui
===================================================================
--- trunk/qgis/src/plugins/dxf2shp_converter/dxf2shpconvertergui.ui 2009-11-07 11:16:44 UTC (rev 11948)
+++ trunk/qgis/src/plugins/dxf2shp_converter/dxf2shpconvertergui.ui 2009-11-07 11:41:45 UTC (rev 11949)
@@ -1,180 +1,175 @@
-<ui version="4.0" >
- <class>dxf2shpConverterGui</class>
- <widget class="QDialog" name="dxf2shpConverterGui" >
- <property name="geometry" >
- <rect>
- <x>0</x>
- <y>0</y>
- <width>500</width>
- <height>220</height>
- </rect>
- </property>
- <property name="minimumSize" >
- <size>
- <width>350</width>
- <height>220</height>
- </size>
- </property>
- <property name="maximumSize" >
- <size>
- <width>500</width>
- <height>300</height>
- </size>
- </property>
- <property name="windowTitle" >
- <string>Dxf Importer</string>
- </property>
- <property name="windowIcon" >
- <iconset>
- <normaloff/>
- </iconset>
- </property>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="QLabel" name="label" >
- <property name="text" >
- <string>Input Dxf file</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1" colspan="2" >
- <widget class="QLineEdit" name="name" />
- </item>
- <item row="0" column="3" >
- <widget class="QToolButton" name="btnBrowseForFile" >
- <property name="text" >
- <string>...</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0" >
- <widget class="QLabel" name="label_2" >
- <property name="text" >
- <string><html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'DejaVu Sans'; 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:'MS Shell Dlg 2'; font-size:8pt;"><span style=" font-size:10pt;">Output file</span></p></body></html></string>
- </property>
- </widget>
- </item>
- <item row="1" column="1" colspan="2" >
- <widget class="QLineEdit" name="dirout" />
- </item>
- <item row="1" column="3" >
- <widget class="QToolButton" name="btnBrowseOutputDir" >
- <property name="text" >
- <string>...</string>
- </property>
- </widget>
- </item>
- <item row="2" column="0" colspan="4" >
- <widget class="QGroupBox" name="groupBox" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Maximum" hsizetype="Preferred" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize" >
- <size>
- <width>0</width>
- <height>50</height>
- </size>
- </property>
- <property name="title" >
- <string>Output file type</string>
- </property>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="QRadioButton" name="polyline" >
- <property name="text" >
- <string>Polyline</string>
- </property>
- <property name="checked" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="0" column="1" >
- <widget class="QRadioButton" name="polygon" >
- <property name="text" >
- <string>Polygon</string>
- </property>
- </widget>
- </item>
- <item row="0" column="2" >
- <widget class="QRadioButton" name="point" >
- <property name="text" >
- <string>Point</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item row="3" column="0" colspan="2" >
- <widget class="QCheckBox" name="convertTextCheck" >
- <property name="text" >
- <string>Export text labels</string>
- </property>
- </widget>
- </item>
- <item row="3" column="2" >
- <spacer>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="4" column="0" colspan="4" >
- <widget class="QDialogButtonBox" name="buttonBox" >
- <property name="standardButtons" >
- <set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- <layoutdefault spacing="6" margin="11" />
- <resources/>
- <connections>
- <connection>
- <sender>buttonBox</sender>
- <signal>accepted()</signal>
- <receiver>dxf2shpConverterGui</receiver>
- <slot>accept()</slot>
- <hints>
- <hint type="sourcelabel" >
- <x>331</x>
- <y>180</y>
- </hint>
- <hint type="destinationlabel" >
- <x>451</x>
- <y>148</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>buttonBox</sender>
- <signal>rejected()</signal>
- <receiver>dxf2shpConverterGui</receiver>
- <slot>reject()</slot>
- <hints>
- <hint type="sourcelabel" >
- <x>415</x>
- <y>182</y>
- </hint>
- <hint type="destinationlabel" >
- <x>427</x>
- <y>201</y>
- </hint>
- </hints>
- </connection>
- </connections>
-</ui>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>dxf2shpConverterGui</class>
+ <widget class="QDialog" name="dxf2shpConverterGui">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>350</width>
+ <height>250</height>
+ </rect>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>350</width>
+ <height>220</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>500</width>
+ <height>300</height>
+ </size>
+ </property>
+ <property name="windowTitle">
+ <string>Dxf Importer</string>
+ </property>
+ <property name="windowIcon">
+ <iconset>
+ <normaloff/>
+ </iconset>
+ </property>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QGroupBox" name="groupBox_2">
+ <property name="title">
+ <string>Input and output</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_3">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>Input Dxf file</string>
+ </property>
+ <property name="buddy">
+ <cstring>name</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QLineEdit" name="name"/>
+ </item>
+ <item row="0" column="2">
+ <widget class="QToolButton" name="btnBrowseForFile">
+ <property name="text">
+ <string>...</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_3">
+ <property name="text">
+ <string>Output file</string>
+ </property>
+ <property name="buddy">
+ <cstring>dirout</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QLineEdit" name="dirout"/>
+ </item>
+ <item row="1" column="2">
+ <widget class="QToolButton" name="btnBrowseOutputDir">
+ <property name="text">
+ <string>...</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0" colspan="3">
+ <widget class="QCheckBox" name="convertTextCheck">
+ <property name="text">
+ <string>Export text labels</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QGroupBox" name="groupBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>50</height>
+ </size>
+ </property>
+ <property name="title">
+ <string>Output file type</string>
+ </property>
+ <layout class="QGridLayout">
+ <item row="0" column="0">
+ <widget class="QRadioButton" name="polyline">
+ <property name="text">
+ <string>Polyline</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QRadioButton" name="polygon">
+ <property name="text">
+ <string>Polygon</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2">
+ <widget class="QRadioButton" name="point">
+ <property name="text">
+ <string>Point</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="standardButtons">
+ <set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11"/>
+ <tabstops>
+ <tabstop>name</tabstop>
+ <tabstop>btnBrowseForFile</tabstop>
+ <tabstop>dirout</tabstop>
+ <tabstop>btnBrowseOutputDir</tabstop>
+ <tabstop>convertTextCheck</tabstop>
+ <tabstop>polyline</tabstop>
+ <tabstop>polygon</tabstop>
+ <tabstop>point</tabstop>
+ <tabstop>buttonBox</tabstop>
+ </tabstops>
+ <resources/>
+ <connections>
+ <connection>
+ <sender>buttonBox</sender>
+ <signal>rejected()</signal>
+ <receiver>dxf2shpConverterGui</receiver>
+ <slot>reject()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>227</x>
+ <y>223</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>349</x>
+ <y>194</y>
+ </hint>
+ </hints>
+ </connection>
+ </connections>
+</ui>
More information about the QGIS-commit
mailing list