sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-13 00:03:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Redesign composer; use dock widgets vs splitter; reduce scrolling in

Browse Source 
item widgets
This commit is contained in:
Nathan Woodrow 2012-02-01 23:11:11 +10:00
parent a406a88381
commit da2d7db41a
15 changed files with 1487 additions and 1327 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
python/gui/qgscomposerview.sip
View File

@ -30,7 +30,9 @@ class QgsComposerView: QGraphicsView
AddLabel, // add label
AddScalebar, // add scalebar
AddPicture, // add raster/vector picture
AddShape, //add shape item (ellipse, rectangle, triangle)
AddRectangle,
AddEllipse,
AddTriangle,
MoveItemContent //move content of item (e.g. content of map)
};

141
src/app/composer/qgscomposer.cpp
View File

@ -89,7 +89,6 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
orderingToolButton->setPopupMode( QToolButton::InstantPopup );
orderingToolButton->setAutoRaise( true );
orderingToolButton->setToolButtonStyle( Qt::ToolButtonIconOnly );
orderingToolButton->addAction( mActionRaiseItems );
orderingToolButton->addAction( mActionLowerItems );
orderingToolButton->addAction( mActionMoveItemsToTop );
@ -111,6 +110,17 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
alignToolButton->setDefaultAction( mActionAlignLeft );
toolBar->addWidget( alignToolButton );
QToolButton* shapeToolButton = new QToolButton( toolBar );
shapeToolButton->setCheckable( true );
shapeToolButton->setPopupMode( QToolButton::InstantPopup );
shapeToolButton->setAutoRaise( true );
shapeToolButton->setToolButtonStyle( Qt::ToolButtonIconOnly );
shapeToolButton->addAction( mActionAddRectangle );
shapeToolButton->addAction( mActionAddTriangle );
shapeToolButton->addAction( mActionAddEllipse );
shapeToolButton->setDefaultAction( mActionAddEllipse );
toolBar->insertWidget( mActionAddArrow, shapeToolButton );
QActionGroup* toggleActionGroup = new QActionGroup( this );
toggleActionGroup->addAction( mActionMoveItemContent );
toggleActionGroup->addAction( mActionAddNewMap );
@ -119,11 +129,14 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
toggleActionGroup->addAction( mActionAddNewScalebar );
toggleActionGroup->addAction( mActionAddImage );
toggleActionGroup->addAction( mActionSelectMoveItem );
toggleActionGroup->addAction( mActionAddBasicShape );
toggleActionGroup->addAction( mActionAddRectangle );
toggleActionGroup->addAction( mActionAddTriangle );
toggleActionGroup->addAction( mActionAddEllipse );
toggleActionGroup->addAction( mActionAddArrow );
toggleActionGroup->addAction( mActionAddTable );
toggleActionGroup->setExclusive( true );
mActionAddNewMap->setCheckable( true );
mActionAddNewLabel->setCheckable( true );
mActionAddNewLegend->setCheckable( true );
@ -131,7 +144,6 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
mActionAddNewScalebar->setCheckable( true );
mActionAddImage->setCheckable( true );
mActionMoveItemContent->setCheckable( true );
mActionAddBasicShape->setCheckable( true );
mActionAddArrow->setCheckable( true );
#ifdef Q_WS_MAC
@ -172,7 +184,7 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
layoutMenu->addAction( mActionAddImage );
layoutMenu->addAction( mActionSelectMoveItem );
layoutMenu->addAction( mActionMoveItemContent );
layoutMenu->addAction( mActionAddBasicShape );
layoutMenu->addAction( mActionAddArrow );
layoutMenu->addAction( mActionAddTable );
layoutMenu->addSeparator();
@ -201,7 +213,6 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
QgsDebugMsg( "entered." );
setMouseTracking( true );
//mSplitter->setMouseTracking(true);
mViewFrame->setMouseTracking( true );
//create composer view
@ -224,24 +235,41 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
mComposition->setParent( mView );
mView->setComposition( mComposition );
QgsCompositionWidget* compositionWidget = new QgsCompositionWidget( mCompositionOptionsFrame, mComposition );
QObject::connect( mComposition, SIGNAL( paperSizeChanged() ), compositionWidget, SLOT( displayCompositionWidthHeight() ) );
compositionWidget->show();
setTabPosition( Qt::AllDockWidgetAreas, QTabWidget::North);
mGeneralDock = new QDockWidget(tr("Composition"),this);
mGeneralDock->setObjectName( "CompositionDock" );
mItemDock = new QDockWidget(tr("Item Properties"));
mItemDock->setObjectName( "ItemDock");
mUndoDock = new QDockWidget(tr("Command history"),this);
mUndoDock->setObjectName( "CommandDock" );
mCompositionOptionsLayout = new QGridLayout( mCompositionOptionsFrame );
mCompositionOptionsLayout->setMargin( 0 );
mCompositionOptionsLayout->addWidget( compositionWidget );
QgsCompositionWidget* compositionWidget = new QgsCompositionWidget( mGeneralDock, mComposition );
connect( mComposition, SIGNAL( paperSizeChanged() ), compositionWidget, SLOT( displayCompositionWidthHeight() ) );
mGeneralDock->setWidget( compositionWidget );
//undo widget
mUndoView = new QUndoView( mComposition->undoStack(), this );
mUndoDock->setWidget( mUndoView );
addDockWidget( Qt::RightDockWidgetArea, mItemDock );
addDockWidget( Qt::RightDockWidgetArea, mGeneralDock );
addDockWidget( Qt::RightDockWidgetArea, mUndoDock );
mItemDock->show();
mGeneralDock->show();
mUndoDock->hide();
tabifyDockWidget(mGeneralDock, mUndoDock);
tabifyDockWidget(mGeneralDock, mItemDock);
mGeneralDock->raise();
QGridLayout *l = new QGridLayout( mViewFrame );
l->setMargin( 0 );
l->addWidget( mView, 0, 0 );
mCompositionNameComboBox->insertItem( 0, tr( "Map 1" ) );
//undo widget
mUndoView = new QUndoView( mComposition->undoStack(), this );
mOptionsTabWidget->addTab( mUndoView, tr( "Command history" ) );
// Create size grip (needed by Mac OS X for QMainWindow if QStatusBar is not visible)
mSizeGrip = new QSizeGrip( this );
mSizeGrip->resize( mSizeGrip->sizeHint() );
@ -286,7 +314,9 @@ void QgsComposer::setupTheme()
mActionAddNewLabel->setIcon( QgisApp::getThemeIcon( "/mActionLabel.png" ) );
mActionAddNewLegend->setIcon( QgisApp::getThemeIcon( "/mActionAddLegend.png" ) );
mActionAddNewScalebar->setIcon( QgisApp::getThemeIcon( "/mActionScaleBar.png" ) );
mActionAddBasicShape->setIcon( QgisApp::getThemeIcon( "/mActionAddBasicShape.png" ) );
mActionAddRectangle->setIcon( QgisApp::getThemeIcon( "/mActionAddBasicShape.png" ) );
mActionAddTriangle->setIcon( QgisApp::getThemeIcon( "/mActionAddBasicShape.png" ) );
mActionAddEllipse->setIcon( QgisApp::getThemeIcon( "/mActionAddBasicShape.png" ) );
mActionAddArrow->setIcon( QgisApp::getThemeIcon( "/mActionAddArrow.png" ) );
mActionAddTable->setIcon( QgisApp::getThemeIcon( "/mActionOpenTable.png" ) );
mActionSelectMoveItem->setIcon( QgisApp::getThemeIcon( "/mActionSelectPan.png" ) );
@ -396,21 +426,13 @@ void QgsComposer::setTitle( const QString& title )
}
}
void QgsComposer::showCompositionOptions( QWidget *w )
{
QWidget* currentWidget = mItemStackedWidget->currentWidget();
mItemStackedWidget->removeWidget( currentWidget );
mItemStackedWidget->addWidget( w );
}
void QgsComposer::showItemOptions( QgsComposerItem* item )
{
QWidget* currentWidget = mItemStackedWidget->currentWidget();
QWidget* currentWidget = mItemDock->widget();
if ( !item )
{
mItemStackedWidget->removeWidget( currentWidget );
mItemStackedWidget->setCurrentWidget( 0 );
mItemDock->setWidget( 0 );
return;
}
@ -427,10 +449,7 @@ void QgsComposer::showItemOptions( QgsComposerItem* item )
return;
}
mItemStackedWidget->removeWidget( currentWidget );
mItemStackedWidget->addWidget( newWidget );
mItemStackedWidget->setCurrentWidget( newWidget );
//newWidget->show();
mItemDock->setWidget( newWidget );
}
QgsMapCanvas *QgsComposer::mapCanvas( void )
@ -848,11 +867,27 @@ void QgsComposer::on_mActionAddImage_triggered()
}
}
void QgsComposer::on_mActionAddBasicShape_triggered()
void QgsComposer::on_mActionAddRectangle_triggered()
{
if ( mView )
{
mView->setCurrentTool( QgsComposerView::AddShape );
mView->setCurrentTool( QgsComposerView::AddRectangle );
}
}
void QgsComposer::on_mActionAddTriangle_triggered()
{
if ( mView )
{
mView->setCurrentTool( QgsComposerView::AddTriangle );
}
}
void QgsComposer::on_mActionAddEllipse_triggered()
{
if ( mView )
{
mView->setCurrentTool( QgsComposerView::AddEllipse );
}
}
@ -1064,6 +1099,12 @@ void QgsComposer::on_mActionRedo_triggered()
}
}
void QgsComposer::closeEvent(QCloseEvent *e)
{
Q_UNUSED( e );
saveWindowState();
}
void QgsComposer::moveEvent( QMoveEvent *e )
{
Q_UNUSED( e );
@ -1108,24 +1149,18 @@ void QgsComposer::saveWindowState()
{
QSettings settings;
settings.setValue( "/Composer/geometry", saveGeometry() );
//settings.setValue("/Composer/splitterState", mSplitter->saveState());
// store the toolbar/dock widget settings using Qt4 settings API
settings.setValue( "/ComposerUI/state", saveState() );
}
void QgsComposer::restoreWindowState()
{
QSettings settings;
if (! restoreState( settings.value( "/ComposerUI/state" ).toByteArray() ))
{
QgsDebugMsg("RESTORE STATE FAILED!!");
}
restoreGeometry( settings.value( "/Composer/geometry" ).toByteArray() );
QVariant splitterState = settings.value( "/Composer/splitterState" );
if ( !splitterState.isNull() )
{
//mSplitter->restoreState(settings.value("/Composer/splitterState").toByteArray());
}
else
{
QList<int> defaultSize;
defaultSize << 300 << 100; // page display 300 pixels, details pane 100 pixels
//mSplitter->setSizes(defaultSize);
}
}
void QgsComposer::writeXML( QDomDocument& doc )
@ -1218,7 +1253,7 @@ void QgsComposer::readXML( const QDomElement& composerElem, const QDomDocument&
delete( *it );
}
//delete composition widget
QgsCompositionWidget* oldCompositionWidget = qobject_cast<QgsCompositionWidget *>( mCompositionOptionsFrame->children().at( 0 ) );
QgsCompositionWidget* oldCompositionWidget = qobject_cast<QgsCompositionWidget *>( mGeneralDock->widget() );
delete oldCompositionWidget;
delete mCompositionOptionsLayout;
mCompositionOptionsLayout = 0;
@ -1241,13 +1276,13 @@ void QgsComposer::readXML( const QDomElement& composerElem, const QDomDocument&
l->addWidget( mView, 0, 0 );
//create compositionwidget
QgsCompositionWidget* compositionWidget = new QgsCompositionWidget( mCompositionOptionsFrame, mComposition );
QObject::connect( mComposition, SIGNAL( paperSizeChanged() ), compositionWidget, SLOT( displayCompositionWidthHeight() ) );
compositionWidget->show();
// QgsCompositionWidget* compositionWidget = new QgsCompositionWidget( mCompositionOptionsFrame, mComposition );
// QObject::connect( mComposition, SIGNAL( paperSizeChanged() ), compositionWidget, SLOT( displayCompositionWidthHeight() ) );
// compositionWidget->show();
mCompositionOptionsLayout = new QGridLayout( mCompositionOptionsFrame );
mCompositionOptionsLayout->setMargin( 0 );
mCompositionOptionsLayout->addWidget( compositionWidget );
// mCompositionOptionsLayout = new QGridLayout( mCompositionOptionsFrame );
// mCompositionOptionsLayout->setMargin( 0 );
// mCompositionOptionsLayout->addWidget( compositionWidget );
//read and restore all the items
if ( mComposition )

17
src/app/composer/qgscomposer.h
View File

@ -20,6 +20,7 @@
#include "qgscomposermap.h"
#include "qgscontexthelp.h"
#include <QPrinter>
#include <QDockWidget>
class QgisApp;
class QgsComposerArrow;
@ -74,9 +75,6 @@ class QgsComposer: public QMainWindow, private Ui::QgsComposerBase
//! Return current composition
//QgsComposition *composition(void);
//! Show composition options in widget
void showCompositionOptions( QWidget *w );
//! Restore the window and toolbar state
void restoreWindowState();
@ -89,6 +87,8 @@ class QgsComposer: public QMainWindow, private Ui::QgsComposerBase
//! Move event
virtual void moveEvent( QMoveEvent * );
virtual void closeEvent(QCloseEvent * );
//! Resize event
virtual void resizeEvent( QResizeEvent * );
@ -157,8 +157,11 @@ class QgsComposer: public QMainWindow, private Ui::QgsComposerBase
//! Add new picture
void on_mActionAddImage_triggered();
//! Add ellipse shape item
void on_mActionAddBasicShape_triggered();
void on_mActionAddRectangle_triggered();
void on_mActionAddTriangle_triggered();
void on_mActionAddEllipse_triggered();
//! Add attribute table
void on_mActionAddTable_triggered();
@ -322,6 +325,10 @@ class QgsComposer: public QMainWindow, private Ui::QgsComposerBase
//! We load composer map content from project xml only on demand. Therefore we need to store the real preview mode type
QMap< QgsComposerMap*, QgsComposerMap::PreviewMode > mMapsToRestore;
QDockWidget* mItemDock;
QDockWidget* mUndoDock;
QDockWidget* mGeneralDock;
};
#endif

59
src/gui/qgscomposerview.cpp
View File

@ -123,7 +123,9 @@ void QgsComposerView::mousePressEvent( QMouseEvent* e )
//create rubber band for map and ellipse items
case AddMap:
case AddShape:
case AddRectangle:
case AddTriangle:
case AddEllipse:
{
QTransform t;
mRubberBandItem = new QGraphicsRectItem( 0, 0, 0, 0 );
@ -204,6 +206,35 @@ void QgsComposerView::mousePressEvent( QMouseEvent* e )
}
}
void QgsComposerView::addShape(Tool currentTool)
{
QgsComposerShape::Shape shape = QgsComposerShape::Ellipse;
if ( currentTool == AddRectangle )
shape = QgsComposerShape::Rectangle;
else if ( currentTool == AddTriangle )
shape = QgsComposerShape::Triangle;
if ( !mRubberBandItem || mRubberBandItem->rect().width() < 0.1 || mRubberBandItem->rect().width() < 0.1 )
{
scene()->removeItem( mRubberBandItem );
delete mRubberBandItem;
mRubberBandItem = 0;
return;
}
if ( composition() )
{
QgsComposerShape* composerShape = new QgsComposerShape( mRubberBandItem->transform().dx(), mRubberBandItem->transform().dy(), mRubberBandItem->rect().width(), mRubberBandItem->rect().height(), composition() );
composerShape->setShapeType( shape );
composition()->addComposerShape( composerShape );
scene()->removeItem( mRubberBandItem );
delete mRubberBandItem;
mRubberBandItem = 0;
emit actionFinished();
composition()->pushAddRemoveCommand( composerShape, tr( "Shape added" ) );
}
}
void QgsComposerView::mouseReleaseEvent( QMouseEvent* e )
{
if ( !composition() )
@ -257,24 +288,10 @@ void QgsComposerView::mouseReleaseEvent( QMouseEvent* e )
}
break;
case AddShape:
if ( !mRubberBandItem || mRubberBandItem->rect().width() < 0.1 || mRubberBandItem->rect().width() < 0.1 )
{
scene()->removeItem( mRubberBandItem );
delete mRubberBandItem;
mRubberBandItem = 0;
return;
}
if ( composition() )
{
QgsComposerShape* composerShape = new QgsComposerShape( mRubberBandItem->transform().dx(), mRubberBandItem->transform().dy(), mRubberBandItem->rect().width(), mRubberBandItem->rect().height(), composition() );
composition()->addComposerShape( composerShape );
scene()->removeItem( mRubberBandItem );
delete mRubberBandItem;
mRubberBandItem = 0;
emit actionFinished();
composition()->pushAddRemoveCommand( composerShape, tr( "Shape added" ) );
}
case AddRectangle:
case AddTriangle:
case AddEllipse:
addShape( mCurrentTool );
break;
case AddMap:
@ -339,7 +356,9 @@ void QgsComposerView::mouseMoveEvent( QMouseEvent* e )
}
case AddMap:
case AddShape:
case AddRectangle:
case AddTriangle:
case AddEllipse:
//adjust rubber band item
{
double x = 0;

7
src/gui/qgscomposerview.h
View File

@ -59,7 +59,9 @@ class GUI_EXPORT QgsComposerView: public QGraphicsView
AddLabel, // add label
AddScalebar, // add scalebar
AddPicture, // add raster/vector picture
AddShape, //add shape item (ellipse, rectangle, triangle)
AddRectangle,
AddEllipse,
AddTriangle,
AddTable, //add attribute table
MoveItemContent //move content of item (e.g. content of map)
};
@ -120,6 +122,9 @@ class GUI_EXPORT QgsComposerView: public QGraphicsView
bool mPaintingEnabled;
/** Draw a shape on the canvas */
void addShape( Tool currentTool );
//void connectAddRemoveCommandSignals( QgsAddRemoveItemCommand* c );
signals:

