66 changes: 8 additions & 58 deletions src/app/composer/qgscomposermapwidget.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,8 @@ QgsComposerMapWidget::QgsComposerMapWidget( QgsComposerMap* composerMap ): QWidg

//add widget for general composer item properties
QgsComposerItemWidget* itemPropertiesWidget = new QgsComposerItemWidget( this, composerMap );
toolBox->addItem( itemPropertiesWidget, tr( "General options" ) );
mainLayout->addWidget( itemPropertiesWidget );

mWidthLineEdit->setValidator( new QDoubleValidator( mWidthLineEdit ) );
mHeightLineEdit->setValidator( new QDoubleValidator( mHeightLineEdit ) );
mScaleLineEdit->setValidator( new QDoubleValidator( mScaleLineEdit ) );

mXMinLineEdit->setValidator( new QDoubleValidator( mXMinLineEdit ) );
Expand Down Expand Up @@ -91,47 +89,6 @@ QgsComposerMapWidget::~QgsComposerMapWidget()
{
}

void QgsComposerMapWidget::on_mWidthLineEdit_editingFinished()
{
if ( mComposerMap )
{
bool conversionSuccess = true;
double newWidth = mWidthLineEdit->text().toDouble( &conversionSuccess );
if ( !conversionSuccess )
{
return;
}
QRectF composerMapRect = mComposerMap->rect();
QTransform composerMapTransform = mComposerMap->transform();

QRectF newRect( composerMapTransform.dx(), composerMapTransform.dy(), newWidth, composerMapRect.height() );

mComposerMap->beginCommand( tr( "Change item width" ) );
mComposerMap->setSceneRect( newRect );
mComposerMap->endCommand();
}
}

void QgsComposerMapWidget::on_mHeightLineEdit_editingFinished()
{
if ( mComposerMap )
{
bool conversionSuccess = true;
double newHeight = mHeightLineEdit->text().toDouble( &conversionSuccess );
if ( !conversionSuccess )
{
return;
}
QRectF composerMapRect = mComposerMap->rect();
QTransform composerMapTransform = mComposerMap->transform();

QRectF newRect( composerMapTransform.dx(), composerMapTransform.dy(), composerMapRect.width(), newHeight );
mComposerMap->beginCommand( tr( "Change item height" ) );
mComposerMap->setSceneRect( newRect );
mComposerMap->endCommand();
}
}

