Skip to content

Commit cd041e1

Browse files
author
timlinux
committedNov 10, 2009
UI updates for compositionwidget
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12070 c8812cc2-4d05-0410-92ff-de0c093fc19c

File tree

3 files changed

+137
-207
lines changed

3 files changed

+137
-207
lines changed
 

‎src/app/composer/qgscompositionwidget.cpp

Lines changed: 51 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ QgsCompositionWidget::QgsCompositionWidget( QWidget* parent, QgsComposition* c )
4343
if ( mComposition )
4444
{
4545
//read printout resolution from composition
46-
mResolutionLineEdit->setText( QString::number( mComposition->printResolution() ) );
46+
mResolutionSpinBox->setValue( mComposition->printResolution() );
4747

4848
//print as raster
4949
if ( mComposition->printAsRaster() )
@@ -64,7 +64,7 @@ QgsCompositionWidget::QgsCompositionWidget( QWidget* parent, QgsComposition* c )
6464
{
6565
mSnapToGridCheckBox->setCheckState( Qt::Unchecked );
6666
}
67-
mResolutionSpinBox->setValue( mComposition->snapGridResolution() );
67+
mGridResolutionSpinBox->setValue( mComposition->snapGridResolution() );
6868
mOffsetXSpinBox->setValue( mComposition->snapGridOffsetX() );
6969
mOffsetYSpinBox->setValue( mComposition->snapGridOffsetY() );
7070

@@ -154,20 +154,21 @@ void QgsCompositionWidget::createPaperEntries()
154154
}
155155

156156
mPaperSizeComboBox->blockSignals( false );
157+
mPaperSizeComboBox->setCurrentIndex( 2 ); //A4
157158
}
158159