83
src/ui/qgscomposerarrowwidgetbase.ui
View File

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>196</width>
<height>407</height>
<width>232</width>
<height>430</height>
</rect>
</property>
<property name="windowTitle">
@ -24,14 +24,17 @@
<rect>
<x>0</x>
<y>0</y>
<width>178</width>
<height>363</height>
<width>214</width>
<height>383</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">
@ -58,20 +61,27 @@
<property name="title">
<string>Arrow markers</string>
</property>
<layout class="QGridLayout" name="gridLayout_1">
<item row="0" column="0" colspan="2">
<widget class="QRadioButton" name="mDefaultMarkerRadioButton">
<layout class="QFormLayout" name="formLayout">
<item row="3" column="0">
<widget class="QLabel" name="mStartMarkerLabel">
<property name="text">
<string>Default marker</string>
<string>Start marker</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QRadioButton" name="mNoMarkerRadioButton">
<property name="text">
<string>No marker</string>
</property>
</widget>
<item row="3" column="1">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLineEdit" name="mStartMarkerLineEdit"/>
</item>
<item>
<widget class="QToolButton" name="mStartMarkerToolButton">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="2" column="0" colspan="2">
<widget class="QRadioButton" name="mSvgMarkerRadioButton">
@ -80,37 +90,38 @@
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="mStartMarkerLabel">
<property name="text">
<string>Start marker</string>
</property>
</widget>
<item row="4" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLineEdit" name="mEndMarkerLineEdit"/>
</item>
<item>
<widget class="QToolButton" name="mEndMarkerToolButton">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="4" column="0">
<widget class="QLineEdit" name="mStartMarkerLineEdit"/>
</item>
<item row="4" column="1">
<widget class="QToolButton" name="mStartMarkerToolButton">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="mEndMarkerLabel">
<property name="text">
<string>End marker</string>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLineEdit" name="mEndMarkerLineEdit"/>
</item>
<item row="6" column="1">
<widget class="QToolButton" name="mEndMarkerToolButton">
<item row="1" column="0" colspan="2">
<widget class="QRadioButton" name="mNoMarkerRadioButton">
<property name="text">
<string>...</string>
<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>