void QgsComposerMapWidget::on_mPreviewModeComboBox_activated( int i )
{
Q_UNUSED( i );
Expand Down Expand Up @@ -264,15 +221,11 @@ void QgsComposerMapWidget::on_mYMaxLineEdit_editingFinished()

void QgsComposerMapWidget::setGuiElementValues()
{
mHeightLineEdit->blockSignals( true );
mWidthLineEdit->blockSignals( true );
mScaleLineEdit->blockSignals( true );
mPreviewModeComboBox->blockSignals( true );

updateGuiElements();

mHeightLineEdit->blockSignals( false );
mWidthLineEdit->blockSignals( false );
mScaleLineEdit->blockSignals( false );
mPreviewModeComboBox->blockSignals( false );
}
Expand All @@ -285,8 +238,6 @@ void QgsComposerMapWidget::updateGuiElements()

//width, height, scale
QRectF composerMapRect = mComposerMap->rect();
mWidthLineEdit->setText( QString::number( composerMapRect.width() ) );
mHeightLineEdit->setText( QString::number( composerMapRect.height() ) );
mScaleLineEdit->setText( QString::number( mComposerMap->scale(), 'f', 0 ) );

//preview mode
Expand Down Expand Up @@ -404,11 +355,11 @@ void QgsComposerMapWidget::updateGuiElements()

if ( mComposerMap->showGridAnnotation() )
{
mDrawAnnotationCheckBox->setCheckState( Qt::Checked );
mDrawAnnotationCheckableGroupBox->setChecked( true );
}
else
{
mDrawAnnotationCheckBox->setCheckState( Qt::Unchecked );
mDrawAnnotationCheckableGroupBox->setChecked( false );
}

mCoordinatePrecisionSpinBox->setValue( mComposerMap->gridAnnotationPrecision() );
Expand Down Expand Up @@ -448,8 +399,6 @@ void QgsComposerMapWidget::updateComposerExtentFromGui()

void QgsComposerMapWidget::blockAllSignals( bool b )
{
mWidthLineEdit->blockSignals( b );
mHeightLineEdit->blockSignals( b );
mScaleLineEdit->blockSignals( b );
mXMinLineEdit->blockSignals( b );
mXMaxLineEdit->blockSignals( b );
Expand All @@ -466,7 +415,7 @@ void QgsComposerMapWidget::blockAllSignals( bool b )
mSetToMapCanvasExtentButton->blockSignals( b );
mUpdatePreviewButton->blockSignals( b );
mGridLineStyleButton->blockSignals( b );
mDrawAnnotationCheckBox->blockSignals( b );
mDrawAnnotationCheckableGroupBox->blockSignals( b );
mAnnotationFontButton->blockSignals( b );
mAnnotationFormatComboBox->blockSignals( b );
mAnnotationPositionLeftComboBox->blockSignals( b );
Expand Down Expand Up @@ -812,15 +761,15 @@ void QgsComposerMapWidget::on_mAnnotationPositionBottomComboBox_currentIndexChan
handleChangedAnnotationPosition( QgsComposerMap::Bottom, text );
}

void QgsComposerMapWidget::on_mDrawAnnotationCheckBox_stateChanged( int state )
void QgsComposerMapWidget::on_mDrawAnnotationCheckableGroupBox_toggled( bool state )
{
if ( !mComposerMap )
{
return;
}

mComposerMap->beginCommand( tr( "Annotation toggled" ) );
if ( state == Qt::Checked )
if ( state )
{
mComposerMap->setShowGridAnnotation( true );
}
Expand Down Expand Up @@ -907,7 +856,8 @@ void QgsComposerMapWidget::showEvent( QShowEvent * event )

void QgsComposerMapWidget::addPageToToolbox( QWidget* widget, const QString& name )
{
toolBox->addItem( widget, name );
//TODO : wrap the widget in a collapsibleGroupBox to be more consistent with previous implementation
mainLayout->addWidget( widget );
}

void QgsComposerMapWidget::insertAnnotationPositionEntries( QComboBox* c )
Expand Down
4 changes: 1 addition & 3 deletions src/app/composer/qgscomposermapwidget.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ class QgsComposerMapWidget: public QWidget, private Ui::QgsComposerMapWidgetBase
virtual ~QgsComposerMapWidget();

public slots:
void on_mWidthLineEdit_editingFinished();
void on_mHeightLineEdit_editingFinished();
void on_mPreviewModeComboBox_activated( int i );
void on_mScaleLineEdit_editingFinished();
void on_mRotationSpinBox_valueChanged( double value );
Expand Down Expand Up @@ -78,7 +76,7 @@ class QgsComposerMapWidget: public QWidget, private Ui::QgsComposerMapWidgetBase
void on_mAnnotationDirectionComboBoxTop_currentIndexChanged( const QString& text );
void on_mAnnotationDirectionComboBoxBottom_currentIndexChanged( const QString& text );

void on_mDrawAnnotationCheckBox_stateChanged( int state );
void on_mDrawAnnotationCheckableGroupBox_toggled( bool state );
void on_mCoordinatePrecisionSpinBox_valueChanged( int value );

void on_mFrameStyleComboBox_currentIndexChanged( const QString& text );
Expand Down
45 changes: 1 addition & 44 deletions src/app/composer/qgscomposerpicturewidget.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,8 @@ QgsComposerPictureWidget::QgsComposerPictureWidget( QgsComposerPicture* picture

//add widget for general composer item properties
QgsComposerItemWidget* itemPropertiesWidget = new QgsComposerItemWidget( this, picture );
toolBox->addItem( itemPropertiesWidget, tr( "General options" ) );
mainLayout->addWidget( itemPropertiesWidget );

mWidthLineEdit->setValidator( new QDoubleValidator( this ) );
mHeightLineEdit->setValidator( new QDoubleValidator( this ) );
setGuiElementValues();

mPreviewListWidget->setIconSize( QSize( 30, 30 ) );
Expand Down Expand Up @@ -115,41 +113,6 @@ void QgsComposerPictureWidget::on_mPictureLineEdit_editingFinished()
}
}

void QgsComposerPictureWidget::on_mWidthLineEdit_editingFinished()
{
if ( mPicture )
{
QRectF pictureRect = mPicture->rect();

bool conversionOk;
double newWidth = mWidthLineEdit->text().toDouble( &conversionOk );
if ( conversionOk )
{
mPicture->beginCommand( tr( "Picture width changed" ) );
QRectF newSceneRect( mPicture->transform().dx(), mPicture->transform().dy(), newWidth, pictureRect.height() );
mPicture->setSceneRect( newSceneRect );
mPicture->endCommand();
}
}
}

void QgsComposerPictureWidget::on_mHeightLineEdit_editingFinished()
{
if ( mPicture )
{
QRectF pictureRect = mPicture->rect();

bool conversionOk;
double newHeight = mHeightLineEdit->text().toDouble( &conversionOk );
if ( conversionOk )
{
mPicture->beginCommand( tr( "Picture height changed" ) );
QRectF newSceneRect( mPicture->transform().dx(), mPicture->transform().dy(), pictureRect.width(), newHeight );
mPicture->setSceneRect( newSceneRect );
mPicture->endCommand();
}
}
}

void QgsComposerPictureWidget::on_mRotationSpinBox_valueChanged( double d )
{
Expand Down Expand Up @@ -345,17 +308,13 @@ void QgsComposerPictureWidget::setGuiElementValues()
//set initial gui values
if ( mPicture )
{
mWidthLineEdit->blockSignals( true );
mHeightLineEdit->blockSignals( true );
mRotationSpinBox->blockSignals( true );
mPictureLineEdit->blockSignals( true );
mComposerMapComboBox->blockSignals( true );
mRotationFromComposerMapCheckBox->blockSignals( true );

mPictureLineEdit->setText( mPicture->pictureFile() );
QRectF pictureRect = mPicture->rect();
mWidthLineEdit->setText( QString::number( pictureRect.width() ) );
mHeightLineEdit->setText( QString::number( pictureRect.height() ) );
mRotationSpinBox->setValue( mPicture->rotation() );

refreshMapComboBox();
Expand All @@ -381,8 +340,6 @@ void QgsComposerPictureWidget::setGuiElementValues()


mRotationFromComposerMapCheckBox->blockSignals( false );
mWidthLineEdit->blockSignals( false );
mHeightLineEdit->blockSignals( false );
mRotationSpinBox->blockSignals( false );
mPictureLineEdit->blockSignals( false );
mComposerMapComboBox->blockSignals( false );
Expand Down
2 changes: 0 additions & 2 deletions src/app/composer/qgscomposerpicturewidget.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ class QgsComposerPictureWidget: public QWidget, private Ui::QgsComposerPictureWi
void on_mPictureBrowseButton_clicked();
void on_mPictureLineEdit_editingFinished();
void on_mRotationSpinBox_valueChanged( double d );
void on_mWidthLineEdit_editingFinished();
void on_mHeightLineEdit_editingFinished();
void on_mPreviewListWidget_currentItemChanged( QListWidgetItem* current, QListWidgetItem* previous );
void on_mAddDirectoryButton_clicked();
void on_mRemoveDirectoryButton_clicked();
Expand Down
2 changes: 1 addition & 1 deletion src/app/composer/qgscomposerscalebarwidget.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ QgsComposerScaleBarWidget::QgsComposerScaleBarWidget( QgsComposerScaleBar* scale

//add widget for general composer item properties
QgsComposerItemWidget* itemPropertiesWidget = new QgsComposerItemWidget( this, scaleBar );
toolBox->addItem( itemPropertiesWidget, tr( "General options" ) );
mainLayout->addWidget( itemPropertiesWidget );

blockMemberSignals( true );

Expand Down
92 changes: 2 additions & 90 deletions src/app/composer/qgscomposershapewidget.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ QgsComposerShapeWidget::QgsComposerShapeWidget( QgsComposerShape* composerShape

//add widget for general composer item properties
QgsComposerItemWidget* itemPropertiesWidget = new QgsComposerItemWidget( this, composerShape );
toolBox->addItem( itemPropertiesWidget, tr( "General options" ) );
mainLayout->addWidget( itemPropertiesWidget );

blockAllSignals( true );

Expand All @@ -53,11 +53,7 @@ QgsComposerShapeWidget::~QgsComposerShapeWidget()
void QgsComposerShapeWidget::blockAllSignals( bool block )
{
mShapeComboBox->blockSignals( block );
mOutlineColorButton->blockSignals( block );
mOutlineWidthSpinBox->blockSignals( block );
mFillColorButton->blockSignals( block );
mRotationSpinBox->blockSignals( block );
mTransparentCheckBox->blockSignals( block );
}

void QgsComposerShapeWidget::setGuiElementValues()
Expand All @@ -68,7 +64,7 @@ void QgsComposerShapeWidget::setGuiElementValues()
}

blockAllSignals( true );
mOutlineWidthSpinBox->setValue( mComposerShape->lineWidth() );

mRotationSpinBox->setValue( mComposerShape->rotation() );
if ( mComposerShape->shapeType() == QgsComposerShape::Ellipse )
{
Expand All @@ -83,16 +79,6 @@ void QgsComposerShapeWidget::setGuiElementValues()
mShapeComboBox->setCurrentIndex( mShapeComboBox->findText( tr( "Triangle" ) ) );
}

if ( mComposerShape->transparentFill() )
{
mTransparentCheckBox->setCheckState( Qt::Checked );
mFillColorButton->setEnabled( false );
}
else
{
mTransparentCheckBox->setCheckState( Qt::Unchecked );
mFillColorButton->setEnabled( true );
}
blockAllSignals( false );
}

Expand Down Expand Up @@ -131,79 +117,5 @@ void QgsComposerShapeWidget::on_mShapeComboBox_currentIndexChanged( const QStrin
mComposerShape->endCommand();
}

void QgsComposerShapeWidget::on_mOutlineColorButton_clicked()
{
if ( !mComposerShape )
{
return;
}
QColor existingColor = mComposerShape->outlineColor();
#if QT_VERSION >= 0x040500
QColor newColor = QColorDialog::getColor( existingColor, 0, tr( "Select outline color" ), QColorDialog::ShowAlphaChannel );
#else
QColor newColor = QColorDialog::getColor( existingColor );
#endif
if ( newColor.isValid() )
{
mComposerShape->beginCommand( tr( "Shape outline color" ) );
mComposerShape->setOutlineColor( newColor );
mComposerShape->update();
mComposerShape->endCommand();
}
}

void QgsComposerShapeWidget::on_mOutlineWidthSpinBox_valueChanged( double d )
{
if ( !mComposerShape )
{
return;
}
mComposerShape->beginCommand( tr( "Shape outline width" ), QgsComposerMergeCommand::ShapeOutlineWidth );
mComposerShape->setLineWidth( d );
mComposerShape->update();
mComposerShape->endCommand();
}

void QgsComposerShapeWidget::on_mTransparentCheckBox_stateChanged( int state )
{
if ( !mComposerShape )
{
return;
}

mComposerShape->beginCommand( tr( "Shape transparency toggled" ) );
if ( state == Qt::Checked )
{
mComposerShape->setTransparentFill( true );
mFillColorButton->setEnabled( false );
}
else
{
mComposerShape->setTransparentFill( false );
mFillColorButton->setEnabled( true );
}
mComposerShape->update();
mComposerShape->endCommand();
}


void QgsComposerShapeWidget::on_mFillColorButton_clicked()
{
if ( !mComposerShape )
{
return;
}
QColor existingColor = mComposerShape->fillColor();
#if QT_VERSION >= 0x040500
QColor newColor = QColorDialog::getColor( existingColor, 0, tr( "Select fill color" ), QColorDialog::ShowAlphaChannel );
#else
QColor newColor = QColorDialog::getColor( existingColor );
#endif
if ( newColor.isValid() )
{
mComposerShape->beginCommand( tr( "Shape fill color" ) );
mComposerShape->setFillColor( newColor );
mComposerShape->update();
mComposerShape->endCommand();
}
}
4 changes: 0 additions & 4 deletions src/app/composer/qgscomposershapewidget.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,6 @@ class QgsComposerShapeWidget: public QWidget, private Ui::QgsComposerShapeWidget

private slots:
void on_mShapeComboBox_currentIndexChanged( const QString& text );
void on_mOutlineColorButton_clicked();
void on_mOutlineWidthSpinBox_valueChanged( double d );
void on_mTransparentCheckBox_stateChanged( int state );
void on_mFillColorButton_clicked();
void on_mRotationSpinBox_valueChanged( int val );

/**Sets the GUI elements to the currentValues of mComposerShape*/
Expand Down
17 changes: 6 additions & 11 deletions src/app/composer/qgscomposertablewidget.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ QgsComposerTableWidget::QgsComposerTableWidget( QgsComposerAttributeTable* table
setupUi( this );
//add widget for general composer item properties
QgsComposerItemWidget* itemPropertiesWidget = new QgsComposerItemWidget( this, mComposerTable );
mToolBox->addItem( itemPropertiesWidget, tr( "General options" ) );
mainLayout->addWidget( itemPropertiesWidget );

blockAllSignals( true );

Expand Down Expand Up @@ -288,20 +288,15 @@ void QgsComposerTableWidget::on_mGridColorButton_clicked()
mComposerTable->endCommand();
}

void QgsComposerTableWidget::on_mShowGridCheckBox_stateChanged( int state )
void QgsComposerTableWidget::on_mShowGridGroupCheckBox_toggled( bool state )
{
if ( !mComposerTable )
{
return;
}

bool showGrid = false;
if ( state == Qt::Checked )
{
showGrid = true;
}
mComposerTable->beginCommand( tr( "Table grid toggled" ) );
mComposerTable->setShowGrid( showGrid );
mComposerTable->setShowGrid( state );
mComposerTable->update();
mComposerTable->endCommand();
}
Expand Down Expand Up @@ -343,11 +338,11 @@ void QgsComposerTableWidget::updateGuiElements()
mGridColorButton->setColor( mComposerTable->gridColor() );
if ( mComposerTable->showGrid() )
{
mShowGridCheckBox->setCheckState( Qt::Checked );
mShowGridGroupCheckBox->setChecked( true );
}
else
{
mShowGridCheckBox->setCheckState( Qt::Unchecked );
mShowGridGroupCheckBox->setChecked( false );
}

if ( mComposerTable->displayOnlyVisibleFeatures() )
Expand All @@ -369,7 +364,7 @@ void QgsComposerTableWidget::blockAllSignals( bool b )
mMarginSpinBox->blockSignals( b );
mGridColorButton->blockSignals( b );
mGridStrokeWidthSpinBox->blockSignals( b );
mShowGridCheckBox->blockSignals( b );
mShowGridGroupCheckBox->blockSignals( b );
mShowOnlyVisibleFeaturesCheckBox->blockSignals( b );
}

Expand Down
2 changes: 1 addition & 1 deletion src/app/composer/qgscomposertablewidget.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class QgsComposerTableWidget: public QWidget, private Ui::QgsComposerTableWidget
void on_mGridColorButton_clicked();
void on_mHeaderFontPushButton_clicked();
void on_mContentFontPushButton_clicked();
void on_mShowGridCheckBox_stateChanged( int state );
void on_mShowGridGroupCheckBox_toggled( bool state );
void on_mShowOnlyVisibleFeaturesCheckBox_stateChanged( int state );

/**Inserts a new maximum number of features into the spin box (without the spinbox emitting a signal)*/
Expand Down
62 changes: 13 additions & 49 deletions src/app/composer/qgscompositionwidget.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,27 +47,13 @@ QgsCompositionWidget::QgsCompositionWidget( QWidget* parent, QgsComposition* c )
mResolutionSpinBox->setValue( mComposition->printResolution() );

//print as raster
if ( mComposition->printAsRaster() )
{
mPrintAsRasterCheckBox->setCheckState( Qt::Checked );
}
else
{
mPrintAsRasterCheckBox->setCheckState( Qt::Unchecked );
}
mPrintAsRasterGroupCheckBox->setChecked( mComposition->printAsRaster() );

mAlignmentSnapCheckBox->setCheckState( mComposition->alignmentSnap() ? Qt::Checked : Qt::Unchecked );
mAlignmentSnapGroupCheckBox->setChecked( mComposition->alignmentSnap() );
mAlignmentToleranceSpinBox->setValue( mComposition->alignmentSnapTolerance() );

//snap grid
if ( mComposition->snapToGridEnabled() )
{
mSnapToGridCheckBox->setCheckState( Qt::Checked );
}
else
{
mSnapToGridCheckBox->setCheckState( Qt::Unchecked );
}
mSnapToGridGroupCheckBox->setChecked( mComposition->snapToGridEnabled() );
mGridResolutionSpinBox->setValue( mComposition->snapGridResolution() );
mOffsetXSpinBox->setValue( mComposition->snapGridOffsetX() );
mOffsetYSpinBox->setValue( mComposition->snapGridOffsetY() );
Expand Down Expand Up @@ -396,15 +382,7 @@ void QgsCompositionWidget::displaySnapingSettings()
return;
}

if ( mComposition->snapToGridEnabled() )
{
mSnapToGridCheckBox->setCheckState( Qt::Checked );
}
else
{
mSnapToGridCheckBox->setCheckState( Qt::Unchecked );
}

mSnapToGridGroupCheckBox->setChecked( mComposition->snapToGridEnabled() );
mGridResolutionSpinBox->setValue( mComposition->snapGridResolution() );
mOffsetXSpinBox->setValue( mComposition->snapGridOffsetX() );
mOffsetYSpinBox->setValue( mComposition->snapGridOffsetY() );
Expand All @@ -415,35 +393,21 @@ void QgsCompositionWidget::on_mResolutionSpinBox_valueChanged( const int value )
mComposition->setPrintResolution( value );
}

