Skip to content

Commit 9a7776a

Browse files
nyalldawsonnyalldawson
committedJun 6, 2013
Fix #7973 Move print as raster and resolution spin box to "paper and quality" group box, don't disable resolution spin box when print as raster is unchecked.
·
ltr-3_40archive/master_2
1 parent 46fedf9 commit 9a7776a

File tree

3 files changed

+28
-42
lines changed

3 files changed

+28
-42
lines changed
 

‎src/app/composer/qgscompositionwidget.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ QgsCompositionWidget::QgsCompositionWidget( QWidget* parent, QgsComposition* c )
4747
mResolutionSpinBox->setValue( mComposition->printResolution() );
4848

4949
//print as raster
50-
mPrintAsRasterGroupCheckBox->setChecked( mComposition->printAsRaster() );
50+
mPrintAsRasterCheckBox->setChecked( mComposition->printAsRaster() );
5151

5252
mAlignmentSnapGroupCheckBox->setChecked( mComposition->alignmentSnap() );
5353
mAlignmentToleranceSpinBox->setValue( mComposition->alignmentSnapTolerance() );
@@ -379,9 +379,9 @@ void QgsCompositionWidget::displayCompositionWidthHeight()
379379

380380
void QgsCompositionWidget::setPrintAsRasterCheckBox( bool state )
381381
{
382-
mPrintAsRasterGroupCheckBox->blockSignals( true );
383-
mPrintAsRasterGroupCheckBox->setChecked( state );
384-
mPrintAsRasterGroupCheckBox->blockSignals( false );
382+
mPrintAsRasterCheckBox->blockSignals( true );
383+
mPrintAsRasterCheckBox->setChecked( state );
384+
mPrintAsRasterCheckBox->blockSignals( false );
385385
}
386386

387387
void QgsCompositionWidget::displaySnapingSettings()
@@ -402,7 +402,7 @@ void QgsCompositionWidget::on_mResolutionSpinBox_valueChanged( const int value )
402402
mComposition->setPrintResolution( value );
403403
}
404404

405-
void QgsCompositionWidget::on_mPrintAsRasterGroupCheckBox_toggled( bool state )
405+
void QgsCompositionWidget::on_mPrintAsRasterCheckBox_toggled( bool state )
406406
{
407407
if ( !mComposition )
408408
{
@@ -518,7 +518,7 @@ void QgsCompositionWidget::blockSignals( bool block )
518518
mNumPagesSpinBox->blockSignals( block );
519519
mPaperOrientationComboBox->blockSignals( block );
520520
mResolutionSpinBox->blockSignals( block );
521-
mPrintAsRasterGroupCheckBox->blockSignals( block );
521+
mPrintAsRasterCheckBox->blockSignals( block );
522522
mSnapToGridGroupCheckBox->blockSignals( block );
523523
mGridResolutionSpinBox->blockSignals( block );
524524
mOffsetXSpinBox->blockSignals( block );

‎src/app/composer/qgscompositionwidget.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class QgsCompositionWidget: public QWidget, private Ui::QgsCompositionWidgetBase
4747
void on_mPaperHeightDoubleSpinBox_editingFinished();
4848
void on_mNumPagesSpinBox_valueChanged( int value );
4949
void on_mResolutionSpinBox_valueChanged( const int value );
50-
void on_mPrintAsRasterGroupCheckBox_toggled( bool state );
50+
void on_mPrintAsRasterCheckBox_toggled( bool state );
5151

5252
void on_mSnapToGridGroupCheckBox_toggled( bool state );
5353
void on_mGridResolutionSpinBox_valueChanged( double d );

‎src/ui/qgscompositionwidgetbase.ui

Lines changed: 21 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -223,41 +223,7 @@
223223
</property>
224224
</widget>
225225
</item>
226-
</layout>
227-
</widget>
228-
</item>
229-
<item>
230-
<widget class="QgsCollapsibleGroupBoxBasic" name="mPrintAsRasterGroupCheckBox">
231-
<property name="title">
232-
<string>Print as raster</string>
233-
</property>
234-
<property name="checkable">
235-
<bool>true</bool>
236-
</property>
237-
<property name="checked">
238-
<bool>false</bool>
239-
</property>
240-
<property name="syncGroup" stdset="0">
241-
<string notr="true">composeritem</string>
242-
</property>
243-
<property name="collapsed" stdset="0">
244-
<bool>false</bool>
245-
</property>
246-
<layout class="QFormLayout" name="formLayout_4">
247-
<property name="fieldGrowthPolicy">
248-
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
249-
</property>
250-
<property name="labelAlignment">
251-
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
252-
</property>
253-
<item row="0" column="0">
254-
<widget class="QLabel" name="label_9">
255-
<property name="text">
256-
<string>Resolution</string>
257-
</property>
258-
</widget>
259-
</item>
260-
<item row="0" column="1">
226+
<item row="6" column="1">
261227
<widget class="QSpinBox" name="mResolutionSpinBox">
262228
<property name="suffix">
263229
<string> dpi</string>
@@ -270,6 +236,26 @@
270236
</property>
271237
</widget>
272238
</item>
239+
<item row="6" column="0">
240+
<widget class="QLabel" name="label_9">
241+
<property name="text">
242+
<string>Export resolution</string>
243+
</property>
244+
</widget>
245+
</item>
246+
<item row="7" column="0" colspan="2">
247+
<widget class="QCheckBox" name="mPrintAsRasterCheckBox">
248+
<property name="text">
249+
<string>Print as raster</string>
250+
</property>
251+
<property name="checkable">
252+
<bool>true</bool>
253+
</property>
254+
<property name="checked">
255+
<bool>false</bool>
256+
</property>
257+
</widget>
258+
</item>
273259
</layout>
274260
</widget>
275261
</item>

0 commit comments

Comments
 (0)
Please sign in to comment.