165
src/ui/qgscomposerbase.ui
View File

@ -20,117 +20,21 @@
<property name="mouseTracking">
<bool>true</bool>
</property>
<layout class="QGridLayout" name="gridLayout_1">
<layout class="QGridLayout" name="gridLayout">
<property name="margin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QSplitter" name="mSplitter">
<widget class="QFrame" name="mViewFrame">
<property name="mouseTracking">
<bool>true</bool>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<widget class="QFrame" name="mViewFrame">
<property name="mouseTracking">
<bool>true</bool>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
</widget>
<widget class="QTabWidget" name="mOptionsTabWidget">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>150</width>
<height>10</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
</size>
</property>
<property name="currentIndex">
<number>0</number>
</property>
<widget class="QWidget" name="tab">
<attribute name="title">
<string>General</string>
</attribute>
<layout class="QGridLayout">
<property name="margin">
<number>9</number>
</property>
<property name="spacing">
<number>6</number>
</property>
<item row="1" column="0" colspan="2">
<widget class="QFrame" name="mCompositionOptionsFrame">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="mCompositionNameComboBox">
<property name="enabled">
<bool>false</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="textLabel1">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Composition</string>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_2">
<attribute name="title">
<string>Item</string>
</attribute>
<layout class="QGridLayout">
<property name="margin">
<number>0</number>
</property>
<property name="spacing">
<number>6</number>
</property>
<item row="0" column="0">
<widget class="QStackedWidget" name="mItemStackedWidget">
<widget class="QWidget" name="page"/>
<widget class="QWidget" name="page_2"/>
</widget>
</item>
</layout>
</widget>
</widget>
</widget>
</item>
<item row="1" column="0">
@ -143,6 +47,9 @@
</layout>
</widget>
<widget class="QToolBar" name="toolBar">
<property name="windowTitle">
<string>Toolbar</string>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
@ -171,7 +78,6 @@
<addaction name="mActionAddNewLabel"/>
<addaction name="mActionAddNewLegend"/>
<addaction name="mActionAddNewScalebar"/>
<addaction name="mActionAddBasicShape"/>
<addaction name="mActionAddArrow"/>
<addaction name="mActionAddTable"/>
<addaction name="separator"/>
@ -449,14 +355,6 @@
<string>Ctrl+Q</string>
</property>
</action>
<action name="mActionAddBasicShape">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>Add Basic Shape</string>
</property>
</action>
<action name="mActionAddArrow">
<property name="checkable">
<bool>true</bool>
@ -512,11 +410,40 @@
<string>Ctrl+Shift+Z</string>
</property>
</action>
<action name="mActionAddRectangle">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>Add Rectangle</string>
</property>
<property name="toolTip">
<string>Add Rectangle</string>
</property>
</action>
<action name="mActionAddTriangle">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>Add Triangle</string>
</property>
<property name="toolTip">
<string>Add Triangle</string>
</property>
</action>
<action name="mActionAddEllipse">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>Add Ellipse</string>
</property>
<property name="toolTip">
<string>Add Ellipse</string>
</property>
</action>
</widget>
<tabstops>
<tabstop>mCompositionNameComboBox</tabstop>
<tabstop>mOptionsTabWidget</tabstop>
</tabstops>
<resources>
<include location="../../images/images.qrc"/>
</resources>