void QgsCompositionWidget::on_mPrintAsRasterCheckBox_stateChanged( int state )
void QgsCompositionWidget::on_mPrintAsRasterGroupCheckBox_toggled( bool state )
{
if ( !mComposition )
{
return;
}

if ( state == Qt::Checked )
{
mComposition->setPrintAsRaster( true );
}
else
{
mComposition->setPrintAsRaster( false );
}
mComposition->setPrintAsRaster( state );
}

void QgsCompositionWidget::on_mSnapToGridCheckBox_stateChanged( int state )
void QgsCompositionWidget::on_mSnapToGridGroupCheckBox_toggled( bool state )
{
if ( mComposition )
{
if ( state == Qt::Checked )
{
mComposition->setSnapToGridEnabled( true );
}
else
{
mComposition->setSnapToGridEnabled( false );
}
mComposition->setSnapToGridEnabled( state );
}
}

Expand Down Expand Up @@ -527,11 +491,11 @@ void QgsCompositionWidget::on_mSelectionToleranceSpinBox_valueChanged( double d
}
}

void QgsCompositionWidget::on_mAlignmentSnapCheckBox_stateChanged( int state )
void QgsCompositionWidget::on_mAlignmentSnapGroupCheckBox_toggled( bool state )
{
if ( mComposition )
{
mComposition->setAlignmentSnap( state == Qt::Checked ? true : false );
mComposition->setAlignmentSnap( state );
}
}

Expand All @@ -552,15 +516,15 @@ void QgsCompositionWidget::blockSignals( bool block )
mNumPagesSpinBox->blockSignals( block );
mPaperOrientationComboBox->blockSignals( block );
mResolutionSpinBox->blockSignals( block );
mPrintAsRasterCheckBox->blockSignals( block );
mSnapToGridCheckBox->blockSignals( block );
mPrintAsRasterGroupCheckBox->blockSignals( block );
mSnapToGridGroupCheckBox->blockSignals( block );
mGridResolutionSpinBox->blockSignals( block );
mOffsetXSpinBox->blockSignals( block );
mOffsetYSpinBox->blockSignals( block );
mPenWidthSpinBox->blockSignals( block );
mGridColorButton->blockSignals( block );
mGridStyleComboBox->blockSignals( block );
mSelectionToleranceSpinBox->blockSignals( block );
mAlignmentSnapCheckBox->blockSignals( block );
mAlignmentSnapGroupCheckBox->blockSignals( block );
mAlignmentToleranceSpinBox->blockSignals( block );
}
6 changes: 3 additions & 3 deletions src/app/composer/qgscompositionwidget.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,17 +47,17 @@ class QgsCompositionWidget: public QWidget, private Ui::QgsCompositionWidgetBase
void on_mPaperHeightDoubleSpinBox_editingFinished();
void on_mNumPagesSpinBox_valueChanged( int value );
void on_mResolutionSpinBox_valueChanged( const int value );
void on_mPrintAsRasterCheckBox_stateChanged( int state );
void on_mPrintAsRasterGroupCheckBox_toggled( bool state );