159160
void QgsCompositionWidget::on_mPaperSizeComboBox_currentIndexChanged( const QString& text )
160161
{
161162
if ( mPaperSizeComboBox->currentText() == tr( "Custom" ) )
162163
{
163-
mPaperWidthLineEdit->setEnabled( true );
164-
mPaperHeightLineEdit->setEnabled( true );
164+
mPaperWidthDoubleSpinBox->setEnabled( true );
165+
mPaperHeightDoubleSpinBox->setEnabled( true );
165166
mPaperUnitsComboBox->setEnabled( true );
166167
}
167168
else
168169
{
169-
mPaperWidthLineEdit->setEnabled( false );
170-
mPaperHeightLineEdit->setEnabled( false );
170+
mPaperWidthDoubleSpinBox->setEnabled( false );
171+
mPaperHeightDoubleSpinBox->setEnabled( false );
171172
mPaperUnitsComboBox->setEnabled( false );
172173
}
173174
applyCurrentPaperSettings();
@@ -189,8 +190,8 @@ void QgsCompositionWidget::on_mPaperOrientationComboBox_currentIndexChanged( con
189190

190191
void QgsCompositionWidget::on_mPaperUnitsComboBox_currentIndexChanged( const QString& text )
191192
{
192-
double width = size( mPaperWidthLineEdit );
193-
double height = size( mPaperHeightLineEdit );
193+
double width = size( mPaperWidthDoubleSpinBox );
194+
double height = size( mPaperHeightDoubleSpinBox );
194195

195196
if ( mPaperUnitsComboBox->currentIndex() == 0 )
196197
{
@@ -205,8 +206,8 @@ void QgsCompositionWidget::on_mPaperUnitsComboBox_currentIndexChanged( const QSt
205206
height /= 25.4;
206207
}
207208

208-
setSize( mPaperWidthLineEdit, width );
209-
setSize( mPaperHeightLineEdit, height );
209+
setSize( mPaperWidthDoubleSpinBox, width );
210+
setSize( mPaperHeightDoubleSpinBox, height );
210211

211212
if ( mPaperSizeComboBox->currentText() == tr( "Custom" ) )
212213
{
@@ -222,8 +223,8 @@ void QgsCompositionWidget::on_mPaperUnitsComboBox_currentIndexChanged( const QSt
222223

223224
void QgsCompositionWidget::adjustOrientation()
224225
{
225-
double width = size( mPaperWidthLineEdit );
226-
double height = size( mPaperHeightLineEdit );
226+
double width = size( mPaperWidthDoubleSpinBox );
227+
double height = size( mPaperHeightDoubleSpinBox );
227228

228229
if ( width < 0 || height < 0 )
229230
{
@@ -237,45 +238,41 @@ void QgsCompositionWidget::adjustOrientation()
237238
height = tmp;
238239
}
239240

240-
bool lineEditsEnabled = mPaperWidthLineEdit->isEnabled();
241+
bool lineEditsEnabled = mPaperWidthDoubleSpinBox->isEnabled();
241242

242-
mPaperWidthLineEdit->setEnabled( true );
243-
mPaperHeightLineEdit->setEnabled( true );
243+
mPaperWidthDoubleSpinBox->setEnabled( true );
244+
mPaperHeightDoubleSpinBox->setEnabled( true );
244245
if ( mPaperOrientationComboBox->currentText() == tr( "Landscape" ) )
245246
{
246-
setSize( mPaperWidthLineEdit, width );
247-
setSize( mPaperHeightLineEdit, height );
247+
setSize( mPaperWidthDoubleSpinBox, width );
248+
setSize( mPaperHeightDoubleSpinBox, height );
248249
}
249250
else
250251
{
251-
setSize( mPaperWidthLineEdit, height );
252-
setSize( mPaperHeightLineEdit, width );
252+
setSize( mPaperWidthDoubleSpinBox, height );
253+
setSize( mPaperHeightDoubleSpinBox, width );
253254
}
254-
mPaperWidthLineEdit->setEnabled( lineEditsEnabled );
255-
mPaperHeightLineEdit->setEnabled( lineEditsEnabled );
255+
mPaperWidthDoubleSpinBox->setEnabled( lineEditsEnabled );
256+
mPaperHeightDoubleSpinBox->setEnabled( lineEditsEnabled );
256257
}
257258

258-
void QgsCompositionWidget::setSize( QLineEdit *le, double v )
259+
void QgsCompositionWidget::setSize( QDoubleSpinBox *spin, double v )
259260
{
260261
if ( mPaperUnitsComboBox->currentIndex() == 0 )
261262
{
262263
// mm
263-
le->setText( QString( "%1" ).arg( v ) );
264+
spin->setValue( v );
264265
}
265266
else
266267
{
267268
// inch (show width in inch)
268-
le->setText( QString( "%1" ).arg( v / 25.4 ) );
269+
spin->setValue( v / 25.4 );
269270
}
270271
}
271272

272-
double QgsCompositionWidget::size( QLineEdit *le )
273+
double QgsCompositionWidget::size( QDoubleSpinBox *spin )
273274
{
274-
bool conversionSuccess;
275-
276-
double size = le->text().toDouble( &conversionSuccess );
277-
if ( !conversionSuccess )
278-
return -1.0;
275+
double size = spin->value();
279276

280277
if ( mPaperUnitsComboBox->currentIndex() == 0 )
281278
{
@@ -300,12 +297,12 @@ void QgsCompositionWidget::applyCurrentPaperSettings()
300297
return;
301298
}
302299

303-
mPaperWidthLineEdit->setEnabled( true );
304-
mPaperHeightLineEdit->setEnabled( true );
305-
setSize( mPaperWidthLineEdit, it->mWidth );
306-
setSize( mPaperHeightLineEdit, it->mHeight );
307-
mPaperWidthLineEdit->setEnabled( false );
308-
mPaperHeightLineEdit->setEnabled( false );
300+
mPaperWidthDoubleSpinBox->setEnabled( true );
301+
mPaperHeightDoubleSpinBox->setEnabled( true );
302+
setSize( mPaperWidthDoubleSpinBox, it->mWidth );
303+
setSize( mPaperHeightDoubleSpinBox, it->mHeight );
304+
mPaperWidthDoubleSpinBox->setEnabled( false );
305+
mPaperHeightDoubleSpinBox->setEnabled( false );
309306

310307
adjustOrientation();
311308
applyWidthHeight();
@@ -314,21 +311,21 @@ void QgsCompositionWidget::applyCurrentPaperSettings()
314311

315312
void QgsCompositionWidget::applyWidthHeight()
316313
{
317-
double width = size( mPaperWidthLineEdit );
318-
double height = size( mPaperHeightLineEdit );
314+
double width = size( mPaperWidthDoubleSpinBox );
315+
double height = size( mPaperHeightDoubleSpinBox );
319316

320317
if ( width < 0 || height < 0 )
321318
return;
322319

323320
mComposition->setPaperSize( width, height );
324321
}
325322

326-
void QgsCompositionWidget::on_mPaperWidthLineEdit_editingFinished()
323+
void QgsCompositionWidget::on_mPaperWidthDoubleSpinBox_editingFinished()
327324
{
328325
applyWidthHeight();
329326
}
330327

331-
void QgsCompositionWidget::on_mPaperHeightLineEdit_editingFinished()
328+
void QgsCompositionWidget::on_mPaperHeightDoubleSpinBox_editingFinished()
332329
{
333330
applyWidthHeight();
334331
}
@@ -343,16 +340,16 @@ void QgsCompositionWidget::displayCompositionWidthHeight()
343340
//block all signals to avoid infinite recursion
344341
mPaperSizeComboBox->blockSignals( true );
345342
mPaperUnitsComboBox->blockSignals( true );
346-
mPaperWidthLineEdit->blockSignals( true );
347-
mPaperHeightLineEdit->blockSignals( true );
343+
mPaperWidthDoubleSpinBox->blockSignals( true );
344+
mPaperHeightDoubleSpinBox->blockSignals( true );
348345
mPaperOrientationComboBox->blockSignals( true );
349-
mResolutionLineEdit->blockSignals( true );
346+
mResolutionSpinBox->blockSignals( true );
350347

351348
double paperWidth = mComposition->paperWidth();
352-
setSize( mPaperWidthLineEdit, paperWidth );
349+
setSize( mPaperWidthDoubleSpinBox, paperWidth );
353350

354351
double paperHeight = mComposition->paperHeight();
355-
setSize( mPaperHeightLineEdit, paperHeight );
352+
setSize( mPaperHeightDoubleSpinBox, paperHeight );
356353

357354
//set orientation
358355
if ( paperWidth > paperHeight )
@@ -389,10 +386,10 @@ void QgsCompositionWidget::displayCompositionWidthHeight()
389386

390387
mPaperSizeComboBox->blockSignals( false );
391388
mPaperUnitsComboBox->blockSignals( false );
392-
mPaperWidthLineEdit->blockSignals( false );
393-
mPaperHeightLineEdit->blockSignals( false );
389+
mPaperWidthDoubleSpinBox->blockSignals( false );
390+
mPaperHeightDoubleSpinBox->blockSignals( false );
394391
mPaperOrientationComboBox->blockSignals( false );
395-
mResolutionLineEdit->blockSignals( false );
392+
mResolutionSpinBox->blockSignals( false );
396393
}
397394

398395
void QgsCompositionWidget::displaySnapingSettings()
@@ -403,7 +400,7 @@ void QgsCompositionWidget::displaySnapingSettings()
403400
}
404401

405402
mSnapToGridCheckBox->blockSignals( true );
406-
mResolutionSpinBox->blockSignals( true );
403+
mGridResolutionSpinBox->blockSignals( true );
407404
mOffsetXSpinBox->blockSignals( true );
408405
mOffsetYSpinBox->blockSignals( true );
409406

@@ -416,30 +413,19 @@ void QgsCompositionWidget::displaySnapingSettings()
416413
mSnapToGridCheckBox->setCheckState( Qt::Unchecked );
417414
}
418415

419-
mResolutionSpinBox->setValue( mComposition->snapGridResolution() );
416+
mGridResolutionSpinBox->setValue( mComposition->snapGridResolution() );
420417
mOffsetXSpinBox->setValue( mComposition->snapGridOffsetX() );
421418
mOffsetYSpinBox->setValue( mComposition->snapGridOffsetY() );
422419

423420
mSnapToGridCheckBox->blockSignals( false );
424-
mResolutionSpinBox->blockSignals( false );
421+
mGridResolutionSpinBox->blockSignals( false );
425422
mOffsetXSpinBox->blockSignals( false );
426423
mOffsetYSpinBox->blockSignals( false );
427424
}
428425

429-
void QgsCompositionWidget::on_mResolutionLineEdit_textChanged( const QString& text )
426+
void QgsCompositionWidget::on_mResolutionSpinBox_valueChanged( const int value )
430427
{
431-
bool conversionOk;
432-
int resolution = text.toInt( &conversionOk );
433-
if ( conversionOk && mComposition )
434-
{
435-
mComposition->setPrintResolution( resolution );
436-
}
437-
else if ( mComposition )
438-
{
439-
//set screen resolution per default
440-
QPrinter resolutionInfo( QPrinter::ScreenResolution );
441-
mComposition->setPrintResolution( resolutionInfo.resolution() );
442-
}
428+
mComposition->setPrintResolution( value );
443429
}
444430

445431
void QgsCompositionWidget::on_mPrintAsRasterCheckBox_stateChanged( int state )
@@ -474,7 +460,7 @@ void QgsCompositionWidget::on_mSnapToGridCheckBox_stateChanged( int state )
474460
}
475461
}
476462

477-
void QgsCompositionWidget::on_mResolutionSpinBox_valueChanged( double d )
463+
void QgsCompositionWidget::on_mGridResolutionSpinBox_valueChanged( double d )
478464
{
479465
if ( mComposition )
480466
{

‎src/app/composer/qgscompositionwidget.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ class QgsCompositionWidget: public QWidget, private Ui::QgsCompositionWidgetBase
4343
void on_mPaperSizeComboBox_currentIndexChanged( const QString& text );
4444
void on_mPaperUnitsComboBox_currentIndexChanged( const QString& text );
4545
void on_mPaperOrientationComboBox_currentIndexChanged( const QString& text );
46-
void on_mPaperWidthLineEdit_editingFinished();
47-
void on_mPaperHeightLineEdit_editingFinished();
48-
void on_mResolutionLineEdit_textChanged( const QString& text );
46+
void on_mPaperWidthDoubleSpinBox_editingFinished();
47+
void on_mPaperHeightDoubleSpinBox_editingFinished();
48+
void on_mResolutionSpinBox_valueChanged( const int value );
4949
void on_mPrintAsRasterCheckBox_stateChanged( int state );
5050

5151
void on_mSnapToGridCheckBox_stateChanged( int state );
52-
void on_mResolutionSpinBox_valueChanged( double d );
52+
void on_mGridResolutionSpinBox_valueChanged( double d );
5353
void on_mOffsetXSpinBox_valueChanged( double d );
5454
void on_mOffsetYSpinBox_valueChanged( double d );
5555
void on_mGridColorButton_clicked();
@@ -75,6 +75,6 @@ class QgsCompositionWidget: public QWidget, private Ui::QgsCompositionWidgetBase
7575
void createPaperEntries();
7676
void insertPaperEntries();
7777

78-
double size( QLineEdit *le );
79-
void setSize( QLineEdit *le, double v );
78+
double size( QDoubleSpinBox *spin );
79+
void setSize( QDoubleSpinBox *spin, double v );
8080
};

‎src/ui/qgscompositionwidgetbase.ui

Lines changed: 80 additions & 136 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<x>0</x>
88
<y>0</y>
99
<width>416</width>
10-
<height>620</height>
10+
<height>570</height>
1111
</rect>
1212
</property>
1313
<property name="sizePolicy">
@@ -32,9 +32,9 @@
3232
<property name="geometry">
3333
<rect>
3434
<x>0</x>
35-
<y>-72</y>
36-
<width>396</width>
37-
<height>688</height>
35+
<y>0</y>
36+
<width>393</width>
37+
<height>707</height>
3838
</rect>
3939
</property>
4040
<layout class="QGridLayout" name="gridLayout_3">
@@ -98,7 +98,7 @@
9898
<item row="3" column="0">
9999
<widget class="QComboBox" name="mPaperUnitsComboBox">
100100
<property name="enabled">
101-
<bool>false</bool>
101+
<bool>true</bool>
102102
</property>
103103
<property name="sizePolicy">
104104
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -108,51 +108,7 @@
108108
</property>
109109
</widget>
110110
</item>
111-
<item row="4" column="0">
112-
<widget class="QLabel" name="textLabel4">
113-
<property name="sizePolicy">
114-
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
115-
<horstretch>0</horstretch>
116-
<verstretch>0</verstretch>
117-
</sizepolicy>
118-
</property>
119-
<property name="text">
120-
<string>Width</string>
121-
</property>
122-
<property name="wordWrap">
123-
<bool>true</bool>
124-
</property>
125-
<property name="buddy">
126-
<cstring>mPaperWidthLineEdit</cstring>
127-
</property>
128-
</widget>
129-
</item>
130-
<item row="5" column="0">
131-
<widget class="QLineEdit" name="mPaperWidthLineEdit"/>
132-
</item>
133111
<item row="6" column="0">
134-
<widget class="QLabel" name="textLabel6">
135-
<property name="sizePolicy">
136-
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
137-
<horstretch>0</horstretch>
138-
<verstretch>0</verstretch>
139-
</sizepolicy>
140-
</property>
141-
<property name="text">
142-
<string>Height</string>
143-
</property>
144-
<property name="wordWrap">
145-
<bool>true</bool>
146-
</property>
147-
<property name="buddy">
148-
<cstring>mPaperHeightLineEdit</cstring>
149-
</property>
150-
</widget>
151-
</item>
152-
<item row="7" column="0">
153-
<widget class="QLineEdit" name="mPaperHeightLineEdit"/>
154-
</item>
155-
<item row="8" column="0">
156112
<widget class="QLabel" name="textLabel7">
157113
<property name="sizePolicy">
158114
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -171,7 +127,7 @@
171127
</property>
172128
</widget>
173129
</item>
174-
<item row="9" column="0">
130+
<item row="7" column="0">
175131
<widget class="QComboBox" name="mPaperOrientationComboBox">
176132
<property name="enabled">
177133
<bool>true</bool>
@@ -184,32 +140,49 @@
184140
</property>
185141
</widget>
186142
</item>
187-
<item row="10" column="0">
188-
<widget class="QLabel" name="mResolutionLabel">
189-
<property name="sizePolicy">
190-
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
191-
<horstretch>0</horstretch>
192-
<verstretch>0</verstretch>
193-
</sizepolicy>
194-
</property>
143+
<item row="9" column="0">
144+
<widget class="QCheckBox" name="mPrintAsRasterCheckBox">
195145
<property name="text">
196-
<string>Print quality (dpi)</string>
146+
<string>Print as raster</string>
197147
</property>
198-
<property name="wordWrap">
199-
<bool>true</bool>
148+
</widget>
149+
</item>
150+
<item row="8" column="0">
151+
<widget class="QSpinBox" name="mResolutionSpinBox">
152+
<property name="suffix">
153+
<string> dpi</string>
200154
</property>
201-
<property name="buddy">
202-
<cstring>mResolutionLineEdit</cstring>
155+
<property name="prefix">
156+
<string>Quality </string>
157+
</property>
158+
<property name="maximum">
159+
<number>3000</number>
203160
</property>
204161
</widget>
205162
</item>
206-
<item row="11" column="0">
207-
<widget class="QLineEdit" name="mResolutionLineEdit"/>
163+
<item row="4" column="0">
164+
<widget class="QDoubleSpinBox" name="mPaperWidthDoubleSpinBox">
165+
<property name="prefix">
166+
<string>Width </string>
167+
</property>
168+
<property name="suffix">
169+
<string/>
170+
</property>
171+
<property name="maximum">
172+
<double>99999.000000000000000</double>
173+
</property>
174+
</widget>
208175
</item>
209-
<item row="12" column="0">
210-
<widget class="QCheckBox" name="mPrintAsRasterCheckBox">
211-
<property name="text">
212-
<string>Print as raster</string>
176+
<item row="5" column="0">
177+
<widget class="QDoubleSpinBox" name="mPaperHeightDoubleSpinBox">
178+
<property name="prefix">
179+
<string>Height </string>
180+
</property>
181+
<property name="suffix">
182+
<string/>
183+
</property>
184+
<property name="maximum">
185+
<double>99999.000000000000000</double>
213186
</property>
214187
</widget>
215188
</item>
@@ -230,82 +203,43 @@
230203
</widget>
231204
</item>
232205
<item row="1" column="0">
233-
<widget class="QLabel" name="mResolutionLabel_2">
234-
<property name="sizePolicy">
235-
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
236-
<horstretch>0</horstretch>
237-
<verstretch>0</verstretch>
238-
</sizepolicy>
206+
<widget class="QDoubleSpinBox" name="mGridResolutionSpinBox">
207+
<property name="prefix">
208+
<string>Spacing </string>
239209
</property>
240-
<property name="text">
241-
<string>Grid resolution</string>
242-
</property>
243-
<property name="wordWrap">
244-
<bool>true</bool>
210+
<property name="suffix">
211+
<string/>
245212
</property>
246-
<property name="buddy">
247-
<cstring>mResolutionSpinBox</cstring>
213+
<property name="maximum">
214+
<double>9999.000000000000000</double>
248215
</property>
249216
</widget>
250217
</item>
251218
<item row="2" column="0">
252-
<widget class="QDoubleSpinBox" name="mResolutionSpinBox"/>
253-
</item>
254-
<item row="3" column="0">
255-
<widget class="QLabel" name="mXOffsetLabel">
256-
<property name="sizePolicy">
257-
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
258-
<horstretch>0</horstretch>
259-
<verstretch>0</verstretch>
260-
</sizepolicy>
261-
</property>
262-
<property name="text">
263-
<string>Offset x</string>
219+
<widget class="QDoubleSpinBox" name="mOffsetXSpinBox">
220+
<property name="prefix">
221+
<string>X offset </string>
264222
</property>
265-
<property name="wordWrap">
266-
<bool>true</bool>
267-
</property>
268-
<property name="buddy">
269-
<cstring>mOffsetXSpinBox</cstring>
223+
<property name="maximum">
224+
<double>9999.000000000000000</double>
270225
</property>
271226
</widget>
272227
</item>
273-
<item row="4" column="0">
274-
<widget class="QDoubleSpinBox" name="mOffsetXSpinBox"/>
275-
</item>
276-
<item row="5" column="0">
277-
<widget class="QLabel" name="mYOffsetLabel">
278-
<property name="text">
279-
<string>Offset y</string>
280-
</property>
281-
<property name="wordWrap">
282-
<bool>true</bool>
283-
</property>
284-
<property name="buddy">
285-
<cstring>mOffsetYSpinBox</cstring>
228+
<item row="3" column="0">
229+
<widget class="QDoubleSpinBox" name="mOffsetYSpinBox">
230+
<property name="prefix">
231+
<string>Y offset </string>
286232
</property>
287233
</widget>
288234
</item>
289-
<item row="6" column="0">
290-
<widget class="QDoubleSpinBox" name="mOffsetYSpinBox"/>
291-
</item>
292-
<item row="7" column="0">
293-
<widget class="QLabel" name="mPenWidthLabel">
294-
<property name="text">
295-
<string>Pen width</string>
296-
</property>
297-
<property name="wordWrap">
298-
<bool>true</bool>
299-
</property>
300-
<property name="buddy">
301-
<cstring>mPenWidthSpinBox</cstring>
235+
<item row="4" column="0">
236+
<widget class="QDoubleSpinBox" name="mPenWidthSpinBox">
237+
<property name="prefix">
238+
<string>Pen width </string>
302239
</property>
303240
</widget>
304241
</item>
305-
<item row="8" column="0">
306-
<widget class="QDoubleSpinBox" name="mPenWidthSpinBox"/>
307-
</item>
308-
<item row="9" column="0">
242+
<item row="5" column="0">
309243
<widget class="QLabel" name="mGridColorLabel">
310244
<property name="text">
311245
<string>Grid color</string>
@@ -318,7 +252,7 @@
318252
</property>
319253
</widget>
320254
</item>
321-
<item row="10" column="0">
255+
<item row="6" column="0">
322256
<widget class="QgsColorButton" name="mGridColorButton">
323257
<property name="sizePolicy">
324258
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -331,7 +265,7 @@
331265
</property>
332266
</widget>
333267
</item>
334-
<item row="11" column="0">
268+
<item row="7" column="0">
335269
<widget class="QLabel" name="mGridStyleLabel">
336270
<property name="text">
337271
<string>Grid style</string>
@@ -344,12 +278,25 @@
344278
</property>
345279
</widget>
346280
</item>
347-
<item row="12" column="0">
281+
<item row="8" column="0">
348282
<widget class="QComboBox" name="mGridStyleComboBox"/>
349283
</item>
350284
</layout>
351285
</widget>
352286
</item>
287+
<item row="2" column="0">
288+
<spacer name="verticalSpacer">
289+
<property name="orientation">
290+
<enum>Qt::Vertical</enum>
291+
</property>
292+
<property name="sizeHint" stdset="0">
293+
<size>
294+
<width>20</width>
295+
<height>40</height>
296+
</size>
297+
</property>
298+
</spacer>
299+
</item>
353300
</layout>
354301
</widget>
355302
</widget>
@@ -368,13 +315,10 @@
368315
<tabstop>scrollArea</tabstop>
369316
<tabstop>mPaperSizeComboBox</tabstop>
370317
<tabstop>mPaperUnitsComboBox</tabstop>
371-
<tabstop>mPaperWidthLineEdit</tabstop>
372-
<tabstop>mPaperHeightLineEdit</tabstop>
373318
<tabstop>mPaperOrientationComboBox</tabstop>
374-
<tabstop>mResolutionLineEdit</tabstop>
375319
<tabstop>mPrintAsRasterCheckBox</tabstop>
376320
<tabstop>mSnapToGridCheckBox</tabstop>
377-
<tabstop>mResolutionSpinBox</tabstop>
321+
<tabstop>mGridResolutionSpinBox</tabstop>
378322
<tabstop>mOffsetXSpinBox</tabstop>
379323
<tabstop>mOffsetYSpinBox</tabstop>
380324
<tabstop>mPenWidthSpinBox</tabstop>

0 commit comments

Comments
 (0)
Please sign in to comment.