92
src/ui/qgscomposeritemwidgetbase.ui
View File

@ -13,7 +13,40 @@
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<layout class="QFormLayout" name="formLayout">
<item row="3" column="0">
<widget class="QLabel" name="mOpacityLabel">
<property name="text">
<string>Opacity</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="buddy">
<cstring>mOpacitySlider</cstring>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="mOutlineWidthLabel">
<property name="text">
<string>Outline width</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="buddy">
<cstring>mOutlineWidthSpinBox</cstring>
</property>
</widget>
</item>
<item row="9" column="0">
<widget class="QLabel" name="mIdLabel">
<property name="text">
<string>Item ID</string>
</property>
</widget>
</item>
<item row="0" column="0" colspan="2">
<widget class="QPushButton" name="mFrameColorButton">
<property name="text">
@ -28,20 +61,7 @@
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="mOpacityLabel">
<property name="text">
<string>Opacity</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="buddy">
<cstring>mOpacitySlider</cstring>
</property>
</widget>
</item>
<item row="3" column="0" colspan="2">
<item row="3" column="1">
<widget class="QSlider" name="mOpacitySlider">
<property name="maximum">
<number>255</number>
@ -51,47 +71,20 @@
</property>
</widget>
</item>
<item row="4" column="0" colspan="2">
<widget class="QLabel" name="mOutlineWidthLabel">
<property name="text">
<string>Outline width</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="buddy">
<cstring>mOutlineWidthSpinBox</cstring>
</property>
</widget>
</item>
<item row="5" column="0">
<item row="5" column="1">
<widget class="QDoubleSpinBox" name="mOutlineWidthSpinBox"/>
</item>
<item row="6" column="0" colspan="2">
<item row="7" column="0" colspan="2">
<widget class="QPushButton" name="mPositionButton">
<property name="text">
<string>Position and size...</string>
</property>
</widget>
</item>
<item row="8" column="0" colspan="2">
<widget class="QCheckBox" name="mFrameCheckBox">
<property name="text">
<string>Show frame</string>
</property>
</widget>
</item>
<item row="10" column="0">
<widget class="QLabel" name="mIdLabel">
<property name="text">
<string>Item ID</string>
</property>
</widget>
</item>
<item row="11" column="0" colspan="2">
<item row="9" column="1">
<widget class="QLineEdit" name="mItemIdLineEdit"/>
</item>
<item row="12" column="0" colspan="2">
<item row="11" column="0" colspan="2">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
@ -104,6 +97,13 @@
</property>
</spacer>
</item>
<item row="8" column="0" colspan="2">
<widget class="QCheckBox" name="mFrameCheckBox">
<property name="text">
<string>Show frame</string>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>

55
src/ui/qgscomposerlabelwidgetbase.ui
View File