void on_mSnapToGridCheckBox_stateChanged( int state );
void on_mSnapToGridGroupCheckBox_toggled( bool state );
void on_mGridResolutionSpinBox_valueChanged( double d );
void on_mOffsetXSpinBox_valueChanged( double d );
void on_mOffsetYSpinBox_valueChanged( double d );
void on_mGridColorButton_clicked();
void on_mGridStyleComboBox_currentIndexChanged( const QString& text );
void on_mPenWidthSpinBox_valueChanged( double d );
void on_mSelectionToleranceSpinBox_valueChanged( double d );
void on_mAlignmentSnapCheckBox_stateChanged( int state );
void on_mAlignmentSnapGroupCheckBox_toggled( bool state );
void on_mAlignmentToleranceSpinBox_valueChanged( double d );

/**Sets GUI elements to width/height from composition*/
Expand Down
247 changes: 0 additions & 247 deletions src/app/composer/qgsitempositiondialog.cpp
View file

This file was deleted.

63 changes: 0 additions & 63 deletions src/app/composer/qgsitempositiondialog.h
View file

This file was deleted.

13 changes: 12 additions & 1 deletion src/core/composer/qgscomposeritem.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ QgsComposerItem::QgsComposerItem( QgsComposition* composition, bool manageZValue
, mItemPositionLocked( false )
, mLastValidViewScaleFactor( -1 )
, mRotation( 0 )
, mLastUsedPositionMode( UpperLeft )
{
init( manageZValue );
}
Expand All @@ -66,6 +67,7 @@ QgsComposerItem::QgsComposerItem( qreal x, qreal y, qreal width, qreal height, Q
, mItemPositionLocked( false )
, mLastValidViewScaleFactor( -1 )
, mRotation( 0 )
, mLastUsedPositionMode( UpperLeft )
{
init( manageZValue );
QTransform t;
Expand Down Expand Up @@ -147,6 +149,7 @@ bool QgsComposerItem::_writeXML( QDomElement& itemElem, QDomDocument& doc ) cons
composerItemElem.setAttribute( "y", QString::number( transform().dy() ) );
composerItemElem.setAttribute( "width", QString::number( rect().width() ) );
composerItemElem.setAttribute( "height", QString::number( rect().height() ) );
composerItemElem.setAttribute( "positionMode", QString::number( (int) mLastUsedPositionMode ) );
composerItemElem.setAttribute( "zValue", QString::number( zValue() ) );
composerItemElem.setAttribute( "outlineWidth", QString::number( pen().widthF() ) );
composerItemElem.setAttribute( "rotation", QString::number( mRotation ) );
Expand Down Expand Up @@ -236,12 +239,17 @@ bool QgsComposerItem::_readXML( const QDomElement& itemElem, const QDomDocument&

//position
double x, y, width, height;
bool xOk, yOk, widthOk, heightOk;
bool xOk, yOk, widthOk, heightOk, positionModeOK;

x = itemElem.attribute( "x" ).toDouble( &xOk );
y = itemElem.attribute( "y" ).toDouble( &yOk );
width = itemElem.attribute( "width" ).toDouble( &widthOk );
height = itemElem.attribute( "height" ).toDouble( &heightOk );
mLastUsedPositionMode = ( ItemPositionMode )itemElem.attribute( "positionMode" ).toInt( &positionModeOK );
if ( !positionModeOK )
{
mLastUsedPositionMode = UpperLeft;
}

if ( !xOk || !yOk || !widthOk || !heightOk )
{
Expand Down Expand Up @@ -771,6 +779,9 @@ void QgsComposerItem::setItemPosition( double x, double y, double width, double
double upperLeftX = x;
double upperLeftY = y;

//store the item position mode
mLastUsedPositionMode = itemPoint;

//adjust x-coordinate if placement is not done to a left point
if ( itemPoint == UpperMiddle || itemPoint == Middle || itemPoint == LowerMiddle )
{
Expand Down
10 changes: 10 additions & 0 deletions src/core/composer/qgscomposeritem.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,11 @@ class CORE_EXPORT QgsComposerItem: public QObject, public QGraphicsRectItem
@note: this method was added in version 1.6*/
void setItemPosition( double x, double y, double width, double height, ItemPositionMode itemPoint = UpperLeft );

/**Returns item's last used position mode.
@note: This property has no effect on actual's item position, which is always the top-left corner.
@note: this method was added in version 2.0*/
ItemPositionMode lastUsedPositionMode(){ return mLastUsedPositionMode; }

/**Sets this items bound in scene coordinates such that 1 item size units
corresponds to 1 scene size unit*/
virtual void setSceneRect( const QRectF& rectangle );
Expand Down Expand Up @@ -290,6 +295,7 @@ class CORE_EXPORT QgsComposerItem: public QObject, public QGraphicsRectItem
/**True if item background needs to be painted*/
bool mBackground;


/**True if item position and size cannot be changed with mouse move
@note: this member was added in version 1.2*/
bool mItemPositionLocked;
Expand All @@ -300,6 +306,10 @@ class CORE_EXPORT QgsComposerItem: public QObject, public QGraphicsRectItem
/**Item rotation in degrees, clockwise*/
double mRotation;

/**The item's position mode
@note: this member was added in version 2.0*/
ItemPositionMode mLastUsedPositionMode;

//event handlers
virtual void mouseMoveEvent( QGraphicsSceneMouseEvent * event );
virtual void mousePressEvent( QGraphicsSceneMouseEvent * event );
Expand Down
187 changes: 47 additions & 140 deletions src/core/composer/qgscomposershape.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,13 @@

QgsComposerShape::QgsComposerShape( QgsComposition* composition ): QgsComposerItem( composition ), mShape( Ellipse )
{
initGraphicsSettings();
setFrameEnabled(true);
}

QgsComposerShape::QgsComposerShape( qreal x, qreal y, qreal width, qreal height, QgsComposition* composition ): QgsComposerItem( x, y, width, height, composition ), mShape( Ellipse )
{
setSceneRect( QRectF( x, y, width, height ) );
mShapeWidth = width;
mShapeHeight = height;
initGraphicsSettings();
setFrameEnabled(true);
}

QgsComposerShape::~QgsComposerShape()
Expand All @@ -45,110 +43,80 @@ void QgsComposerShape::paint( QPainter* painter, const QStyleOptionGraphicsItem*
return;
}
drawBackground( painter );
drawFrame( painter );

if ( isSelected() )
{
drawSelectionBoxes( painter );
}
}


painter->save();
painter->setRenderHint( QPainter::Antialiasing );
painter->setPen( mPen );
painter->setBrush( mBrush );
void QgsComposerShape::drawShape( QPainter* p )
{

painter->translate( rect().width() / 2.0, rect().height() / 2.0 );
painter->rotate( mRotation );
painter->translate( -mShapeWidth / 2.0, -mShapeHeight / 2.0 );
p->save();
p->setRenderHint( QPainter::Antialiasing );

double halfPenWidth = mPen.widthF() / 2.0;
p->translate( rect().width() / 2.0, rect().height() / 2.0 );
p->rotate( mRotation );
p->translate( -rect().width() / 2.0, -rect().height() / 2.0 );

switch ( mShape )
{
case Ellipse:
painter->drawEllipse( QRectF( halfPenWidth, halfPenWidth , mShapeWidth - mPen.widthF(), mShapeHeight - mPen.widthF() ) );
p->drawEllipse( QRectF( 0, 0 , rect().width(), rect().height() ) );
break;
case Rectangle:
painter->drawRect( QRectF( halfPenWidth, halfPenWidth , mShapeWidth - mPen.widthF(), mShapeHeight - mPen.widthF() ) );
p->drawRect( QRectF( 0, 0 , rect().width(), rect().height() ) );
break;
case Triangle:
QPolygonF triangle;
triangle << QPointF( halfPenWidth, mShapeHeight - halfPenWidth );
triangle << QPointF( mShapeWidth - halfPenWidth, mShapeHeight - halfPenWidth );
triangle << QPointF( mShapeWidth / 2.0, halfPenWidth );
painter->drawPolygon( triangle );
triangle << QPointF( 0, rect().height() );
triangle << QPointF( rect().width() , rect().height() );
triangle << QPointF( rect().width() / 2.0, 0 );
p->drawPolygon( triangle );
break;
}
p->restore();

painter->restore();
}

drawFrame( painter );
if ( isSelected() )

void QgsComposerShape::drawFrame( QPainter* p )
{
if ( mFrame && p )
{
drawSelectionBoxes( painter );
p->setPen( pen() );
p->setBrush( Qt::NoBrush );
p->setRenderHint( QPainter::Antialiasing, true );
drawShape( p );
}
}

void QgsComposerShape::drawBackground( QPainter* p )
{
if ( mBackground && p )
{
p->setBrush( brush() );//this causes a problem in atlas generation
p->setPen( Qt::NoPen );
p->setRenderHint( QPainter::Antialiasing, true );
drawShape( p );
}
}


bool QgsComposerShape::writeXML( QDomElement& elem, QDomDocument & doc ) const
{
QDomElement composerShapeElem = doc.createElement( "ComposerShape" );
composerShapeElem.setAttribute( "shapeType", mShape );
composerShapeElem.setAttribute( "outlineWidth", QString::number( mPen.widthF() ) );
composerShapeElem.setAttribute( "transparentFill", mBrush.style() == Qt::NoBrush );
composerShapeElem.setAttribute( "shapeWidth", QString::number( mShapeWidth ) );
composerShapeElem.setAttribute( "shapeHeight", QString::number( mShapeHeight ) );
QDomElement outlineColorElem = doc.createElement( "OutlineColor" );
outlineColorElem.setAttribute( "red", mPen.color().red() );
outlineColorElem.setAttribute( "green", mPen.color().green() );
outlineColorElem.setAttribute( "blue", mPen.color().blue() );
outlineColorElem.setAttribute( "alpha", mPen.color().alpha() );
composerShapeElem.appendChild( outlineColorElem );
QDomElement fillColorElem = doc.createElement( "FillColor" );
fillColorElem.setAttribute( "red", mBrush.color().red() );
fillColorElem.setAttribute( "green", mBrush.color().green() );
fillColorElem.setAttribute( "blue", mBrush.color().blue() );
fillColorElem.setAttribute( "alpha", mBrush.color().alpha() );
composerShapeElem.appendChild( fillColorElem );
elem.appendChild( composerShapeElem );
return _writeXML( composerShapeElem, doc );
}

bool QgsComposerShape::readXML( const QDomElement& itemElem, const QDomDocument& doc )
{
mShape = QgsComposerShape::Shape( itemElem.attribute( "shapeType", "0" ).toInt() );
mShapeWidth = itemElem.attribute( "shapeWidth", "10" ).toDouble();
mShapeHeight = itemElem.attribute( "shapeHeight", "10" ).toDouble();
mPen.setWidthF( itemElem.attribute( "outlineWidth", "0.4" ).toDouble() );

//transparent fill
bool transparent = itemElem.attribute( "transparentFill", "1" ).toInt() == 1;
if ( transparent )
{
mBrush.setStyle( Qt::NoBrush );
}
else
{
mBrush.setStyle( Qt::SolidPattern );
}

//outline color
QDomNodeList outlineColorList = itemElem.elementsByTagName( "OutlineColor" );
if ( outlineColorList.size() > 0 )
{
QDomElement outlineColorElem = outlineColorList.at( 0 ).toElement();
int penRed = outlineColorElem.attribute( "red", "0" ).toInt();
int penGreen = outlineColorElem.attribute( "green", "0" ).toInt();
int penBlue = outlineColorElem.attribute( "blue", "0" ).toInt();
int penAlpha = outlineColorElem.attribute( "alpha", "255" ).toInt();
mPen.setColor( QColor( penRed, penGreen, penBlue, penAlpha ) );
}

//fill color
QDomNodeList fillNodeList = itemElem.elementsByTagName( "FillColor" );
if ( fillNodeList.size() > 0 )
{
QDomElement fillColorElem = fillNodeList.at( 0 ).toElement();
int brushRed = fillColorElem.attribute( "red", "0" ).toInt();
int brushGreen = fillColorElem.attribute( "green", "0" ).toInt();
int brushBlue = fillColorElem.attribute( "blue", "0" ).toInt();
int brushAlpha = fillColorElem.attribute( "alpha", "255" ).toInt();
mBrush.setColor( QColor( brushRed, brushGreen, brushBlue, brushAlpha ) );
}


//restore general composer item properties
QDomNodeList composerItemList = itemElem.elementsByTagName( "ComposerItem" );
Expand All @@ -161,71 +129,12 @@ bool QgsComposerShape::readXML( const QDomElement& itemElem, const QDomDocument&
return true;
}

void QgsComposerShape::setLineWidth( double width )
{
mPen.setWidthF( width );
}

double QgsComposerShape::lineWidth() const
{
return mPen.widthF();
}

void QgsComposerShape::setOutlineColor( const QColor& color )
{
mPen.setColor( color );
}

QColor QgsComposerShape::outlineColor() const
{
return mPen.color();
}

void QgsComposerShape::setFillColor( const QColor& color )
{
mBrush.setColor( color );
}

QColor QgsComposerShape::fillColor() const
{
return mBrush.color();
}

bool QgsComposerShape::transparentFill() const
{
return mBrush.style() == Qt::NoBrush;
}

void QgsComposerShape::setTransparentFill( bool transparent )
{
if ( transparent )
{
mBrush.setStyle( Qt::NoBrush );
}
else
{
mBrush.setStyle( Qt::SolidPattern );
}
}

void QgsComposerShape::initGraphicsSettings()
{
mPen.setColor( QColor( 0, 0, 0 ) );
mPen.setWidthF( 1 );
mPen.setJoinStyle( Qt::RoundJoin );
mBrush.setColor( QColor( 0, 0, 0 ) );
mBrush.setStyle( Qt::NoBrush );

//set composer item brush and pen to transparent white by default
setPen( QPen( QColor( 255, 255, 255, 0 ) ) );
setBrush( QBrush( QColor( 255, 255, 255, 0 ) ) );
}

void QgsComposerShape::setRotation( double r )
{
//adapt rectangle size
double width = mShapeWidth;
double height = mShapeHeight;
double width = rect().width();
double height = rect().height();
sizeChangedByRotation( width, height );

//adapt scene rect to have the same center and the new width / height
Expand All @@ -246,8 +155,6 @@ void QgsComposerShape::setSceneRect( const QRectF& rectangle )
double newShapeWidth = rectangle.width();
double newShapeHeight = rectangle.height();
imageSizeConsideringRotation( newShapeWidth, newShapeHeight );
mShapeWidth = newShapeWidth;
mShapeHeight = newShapeHeight;
}

QgsComposerItem::setSceneRect( rectangle );
Expand Down
29 changes: 12 additions & 17 deletions src/core/composer/qgscomposershape.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,8 @@ class CORE_EXPORT QgsComposerShape: public QgsComposerItem
bool readXML( const QDomElement& itemElem, const QDomDocument& doc );

//setters and getters
void setLineWidth( double width );
double lineWidth() const;
void setOutlineColor( const QColor& color );
QColor outlineColor() const;
void setFillColor( const QColor& color );
QColor fillColor() const;
QgsComposerShape::Shape shapeType() const {return mShape;}
void setShapeType( QgsComposerShape::Shape s ) {mShape = s;}
bool transparentFill() const;
void setTransparentFill( bool transparent );

/**Sets this items bound in scene coordinates such that 1 item size units
corresponds to 1 scene size unit. Also, the shape is scaled*/
Expand All @@ -75,18 +67,21 @@ class CORE_EXPORT QgsComposerShape: public QgsComposerItem
/**Sets item rotation and resizes item bounds such that the shape always has the same size*/
virtual void setRotation( double r );


protected:
/* reimplement drawFrame, since it's not a rect, but a custom shape */
virtual void drawFrame( QPainter* p );
/* reimplement drawBackground, since it's not a rect, but a custom shape */
virtual void drawBackground( QPainter* p );


private:
/**Ellipse, rectangle or triangle*/
Shape mShape;
/**Shape outline*/
QPen mPen;
/**Shape fill*/
QBrush mBrush;
double mShapeWidth;
double mShapeHeight;

/**Apply default graphics settings*/
void initGraphicsSettings();

/* draws the custom shape */
void drawShape( QPainter* p );


/**Returns a point on the line from startPoint to directionPoint that is a certain distance away from the starting point*/
QPointF pointOnLineWithDistance( const QPointF& startPoint, const QPointF& directionPoint, double distance ) const;
Expand Down
4 changes: 2 additions & 2 deletions src/core/composer/qgscomposition.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@

QgsComposition::QgsComposition( QgsMapRenderer* mapRenderer ) :
QGraphicsScene( 0 ), mMapRenderer( mapRenderer ), mPlotStyle( QgsComposition::Preview ), mPageWidth( 297 ), mPageHeight( 210 ), mSpaceBetweenPages( 10 ), mPrintAsRaster( false ), mSelectionTolerance( 0.0 ),
mSnapToGrid( false ), mSnapGridResolution( 0.0 ), mSnapGridOffsetX( 0.0 ), mSnapGridOffsetY( 0.0 ), mAlignmentSnap( true ), mAlignmentSnapTolerance( 2 ),
mSnapToGrid( false ), mSnapGridResolution( 10.0 ), mSnapGridOffsetX( 0.0 ), mSnapGridOffsetY( 0.0 ), mAlignmentSnap( true ), mAlignmentSnapTolerance( 2 ),
mActiveItemCommand( 0 ), mActiveMultiFrameCommand( 0 ), mAtlasComposition( this )
{
setBackgroundBrush( Qt::gray );
Expand All @@ -61,7 +61,7 @@ QgsComposition::QgsComposition( QgsMapRenderer* mapRenderer ) :

QgsComposition::QgsComposition():
QGraphicsScene( 0 ), mMapRenderer( 0 ), mPlotStyle( QgsComposition::Preview ), mPageWidth( 297 ), mPageHeight( 210 ), mSpaceBetweenPages( 10 ), mPrintAsRaster( false ),
mSelectionTolerance( 0.0 ), mSnapToGrid( false ), mSnapGridResolution( 0.0 ), mSnapGridOffsetX( 0.0 ), mSnapGridOffsetY( 0.0 ), mAlignmentSnap( true ),
mSelectionTolerance( 0.0 ), mSnapToGrid( false ), mSnapGridResolution( 10.0 ), mSnapGridOffsetX( 0.0 ), mSnapGridOffsetY( 0.0 ), mAlignmentSnap( true ),
mAlignmentSnapTolerance( 2 ), mActiveItemCommand( 0 ), mActiveMultiFrameCommand( 0 ), mAtlasComposition( this )
{
loadSettings();
Expand Down
199 changes: 124 additions & 75 deletions src/ui/qgscomposerarrowwidgetbase.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,70 +6,145 @@
<rect>
<x>0</x>
<y>0</y>
<width>232</width>
<height>430</height>
<width>469</width>
<height>689</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<widget class="QToolBox" name="toolBox">
<property name="currentIndex">
<number>0</number>
<layout class="QHBoxLayout" name="horizontalLayout_5">
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QScrollArea" name="scrollArea">
<property name="widgetResizable">
<bool>true</bool>
</property>
<widget class="QWidget" name="page">
<widget class="QWidget" name="scrollAreaWidgetContents">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>214</width>
<height>383</height>
<width>467</width>
<height>687</height>
</rect>
</property>
<attribute name="label">
<string>Arrow</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_2">
<property name="margin">
<number>3</number>
</property>
<item row="0" column="0">
<widget class="QPushButton" name="mArrowColorButton">
<property name="text">
<string>Arrow color...</string>
<layout class="QVBoxLayout" name="mainLayout">
<item>
<widget class="QgsCollapsibleGroupBoxBasic" name="groupBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QDoubleSpinBox" name="mOutlineWidthSpinBox">
<property name="prefix">
<string>Line width </string>
<property name="title">
<string>Main properties</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QDoubleSpinBox" name="mArrowHeadWidthSpinBox">
<property name="prefix">
<string>Arrow head width </string>
<property name="collapsed" stdset="0">
<bool>false</bool>
</property>
<layout class="QFormLayout" name="formLayout_2">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="1" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Line width</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QDoubleSpinBox" name="mOutlineWidthSpinBox">
<property name="prefix">
<string/>
</property>
<property name="suffix">
<string> mm</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Arrow head width</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QDoubleSpinBox" name="mArrowHeadWidthSpinBox">
<property name="prefix">
<string/>
</property>
<property name="suffix">
<string> mm</string>
</property>
</widget>
</item>
<item row="0" column="0" colspan="2">
<widget class="QPushButton" name="mArrowColorButton">
<property name="text">
<string>Arrow color...</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="3" column="0">
<widget class="QGroupBox" name="mArrowMarkersGroupBox">
<item>
<widget class="QgsCollapsibleGroupBoxBasic" name="mArrowMarkersGroupBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string>Arrow markers</string>
</property>
<property name="collapsed" stdset="0">
<bool>true</bool>
</property>
<layout class="QFormLayout" name="formLayout">
<item row="3" column="0">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="0" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QRadioButton" name="mDefaultMarkerRadioButton">
<property name="text">
<string>Default</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="mNoMarkerRadioButton">
<property name="text">
<string>None</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="mSvgMarkerRadioButton">
<property name="text">
<string>SVG</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0">
<widget class="QLabel" name="mStartMarkerLabel">
<property name="text">
<string>Start marker</string>
</property>
</widget>
</item>
<item row="3" column="1">
<item row="1" column="1">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLineEdit" name="mStartMarkerLineEdit"/>
Expand All @@ -83,14 +158,14 @@
</item>
</layout>
</item>
<item row="2" column="0" colspan="2">
<widget class="QRadioButton" name="mSvgMarkerRadioButton">
<item row="2" column="0">
<widget class="QLabel" name="mEndMarkerLabel">
<property name="text">
<string>SVG markers</string>
<string>End marker</string>
</property>
</widget>
</item>
<item row="4" column="1">
<item row="2" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLineEdit" name="mEndMarkerLineEdit"/>
Expand All @@ -104,49 +179,23 @@
</item>
</layout>
</item>
<item row="4" column="0">
<widget class="QLabel" name="mEndMarkerLabel">
<property name="text">
<string>End marker</string>
</property>
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="QRadioButton" name="mNoMarkerRadioButton">
<property name="text">
<string>No marker</string>
</property>
</widget>
</item>
<item row="0" column="0" colspan="2">
<widget class="QRadioButton" name="mDefaultMarkerRadioButton">
<property name="text">
<string>Default marker</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="4" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>62</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>QgsCollapsibleGroupBoxBasic</class>
<extends>QGroupBox</extends>
<header location="global">qgscollapsiblegroupbox.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>
111 changes: 64 additions & 47 deletions src/ui/qgscomposerhtmlwidgetbase.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,70 +6,79 @@
<rect>
<x>0</x>
<y>0</y>
<width>243</width>
<height>153</height>
<width>409</width>
<height>370</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<property name="margin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QToolBox" name="mToolBox">
<property name="currentIndex">
<number>0</number>
<widget class="QScrollArea" name="scrollArea">
<property name="widgetResizable">
<bool>true</bool>
</property>
<widget class="QWidget" name="page">
<widget class="QWidget" name="scrollAreaWidgetContents">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>221</width>
<height>100</height>
<width>407</width>
<height>368</height>
</rect>
</property>
<attribute name="label">
<string>HTML</string>
</attribute>
<layout class="QGridLayout" name="gridLayout">
<item row="2" column="2">
<widget class="QToolButton" name="mFileToolButton">
<property name="text">
<string>...</string>
<layout class="QVBoxLayout" name="mainLayout">
<item>
<widget class="QgsCollapsibleGroupBoxBasic" name="groupBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLineEdit" name="mUrlLineEdit"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="mUrlLabel">
<property name="text">
<string>URL</string>
<property name="title">
<string>Main properties</string>
</property>
</widget>
</item>
<item row="0" column="1" colspan="2">
<widget class="QComboBox" name="mResizeModeComboBox"/>
</item>
<item row="3" column="1">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="0">
<widget class="QLabel" name="mResizeModeLabel">
<property name="text">
<string>Resize mode</string>
<property name="collapsed" stdset="0">
<bool>false</bool>
</property>
<layout class="QFormLayout" name="formLayout">
<item row="2" column="0">
<widget class="QLabel" name="mResizeModeLabel">
<property name="text">
<string>Resize mode</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QComboBox" name="mResizeModeComboBox"/>
</item>
<item row="0" column="1">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLineEdit" name="mUrlLineEdit"/>
</item>
<item>
<widget class="QToolButton" name="mFileToolButton">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="0" column="0">
<widget class="QLabel" name="mUrlLabel">
<property name="text">
<string>URL</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
Expand All @@ -78,6 +87,14 @@
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>QgsCollapsibleGroupBoxBasic</class>
<extends>QGroupBox</extends>
<header location="global">qgscollapsiblegroupbox.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>
393 changes: 316 additions & 77 deletions src/ui/qgscomposeritemwidgetbase.ui
View file

Large diffs are not rendered by default.

428 changes: 255 additions & 173 deletions src/ui/qgscomposerlabelwidgetbase.ui
View file

Large diffs are not rendered by default.

1,049 changes: 587 additions & 462 deletions src/ui/qgscomposerlegendwidgetbase.ui
View file

Large diffs are not rendered by default.

1,158 changes: 530 additions & 628 deletions src/ui/qgscomposermapwidgetbase.ui
View file

Large diffs are not rendered by default.

278 changes: 102 additions & 176 deletions src/ui/qgscomposerpicturewidgetbase.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>327</width>
<width>331</width>
<height>614</height>
</rect>
</property>
Expand All @@ -19,95 +19,52 @@
<property name="windowTitle">
<string>Picture Options</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="margin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QToolBox" name="toolBox">
<property name="currentIndex">
<number>0</number>
<item>
<widget class="QScrollArea" name="scrollArea">
<property name="widgetResizable">
<bool>true</bool>
</property>
<widget class="QWidget" name="page">
<widget class="QWidget" name="scrollAreaWidgetContents">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>317</width>
<height>577</height>
<width>329</width>
<height>612</height>
</rect>
</property>
<attribute name="label">
<string>Picture options</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="margin">
<number>3</number>
</property>
<layout class="QVBoxLayout" name="mainLayout">
<item>
<widget class="QGroupBox" name="mPreviewGroupBox">
<widget class="QgsCollapsibleGroupBoxBasic" name="mPreviewGroupBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string>Preloaded images</string>
<string>Main properties</string>
</property>
<layout class="QGridLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QListWidget" name="mPreviewListWidget">
<property name="showDropIndicator" stdset="0">
<bool>false</bool>
</property>
<property name="dragDropMode">
<enum>QAbstractItemView::DragDrop</enum>
</property>
<property name="movement">
<enum>QListView::Free</enum>
</property>
<property name="flow">
<enum>QListView::LeftToRight</enum>
</property>
<property name="isWrapping" stdset="0">
<bool>true</bool>
</property>
<property name="resizeMode">
<enum>QListView::Adjust</enum>
</property>
<property name="gridSize">
<size>
<width>30</width>
<height>30</height>
</size>
</property>
<property name="viewMode">
<enum>QListView::IconMode</enum>
<property name="collapsed" stdset="0">
<bool>false</bool>
</property>
<layout class="QFormLayout" name="formLayout_2">
<item row="1" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Path</string>
</property>
<property name="wordWrap">
<bool>true</bool>
<property name="buddy">
<cstring>mPictureLineEdit</cstring>
</property>
</widget>
</item>
<item row="1" column="0">
<item row="1" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Load another</string>
</property>
<property name="buddy">
<cstring>mPictureLineEdit</cstring>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="mPictureLineEdit"/>
</item>
Expand Down Expand Up @@ -136,146 +93,110 @@
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox">
<widget class="QgsCollapsibleGroupBoxBasic" name="mSearchDirectoriesGroupBox">
<property name="title">
<string>Options</string>
<string>Search directories</string>
</property>
<layout class="QFormLayout" name="formLayout">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<property name="margin">
<number>3</number>
</property>
<item row="3" column="0">
<widget class="QLabel" name="textLabel3">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Width</string>
</property>
<property name="wordWrap">
<bool>true</bool>
<property name="collapsed" stdset="0">
<bool>false</bool>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QListWidget" name="mPreviewListWidget">
<property name="showDropIndicator" stdset="0">
<bool>false</bool>
</property>
<property name="buddy">
<cstring>mWidthLineEdit</cstring>
<property name="dragDropMode">
<enum>QAbstractItemView::DragDrop</enum>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="textLabel4">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
<property name="movement">
<enum>QListView::Free</enum>
</property>
<property name="text">
<string>Height</string>
<property name="flow">
<enum>QListView::LeftToRight</enum>
</property>
<property name="wordWrap">
<property name="isWrapping" stdset="0">
<bool>true</bool>
</property>
<property name="buddy">
<cstring>mHeightLineEdit</cstring>
<property name="resizeMode">
<enum>QListView::Adjust</enum>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QLineEdit" name="mHeightLineEdit"/>
</item>
<item row="6" column="0">
<widget class="QLabel" name="mRotationLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
<property name="gridSize">
<size>
<width>30</width>
<height>30</height>
</size>
</property>
<property name="text">
<string>Rotation</string>
<property name="viewMode">
<enum>QListView::IconMode</enum>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="buddy">
<cstring>mRotationSpinBox</cstring>
</property>
</widget>
</item>
<item row="8" column="0">
<widget class="QCheckBox" name="mRotationFromComposerMapCheckBox">
<property name="text">
<string>Sync with map</string>
</property>
</widget>
<item>
<widget class="QComboBox" name="mSearchDirectoriesComboBox"/>
</item>
<item row="6" column="1">
<widget class="QDoubleSpinBox" name="mRotationSpinBox">
<property name="maximum">
<double>360.000000000000000</double>
</property>
</widget>
</item>
<item row="8" column="1">
<widget class="QComboBox" name="mComposerMapComboBox"/>
</item>
<item row="3" column="1">
<widget class="QLineEdit" name="mWidthLineEdit"/>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QPushButton" name="mRemoveDirectoryButton">
<property name="text">
<string>Remove</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="mAddDirectoryButton">
<property name="text">
<string>Add...</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="mSearchDirectoriesGroupBox">
<widget class="QgsCollapsibleGroupBoxBasic" name="groupBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string>Search directories</string>
<string>Rotation</string>
</property>
<layout class="QGridLayout">
<item row="0" column="0" colspan="3">
<widget class="QComboBox" name="mSearchDirectoriesComboBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<property name="collapsed" stdset="0">
<bool>true</bool>
</property>
<layout class="QFormLayout" name="formLayout">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<property name="margin">
<number>3</number>
</property>
<item row="1" column="0">
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>101</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="1">
<widget class="QPushButton" name="mAddDirectoryButton">
<widget class="QCheckBox" name="mRotationFromComposerMapCheckBox">
<property name="text">
<string>Add...</string>
<string>Sync with map</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QPushButton" name="mRemoveDirectoryButton">
<property name="text">
<string>Remove</string>
<item row="1" column="1">
<widget class="QComboBox" name="mComposerMapComboBox"/>
</item>
<item row="0" column="0" colspan="2">
<widget class="QDoubleSpinBox" name="mRotationSpinBox">
<property name="suffix">
<string> °</string>
</property>
<property name="maximum">
<double>360.000000000000000</double>
</property>
</widget>
</item>
Expand All @@ -289,11 +210,16 @@
</layout>
</widget>
<layoutdefault spacing="6" margin="11"/>
<customwidgets>
<customwidget>
<class>QgsCollapsibleGroupBoxBasic</class>
<extends>QGroupBox</extends>
<header location="global">qgscollapsiblegroupbox.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>mSearchDirectoriesComboBox</tabstop>
<tabstop>mAddDirectoryButton</tabstop>
<tabstop>mRemoveDirectoryButton</tabstop>
<tabstop>mPreviewListWidget</tabstop>
<tabstop>mPictureLineEdit</tabstop>
<tabstop>mPictureBrowseButton</tabstop>
<tabstop>mRotationFromComposerMapCheckBox</tabstop>
Expand Down
611 changes: 366 additions & 245 deletions src/ui/qgscomposerscalebarwidgetbase.ui
View file

Large diffs are not rendered by default.

120 changes: 59 additions & 61 deletions src/ui/qgscomposershapewidgetbase.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,85 +13,83 @@
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<widget class="QToolBox" name="toolBox">
<property name="currentIndex">
<number>0</number>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QScrollArea" name="scrollArea">
<property name="widgetResizable">
<bool>true</bool>
</property>
<widget class="QWidget" name="Shape">
<widget class="QWidget" name="scrollAreaWidgetContents">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>267</width>
<height>377</height>
<width>283</width>
<height>425</height>
</rect>
</property>
<attribute name="label">
<string>Shape</string>
</attribute>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QComboBox" name="mShapeComboBox"/>
</item>
<item row="1" column="0">
<widget class="QPushButton" name="mOutlineColorButton">
<property name="text">
<string>Shape outline color...</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QDoubleSpinBox" name="mOutlineWidthSpinBox">
<property name="prefix">
<string>Outline width </string>
<layout class="QVBoxLayout" name="mainLayout">
<item>
<widget class="QgsCollapsibleGroupBoxBasic" name="groupBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QCheckBox" name="mTransparentCheckBox">
<property name="text">
<string>Transparent fill</string>
<property name="title">
<string>Main properties</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QPushButton" name="mFillColorButton">
<property name="text">
<string>Shape fill Color...</string>
<property name="collapsed" stdset="0">
<bool>false</bool>
</property>
<layout class="QFormLayout" name="formLayout">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="0" column="0" colspan="2">
<widget class="QComboBox" name="mShapeComboBox"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Rotation</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QSpinBox" name="mRotationSpinBox">
<property name="suffix">
<string> °</string>
</property>
<property name="prefix">
<string comment="Rotation" extracomment="Rotation"/>
</property>
<property name="maximum">
<number>359</number>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="5" column="0">
<widget class="QSpinBox" name="mRotationSpinBox">
<property name="prefix">
<string comment="Rotation" extracomment="Rotation">Rotation </string>
</property>
<property name="maximum">
<number>359</number>
</property>
</widget>
</item>
<item row="6" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>QgsCollapsibleGroupBoxBasic</class>
<extends>QGroupBox</extends>
<header location="global">qgscollapsiblegroupbox.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>
353 changes: 179 additions & 174 deletions src/ui/qgscomposertablewidgetbase.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,207 +6,206 @@
<rect>
<x>0</x>
<y>0</y>
<width>262</width>
<height>490</height>
<width>605</width>
<height>631</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<layout class="QVBoxLayout" name="verticalLayout">
<property name="margin">
<number>3</number>
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QToolBox" name="mToolBox">
<property name="currentIndex">
<number>0</number>
<item>
<widget class="QScrollArea" name="scrollArea">
<property name="widgetResizable">
<bool>true</bool>
</property>
<widget class="QWidget" name="page">
<widget class="QWidget" name="scrollAreaWidgetContents">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>239</width>
<height>464</height>
<width>603</width>
<height>629</height>
</rect>
</property>
<attribute name="label">
<string>Table</string>
</attribute>
<layout class="QFormLayout" name="formLayout">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="0" column="0">
<widget class="QLabel" name="mLayerLabel">
<property name="text">
<string>Layer</string>
</property>
<property name="buddy">
<cstring>mLayerComboBox</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="mLayerComboBox"/>
</item>
<item row="1" column="0" colspan="2">
<widget class="QPushButton" name="mAttributesPushButton">
<property name="text">
<string>Attributes...</string>
</property>
</widget>
</item>
<item row="3" column="0" colspan="2">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item row="5" column="0">
<widget class="QLabel" name="mComposerMapLabel">
<property name="text">
<string>Composer map</string>
</property>
<property name="buddy">
<cstring>mComposerMapComboBox</cstring>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QComboBox" name="mComposerMapComboBox"/>
</item>
<item row="8" column="0">
<widget class="QLabel" name="mMaxNumFeaturesLabel">
<property name="text">
<string>Maximum rows</string>
</property>
<property name="buddy">
<cstring>mMaximumColumnsSpinBox</cstring>
<layout class="QVBoxLayout" name="mainLayout">
<item>
<widget class="QgsCollapsibleGroupBoxBasic" name="groupBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string>Main attributes</string>
</property>
<property name="collapsed" stdset="0">
<bool>false</bool>
</property>
<layout class="QFormLayout" name="formLayout_2">
<item row="1" column="0">
<widget class="QLabel" name="mLayerLabel">
<property name="text">
<string>Layer</string>
</property>
<property name="buddy">
<cstring>mLayerComboBox</cstring>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="mLayerComboBox"/>
</item>
<item row="2" column="0" colspan="2">
<widget class="QPushButton" name="mAttributesPushButton">
<property name="text">
<string>Attributes...</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="mComposerMapLabel">
<property name="text">
<string>Composer map</string>
</property>
<property name="buddy">
<cstring>mComposerMapComboBox</cstring>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QComboBox" name="mComposerMapComboBox"/>
</item>
<item row="3" column="0" colspan="2">
<widget class="QCheckBox" name="mShowOnlyVisibleFeaturesCheckBox">
<property name="text">
<string>Show only visible features</string>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="mMaxNumFeaturesLabel">
<property name="text">
<string>Maximum rows</string>
</property>
<property name="buddy">
<cstring>mMaximumColumnsSpinBox</cstring>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="QSpinBox" name="mMaximumColumnsSpinBox"/>
</item>
<item row="7" column="0">
<widget class="QLabel" name="mMarginLabel">
<property name="text">
<string>Margin</string>
</property>
<property name="buddy">
<cstring>mMarginSpinBox</cstring>
</property>
</widget>
</item>
<item row="7" column="1">
<widget class="QDoubleSpinBox" name="mMarginSpinBox"/>
</item>
</layout>
</widget>
</item>
<item row="8" column="1">
<widget class="QSpinBox" name="mMaximumColumnsSpinBox"/>
</item>
<item row="12" column="0" colspan="2">
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>10</height>
</size>
<item>
<widget class="QgsCollapsibleGroupBoxBasic" name="mShowGridGroupCheckBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</spacer>
</item>
<item row="13" column="0" colspan="2">
<widget class="QCheckBox" name="mShowGridCheckBox">
<property name="text">
<property name="title">
<string>Show grid</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="collapsed" stdset="0">
<bool>true</bool>
</property>
<layout class="QFormLayout" name="formLayout_3">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="0" column="0">
<widget class="QLabel" name="mGridStrokeWidthLabel">
<property name="text">
<string>Stroke width</string>
</property>
<property name="buddy">
<cstring>mGridStrokeWidthSpinBox</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QDoubleSpinBox" name="mGridStrokeWidthSpinBox"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="mGridColorLabel">
<property name="text">
<string>Color</string>
</property>
<property name="buddy">
<cstring>mGridColorButton</cstring>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QgsColorButton" name="mGridColorButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="14" column="0">
<widget class="QLabel" name="mGridStrokeWidthLabel">
<property name="text">
<string>Grid stroke width</string>
</property>
<property name="buddy">
<cstring>mGridStrokeWidthSpinBox</cstring>
</property>
</widget>
</item>
<item row="14" column="1">
<widget class="QDoubleSpinBox" name="mGridStrokeWidthSpinBox"/>
</item>
<item row="15" column="0">
<widget class="QLabel" name="mGridColorLabel">
<property name="text">
<string>Grid color</string>
</property>
<property name="buddy">
<cstring>mGridColorButton</cstring>
</property>
</widget>
</item>
<item row="15" column="1">
<widget class="QgsColorButton" name="mGridColorButton">
<item>
<widget class="QgsCollapsibleGroupBoxBasic" name="groupBox_3">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="20" column="0" colspan="2">
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item row="22" column="0" colspan="2">
<widget class="QPushButton" name="mHeaderFontPushButton">
<property name="text">
<string>Header Font...</string>
</property>
</widget>
</item>
<item row="24" column="0" colspan="2">
<widget class="QPushButton" name="mContentFontPushButton">
<property name="text">
<string>Content Font...</string>
</property>
</widget>
</item>
<item row="21" column="0">
<widget class="QLabel" name="mMarginLabel">
<property name="text">
<string>Margin</string>
</property>
<property name="buddy">
<cstring>mMarginSpinBox</cstring>
</property>
</widget>
</item>
<item row="21" column="1">
<widget class="QDoubleSpinBox" name="mMarginSpinBox"/>
</item>
<item row="4" column="0" colspan="2">
<widget class="QCheckBox" name="mShowOnlyVisibleFeaturesCheckBox">
<property name="text">
<string>Show only visible features</string>
</property>
<property name="title">
<string>Fonts</string>
</property>
<property name="collapsed" stdset="0">
<bool>true</bool>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QPushButton" name="mHeaderFontPushButton">
<property name="text">
<string>Header Font...</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="mContentFontPushButton">
<property name="text">
<string>Content Font...</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
Expand All @@ -221,6 +220,12 @@
<extends>QToolButton</extends>
<header>qgscolorbutton.h</header>
</customwidget>
<customwidget>
<class>QgsCollapsibleGroupBoxBasic</class>
<extends>QGroupBox</extends>
<header location="global">qgscollapsiblegroupbox.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources/>
<connections/>
Expand Down
Loading