From 4437567aad1d776718eb9f8c3945b07e095edcf7 Mon Sep 17 00:00:00 2001 From: timlinux Date: Sun, 8 Nov 2009 19:34:54 +0000 Subject: [PATCH] UI overhaul bonanza...hope this doesnt break anything...I guess we should say [FEATURE] at some point as the map composer dialogs have been somewhat overhauled.... git-svn-id: http://svn.osgeo.org/qgis/trunk@12031 c8812cc2-4d05-0410-92ff-de0c093fc19c --- src/app/composer/qgscomposerlabelwidget.cpp | 2 +- src/app/composer/qgscomposerlegendwidget.cpp | 4 +- src/app/composer/qgscomposermapwidget.cpp | 2 +- src/app/composer/qgscomposerpicturewidget.cpp | 2 +- .../composer/qgscomposerscalebarwidget.cpp | 2 +- src/app/qgisapp.cpp | 25 +- src/app/qgisapp.h | 1 + src/ui/qgscomposeritemwidgetbase.ui | 183 ++-- src/ui/qgscomposerlabelwidgetbase.ui | 86 +- src/ui/qgscomposerlegendwidgetbase.ui | 440 +++++---- src/ui/qgscomposermapwidgetbase.ui | 51 +- src/ui/qgscomposerpicturewidgetbase.ui | 24 +- src/ui/qgscomposerscalebarwidgetbase.ui | 37 +- src/ui/qgscompositionwidgetbase.ui | 28 +- src/ui/qgsconfigureshortcutsdialog.ui | 24 +- src/ui/qgscontinuouscolordialogbase.ui | 248 ++--- src/ui/qgsdetaileditemwidgetbase.ui | 203 ++-- src/ui/qgsfieldcalculatorbase.ui | 44 +- src/ui/qgsgenericprojectionselectorbase.ui | 80 +- src/ui/qgsgraduatedsymboldialogbase.ui | 1 + src/ui/qgslabeldialogbase.ui | 912 +++++++++--------- src/ui/qgsludialogbase.ui | 138 ++- src/ui/qgsmeasurebase.ui | 9 +- 23 files changed, 1278 insertions(+), 1268 deletions(-) diff --git a/src/app/composer/qgscomposerlabelwidget.cpp b/src/app/composer/qgscomposerlabelwidget.cpp index 20fb617eb03..f61f22bd5a5 100644 --- a/src/app/composer/qgscomposerlabelwidget.cpp +++ b/src/app/composer/qgscomposerlabelwidget.cpp @@ -27,7 +27,7 @@ QgsComposerLabelWidget::QgsComposerLabelWidget( QgsComposerLabel* label ): QWidg //add widget for general composer item properties QgsComposerItemWidget* itemPropertiesWidget = new QgsComposerItemWidget( this, label ); - gridLayout->addWidget( itemPropertiesWidget, 5, 0, 1, 2 ); + toolBox->addItem( itemPropertiesWidget, tr( "Item properties" ) ); if ( mComposerLabel ) { diff --git a/src/app/composer/qgscomposerlegendwidget.cpp b/src/app/composer/qgscomposerlegendwidget.cpp index 4091d9f2d2e..ca9595a394f 100644 --- a/src/app/composer/qgscomposerlegendwidget.cpp +++ b/src/app/composer/qgscomposerlegendwidget.cpp @@ -27,8 +27,8 @@ QgsComposerLegendWidget::QgsComposerLegendWidget( QgsComposerLegend* legend ): m //add widget for item properties QgsComposerItemWidget* itemPropertiesWidget = new QgsComposerItemWidget( this, legend ); - gridLayout->addWidget( itemPropertiesWidget, 2, 0, 1, 1 ); - + toolBox->addItem( itemPropertiesWidget, tr( "Item Options") ); + if ( legend ) { mItemTreeView->setModel( legend->model() ); diff --git a/src/app/composer/qgscomposermapwidget.cpp b/src/app/composer/qgscomposermapwidget.cpp index 0ca614675a5..e03190eb202 100644 --- a/src/app/composer/qgscomposermapwidget.cpp +++ b/src/app/composer/qgscomposermapwidget.cpp @@ -28,7 +28,7 @@ QgsComposerMapWidget::QgsComposerMapWidget( QgsComposerMap* composerMap ): QWidg //add widget for general composer item properties QgsComposerItemWidget* itemPropertiesWidget = new QgsComposerItemWidget( this, composerMap ); - gridLayout->addWidget( itemPropertiesWidget ); + toolBox->addItem( itemPropertiesWidget, tr( "General options" ) ); QDoubleValidator v( 0 ); mWidthLineEdit->setValidator( &v ); diff --git a/src/app/composer/qgscomposerpicturewidget.cpp b/src/app/composer/qgscomposerpicturewidget.cpp index c9ff1699ee7..baadff2b625 100644 --- a/src/app/composer/qgscomposerpicturewidget.cpp +++ b/src/app/composer/qgscomposerpicturewidget.cpp @@ -35,7 +35,7 @@ QgsComposerPictureWidget::QgsComposerPictureWidget( QgsComposerPicture* picture //add widget for general composer item properties QgsComposerItemWidget* itemPropertiesWidget = new QgsComposerItemWidget( this, picture ); - gridLayout->addWidget( itemPropertiesWidget, 8, 0, 1, 4 ); + toolBox->addItem( itemPropertiesWidget, tr( "General options" ) ); mWidthLineEdit->setValidator( new QDoubleValidator( this ) ); mHeightLineEdit->setValidator( new QDoubleValidator( this ) ); diff --git a/src/app/composer/qgscomposerscalebarwidget.cpp b/src/app/composer/qgscomposerscalebarwidget.cpp index 5af6f016fd6..4d2579eec94 100644 --- a/src/app/composer/qgscomposerscalebarwidget.cpp +++ b/src/app/composer/qgscomposerscalebarwidget.cpp @@ -28,7 +28,7 @@ QgsComposerScaleBarWidget::QgsComposerScaleBarWidget( QgsComposerScaleBar* scale //add widget for general composer item properties QgsComposerItemWidget* itemPropertiesWidget = new QgsComposerItemWidget( this, scaleBar ); - gridLayout->addWidget( itemPropertiesWidget ); + toolBox->addItem( itemPropertiesWidget, tr( "General options" ) ); blockMemberSignals( true ); mStyleComboBox->insertItem( 0, tr( "Single Box" ) ); diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp index 7aa18d0fba6..e1fa363caf2 100644 --- a/src/app/qgisapp.cpp +++ b/src/app/qgisapp.cpp @@ -466,6 +466,7 @@ QgisApp::QgisApp( QSplashScreen *splash, QWidget * parent, Qt::WFlags fl ) QgsDebugMsg( QgsApplication::showSettings() ); QgsDebugMsg( "\n--------------------------\n\n\n" ); mMapCanvas->freeze( false ); + mLastComposerId = 0; } // QgisApp ctor @@ -3690,26 +3691,8 @@ void QgisApp::newPrintComposer() } //ask user about name - bool composerExists = true; - QString composerId; - while ( composerExists ) - { - composerId = QInputDialog::getText( 0, tr( "Enter id string for composer" ), tr( "id:" ) ); - if ( composerId.isNull() ) - { - return; - } - - if ( mPrintComposers.contains( composerId ) ) - { - QMessageBox::critical( 0, tr( "Composer id already exists" ), tr( "The entered composer id '%1' already exists. Please enter a different id" ).arg( composerId ) ); - } - else - { - composerExists = false; - } - } - + mLastComposerId++; + QString composerId = QString( tr("Map Composer %1").arg( mLastComposerId ) ); //create new composer object QgsComposer* newComposerObject = new QgsComposer( this, composerId ); //add it to the map of existing print composers @@ -4244,6 +4227,7 @@ bool QgisApp::loadComposersFromProject( const QString& projectFilePath ) composer->showMinimized(); composer->zoomFull(); } + mLastComposerId = composerNodes.size(); return true; } @@ -4256,6 +4240,7 @@ void QgisApp::deletePrintComposers() delete it.value(); } mPrintComposers.clear(); + mLastComposerId = 0; } void QgisApp::mergeSelectedFeatures() diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h index 075e849d3b5..b54dc219a37 100644 --- a/src/app/qgisapp.h +++ b/src/app/qgisapp.h @@ -991,6 +991,7 @@ class QgisApp : public QMainWindow QgsUndoWidget* mUndoWidget; + int mLastComposerId; }; #endif diff --git a/src/ui/qgscomposeritemwidgetbase.ui b/src/ui/qgscomposeritemwidgetbase.ui index 403e8f862f8..01c6f2d1e5b 100644 --- a/src/ui/qgscomposeritemwidgetbase.ui +++ b/src/ui/qgscomposeritemwidgetbase.ui @@ -6,119 +6,94 @@ 0 0 - 215 - 434 + 236 + 314 Form - - - 0 - + - - - Composer item properties + + + Frame color... - - - - - Color - - - true - - - mFrameColorButton - - - - - - - Frame... - - - - - - - Background... - - - - - - - Opacity - - - true - - - mOpacitySlider - - - - - - - 255 - - - Qt::Horizontal - - - - - - - Outline width - - - true - - - mOutlineWidthSpinBox - - - - - - - - - - Position... - - - - - - - Show frame - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - + + + + Background color... + + + + + + + Opacity + + + true + + + mOpacitySlider + + + + + + + 255 + + + Qt::Horizontal + + + + + + + Outline width + + + true + + + mOutlineWidthSpinBox + + + + + + + + + + Position... + + + + + + + Show frame + + + + + + + Qt::Vertical + + + + 215 + 57 + + + + diff --git a/src/ui/qgscomposerlabelwidgetbase.ui b/src/ui/qgscomposerlabelwidgetbase.ui index 548966792e4..bd74645cad4 100644 --- a/src/ui/qgscomposerlabelwidgetbase.ui +++ b/src/ui/qgscomposerlabelwidgetbase.ui @@ -6,8 +6,8 @@ 0 0 - 217 - 302 + 203 + 303 @@ -19,43 +19,65 @@ Label Options - + 0 - - - QTextEdit::NoWrap + + + 0 + + + + 0 + 0 + 203 + 271 + + + + Label + + + + + + + 0 + 0 + + + + Font + + + + + + + Margin (mm) + + + mMarginDoubleSpinBox + + + + + + + + + + QTextEdit::NoWrap + + + + + - - - - - 0 - 0 - - - - Font - - - - - - - Margin (mm) - - - mMarginDoubleSpinBox - - - - - - diff --git a/src/ui/qgscomposerlegendwidgetbase.ui b/src/ui/qgscomposerlegendwidgetbase.ui index 63042752c8e..2f85f185c36 100644 --- a/src/ui/qgscomposerlegendwidgetbase.ui +++ b/src/ui/qgscomposerlegendwidgetbase.ui @@ -1,219 +1,255 @@ - + + QgsComposerLegendWidgetBase - - + + 0 0 - 520 - 498 + 354 + 474 - - + + 0 0 - + Barscale Options - - - - - General + + + 0 + + + + + true - - - - - Title - - - mTitleLineEdit - - - - - - - - - - Font - - - - - - - - 0 - 0 - - - - Title... - - - - - - - Layer... - - - - - - - Item... - - - - - - - Symbol width - - - mSymbolWidthSpinBox - - - - - - - - - - Symbol height - - - mSymbolHeightSpinBox - - - - - - - - - - Layer space - - - mLayerSpaceSpinBox - - - - - - - - - - Symbol space - - - mSymbolSpaceSpinBox - - - - - - - - - - Icon label space - - - mIconLabelSpaceSpinBox - - - - - - - - - - Box space - - - mBoxSpaceSpinBox - - - - - - - - - - - - - Legend items - - - - - - true - - - - - - - Down - - - - - - - Up - - - - - - - Remove - - - - - - - Edit... - - - - - - - Update - - - - - - - Update all - - - - + + + + 0 + 0 + 352 + 472 + + + + + + + 1 + + + + + 0 + 0 + 334 + 390 + + + + General + + + + + + &Title + + + mTitleLineEdit + + + + + + + + + + + 0 + 0 + + + + Title Font... + + + + + + + Layer Font... + + + + + + + Item Font... + + + + + + + Symbol width + + + mm + + + + + + + Symbol height + + + mm + + + + + + + Layer space + + + mm + + + + + + + Symbol space + + + mm + + + + + + + Icon label space + + + mm + + + + + + + Box space + + + mm + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + 0 + 0 + 334 + 390 + + + + Legend items + + + + + + + 0 + 0 + + + + true + + + + + + + v + + + + + + + ^ + + + + + + + X + + + + + + + Edit + + + + + + + Update + + + + + + + All + + + + + + + + + - + mTitleLineEdit mTitleFontButton @@ -226,12 +262,6 @@ mIconLabelSpaceSpinBox mBoxSpaceSpinBox mItemTreeView - mMoveDownPushButton - mMoveUpPushButton - mRemovePushButton - mEditPushButton - mUpdatePushButton - mUpdateAllPushButton diff --git a/src/ui/qgscomposermapwidgetbase.ui b/src/ui/qgscomposermapwidgetbase.ui index cc22d0a1287..4822ab0a1b5 100644 --- a/src/ui/qgscomposermapwidgetbase.ui +++ b/src/ui/qgscomposermapwidgetbase.ui @@ -6,8 +6,8 @@ 0 0 - 504 - 802 + 404 + 447 @@ -19,28 +19,28 @@ Map options - + 0 - - - true + + + 0 - + 0 0 - 481 - 1482 + 386 + 419 + + Map + - - 0 - @@ -175,7 +175,22 @@ - + + + + + + 0 + 0 + 404 + 351 + + + + Extents + + + Map extent @@ -264,7 +279,14 @@ - + + + + + Grid + + + Show grid? @@ -552,7 +574,6 @@ - scrollArea mPreviewModeComboBox mUpdatePreviewButton mWidthLineEdit diff --git a/src/ui/qgscomposerpicturewidgetbase.ui b/src/ui/qgscomposerpicturewidgetbase.ui index 18213d1adf7..6f71ef6e3ab 100644 --- a/src/ui/qgscomposerpicturewidgetbase.ui +++ b/src/ui/qgscomposerpicturewidgetbase.ui @@ -6,7 +6,7 @@ 0 0 - 347 + 240 540 @@ -24,19 +24,22 @@ 0 - - - true + + + 0 - + 0 0 - 324 + 226 679 + + Picture options + @@ -102,6 +105,12 @@ Preview + + 0 + + + 0 + @@ -251,7 +260,7 @@ - Take rotation from composer map + Sync from map @@ -280,7 +289,6 @@ mRotationSpinBox mRotationFromComposerMapCheckBox mComposerMapComboBox - scrollArea diff --git a/src/ui/qgscomposerscalebarwidgetbase.ui b/src/ui/qgscomposerscalebarwidgetbase.ui index c2965f95beb..17a5a7ae8cb 100644 --- a/src/ui/qgscomposerscalebarwidgetbase.ui +++ b/src/ui/qgscomposerscalebarwidgetbase.ui @@ -6,7 +6,7 @@ 0 0 - 212 + 325 537 @@ -19,25 +19,28 @@ Barscale Options - + 0 - - - true + + + 0 - + 0 - -179 - 189 + 0 + 307 714 - + + Scale bar + + @@ -269,22 +272,6 @@ - - scrollArea - mSegmentSizeSpinBox - mMapUnitsPerBarUnitSpinBox - mNumberOfSegmentsSpinBox - mSegmentsLeftSpinBox - mStyleComboBox - mMapComboBox - mHeightSpinBox - mLineWidthSpinBox - mLabelBarSpaceSpinBox - mBoxSizeSpinBox - mUnitLabelLineEdit - mFontButton - mColorPushButton - diff --git a/src/ui/qgscompositionwidgetbase.ui b/src/ui/qgscompositionwidgetbase.ui index f6374a02f92..bf3b1f55ac7 100644 --- a/src/ui/qgscompositionwidgetbase.ui +++ b/src/ui/qgscompositionwidgetbase.ui @@ -6,8 +6,8 @@ 0 0 - 514 - 535 + 416 + 620 @@ -32,9 +32,9 @@ 0 - -290 - 491 - 823 + -72 + 396 + 688 @@ -243,6 +243,9 @@ true + + mResolutionSpinBox + @@ -262,6 +265,9 @@ true + + mOffsetXSpinBox + @@ -275,6 +281,9 @@ true + + mOffsetYSpinBox + @@ -288,6 +297,9 @@ true + + mPenWidthSpinBox + @@ -301,6 +313,9 @@ true + + mGridColorButton + @@ -324,6 +339,9 @@ true + + mGridStyleComboBox + diff --git a/src/ui/qgsconfigureshortcutsdialog.ui b/src/ui/qgsconfigureshortcutsdialog.ui index f5f79891c38..376cab32b09 100644 --- a/src/ui/qgsconfigureshortcutsdialog.ui +++ b/src/ui/qgsconfigureshortcutsdialog.ui @@ -120,22 +120,6 @@ - - buttonBox - accepted() - QgsConfigureShortcutsDialog - accept() - - - 248 - 254 - - - 157 - 274 - - - buttonBox rejected() @@ -143,12 +127,12 @@ reject() - 316 - 260 + 334 + 279 - 286 - 274 + 267 + 297 diff --git a/src/ui/qgscontinuouscolordialogbase.ui b/src/ui/qgscontinuouscolordialogbase.ui index a934f944d0d..93f4ace72c0 100644 --- a/src/ui/qgscontinuouscolordialogbase.ui +++ b/src/ui/qgscontinuouscolordialogbase.ui @@ -6,132 +6,127 @@ 0 0 - 506 - 265 + 453 + 222 Continuous color - - - 9 - - - 6 - - - + + + - - - - 0 - 20 - - - - Classification field - - - classificationComboBox - - - - - - - - 0 - 20 - - - + + + + + + 0 + 20 + + + + Classification field + + + classificationComboBox + + + + + + + + 0 + 20 + + + + + + + + + 0 + 20 + + + + Minimum value + + + btnMinValue + + + + + + + + 0 + 20 + + + + Maximum value + + + btnMaxValue + + + + + + + + 100 + 0 + + + + + + + + + 100 + 0 + + + + + + + + + 0 + 20 + + + + Outline width + + + outlinewidthspinbox + + + + + + + - - - - 0 - 20 - - + - Minimum value - - - btnMinValue + Draw polygon outline - - - - - 0 - 20 - - - - Maximum value - - - btnMaxValue - - - - - - - - 100 - 0 - - - - - - - - - 100 - 0 - - - - - - - - - 0 - 20 - - - - Outline width - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - + Qt::Vertical @@ -144,7 +139,20 @@ - + + + + Qt::Horizontal + + + + 40 + 20 + + + + + Qt::Horizontal @@ -157,13 +165,6 @@ - - - - Draw polygon outline - - - @@ -174,6 +175,13 @@
qgscolorbutton.h
+ + classificationComboBox + btnMinValue + btnMaxValue + outlinewidthspinbox + cb_polygonOutline + diff --git a/src/ui/qgsdetaileditemwidgetbase.ui b/src/ui/qgsdetaileditemwidgetbase.ui index 885af3a12d9..a83a5b16927 100755 --- a/src/ui/qgsdetaileditemwidgetbase.ui +++ b/src/ui/qgsdetaileditemwidgetbase.ui @@ -1,128 +1,117 @@ - + + QgsDetailedItemWidgetBase - - + + 0 0 - 295 - 68 + 312 + 72 - + Form - - - 2 - - - 2 - - - 2 - - - 2 - - - 2 - - - 2 - - - - - - - - 0 - 0 - - - - - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 80 - 80 - - - - - - - ../../images/icons/qgis-icon-16x16.png - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - 0 - 0 - - - - - 15 - 75 - true - - - - Heading Label - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - true - - - - - - - - - + + + + + 0 0 - + + + 0 + 0 + + + + + 150 + 80 + + + + + + + ../../images/icons/qgis-icon-16x16.png + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 15 + 75 + true + + + + Heading Label + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + true + + + + + + + + 0 + 0 + + + + + + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + Detail label - + false - + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - + true diff --git a/src/ui/qgsfieldcalculatorbase.ui b/src/ui/qgsfieldcalculatorbase.ui index 0c99aa22a56..c1611d9570e 100644 --- a/src/ui/qgsfieldcalculatorbase.ui +++ b/src/ui/qgsfieldcalculatorbase.ui @@ -285,7 +285,7 @@ - + Qt::Horizontal @@ -297,6 +297,40 @@ + + mUpdateExistingFieldCheckBox + mExistingFieldComboBox + mOnlyUpdateSelectedCheckBox + mOutputFieldNameLineEdit + mOutputFieldTypeComboBox + mOuputFieldWidthSpinBox + mOutputFieldPrecisionSpinBox + mFieldsListWidget + mValueListWidget + mSamplePushButton + mAllPushButton + mPlusPushButton + mMultiplyPushButton + mSqrtButton + mSinButton + mTanButton + mACosButton + mOpenBracketPushButton + mMinusPushButton + mDividePushButton + mExpButton + mCosButton + mASinButton + mATanButton + mCloseBracketPushButton + mToRealButton + mToIntButton + mToStringButton + mLengthButton + mAreaButton + mExpressionTextEdit + mButtonBox + @@ -306,8 +340,8 @@ accept() - 248 - 254 + 321 + 676 157 @@ -322,8 +356,8 @@ reject() - 316 - 260 + 321 + 676 286 diff --git a/src/ui/qgsgenericprojectionselectorbase.ui b/src/ui/qgsgenericprojectionselectorbase.ui index e094c8832c5..9a2d820841b 100644 --- a/src/ui/qgsgenericprojectionselectorbase.ui +++ b/src/ui/qgsgenericprojectionselectorbase.ui @@ -1,7 +1,8 @@ - + + QgsGenericProjectionSelectorBase - - + + 0 0 @@ -9,59 +10,62 @@ 563 - + Coordinate Reference System Selector - + - + true - - - - - + + + + + 0 0 - + 16777215 160 - + Qt::NoFocus - + false - + 2 - + true - - + + - - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok + + + false - + QgsProjectionSelector @@ -74,33 +78,33 @@ buttonBox - rejected() + accepted() QgsGenericProjectionSelectorBase - reject() + accept() - - 475 + + 409 534 - - 493 - 523 + + 417 + 559 buttonBox - accepted() + rejected() QgsGenericProjectionSelectorBase - accept() + reject() - - 566 - 534 + + 471 + 537 - - 600 - 530 + + 594 + 563 diff --git a/src/ui/qgsgraduatedsymboldialogbase.ui b/src/ui/qgsgraduatedsymboldialogbase.ui index 8cf9f2d2c12..0c7874b9309 100644 --- a/src/ui/qgsgraduatedsymboldialogbase.ui +++ b/src/ui/qgsgraduatedsymboldialogbase.ui @@ -219,6 +219,7 @@ numberofclassesspinbox mClassifyButton mDeleteClassButton + mClassListWidget diff --git a/src/ui/qgslabeldialogbase.ui b/src/ui/qgslabeldialogbase.ui index c971fc0af16..3602d8d5694 100644 --- a/src/ui/qgslabeldialogbase.ui +++ b/src/ui/qgslabeldialogbase.ui @@ -1,7 +1,8 @@ - + + QgsLabelDialogBase - - + + 0 0 @@ -9,37 +10,40 @@ 487 - - + + 0 0 - + Form1 - - + + 0 - - + + - - + + Field containing label + + cboLabelField + - - - + + + 1 0 - + 0 20 @@ -48,21 +52,24 @@ - - + + Default label + + leDefaultLabel + - - - + + + 2 0 - + 0 20 @@ -72,55 +79,55 @@ - - - - + + + + 0 0 - + General - + Buffer - + Position - + Data defined style - + Data defined alignment - + Data defined buffer - + Data defined position - - - - + + + + 0 0 @@ -131,16 +138,16 @@ 200 - + Preview: - - + + 11 - - - + + + QGIS Rocks! @@ -148,61 +155,56 @@ - - - - + + + + 0 0 - + 0 - - - - 0 - 0 - 304 - 399 - - - - - - - - - + + + + + + + + 2 0 - + Font - - - + + + Font size - + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + spinFontSize + - - - - + + + + 0 0 - + 50 0 @@ -212,119 +214,122 @@ 6 - 1000000 + 1000000.000000000000000 - - 0 + + 0.000000000000000 - - - - + + + + 2 0 - + Color - - - + + + Angle (deg) + + spinAngle + - - - + + + ° - + 360 - + 0 - - - + + + Placement - - + + 11 - - - + + + Below Right - - - + + + Right - - - + + + Below - - - + + + Over - + true - - - + + + Above - - - + + + Left - - - + + + Below Left - - - + + + Above Right - - - + + + Above Left @@ -332,22 +337,22 @@ - - - + + + Font size units - - - - + + + + Points - - - + + + Map units @@ -355,12 +360,12 @@ - + - + Qt::Vertical - + 20 40 @@ -368,60 +373,60 @@ - - - + + + Use scale dependent rendering - + true - - + + 11 - - - + + + Maximum - + spinMaximumScale - - - + + + Minimum - + spinMinimumScale - - - + + + Minimum scale at which this layer will be displayed. - + 1 - + 100000000 - - - + + + Maximum scale at which this layer will be displayed. - + 1 - + 100000000 @@ -429,112 +434,104 @@ - - - + + + Multiline labels? - + true - - - - 0 - 0 - 304 - 399 - - - - - - + + + + + Buffer labels? - + true - - - + + + Buffer size - - + + - - - + + + false - + Transparency - + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - + + + false - - + + 0 0 - + 50 0 - + % - + 100 - + 0 - - - + + + Color - - - + + + Buffer size units - - - - + + + + Size is in points - - - + + + Size is in map units @@ -542,12 +539,12 @@ - + - + Qt::Vertical - + 20 40 @@ -557,60 +554,52 @@ - - - - 0 - 0 - 304 - 399 - - - - - - + + + + + X Offset (pts) - - - - -99 + + + + -99.000000000000000 - - - + + + Y Offset (pts) - - - - -99 + + + + -99.000000000000000 - - - + + + Offset units - - - - + + + + Points - - - + + + Map units @@ -618,12 +607,12 @@ - + - + Qt::Vertical - + 20 181 @@ -633,35 +622,27 @@ - - - - 0 - 0 - 304 - 399 - - - - - - - + + + + + + 0 0 - + &Font family - + cboFontField - - - + + + 0 20 @@ -669,25 +650,25 @@ - - - - + + + + 0 0 - + &Bold - + cboBoldField - - - + + + 0 20 @@ -695,25 +676,25 @@ - - - - + + + + 0 0 - + &Italic - + cboItalicField - - - + + + 0 20 @@ -721,25 +702,25 @@ - - - - + + + + 0 0 - + &Underline - + cboUnderlineField - - - + + + 0 20 @@ -747,25 +728,25 @@ - - - - + + + + 0 0 - + &Size - + cboFontSizeField - - - + + + 0 20 @@ -773,25 +754,25 @@ - - - - + + + + 0 0 - + Size units - + cboFontSizeTypeField - - - + + + 0 20 @@ -799,31 +780,31 @@ - - - + + + false - - + + 0 0 - + Transparency - + cboFontTransparencyField - - - + + + false - + 0 20 @@ -831,25 +812,25 @@ - - - - + + + + 0 0 - + &Color - + cboFontColorField - - - + + + 0 20 @@ -859,205 +840,177 @@ - - - - 0 - 0 - 304 - 399 - - - - - - - + + + + + + 0 0 - + Placement - - + + - - - - + + + + 0 0 - + Angle (deg) - - + + - - - - 0 - 0 - 304 - 399 - - - - - - + + + + + false - - + + 0 0 - + 70 0 - + Transparency: - + cboBufferTransparencyField - - - + + + false - - - - + + + + 0 0 - + Size: - + cboBufferSizeField - - + + - - - - 0 - 0 - 100 - 30 - - - - - - - + + + + + + 0 0 - + X Coordinate - - + + - - - - + + + + 0 0 - + Y Coordinate - - + + - - - - + + + + 0 0 - + X Offset (pts) - - + + - - - - + + + + 0 0 - + Y Offset (pts) - - + + - listWidget - groupBox5 - stackedWidget - + cboLabelField leDefaultLabel + listWidget btnDefaultFont - pbnDefaultFontColor spinFontSize - radioFontSizeUnitsPoints - radioFontSizeUnitsMap + pbnDefaultFontColor spinAngle radioAboveLeft radioAbove @@ -1068,11 +1021,12 @@ radioBelowLeft radioBelow radioBelowRight - chkUseBuffer - spinBufferSize - spinBufferTransparency - radioBufferUnitsPoints - radioBufferUnitsMap + radioFontSizeUnitsPoints + radioFontSizeUnitsMap + chkUseScaleDependentRendering + spinMinimumScale + spinMaximumScale + chkUseMultiline spinXOffset spinYOffset radioOffsetUnitsPoints @@ -1091,6 +1045,14 @@ cboYCoordinateField cboXOffsetField cboYOffsetField + chkUseBuffer + spinBufferSize + spinBufferTransparency + radioBufferUnitsPoints + radioBufferUnitsMap + pbnDefaultBufferColor_2 + cboFontSizeTypeField + cboFontColorField @@ -1100,11 +1062,11 @@ stackedWidget setCurrentIndex(int) - + 121 72 - + 269 54 @@ -1116,13 +1078,13 @@ spinBufferTransparency setEnabled(bool) - - 415 - 64 + + 320 + 55 - - 467 - 130 + + 506 + 107 @@ -1132,13 +1094,13 @@ textLabel4_3_2_2 setEnabled(bool) - - 390 - 61 + + 320 + 55 - - 333 - 100 + + 320 + 81 @@ -1148,13 +1110,13 @@ spinBufferSize setEnabled(bool) - - 396 - 67 + + 320 + 55 - - 451 - 92 + + 506 + 81 @@ -1164,13 +1126,13 @@ textLabel5_2_2_3 setEnabled(bool) - - 431 - 65 + + 320 + 55 - - 347 - 128 + + 320 + 107 @@ -1180,13 +1142,13 @@ pbnDefaultBufferColor_2 setEnabled(bool) - - 380 - 66 + + 320 + 55 - - 393 - 159 + + 320 + 137 @@ -1196,13 +1158,13 @@ groupBox_4 setEnabled(bool) - - 294 - 66 + + 320 + 55 - - 306 - 195 + + 320 + 173 diff --git a/src/ui/qgsludialogbase.ui b/src/ui/qgsludialogbase.ui index c7057c2a4c0..f159032e1b5 100644 --- a/src/ui/qgsludialogbase.ui +++ b/src/ui/qgsludialogbase.ui @@ -1,101 +1,75 @@ - + + QgsLUDialogBase - - + + 0 0 - 324 - 133 + 227 + 117 - + Enter class bounds - + true - - - 4 - - - 4 - - - 4 - - - 4 - - - -1 - - - -1 - - - - - Lower value - - - mLowerEdit - - + + + + + + + Lower value + + + mLowerEdit + + + + + + + + + + Upper value + + + mUpperEdit + + + + + + + - - - - Qt::Horizontal + + + + Qt::Vertical - - QSizePolicy::Expanding - - + - 16 - 49 + 20 + 10 - - - - Upper value - - - mUpperEdit - - - - - - - - - - - - - - Qt::AutoText - - - - - - - - - - QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok + + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok - + @@ -104,11 +78,11 @@ QgsLUDialogBase accept() - - 285 + + 163 120 - + 321 35 @@ -120,11 +94,11 @@ QgsLUDialogBase reject() - - 209 + + 163 116 - + 151 7 diff --git a/src/ui/qgsmeasurebase.ui b/src/ui/qgsmeasurebase.ui index f16eaae84d8..a706c3d0ef2 100644 --- a/src/ui/qgsmeasurebase.ui +++ b/src/ui/qgsmeasurebase.ui @@ -6,7 +6,7 @@ 0 0 - 275 + 281 272 @@ -154,6 +154,13 @@ + + mTable + editTotal + btnHelp + mRestartButton + mCloseButton +