@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>547</width>
<width>433</width>
<height>425</height>
</rect>
</property>
@ -30,8 +30,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>529</width>
<height>376</height>
<width>415</width>
<height>378</height>
</rect>
</property>
<attribute name="label">
@ -65,19 +65,6 @@
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="mMarginTextLabel">
<property name="text">
<string>Margin (mm)</string>
</property>
<property name="buddy">
<cstring>mMarginDoubleSpinBox</cstring>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QDoubleSpinBox" name="mMarginDoubleSpinBox"/>
</item>
<item row="3" column="0">
<widget class="QGroupBox" name="buttonGroup1">
<property name="title">
@ -108,6 +95,19 @@
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
@ -138,9 +138,32 @@
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item row="6" column="0">
<widget class="QDoubleSpinBox" name="mMarginDoubleSpinBox">
<property name="prefix">
<string>Margin </string>
</property>
<property name="suffix">
<string>mm</string>
</property>
</widget>
</item>
</layout>
</widget>
</widget>

128
src/ui/qgscomposerlegendwidgetbase.ui
View File

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>371</width>
<height>476</height>
<width>405</width>
<height>490</height>
</rect>
</property>
<property name="sizePolicy">
@ -25,6 +25,9 @@
</property>
<item row="0" column="0">
<widget class="QScrollArea" name="scrollArea">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="widgetResizable">
<bool>true</bool>
</property>
@ -33,43 +36,33 @@
<rect>
<x>0</x>
<y>0</y>
<width>367</width>
<height>472</height>
<width>405</width>
<height>490</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<widget class="QToolBox" name="toolBox">
<property name="currentIndex">
<number>0</number>
<number>1</number>
</property>
<widget class="QWidget" name="page">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>349</width>
<height>398</height>
<y>-26</y>
<width>370</width>
<height>440</height>
</rect>
</property>
<attribute name="label">
<string>General</string>
</attribute>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="mTitleLabel">
<property name="text">
<string>&amp;Title</string>
</property>
<property name="buddy">
<cstring>mTitleLineEdit</cstring>
</property>
</widget>
</item>
<item row="1" column="0">
<item row="2" column="0">
<widget class="QLineEdit" name="mTitleLineEdit"/>
</item>
<item row="2" column="0">
<item row="3" column="0">
<widget class="QPushButton" name="mTitleFontButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@ -82,28 +75,28 @@
</property>
</widget>
</item>
<item row="3" column="0">
<item row="4" column="0">
<widget class="QPushButton" name="mGroupFontButton">
<property name="text">
<string>Group Font...</string>
</property>
</widget>
</item>
<item row="4" column="0">
<item row="5" column="0">
<widget class="QPushButton" name="mLayerFontButton">
<property name="text">
<string>Layer Font...</string>
</property>
</widget>
</item>
<item row="5" column="0">
<item row="6" column="0">
<widget class="QPushButton" name="mItemFontButton">
<property name="text">
<string>Item Font...</string>
</property>
</widget>
</item>
<item row="6" column="0">
<item row="7" column="0">
<widget class="QDoubleSpinBox" name="mSymbolWidthSpinBox">
<property name="prefix">
<string>Symbol width </string>
@ -113,7 +106,7 @@
</property>
</widget>
</item>
<item row="7" column="0">
<item row="8" column="0">
<widget class="QDoubleSpinBox" name="mSymbolHeightSpinBox">
<property name="prefix">
<string>Symbol height </string>
@ -123,7 +116,7 @@
</property>
</widget>
</item>
<item row="8" column="0">
<item row="9" column="0">
<widget class="QDoubleSpinBox" name="mLayerSpaceSpinBox">
<property name="prefix">
<string>Layer space </string>
@ -133,7 +126,7 @@
</property>
</widget>
</item>
<item row="9" column="0">
<item row="10" column="0">
<widget class="QDoubleSpinBox" name="mSymbolSpaceSpinBox">
<property name="prefix">
<string>Symbol space </string>
@ -143,7 +136,7 @@
</property>
</widget>
</item>
<item row="10" column="0">
<item row="11" column="0">
<widget class="QDoubleSpinBox" name="mIconLabelSpaceSpinBox">
<property name="prefix">
<string>Icon label space </string>
@ -153,7 +146,7 @@
</property>
</widget>
</item>
<item row="11" column="0">
<item row="12" column="0">
<widget class="QDoubleSpinBox" name="mBoxSpaceSpinBox">
<property name="prefix">
<string>Box space </string>
@ -163,7 +156,7 @@
</property>
</widget>
</item>
<item row="14" column="0">
<item row="15" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
@ -176,16 +169,26 @@
</property>
</spacer>
</item>
<item row="13" column="0">
<item row="14" column="0">
<widget class="QComboBox" name="mMapComboBox"/>
</item>
<item row="12" column="0">
<item row="13" column="0">
<widget class="QLabel" name="mMapLabel">
<property name="text">
<string>Map</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="mTitleLabel">
<property name="text">
<string>&amp;Title</string>
</property>
<property name="buddy">
<cstring>mTitleLineEdit</cstring>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="page_2">
@ -193,8 +196,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>349</width>
<height>398</height>
<width>387</width>
<height>414</height>
</rect>
</property>
<attribute name="label">
@ -217,7 +220,7 @@
</property>
</widget>
</item>
<item row="1" column="0" colspan="8">
<item row="1" column="0" colspan="9">
<widget class="QTreeView" name="mItemTreeView">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Expanding">
@ -241,9 +244,21 @@
</item>
<item row="2" column="0">
<widget class="QToolButton" name="mMoveDownToolButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
</widget>
</item>
<item row="2" column="1">
@ -251,6 +266,12 @@
<property name="text">
<string/>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
</widget>
</item>
<item row="2" column="2">
@ -258,6 +279,12 @@
<property name="text">
<string/>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
</widget>
</item>
<item row="2" column="3">
@ -265,6 +292,12 @@
<property name="text">
<string/>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
</widget>
</item>
<item row="2" column="4">
@ -272,6 +305,12 @@
<property name="text">
<string/>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
</widget>
</item>
<item row="2" column="5">
@ -279,6 +318,12 @@
<property name="text">
<string>Update</string>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
</widget>
</item>
<item row="2" column="6">
@ -288,6 +333,19 @@
</property>
</widget>
</item>
<item row="2" column="8">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="7">
<widget class="QToolButton" name="mAddGroupButton">
<property name="text">

907
src/ui/qgscomposermapwidgetbase.ui
View File

File diff suppressed because it is too large Load Diff

