Skip to content

Commit b36591b

Browse files
author
timlinux
committed
ui cleanups
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@11949 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 70a5f40 commit b36591b

File tree

2 files changed

+177
-181
lines changed

2 files changed

+177
-181
lines changed

‎src/plugins/dxf2shp_converter/dxf2shpconvertergui.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ void dxf2shpConverterGui::on_buttonBox_accepted()
6565
{
6666
// if file open failed
6767
QgsDebugMsg( "Aborting: The input file could not be opened." );
68-
return ;
68+
return;
6969
}
7070

7171
Builder *parser = new Builder(
@@ -105,6 +105,7 @@ void dxf2shpConverterGui::on_buttonBox_accepted()
105105
else
106106
{
107107
QMessageBox::information( this, "Warning", "Please select a file to convert" );
108+
return;
108109
}
109110

110111
accept();

‎src/plugins/dxf2shp_converter/dxf2shpconvertergui.ui‎

Lines changed: 175 additions & 180 deletions
Original file line numberDiff line numberDiff line change
@@ -1,180 +1,175 @@
1-
<ui version="4.0" >
2-
<class>dxf2shpConverterGui</class>
3-
<widget class="QDialog" name="dxf2shpConverterGui" >
4-
<property name="geometry" >
5-
<rect>
6-
<x>0</x>
7-
<y>0</y>
8-
<width>500</width>
9-
<height>220</height>
10-
</rect>
11-
</property>
12-
<property name="minimumSize" >
13-
<size>
14-
<width>350</width>
15-
<height>220</height>
16-
</size>
17-
</property>
18-
<property name="maximumSize" >
19-
<size>
20-
<width>500</width>
21-
<height>300</height>
22-
</size>
23-
</property>
24-
<property name="windowTitle" >
25-
<string>Dxf Importer</string>
26-
</property>
27-
<property name="windowIcon" >
28-
<iconset>
29-
<normaloff/>
30-
</iconset>
31-
</property>
32-
<layout class="QGridLayout" >
33-
<item row="0" column="0" >
34-
<widget class="QLabel" name="label" >
35-
<property name="text" >
36-
<string>Input Dxf file</string>
37-
</property>
38-
</widget>
39-
</item>
40-
<item row="0" column="1" colspan="2" >
41-
<widget class="QLineEdit" name="name" />
42-
</item>
43-
<item row="0" column="3" >
44-
<widget class="QToolButton" name="btnBrowseForFile" >
45-
<property name="text" >
46-
<string>...</string>
47-
</property>
48-
</widget>
49-
</item>
50-
<item row="1" column="0" >
51-
<widget class="QLabel" name="label_2" >
52-
<property name="text" >
53-
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
54-
p, li { white-space: pre-wrap; }
55-
&lt;/style>&lt;/head>&lt;body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;">
56-
&lt;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;">&lt;span style=" font-size:10pt;">Output file&lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
57-
</property>
58-
</widget>
59-
</item>
60-
<item row="1" column="1" colspan="2" >
61-
<widget class="QLineEdit" name="dirout" />
62-
</item>
63-
<item row="1" column="3" >
64-
<widget class="QToolButton" name="btnBrowseOutputDir" >
65-
<property name="text" >
66-
<string>...</string>
67-
</property>
68-
</widget>
69-
</item>
70-
<item row="2" column="0" colspan="4" >
71-
<widget class="QGroupBox" name="groupBox" >
72-
<property name="sizePolicy" >
73-
<sizepolicy vsizetype="Maximum" hsizetype="Preferred" >
74-
<horstretch>0</horstretch>
75-
<verstretch>0</verstretch>
76-
</sizepolicy>
77-
</property>
78-
<property name="minimumSize" >
79-
<size>
80-
<width>0</width>
81-
<height>50</height>
82-
</size>
83-
</property>
84-
<property name="title" >
85-
<string>Output file type</string>
86-
</property>
87-
<layout class="QGridLayout" >
88-
<item row="0" column="0" >
89-
<widget class="QRadioButton" name="polyline" >
90-
<property name="text" >
91-
<string>Polyline</string>
92-
</property>
93-
<property name="checked" >
94-
<bool>true</bool>
95-
</property>
96-
</widget>
97-
</item>
98-
<item row="0" column="1" >
99-
<widget class="QRadioButton" name="polygon" >
100-
<property name="text" >
101-
<string>Polygon</string>
102-
</property>
103-
</widget>
104-
</item>
105-
<item row="0" column="2" >
106-
<widget class="QRadioButton" name="point" >
107-
<property name="text" >
108-
<string>Point</string>
109-
</property>
110-
</widget>
111-
</item>
112-
</layout>
113-
</widget>
114-
</item>
115-
<item row="3" column="0" colspan="2" >
116-
<widget class="QCheckBox" name="convertTextCheck" >
117-
<property name="text" >
118-
<string>Export text labels</string>
119-
</property>
120-
</widget>
121-
</item>
122-
<item row="3" column="2" >
123-
<spacer>
124-
<property name="orientation" >
125-
<enum>Qt::Horizontal</enum>
126-
</property>
127-
<property name="sizeHint" >
128-
<size>
129-
<width>40</width>
130-
<height>20</height>
131-
</size>
132-
</property>
133-
</spacer>
134-
</item>
135-
<item row="4" column="0" colspan="4" >
136-
<widget class="QDialogButtonBox" name="buttonBox" >
137-
<property name="standardButtons" >
138-
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
139-
</property>
140-
</widget>
141-
</item>
142-
</layout>
143-
</widget>
144-
<layoutdefault spacing="6" margin="11" />
145-
<resources/>
146-
<connections>
147-
<connection>
148-
<sender>buttonBox</sender>
149-
<signal>accepted()</signal>
150-
<receiver>dxf2shpConverterGui</receiver>
151-
<slot>accept()</slot>
152-
<hints>
153-
<hint type="sourcelabel" >
154-
<x>331</x>
155-
<y>180</y>
156-
</hint>
157-
<hint type="destinationlabel" >
158-
<x>451</x>
159-
<y>148</y>
160-
</hint>
161-
</hints>
162-
</connection>
163-
<connection>
164-
<sender>buttonBox</sender>
165-
<signal>rejected()</signal>
166-
<receiver>dxf2shpConverterGui</receiver>
167-
<slot>reject()</slot>
168-
<hints>
169-
<hint type="sourcelabel" >
170-
<x>415</x>
171-
<y>182</y>
172-
</hint>
173-
<hint type="destinationlabel" >
174-
<x>427</x>
175-
<y>201</y>
176-
</hint>
177-
</hints>
178-
</connection>
179-
</connections>
180-
</ui>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<ui version="4.0">
3+
<class>dxf2shpConverterGui</class>
4+
<widget class="QDialog" name="dxf2shpConverterGui">
5+
<property name="geometry">
6+
<rect>
7+
<x>0</x>
8+
<y>0</y>
9+
<width>350</width>
10+
<height>250</height>
11+
</rect>
12+
</property>
13+
<property name="minimumSize">
14+
<size>
15+
<width>350</width>
16+
<height>220</height>
17+
</size>
18+
</property>
19+
<property name="maximumSize">
20+
<size>
21+
<width>500</width>
22+
<height>300</height>
23+
</size>
24+
</property>
25+
<property name="windowTitle">
26+
<string>Dxf Importer</string>
27+
</property>
28+
<property name="windowIcon">
29+
<iconset>
30+
<normaloff/>
31+
</iconset>
32+
</property>
33+
<layout class="QGridLayout" name="gridLayout">
34+
<item row="0" column="0">
35+
<widget class="QGroupBox" name="groupBox_2">
36+
<property name="title">
37+
<string>Input and output</string>
38+
</property>
39+
<layout class="QGridLayout" name="gridLayout_3">
40+
<item row="0" column="0">
41+
<widget class="QLabel" name="label">
42+
<property name="text">
43+
<string>Input Dxf file</string>
44+
</property>
45+
<property name="buddy">
46+
<cstring>name</cstring>
47+
</property>
48+
</widget>
49+
</item>
50+
<item row="0" column="1">
51+
<widget class="QLineEdit" name="name"/>
52+
</item>
53+
<item row="0" column="2">
54+
<widget class="QToolButton" name="btnBrowseForFile">
55+
<property name="text">
56+
<string>...</string>
57+
</property>
58+
</widget>
59+
</item>
60+
<item row="1" column="0">
61+
<widget class="QLabel" name="label_3">
62+
<property name="text">
63+
<string>Output file</string>
64+
</property>
65+
<property name="buddy">
66+
<cstring>dirout</cstring>
67+
</property>
68+
</widget>
69+
</item>
70+
<item row="1" column="1">
71+
<widget class="QLineEdit" name="dirout"/>
72+
</item>
73+
<item row="1" column="2">
74+
<widget class="QToolButton" name="btnBrowseOutputDir">
75+
<property name="text">
76+
<string>...</string>
77+
</property>
78+
</widget>
79+
</item>
80+
<item row="2" column="0" colspan="3">
81+
<widget class="QCheckBox" name="convertTextCheck">
82+
<property name="text">
83+
<string>Export text labels</string>
84+
</property>
85+
</widget>
86+
</item>
87+
</layout>
88+
</widget>
89+
</item>
90+
<item row="1" column="0">
91+
<widget class="QGroupBox" name="groupBox">
92+
<property name="sizePolicy">
93+
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
94+
<horstretch>0</horstretch>
95+
<verstretch>0</verstretch>
96+
</sizepolicy>
97+
</property>
98+
<property name="minimumSize">
99+
<size>
100+
<width>0</width>
101+
<height>50</height>
102+
</size>
103+
</property>
104+
<property name="title">
105+
<string>Output file type</string>
106+
</property>
107+
<layout class="QGridLayout">
108+
<item row="0" column="0">
109+
<widget class="QRadioButton" name="polyline">
110+
<property name="text">
111+
<string>Polyline</string>
112+
</property>
113+
<property name="checked">
114+
<bool>true</bool>
115+
</property>
116+
</widget>
117+
</item>
118+
<item row="0" column="1">
119+
<widget class="QRadioButton" name="polygon">
120+
<property name="text">
121+
<string>Polygon</string>
122+
</property>
123+
</widget>
124+
</item>
125+
<item row="0" column="2">
126+
<widget class="QRadioButton" name="point">
127+
<property name="text">
128+
<string>Point</string>
129+
</property>
130+
</widget>
131+
</item>
132+
</layout>
133+
</widget>
134+
</item>
135+
<item row="2" column="0">
136+
<widget class="QDialogButtonBox" name="buttonBox">
137+
<property name="standardButtons">
138+
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
139+
</property>
140+
</widget>
141+
</item>
142+
</layout>
143+
</widget>
144+
<layoutdefault spacing="6" margin="11"/>
145+
<tabstops>
146+
<tabstop>name</tabstop>
147+
<tabstop>btnBrowseForFile</tabstop>
148+
<tabstop>dirout</tabstop>
149+
<tabstop>btnBrowseOutputDir</tabstop>
150+
<tabstop>convertTextCheck</tabstop>
151+
<tabstop>polyline</tabstop>
152+
<tabstop>polygon</tabstop>
153+
<tabstop>point</tabstop>
154+
<tabstop>buttonBox</tabstop>
155+
</tabstops>
156+
<resources/>
157+
<connections>
158+
<connection>
159+
<sender>buttonBox</sender>
160+
<signal>rejected()</signal>
161+
<receiver>dxf2shpConverterGui</receiver>
162+
<slot>reject()</slot>
163+
<hints>
164+
<hint type="sourcelabel">
165+
<x>227</x>
166+
<y>223</y>
167+
</hint>
168+
<hint type="destinationlabel">
169+
<x>349</x>
170+
<y>194</y>
171+
</hint>
172+
</hints>
173+
</connection>
174+
</connections>
175+
</ui>

0 commit comments

Comments
 (0)