385
src/ui/qgscomposerpicturewidgetbase.ui
View File

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>293</width>
<height>540</height>
<width>327</width>
<height>614</height>
</rect>
</property>
<property name="sizePolicy">
@ -32,16 +32,202 @@
<property name="geometry">
<rect>
<x>0</x>
<y>-129</y>
<width>266</width>
<height>632</height>
<y>0</y>
<width>327</width>
<height>585</height>
</rect>
</property>
<attribute name="label">
<string>Picture options</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout">
<property name="margin">
<number>3</number>
</property>
<item>
<widget class="QGroupBox" name="mPreviewGroupBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string>Preloaded images</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="gridSize">
<size>
<width>30</width>
<height>30</height>
</size>
</property>
<property name="viewMode">
<enum>QListView::IconMode</enum>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0">
<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>
<item>
<widget class="QPushButton" name="mPictureBrowseButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>150</width>
<height>32767</height>
</size>
</property>
<property name="text">
<string>...</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Options</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>
<property name="buddy">
<cstring>mWidthLineEdit</cstring>
</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>
<property name="text">
<string>Height</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="buddy">
<cstring>mHeightLineEdit</cstring>
</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>
<property name="text">
<string>Rotation</string>
</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>
<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>
</widget>
</item>
<item>
<widget class="QGroupBox" name="mSearchDirectoriesGroupBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@ -93,187 +279,6 @@
</layout>
</widget>
</item>
<item row="1" column="0">
<widget class="QGroupBox" name="mPreviewGroupBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string>Preview</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="gridSize">
<size>
<width>30</width>
<height>30</height>
</size>
</property>
<property name="viewMode">
<enum>QListView::IconMode</enum>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="2" column="0">
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Options</string>
</property>
<layout class="QGridLayout" name="gridLayout_1">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Load</string>
</property>
<property name="buddy">
<cstring>mPictureLineEdit</cstring>
</property>
</widget>
</item>
<item row="1" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLineEdit" name="mPictureLineEdit"/>
</item>
<item>
<widget class="QPushButton" name="mPictureBrowseButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>150</width>
<height>32767</height>
</size>
</property>
<property name="text">
<string>...</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="2" 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>
<property name="buddy">
<cstring>mWidthLineEdit</cstring>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLineEdit" name="mWidthLineEdit"/>
</item>
<item row="4" column="0">
<widget class="QLabel" name="textLabel4">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Height</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="buddy">
<cstring>mHeightLineEdit</cstring>
</property>
</widget>
</item>
<item row="5" column="0">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLineEdit" name="mHeightLineEdit"/>
</item>
</layout>
</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>
<property name="text">
<string>Rotation</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="buddy">
<cstring>mRotationSpinBox</cstring>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QDoubleSpinBox" name="mRotationSpinBox">
<property name="maximum">
<double>360.000000000000000</double>
</property>
</widget>
</item>
<item row="8" column="0">
<widget class="QCheckBox" name="mRotationFromComposerMapCheckBox">
<property name="text">
<string>Sync with map</string>
</property>
</widget>
</item>
<item row="9" column="0">
<widget class="QComboBox" name="mComposerMapComboBox"/>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
</widget>
@ -288,11 +293,7 @@
<tabstop>mPreviewListWidget</tabstop>
<tabstop>mPictureLineEdit</tabstop>
<tabstop>mPictureBrowseButton</tabstop>
<tabstop>mWidthLineEdit</tabstop>
<tabstop>mHeightLineEdit</tabstop>
<tabstop>mRotationSpinBox</tabstop>
<tabstop>mRotationFromComposerMapCheckBox</tabstop>
<tabstop>mComposerMapComboBox</tabstop>
</tabstops>
<resources/>
<connections/>

152
src/ui/qgscomposerscalebarwidgetbase.ui
View File

@ -33,14 +33,14 @@
<rect>
<x>0</x>
<y>0</y>
<width>298</width>
<height>545</height>
<width>325</width>
<height>508</height>
</rect>
</property>
<attribute name="label">
<string>Scale bar</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_2">
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0">
<widget class="QLabel" name="mSegmentSizeLabel">
<property name="text">
@ -54,7 +54,7 @@
</property>
</widget>
</item>
<item row="1" column="0">
<item row="0" column="1">
<widget class="QDoubleSpinBox" name="mSegmentSizeSpinBox">
<property name="decimals">
<number>4</number>
@ -64,7 +64,7 @@
</property>
</widget>
</item>
<item row="2" column="0">
<item row="1" column="0">
<widget class="QLabel" name="mMapUnitsPerBarUnitLabel">
<property name="text">
<string>Map units per bar unit</string>
@ -77,28 +77,32 @@
</property>
</widget>
</item>
<item row="3" column="0">
<item row="1" column="1">
<widget class="QDoubleSpinBox" name="mMapUnitsPerBarUnitSpinBox">
<property name="maximum">
<double>9999999999999.000000000000000</double>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QSpinBox" name="mNumberOfSegmentsSpinBox">
<property name="suffix">
<string> Right segments</string>
</property>
</widget>
<item row="2" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QSpinBox" name="mSegmentsLeftSpinBox">
<property name="suffix">
<string> Left segments</string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="mNumberOfSegmentsSpinBox">
<property name="suffix">
<string> Right segments</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="5" column="0">
<widget class="QSpinBox" name="mSegmentsLeftSpinBox">
<property name="suffix">
<string> Left segments</string>
</property>
</widget>
</item>
<item row="6" column="0">
<item row="3" column="0">
<widget class="QLabel" name="mStyleLabel">
<property name="text">
<string>Style</string>
@ -108,10 +112,10 @@
</property>
</widget>
</item>
<item row="7" column="0">
<item row="3" column="1">
<widget class="QComboBox" name="mStyleComboBox"/>
</item>
<item row="8" column="0">
<item row="4" column="0">
<widget class="QLabel" name="mMapLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@ -130,7 +134,7 @@
</property>
</widget>
</item>
<item row="9" column="0">
<item row="4" column="1">
<widget class="QComboBox" name="mMapComboBox">
<property name="enabled">
<bool>true</bool>
@ -143,7 +147,53 @@
</property>
</widget>
</item>
<item row="12" column="0">
<item row="5" column="0">
<widget class="QLabel" name="mAlignmentLabel">
<property name="text">
<string>Alignment</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QComboBox" name="mAlignmentComboBox"/>
</item>
<item row="10" column="0">
<widget class="QLabel" name="mUnitLabelLabel">
<property name="text">
<string>Unit label</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="buddy">
<cstring>mUnitLabelLineEdit</cstring>
</property>
</widget>
</item>
<item row="10" column="1">
<widget class="QLineEdit" name="mUnitLabelLineEdit"/>
</item>
<item row="11" column="0" colspan="2">
<widget class="QPushButton" name="mFontButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Font...</string>
</property>
</widget>
</item>
<item row="12" column="0" colspan="2">
<widget class="QPushButton" name="mColorPushButton">
<property name="text">
<string>Color...</string>
</property>
</widget>
</item>
<item row="6" column="0" colspan="2">
<widget class="QSpinBox" name="mHeightSpinBox">
<property name="suffix">
<string> mm</string>
@ -153,7 +203,7 @@
</property>
</widget>
</item>
<item row="13" column="0">
<item row="7" column="0" colspan="2">
<widget class="QDoubleSpinBox" name="mLineWidthSpinBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@ -178,7 +228,7 @@
</property>
</widget>
</item>
<item row="14" column="0">
<item row="8" column="0" colspan="2">
<widget class="QDoubleSpinBox" name="mLabelBarSpaceSpinBox">
<property name="prefix">
<string>Label space </string>
@ -188,7 +238,7 @@
</property>
</widget>
</item>
<item row="15" column="0">
<item row="9" column="0" colspan="2">
<widget class="QDoubleSpinBox" name="mBoxSizeSpinBox">
<property name="prefix">
<string>Box space </string>
@ -198,43 +248,7 @@
</property>
</widget>
</item>
<item row="16" column="0">
<widget class="QLabel" name="mUnitLabelLabel">
<property name="text">
<string>Unit label</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="buddy">
<cstring>mUnitLabelLineEdit</cstring>
</property>
</widget>
</item>
<item row="17" column="0">
<widget class="QLineEdit" name="mUnitLabelLineEdit"/>
</item>
<item row="18" column="0">
<widget class="QPushButton" name="mFontButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Font...</string>
</property>
</widget>
</item>
<item row="19" column="0">
<widget class="QPushButton" name="mColorPushButton">
<property name="text">
<string>Color...</string>
</property>
</widget>
</item>
<item row="20" column="0">
<item row="13" column="0" colspan="2">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
@ -247,16 +261,6 @@
</property>
</spacer>
</item>
<item row="11" column="0">
<widget class="QComboBox" name="mAlignmentComboBox"/>
</item>
<item row="10" column="0">
<widget class="QLabel" name="mAlignmentLabel">
<property name="text">
<string>Alignment</string>
</property>
</widget>
</item>
</layout>
</widget>
</widget>

219
src/ui/qgscomposertablewidgetbase.ui
View File

@ -6,14 +6,17 @@
<rect>
<x>0</x>
<y>0</y>
<width>269</width>
<height>346</height>
<width>262</width>
<height>490</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<property name="margin">
<number>3</number>
</property>
<item row="0" column="0">
<widget class="QToolBox" name="mToolBox">
<property name="currentIndex">
@ -24,134 +27,116 @@
<rect>
<x>0</x>
<y>0</y>
<width>260</width>
<height>298</height>
<width>239</width>
<height>464</height>
</rect>
</property>
<attribute name="label">
<string>Table</string>
</attribute>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="QLabel" name="mLayerLabel">
<property name="text">
<string>Layer</string>
</property>
<property name="buddy">
<cstring>mLayerComboBox</cstring>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="mLayerComboBox"/>
</item>
</layout>
<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="1" column="0">
<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="1" column="1">
<spacer name="horizontalSpacer">
<item row="3" column="0" colspan="2">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
<width>20</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="mShowOnlyVisibleFeaturesCheckBox">
<item row="5" column="0">
<widget class="QLabel" name="mComposerMapLabel">
<property name="text">
<string>Show only visible features</string>
<string>Composer map</string>
</property>
<property name="buddy">
<cstring>mComposerMapComboBox</cstring>
</property>
</widget>
</item>
<item row="3" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QLabel" name="mComposerMapLabel">
<property name="text">
<string>Composer map</string>
</property>
<property name="buddy">
<cstring>mComposerMapComboBox</cstring>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="mComposerMapComboBox"/>
</item>
</layout>
<item row="5" column="1">
<widget class="QComboBox" name="mComposerMapComboBox"/>
</item>
<item row="4" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="mMaxNumFeaturesLabel">
<property name="text">
<string>Maximum rows</string>
</property>
<property name="buddy">
<cstring>mMaximumColumnsSpinBox</cstring>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="mMaximumColumnsSpinBox"/>
</item>
</layout>
<item row="8" 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="5" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="mMarginLabel">
<property name="text">
<string>Margin</string>
</property>
<property name="buddy">
<cstring>mMarginSpinBox</cstring>
</property>
</widget>
</item>
<item>
<widget class="QDoubleSpinBox" name="mMarginSpinBox"/>
</item>
</layout>
<item row="8" column="1">
<widget class="QSpinBox" name="mMaximumColumnsSpinBox"/>
</item>
<item row="6" column="0" colspan="2">
<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>
</property>
</spacer>
</item>
<item row="13" column="0" colspan="2">
<widget class="QCheckBox" name="mShowGridCheckBox">
<property name="text">
<string>Show grid</string>
</property>
</widget>
</item>
<item row="7" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
<widget class="QLabel" name="mGridStrokeWidthLabel">
<property name="text">
<string>Grid stroke width</string>
</property>
<property name="buddy">
<cstring>mGridStrokeWidthSpinBox</cstring>
</property>
</widget>
</item>
<item>
<widget class="QDoubleSpinBox" name="mGridStrokeWidthSpinBox"/>
</item>
</layout>
<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="8" column="0">
<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>
@ -161,7 +146,7 @@
</property>
</widget>
</item>
<item row="8" column="1">
<item row="15" column="1">
<widget class="QgsColorButton" name="mGridColorButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@ -174,20 +159,56 @@
</property>
</widget>
</item>
<item row="9" column="0">
<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="9" column="1">
<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>
</widget>
</item>
</layout>
</widget>
</widget>

400
src/ui/qgscompositionwidgetbase.ui
View File

@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>416</width>
<width>352</width>
<height>570</height>
</rect>
</property>
@ -23,8 +23,17 @@
<property name="margin">
<number>0</number>
</property>
<property name="spacing">
<number>6</number>
</property>
<item row="0" column="0">
<widget class="QScrollArea" name="scrollArea">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="widgetResizable">
<bool>true</bool>
</property>
@ -33,17 +42,29 @@
<rect>
<x>0</x>
<y>0</y>
<width>395</width>
<height>579</height>
<width>352</width>
<height>570</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<property name="margin">
<number>3</number>
</property>
<item row="0" column="0">
<widget class="QGroupBox" name="groupBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string>Paper and quality</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<layout class="QFormLayout" name="formLayout">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="0" column="0">
<widget class="QLabel" name="textLabel3">
<property name="sizePolicy">
@ -63,7 +84,7 @@
</property>
</widget>
</item>
<item row="1" column="0">
<item row="0" column="1">
<widget class="QComboBox" name="mPaperSizeComboBox">
<property name="enabled">
<bool>true</bool>
@ -76,39 +97,62 @@
</property>
</widget>
</item>
<item row="1" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QDoubleSpinBox" name="mPaperWidthDoubleSpinBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="prefix">
<string>Width </string>
</property>
<property name="suffix">
<string/>
</property>
<property name="maximum">
<double>99999.000000000000000</double>
</property>
</widget>
</item>
<item>
<widget class="QDoubleSpinBox" name="mPaperHeightDoubleSpinBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="prefix">
<string>Height </string>
</property>
<property name="suffix">
<string/>
</property>
<property name="maximum">
<double>99999.000000000000000</double>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="mPaperUnitsComboBox">
<property name="enabled">
<bool>true</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout>
</item>
<item row="2" column="0">
<widget class="QLabel" name="textLabel5">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Units</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="buddy">
<cstring>mPaperUnitsComboBox</cstring>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QComboBox" name="mPaperUnitsComboBox">
<property name="enabled">
<bool>true</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="textLabel7">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@ -127,7 +171,7 @@
</property>
</widget>
</item>
<item row="7" column="0">
<item row="2" column="1">
<widget class="QComboBox" name="mPaperOrientationComboBox">
<property name="enabled">
<bool>true</bool>
@ -140,15 +184,27 @@
</property>
</widget>
</item>
<item row="9" column="0">
<item row="3" column="0">
<widget class="QCheckBox" name="mPrintAsRasterCheckBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Print as raster</string>
</property>
</widget>
</item>
<item row="8" column="0">
<item row="3" column="1">
<widget class="QSpinBox" name="mResolutionSpinBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="suffix">
<string> dpi</string>
</property>
@ -160,134 +216,6 @@
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QDoubleSpinBox" name="mPaperWidthDoubleSpinBox">
<property name="prefix">
<string>Width </string>
</property>
<property name="suffix">
<string/>
</property>
<property name="maximum">
<double>99999.000000000000000</double>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QDoubleSpinBox" name="mPaperHeightDoubleSpinBox">
<property name="prefix">
<string>Height </string>
</property>
<property name="suffix">
<string/>
</property>
<property name="maximum">
<double>99999.000000000000000</double>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="0">
<widget class="QGroupBox" name="mSnapGroupBox">
<property name="title">
<string>Snapping</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<widget class="QCheckBox" name="mSnapToGridCheckBox">
<property name="text">
<string>Snap to grid</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QDoubleSpinBox" name="mGridResolutionSpinBox">
<property name="prefix">
<string>Spacing </string>
</property>
<property name="suffix">
<string/>
</property>
<property name="maximum">
<double>9999.000000000000000</double>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QDoubleSpinBox" name="mOffsetXSpinBox">
<property name="prefix">
<string>X offset </string>
</property>
<property name="maximum">
<double>9999.000000000000000</double>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QDoubleSpinBox" name="mOffsetYSpinBox">
<property name="prefix">
<string>Y offset </string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QDoubleSpinBox" name="mPenWidthSpinBox">
<property name="prefix">
<string>Pen width </string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="mGridColorLabel">
<property name="text">
<string>Grid color</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="buddy">
<cstring>mGridColorButton</cstring>
</property>
</widget>
</item>
<item row="6" column="0">
<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>
<item row="7" column="0">
<widget class="QLabel" name="mGridStyleLabel">
<property name="text">
<string>Grid style</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="buddy">
<cstring>mGridStyleComboBox</cstring>
</property>
</widget>
</item>
<item row="8" column="0">
<widget class="QComboBox" name="mGridStyleComboBox"/>
</item>
<item row="9" column="0">
<widget class="QDoubleSpinBox" name="mSelectionToleranceSpinBox">
<property name="prefix">
<string>Selection tolerance (mm) </string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
@ -304,6 +232,133 @@
</property>
</spacer>
</item>
<item row="1" column="0">
<widget class="QGroupBox" name="mSnapGroupBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string>Snapping</string>
</property>
<layout class="QFormLayout" name="formLayout_2">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="0" column="0">
<widget class="QCheckBox" name="mSnapToGridCheckBox">
<property name="text">
<string>Snap to grid</string>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QDoubleSpinBox" name="mOffsetXSpinBox">
<property name="prefix">
<string>X offset </string>
</property>
<property name="maximum">
<double>9999.000000000000000</double>
</property>
</widget>
</item>
<item>
<widget class="QDoubleSpinBox" name="mOffsetYSpinBox">
<property name="prefix">
<string>Y offset </string>
</property>
</widget>
</item>
</layout>
</item>
<item row="4" column="0">
<widget class="QLabel" name="mGridColorLabel">
<property name="text">
<string>Grid color</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="buddy">
<cstring>mGridColorButton</cstring>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QgsColorButton" name="mGridColorButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="mGridStyleLabel">
<property name="text">
<string>Grid style</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="buddy">
<cstring>mGridStyleComboBox</cstring>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QComboBox" name="mGridStyleComboBox"/>
</item>
<item row="6" column="0" colspan="2">
<widget class="QDoubleSpinBox" name="mSelectionToleranceSpinBox">
<property name="prefix">
<string>Selection tolerance (mm) </string>
</property>
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="QDoubleSpinBox" name="mGridResolutionSpinBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="prefix">
<string>Spacing </string>
</property>
<property name="suffix">
<string/>
</property>
<property name="maximum">
<double>9999.000000000000000</double>
</property>
</widget>
</item>
<item row="3" column="0" colspan="2">
<widget class="QDoubleSpinBox" name="mPenWidthSpinBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="prefix">
<string>Pen width </string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
</widget>
@ -320,20 +375,11 @@
</customwidgets>
<tabstops>
<tabstop>scrollArea</tabstop>
<tabstop>mPaperSizeComboBox</tabstop>
<tabstop>mPaperUnitsComboBox</tabstop>
<tabstop>mPaperWidthDoubleSpinBox</tabstop>
<tabstop>mPaperHeightDoubleSpinBox</tabstop>
<tabstop>mPaperOrientationComboBox</tabstop>
<tabstop>mResolutionSpinBox</tabstop>
<tabstop>mPrintAsRasterCheckBox</tabstop>
<tabstop>mSnapToGridCheckBox</tabstop>
<tabstop>mGridResolutionSpinBox</tabstop>
<tabstop>mOffsetXSpinBox</tabstop>
<tabstop>mOffsetYSpinBox</tabstop>
<tabstop>mPenWidthSpinBox</tabstop>
<tabstop>mGridColorButton</tabstop>
<tabstop>mGridStyleComboBox</tabstop>
</tabstops>
<resources/>
<connections/>