From 956e18d28f5991db47fbc7d2e21adb6a7ac6fa46 Mon Sep 17 00:00:00 2001 From: Larry Shaffer Date: Fri, 19 Apr 2013 19:54:57 -0600 Subject: [PATCH] Update vector layer properties dialog with vertical tabs - Following subsections still need work: Labeling (ng), Diagrams and possibly more on Style - Add new SVG icons for Labels, Display and Metadata tabs - Add up/down, plus/minus icons for consistency - Move Metadata tab to bottom of list for vector and raster layer property dialogs - Update report stylesheet (metadata output) to support direct RTF copy/paste (i.e. black-colored fonts) - Update report stylesheet to use light gray backgrounds for headers instead of unpredictable highlight color --- images/images.qrc | 3 + .../themes/default/propertyicons/display.svg | 12 + .../themes/default/propertyicons/labels.svg | 117 + .../themes/default/propertyicons/metadata.svg | 18 + src/app/qgsvectorlayerproperties.cpp | 73 +- src/app/qgsvectorlayerproperties.h | 5 +- src/core/qgsapplication.cpp | 54 +- src/core/qgsvectorlayer.cpp | 114 +- src/core/raster/qgsrasterlayer.cpp | 12 +- src/gui/qgsoptionsdialogbase.cpp | 17 + src/providers/gdal/qgsgdalprovider.cpp | 6 +- src/ui/qgsattributeactiondialogbase.ui | 236 +- src/ui/qgsdiagrampropertiesbase.ui | 40 +- src/ui/qgsrasterlayerpropertiesbase.ui | 311 +-- src/ui/qgsrulebasedrendererv2widget.ui | 41 +- src/ui/qgssymbolv2selectordialogbase.ui | 61 +- src/ui/qgsvectorlayerpropertiesbase.ui | 2415 ++++++++++------- src/ui/symbollayer/widget_symbolslist.ui | 6 +- 18 files changed, 2197 insertions(+), 1344 deletions(-) create mode 100644 images/themes/default/propertyicons/display.svg create mode 100644 images/themes/default/propertyicons/labels.svg create mode 100644 images/themes/default/propertyicons/metadata.svg diff --git a/images/images.qrc b/images/images.qrc index a8b0f9a14c6..a2f6dcd9695 100644 --- a/images/images.qrc +++ b/images/images.qrc @@ -374,14 +374,17 @@ themes/default/propertyicons/CRS.png themes/default/propertyicons/diagram.png themes/default/propertyicons/digitising.png + themes/default/propertyicons/display.svg themes/default/propertyicons/gdal.png themes/default/propertyicons/general.png themes/default/propertyicons/histogram.png themes/default/propertyicons/join.png themes/default/propertyicons/labels.png + themes/default/propertyicons/labels.svg themes/default/propertyicons/locale.png themes/default/propertyicons/map_tools.png themes/default/propertyicons/metadata.png + themes/default/propertyicons/metadata.svg themes/default/propertyicons/network_and_proxy.png themes/default/propertyicons/overlay.png themes/default/propertyicons/pyramids.png diff --git a/images/themes/default/propertyicons/display.svg b/images/themes/default/propertyicons/display.svg new file mode 100644 index 00000000000..e5fc3f17a81 --- /dev/null +++ b/images/themes/default/propertyicons/display.svg @@ -0,0 +1,12 @@ + + + + + + + diff --git a/images/themes/default/propertyicons/labels.svg b/images/themes/default/propertyicons/labels.svg new file mode 100644 index 00000000000..00303f382de --- /dev/null +++ b/images/themes/default/propertyicons/labels.svg @@ -0,0 +1,117 @@ + + + + +label + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/images/themes/default/propertyicons/metadata.svg b/images/themes/default/propertyicons/metadata.svg new file mode 100644 index 00000000000..8ea214b9843 --- /dev/null +++ b/images/themes/default/propertyicons/metadata.svg @@ -0,0 +1,18 @@ + + + + + + + + + diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp index 42d560548b7..3365462dac0 100644 --- a/src/app/qgsvectorlayerproperties.cpp +++ b/src/app/qgsvectorlayerproperties.cpp @@ -69,24 +69,35 @@ QgsVectorLayerProperties::QgsVectorLayerProperties( QWidget * parent, Qt::WFlags fl ) - : QDialog( parent, fl ) + : QgsOptionsDialogBase( "VectorLayerProperties", parent, fl ) , layer( lyr ) , mMetadataFilled( false ) , mRendererDialog( 0 ) { setupUi( this ); + // QgsOptionsDialogBase handles saving/restoring of geometry, splitter and current tab states, + // switching vertical tabs between icon/text to icon-only modes (splitter collapsed to left), + // and connecting QDialogButtonBox's accepted/rejected signals to dialog's accept/reject slots + initOptionsBase( false ); mMaximumScaleIconLabel->setPixmap( QgsApplication::getThemePixmap( "/mActionZoomIn.png" ) ); mMinimumScaleIconLabel->setPixmap( QgsApplication::getThemePixmap( "/mActionZoomOut.png" ) ); - connect( buttonBox, SIGNAL( accepted() ), this, SLOT( accept() ) ); - connect( buttonBox, SIGNAL( rejected() ), this, SLOT( reject() ) ); connect( buttonBox->button( QDialogButtonBox::Apply ), SIGNAL( clicked() ), this, SLOT( apply() ) ); connect( this, SIGNAL( accepted() ), this, SLOT( apply() ) ); + connect( mOptionsStackedWidget, SIGNAL( currentChanged( int ) ), this, SLOT( mOptionsStackedWidget_CurrentChanged( int ) ) ); + connect( insertFieldButton, SIGNAL( clicked() ), this, SLOT( insertField() ) ); connect( insertExpressionButton, SIGNAL( clicked() ), this, SLOT( insertExpression() ) ); + // connections for Map Tip display + connect( htmlRadio, SIGNAL( toggled( bool ) ), htmlMapTip, SLOT( setEnabled( bool ) ) ); + connect( htmlRadio, SIGNAL( toggled( bool ) ), insertFieldButton, SLOT( setEnabled( bool ) ) ); + connect( htmlRadio, SIGNAL( toggled( bool ) ), fieldComboBox, SLOT( setEnabled( bool ) ) ); + connect( htmlRadio, SIGNAL( toggled( bool ) ), insertExpressionButton, SLOT( setEnabled( bool ) ) ); + connect( fieldComboRadio, SIGNAL( toggled( bool ) ), displayFieldComboBox, SLOT( setEnabled( bool ) ) ); + QVBoxLayout *layout; if ( layer->hasGeometryType() ) @@ -95,6 +106,7 @@ QgsVectorLayerProperties::QgsVectorLayerProperties( layout = new QVBoxLayout( labelingFrame ); layout->setMargin( 0 ); labelingDialog = new QgsLabelingGui( QgisApp::instance()->palLabeling(), layer, QgisApp::instance()->mapCanvas(), labelingFrame ); + labelingDialog->layout()->setMargin( 0 ); layout->addWidget( labelingDialog ); labelingFrame->setLayout( layout ); @@ -102,6 +114,7 @@ QgsVectorLayerProperties::QgsVectorLayerProperties( layout = new QVBoxLayout( labelOptionsFrame ); layout->setMargin( 0 ); labelDialog = new QgsLabelDialog( layer->label(), labelOptionsFrame ); + labelDialog->layout()->setMargin( 0 ); layout->addWidget( labelDialog ); labelOptionsFrame->setLayout( layout ); connect( labelDialog, SIGNAL( labelSourceSet() ), this, SLOT( setLabelCheckBox() ) ); @@ -110,8 +123,8 @@ QgsVectorLayerProperties::QgsVectorLayerProperties( { labelingDialog = 0; labelDialog = 0; - tabWidget->setTabEnabled( 1, false ); // hide labeling item - tabWidget->setTabEnabled( 2, false ); // hide labeling (deprecated) item + mOptsPage_Labels->setEnabled( false ); // disable labeling item + mOptsPage_LabelsOld->setEnabled( false ); // disable labeling (deprecated) item } // Create the Actions dialog tab @@ -119,6 +132,7 @@ QgsVectorLayerProperties::QgsVectorLayerProperties( actionLayout->setMargin( 0 ); const QgsFields &fields = layer->pendingFields(); actionDialog = new QgsAttributeActionDialog( layer->actions(), fields, actionOptionsFrame ); + actionDialog->layout()->setMargin( 0 ); actionLayout->addWidget( actionDialog ); // Create the menu for the save style button to choose the output format @@ -128,7 +142,9 @@ QgsVectorLayerProperties::QgsVectorLayerProperties( QObject::connect( mSaveAsMenu, SIGNAL( triggered( QAction * ) ), this, SLOT( saveStyleAsMenuTriggered( QAction * ) ) ); mFieldsPropertiesDialog = new QgsFieldsProperties( layer, mFieldsFrame ); + mFieldsPropertiesDialog->layout()->setMargin( 0 ); mFieldsFrame->setLayout( new QVBoxLayout( mFieldsFrame ) ); + mFieldsFrame->layout()->setMargin( 0 ); mFieldsFrame->layout()->addWidget( mFieldsPropertiesDialog ); connect( mFieldsPropertiesDialog, SIGNAL( toggleEditing() ), this, SLOT( toggleEditing() ) ); @@ -158,8 +174,7 @@ QgsVectorLayerProperties::QgsVectorLayerProperties( } else { - // currently only encoding can be set in this group, so hide it completely - grpProviderOptions->hide(); + mDataSourceEncodingFrame->hide(); } } @@ -174,7 +189,9 @@ QgsVectorLayerProperties::QgsVectorLayerProperties( } diagramPropertiesDialog = new QgsDiagramProperties( layer, mDiagramFrame ); + diagramPropertiesDialog->layout()->setMargin( 0 ); mDiagramFrame->setLayout( new QVBoxLayout( mDiagramFrame ) ); + mDiagramFrame->layout()->setMargin( 0 ); mDiagramFrame->layout()->addWidget( diagramPropertiesDialog ); //layer title and abstract @@ -184,26 +201,18 @@ QgsVectorLayerProperties::QgsVectorLayerProperties( mLayerAbstractTextEdit->setPlainText( layer->abstract() ); } - QSettings settings; - restoreGeometry( settings.value( "/Windows/VectorLayerProperties/geometry" ).toByteArray() ); - int tabIndex = settings.value( "/Windows/VectorLayerProperties/row", 0 ).toInt(); - - // if the last used tab is not enabled display the first enabled one - if ( !tabWidget->isTabEnabled( tabIndex ) ) - { - tabIndex = 0; - for ( int i = 0; i < tabWidget->count(); i++ ) - { - if ( tabWidget->isTabEnabled( i ) ) - { - tabIndex = i; - break; - } - } - } - tabWidget->setCurrentIndex( tabIndex ); - setWindowTitle( tr( "Layer Properties - %1" ).arg( layer->name() ) ); + + QSettings settings; + // if dialog hasn't been opened/closed yet, default to Styles tab, which is used most often + // this will be read by restoreOptionsBaseUi() + if ( !settings.contains( QString( "/Windows/VectorLayerProperties/tab" ) ) ) + { + settings.setValue( QString( "/Windows/VectorLayerProperties/tab" ), + mOptStackedWidget->indexOf( mOptsPage_Style ) ); + } + + restoreOptionsBaseUi(); } // QgsVectorLayerProperties ctor @@ -213,10 +222,6 @@ QgsVectorLayerProperties::~QgsVectorLayerProperties() { disconnect( labelDialog, SIGNAL( labelSourceSet() ), this, SLOT( setLabelCheckBox() ) ); } - - QSettings settings; - settings.setValue( "/Windows/VectorLayerProperties/geometry", saveGeometry() ); - settings.setValue( "/Windows/VectorLayerProperties/row", tabWidget->currentIndex() ); } void QgsVectorLayerProperties::toggleEditing() @@ -788,13 +793,15 @@ void QgsVectorLayerProperties::updateSymbologyPage() } else { - tabWidget->setTabEnabled( 0, false ); // hide symbology item + mOptsPage_Style->setEnabled( false ); // hide symbology item } if ( mRendererDialog ) { + mRendererDialog->layout()->setMargin( 0 ); widgetStackRenderers->addWidget( mRendererDialog ); widgetStackRenderers->setCurrentWidget( mRendererDialog ); + widgetStackRenderers->currentWidget()->layout()->setMargin( 0 ); } } @@ -804,9 +811,9 @@ void QgsVectorLayerProperties::on_pbnUpdateExtents_clicked() mMetadataFilled = false; } -void QgsVectorLayerProperties::on_tabWidget_currentChanged( int index ) +void QgsVectorLayerProperties::mOptionsStackedWidget_CurrentChanged( int indx ) { - if ( index != 6 || mMetadataFilled ) + if ( indx != mOptStackedWidget->indexOf( mOptsPage_Metadata ) || mMetadataFilled ) return; //set the metadata contents (which can be expensive) diff --git a/src/app/qgsvectorlayerproperties.h b/src/app/qgsvectorlayerproperties.h index 74e1a9e669f..e1944c7ea87 100644 --- a/src/app/qgsvectorlayerproperties.h +++ b/src/app/qgsvectorlayerproperties.h @@ -19,6 +19,7 @@ #ifndef QGSVECTORLAYERPROPERTIES #define QGSVECTORLAYERPROPERTIES +#include "qgsoptionsdialogbase.h" #include "ui_qgsvectorlayerpropertiesbase.h" #include "qgisgui.h" #include "qgsaddattrdialog.h" @@ -41,7 +42,7 @@ class QgsLabelingGui; class QgsDiagramProperties; class QgsFieldsProperties; -class QgsVectorLayerProperties : public QDialog, private Ui::QgsVectorLayerPropertiesBase +class QgsVectorLayerProperties : public QgsOptionsDialogBase, private Ui::QgsVectorLayerPropertiesBase { Q_OBJECT @@ -106,7 +107,7 @@ class QgsVectorLayerProperties : public QDialog, private Ui::QgsVectorLayerPrope void on_pbnSaveDefaultStyle_clicked(); void on_pbnLoadStyle_clicked(); void on_pbnSaveStyleAs_clicked(); - void on_tabWidget_currentChanged( int idx ); + void mOptionsStackedWidget_CurrentChanged( int indx ); void on_buttonBox_helpRequested() { QgsContextHelp::run( metaObject()->className() ); } void on_pbnUpdateExtents_clicked(); diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp index 6d656477024..fc0eb61159d 100644 --- a/src/core/qgsapplication.cpp +++ b/src/core/qgsapplication.cpp @@ -623,30 +623,48 @@ QString QgsApplication::reportStyleSheet() // Make the style sheet desktop preferences aware by using qappliation // palette as a basis for colors where appropriate // - QColor myColor1 = palette().highlight().color(); +// QColor myColor1 = palette().highlight().color(); + QColor myColor1( Qt::lightGray ); QColor myColor2 = myColor1; myColor2 = myColor2.lighter( 110 ); //10% lighter QString myStyle; myStyle = "p.glossy{ background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, " - "stop: 0 " + myColor1.name() + "," - "stop: 0.1 " + myColor2.name() + "," - "stop: 0.5 " + myColor1.name() + "," - "stop: 0.9 " + myColor2.name() + "," - "stop: 1 " + myColor1.name() + ");" - "color: white;" - "padding-left: 4px;" - "padding-top: 20px;" - "padding-bottom: 8px;" - "border: 1px solid #6c6c6c;" + " stop: 0 " + myColor1.name() + "," + " stop: 0.1 " + myColor2.name() + "," + " stop: 0.5 " + myColor1.name() + "," + " stop: 0.9 " + myColor2.name() + "," + " stop: 1 " + myColor1.name() + ");" + " color: black;" + " padding-left: 4px;" + " padding-top: 20px;" + " padding-bottom: 8px;" + " border: 1px solid #6c6c6c;" + "}" + "p.subheaderglossy{ background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, " + " stop: 0 " + myColor1.name() + "," + " stop: 0.1 " + myColor2.name() + "," + " stop: 0.5 " + myColor1.name() + "," + " stop: 0.9 " + myColor2.name() + "," + " stop: 1 " + myColor1.name() + ");" + " font-weight: bold;" + " font-size: medium;" + " line-height: 1.1em;" + " width: 100%;" + " color: black;" + " padding-left: 4px;" + " padding-right: 4px;" + " padding-top: 20px;" + " padding-bottom: 8px;" + " border: 1px solid #6c6c6c;" "}" "th.glossy{ background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, " - "stop: 0 " + myColor1.name() + "," - "stop: 0.1 " + myColor2.name() + "," - "stop: 0.5 " + myColor1.name() + "," - "stop: 0.9 " + myColor2.name() + "," - "stop: 1 " + myColor1.name() + ");" - "color: white;" - "border: 1px solid #6c6c6c;" + " stop: 0 " + myColor1.name() + "," + " stop: 0.1 " + myColor2.name() + "," + " stop: 0.5 " + myColor1.name() + "," + " stop: 0.9 " + myColor2.name() + "," + " stop: 1 " + myColor1.name() + ");" + " color: black;" + " border: 1px solid #6c6c6c;" "}" ".overview{ font: 1.82em; font-weight: bold;}" "body{ background: white;" diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp index 3be4e943d3f..1d0a6546f5a 100644 --- a/src/core/qgsvectorlayer.cpp +++ b/src/core/qgsvectorlayer.cpp @@ -3396,31 +3396,33 @@ void QgsVectorLayer::setDiagramLayerSettings( const QgsDiagramLayerSettings& s ) QString QgsVectorLayer::metadata() { QString myMetadata = ""; - myMetadata += ""; //------------- - myMetadata += ""; + myMetadata += "

"; + myMetadata += tr( "General" ); + myMetadata += "

\n"; // data comment if ( !( dataComment().isEmpty() ) ) { - myMetadata += ""; + myMetadata += "

" + tr( "Layer comment" ) + "

\n"; + myMetadata += "

"; + myMetadata += dataComment(); + myMetadata += "

\n"; } //storage type - myMetadata += ""; + myMetadata += "

" + tr( "Storage type of this layer" ) + "

\n"; + myMetadata += "

"; + myMetadata += storageType(); + myMetadata += "

\n"; // data source - myMetadata += ""; + myMetadata += "

" + tr( "Source for this layer" ) + "

\n"; + myMetadata += "

"; + myMetadata += publicSource(); + myMetadata += "

\n"; //geom type @@ -3434,42 +3436,46 @@ QString QgsVectorLayer::metadata() { QString typeString( QGis::vectorGeometryType( geometryType() ) ); - myMetadata += ""; + myMetadata += "

" + tr( "Geometry type of the features in this layer" ) + "

\n"; + myMetadata += "

"; + myMetadata += typeString; + myMetadata += "

\n"; } QgsAttributeList pkAttrList = pendingPkAttributesList(); if ( !pkAttrList.isEmpty() ) { - myMetadata += ""; + myMetadata += "

\n"; } //feature count - myMetadata += ""; + myMetadata += "

" + tr( "The number of features in this layer" ) + "

\n"; + myMetadata += "

"; + myMetadata += QString::number( featureCount() ); + myMetadata += "

\n"; //capabilities - myMetadata += ""; + myMetadata += "

" + tr( "Editing capabilities of this layer" ) + "

\n"; + myMetadata += "

"; + myMetadata += capabilitiesString(); + myMetadata += "

\n"; //------------- QgsRectangle myExtent = extent(); - myMetadata += ""; - //extents in layer cs TODO...maybe make a little nested table to improve layout... - myMetadata += ""; + myMetadata += "

\n"; //extents in project cs @@ -3534,37 +3540,34 @@ QString QgsVectorLayer::metadata() #if 0 // TODO: currently disabled, will revisit later [MD] QgsRectangle myProjectedExtent = coordinateTransform->transformBoundingBox( extent() ); - myMetadata += ""; + myMetadata += "

\n"; #endif // // Display layer spatial ref system // - myMetadata += ""; - myMetadata += ""; + myMetadata += "

\n"; // // Display project (output) spatial ref system // #if 0 // TODO: disabled for now, will revisit later [MD] - myMetadata += ""; - myMetadata += ""; + myMetadata += "

\n"; #endif } catch ( QgsCsException &cse ) @@ -3572,10 +3575,10 @@ QString QgsVectorLayer::metadata() Q_UNUSED( cse ); QgsDebugMsg( cse.what() ); - myMetadata += ""; + myMetadata += "

" + tr( "In project spatial reference system units" ) + "

\n"; + myMetadata += "

"; + myMetadata += tr( "(Invalid transformation of layer extents)" ); + myMetadata += "

\n"; } @@ -3583,10 +3586,8 @@ QString QgsVectorLayer::metadata() // // Add the info about each field in the attribute table // - myMetadata += ""; - myMetadata += ""; //end of stats container table row - // - // Close the table - // - - myMetadata += "
"; - myMetadata += tr( "General:" ); - myMetadata += "
"; - myMetadata += tr( "Layer comment: %1" ).arg( dataComment() ); - myMetadata += "
"; - myMetadata += tr( "Storage type of this layer: %1" ).arg( storageType() ); - myMetadata += "
"; - myMetadata += tr( "Source for this layer: %1" ).arg( publicSource() ); - myMetadata += "
"; - myMetadata += tr( "Geometry type of the features in this layer: %1" ).arg( typeString ); - myMetadata += "
"; - myMetadata += tr( "Primary key attributes: " ); + myMetadata += "

" + tr( "Primary key attributes" ) + "

\n"; + myMetadata += "

"; foreach ( int idx, pkAttrList ) { myMetadata += pendingFields()[ idx ].name() + " "; } - myMetadata += "

"; - myMetadata += tr( "The number of features in this layer: %1" ).arg( featureCount() ); - myMetadata += "
"; - myMetadata += tr( "Editing capabilities of this layer: %1" ).arg( capabilitiesString() ); - myMetadata += "
"; - myMetadata += tr( "Extents:" ); - myMetadata += "
" + tr( "In layer spatial reference system units : " ); + myMetadata += "

"; + myMetadata += tr( "Extents" ); + myMetadata += "

\n"; + //extents in layer cs TODO...maybe make a little nested table to improve layout... + myMetadata += "

" + tr( "In layer spatial reference system units" ) + "

\n"; + myMetadata += "

"; // Try to be a bit clever over what number format we use for the // extents. Some people don't like it using scientific notation when the // numbers get large, but for small numbers this is the more practical @@ -3525,7 +3531,7 @@ QString QgsVectorLayer::metadata() myMetadata += tr( "unknown extent" ); } - myMetadata += "

"; - myMetadata += tr( "In project spatial reference system units : " ) - + tr( "xMin,yMin %1,%2 : xMax,yMax %3,%4" ) + myMetadata += "

" + tr( "In project spatial reference system units" ) + "

\n"; + myMetadata += "

"; + myMetadata += tr( "xMin,yMin %1,%2 : xMax,yMax %3,%4" ) .arg( myProjectedExtent.xMinimum() ) .arg( myProjectedExtent.yMinimum() ) .arg( myProjectedExtent.xMaximum() ) .arg( myProjectedExtent.yMaximum() ); - myMetadata += "

"; - myMetadata += tr( "Layer Spatial Reference System:" ); - myMetadata += "
"; + myMetadata += "

" + tr( "Layer Spatial Reference System" ) + "

\n"; + myMetadata += "

"; myMetadata += crs().toProj4().replace( QRegExp( "\"" ), " \"" ); - myMetadata += "

"; - myMetadata += tr( "Project (Output) Spatial Reference System:" ); - myMetadata += "
"; + //myMetadata += "
"; + myMetadata += "

" + tr( "Project (Output) Spatial Reference System" ) + "

\n"; + myMetadata += "

"; myMetadata += coordinateTransform->destCRS().toProj4().replace( QRegExp( "\"" ), " \"" ); - myMetadata += "

"; - myMetadata += tr( "In project spatial reference system units : " ) - + tr( "(Invalid transformation of layer extents)" ); - myMetadata += "
"; - myMetadata += tr( "Attribute field info:" ); - myMetadata += "
"; + myMetadata += "

" + tr( "Attribute field info" ) + "

\n"; + myMetadata += "

"; // Start a nested table in this trow myMetadata += ""; @@ -3633,13 +3634,6 @@ QString QgsVectorLayer::metadata() myMetadata += "
"; //end of nested table #endif - myMetadata += "

"; - myMetadata += ""; return myMetadata; } diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp index 316c4285d9a..90dce5c00d4 100644 --- a/src/core/raster/qgsrasterlayer.cpp +++ b/src/core/raster/qgsrasterlayer.cpp @@ -487,7 +487,7 @@ QList< QPair< QString, QColor > > QgsRasterLayer::legendSymbologyItems() const QString QgsRasterLayer::metadata() { QString myMetadata ; - myMetadata += "

" + tr( "Driver:" ) + "

\n"; + myMetadata += "

" + tr( "Driver" ) + "

\n"; myMetadata += "

"; myMetadata += mDataProvider->description(); myMetadata += "

\n"; @@ -513,7 +513,7 @@ QString QgsRasterLayer::metadata() myMetadata += "

\n"; myMetadata += "

"; - myMetadata += tr( "Data Type:" ); + myMetadata += tr( "Data Type" ); myMetadata += "

\n"; myMetadata += "

"; //just use the first band @@ -558,19 +558,19 @@ QString QgsRasterLayer::metadata() myMetadata += "

\n"; myMetadata += "

"; - myMetadata += tr( "Pyramid overviews:" ); + myMetadata += tr( "Pyramid overviews" ); myMetadata += "

\n"; myMetadata += "

"; myMetadata += "

"; - myMetadata += tr( "Layer Spatial Reference System: " ); + myMetadata += tr( "Layer Spatial Reference System" ); myMetadata += "

\n"; myMetadata += "

"; myMetadata += crs().toProj4(); myMetadata += "

\n"; myMetadata += "

"; - myMetadata += tr( "Layer Extent (layer original source projection): " ); + myMetadata += tr( "Layer Extent (layer original source projection)" ); myMetadata += "

\n"; myMetadata += "

"; myMetadata += mDataProvider->extent().toString(); @@ -580,7 +580,7 @@ QString QgsRasterLayer::metadata() // TODO: this is not related to layer, to be removed? [MD] #if 0 myMetadata += ""; - myMetadata += tr( "Project Spatial Reference System: " ); + myMetadata += tr( "Project Spatial Reference System" ); myMetadata += "

\n"; myMetadata += "

"; myMetadata += mCoordinateTransform->destCRS().toProj4(); diff --git a/src/gui/qgsoptionsdialogbase.cpp b/src/gui/qgsoptionsdialogbase.cpp index f11b1275e36..9251e0f00ca 100644 --- a/src/gui/qgsoptionsdialogbase.cpp +++ b/src/gui/qgsoptionsdialogbase.cpp @@ -95,6 +95,23 @@ void QgsOptionsDialogBase::restoreOptionsBaseUi() settings.value( QString( "/Windows/%1/splitState" ).arg( mOptsKey ) ).isNull() ? 150 : 16777215 ); mOptSplitter->restoreState( settings.value( QString( "/Windows/%1/splitState" ).arg( mOptsKey ) ).toByteArray() ); int curIndx = settings.value( QString( "/Windows/%1/tab" ).arg( mOptsKey ), 0 ).toInt(); + + // if the last used tab is not enabled, or is missing, display the first enabled one + if ( !mOptStackedWidget->widget( curIndx )->isEnabled() + || mOptStackedWidget->count() < ( curIndx + 1 ) ) + { + curIndx = 0; + for ( int i = 0; i < mOptStackedWidget->count(); i++ ) + { + if ( mOptStackedWidget->widget( i )->isEnabled() ) + { + curIndx = i; + break; + } + } + curIndx = -1; // default fallback + } + mOptStackedWidget->setCurrentIndex( curIndx ); mOptListWidget->setCurrentRow( curIndx ); diff --git a/src/providers/gdal/qgsgdalprovider.cpp b/src/providers/gdal/qgsgdalprovider.cpp index cd99c3e3db9..8ff1d1c1dd7 100644 --- a/src/providers/gdal/qgsgdalprovider.cpp +++ b/src/providers/gdal/qgsgdalprovider.cpp @@ -289,7 +289,7 @@ QString QgsGdalProvider::metadata() // end my added code myMetadata += "

"; - myMetadata += tr( "Dimensions:" ); + myMetadata += tr( "Dimensions" ); myMetadata += "

\n"; myMetadata += "

"; myMetadata += tr( "X: %1 Y: %2 Bands: %3" ) @@ -326,7 +326,7 @@ QString QgsGdalProvider::metadata() else { myMetadata += "

"; - myMetadata += tr( "Origin:" ); + myMetadata += tr( "Origin" ); myMetadata += "

\n"; myMetadata += "

"; myMetadata += QString::number( mGeoTransform[0] ); @@ -335,7 +335,7 @@ QString QgsGdalProvider::metadata() myMetadata += "

\n"; myMetadata += "

"; - myMetadata += tr( "Pixel Size:" ); + myMetadata += tr( "Pixel Size" ); myMetadata += "

\n"; myMetadata += "

"; myMetadata += QString::number( mGeoTransform[1] ); diff --git a/src/ui/qgsattributeactiondialogbase.ui b/src/ui/qgsattributeactiondialogbase.ui index 5e91dd859dd..6d8b0c2e5fd 100644 --- a/src/ui/qgsattributeactiondialogbase.ui +++ b/src/ui/qgsattributeactiondialogbase.ui @@ -6,8 +6,8 @@ 0 0 - 695 - 476 + 609 + 731 @@ -21,12 +21,41 @@ - + + + + 0 + 3 + + Action list + + actiongroup + - + + + + + 0 + 0 + + + + Move the selected action up + + + + + + + :/images/themes/default/mActionArrowUp.png:/images/themes/default/mActionArrowUp.png + + + + @@ -70,60 +99,101 @@ + + + 0 + 0 + + Remove the selected action - Remove action + - - - - - - Move the selected action up - - - Move up + + + :/images/themes/default/symbologyRemove.png:/images/themes/default/symbologyRemove.png + + + 0 + 0 + + Move the selected action down - Move down + + + + + :/images/themes/default/mActionArrowDown.png:/images/themes/default/mActionArrowDown.png - + Add default actions + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + - + + + + 0 + 3 + + Action properties - - - - - Type - - - actionType - - - + + actiongroup + + + + QFormLayout::AllNonFixedFieldsGrow + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + @@ -176,7 +246,7 @@ - 37 + 12 24 @@ -234,24 +304,8 @@ - - - - - - 0 - 0 - - - - Enter the action command here - - - Enter the action here. This can be any program, script or command that is available on your system. When the action is invoked any set of characters within [% and %] will be evaluated as expression and replaced by its result. Double quote marks group text into single arguments to the program, script or command. Double quotes will be ignored if prefixed with a backslash - - - - + + Browse for action @@ -265,6 +319,39 @@ ... + + + :/images/themes/default/mActionFileOpen.png:/images/themes/default/mActionFileOpen.png + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + 0 + 0 + + + + Enter the action command here + + + Enter the action here. This can be any program, script or command that is available on your system. When the action is invoked any set of characters within [% and %] will be evaluated as expression and replaced by its result. Double quote marks group text into single arguments to the program, script or command. Double quotes will be ignored if prefixed with a backslash + @@ -297,7 +384,7 @@ - 40 + 12 20 @@ -340,7 +427,7 @@ - 40 + 12 20 @@ -368,22 +455,49 @@ - - - - Type - - - actionType - - - + + + + 15 + 33 + 41 + 31 + + + + Type + + + actionType + + + + + + Qt::Vertical + + + + 20 + 0 + + + + + + + QgsCollapsibleGroupBox + QGroupBox +

qgscollapsiblegroupbox.h
+ 1 + + attributeActionTable moveUpButton @@ -400,6 +514,8 @@ insertButton updateButton - + + + diff --git a/src/ui/qgsdiagrampropertiesbase.ui b/src/ui/qgsdiagrampropertiesbase.ui index 8fbae97dce7..7aee65f9f04 100644 --- a/src/ui/qgsdiagrampropertiesbase.ui +++ b/src/ui/qgsdiagrampropertiesbase.ui @@ -39,8 +39,8 @@ 0 0 - 756 - 627 + 752 + 613 @@ -63,7 +63,7 @@ - 40 + 20 20 @@ -124,8 +124,8 @@ 0 0 - 725 - 397 + 713 + 394 @@ -307,7 +307,7 @@ - 40 + 0 20 @@ -320,8 +320,8 @@ 0 0 - 725 - 293 + 715 + 278 @@ -343,7 +343,7 @@ 20 - 40 + 0 @@ -378,7 +378,7 @@ - 483 + 0 20 @@ -490,7 +490,7 @@ - 40 + 0 20 @@ -509,8 +509,8 @@ 0 0 - 725 - 278 + 713 + 271 @@ -638,7 +638,7 @@ - 40 + 0 20 @@ -651,7 +651,7 @@ - 40 + 0 20 @@ -671,8 +671,8 @@ 0 0 - 738 - 196 + 728 + 166 @@ -781,7 +781,7 @@ 20 - 40 + 0 @@ -844,7 +844,7 @@ 20 - 40 + 0 @@ -891,7 +891,7 @@ 20 - 40 + 0 diff --git a/src/ui/qgsrasterlayerpropertiesbase.ui b/src/ui/qgsrasterlayerpropertiesbase.ui index 634a2694407..48dfe32f919 100644 --- a/src/ui/qgsrasterlayerpropertiesbase.ui +++ b/src/ui/qgsrasterlayerpropertiesbase.ui @@ -92,18 +92,6 @@ :/images/themes/default/propertyicons/general.png:/images/themes/default/propertyicons/general.png - - - Metadata - - - Metadata - - - - :/images/themes/default/propertyicons/metadata.png:/images/themes/default/propertyicons/metadata.png - - Style @@ -152,6 +140,18 @@ :/images/themes/default/propertyicons/histogram.png:/images/themes/default/propertyicons/histogram.png + + + Metadata + + + Metadata + + + + :/images/themes/default/propertyicons/metadata.png:/images/themes/default/propertyicons/metadata.png + + @@ -182,7 +182,7 @@ - 2 + 0 @@ -212,8 +212,8 @@ 0 0 - 713 - 686 + 693 + 646 @@ -379,6 +379,9 @@ rastergeneral + + 6 + 11 @@ -652,130 +655,6 @@ - - - - 0 - - - - - font-weight:bold; - - - Metadata - - - - - - - QFrame::NoFrame - - - true - - - - - 0 - 0 - 150 - 236 - - - - - 0 - - - 0 - - - - - Description - - - rastermeta - - - - - - - 0 - 0 - - - - - 16777215 - 50 - - - - - - - - - - - Title - - - - - - - Abstract - - - - - - - - - - - 0 - 5 - - - - Properties - - - rastermeta - - - - - - - - - - - - Qt::Vertical - - - - 20 - 0 - - - - - - - - - - @@ -804,8 +683,8 @@ 0 0 - 713 - 686 + 610 + 360 @@ -1319,8 +1198,8 @@ 0 0 - 431 - 384 + 472 + 439 @@ -1736,8 +1615,8 @@ 0 0 - 557 - 164 + 632 + 199 @@ -1800,7 +1679,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Cantarell'; font-size:11pt;"><br /></span></p></body></html> @@ -1907,8 +1786,8 @@ p, li { white-space: pre-wrap; } 0 0 - 82 - 18 + 98 + 31 @@ -1939,6 +1818,130 @@ p, li { white-space: pre-wrap; } + + + + 0 + + + + + font-weight:bold; + + + Metadata + + + + + + + QFrame::NoFrame + + + true + + + + + 0 + 0 + 195 + 267 + + + + + 0 + + + 0 + + + + + Description + + + rastermeta + + + + + + + 0 + 0 + + + + + 16777215 + 50 + + + + + + + + + + + Title + + + + + + + Abstract + + + + + + + + + + + 0 + 5 + + + + Properties + + + rastermeta + + + + + + + + + + + + Qt::Vertical + + + + 20 + 0 + + + + + + + + + + @@ -2008,9 +2011,9 @@ p, li { white-space: pre-wrap; } - QgsColorButton - QPushButton -
qgscolorbutton.h
+ QgsScaleComboBox + QComboBox +
qgsscalecombobox.h
 QgsCollapsibleGroupBox @@ -2019,9 +2022,9 @@ p, li { white-space: pre-wrap; } 1 - QgsScaleComboBox - QComboBox -
qgsscalecombobox.h
+ QgsColorButton + QPushButton +
qgscolorbutton.h
 QgsBlendModeComboBox diff --git a/src/ui/qgsrulebasedrendererv2widget.ui b/src/ui/qgsrulebasedrendererv2widget.ui index 56206c7b29e..fb1b2bdf687 100644 --- a/src/ui/qgsrulebasedrendererv2widget.ui +++ b/src/ui/qgsrulebasedrendererv2widget.ui @@ -6,7 +6,7 @@ 0 0 - 643 + 709 401 @@ -43,34 +43,49 @@ true - - 100 - - - true - + + Add rule + - Add + + + + + :/images/themes/default/mActionSignPlus.png:/images/themes/default/mActionSignPlus.png + + Edit rule + - Edit + + + + + :/images/themes/default/symbologyEdit.png:/images/themes/default/symbologyEdit.png + + Remove rule + - Remove + + + + + :/images/themes/default/mActionSignMinus.png:/images/themes/default/mActionSignMinus.png @@ -110,7 +125,7 @@ - 40 + 0 20 @@ -127,6 +142,8 @@ - + + + diff --git a/src/ui/qgssymbolv2selectordialogbase.ui b/src/ui/qgssymbolv2selectordialogbase.ui index e40cfe877e5..9dabf8826fa 100644 --- a/src/ui/qgssymbolv2selectordialogbase.ui +++ b/src/ui/qgssymbolv2selectordialogbase.ui @@ -6,8 +6,8 @@ 0 0 - 509 - 416 + 444 + 383 @@ -65,14 +65,17 @@ - + + + 6 + - - - 0 - 0 - + + + 50 + 16777215 + Add symbol layer @@ -81,11 +84,11 @@ - - - 0 - 0 - + + + 50 + 16777215 + Remove symbol layer @@ -94,11 +97,11 @@ - - - 0 - 0 - + + + 50 + 16777215 + Lock layer's color @@ -110,11 +113,11 @@ - - - 0 - 0 - + + + 50 + 16777215 + Move up @@ -123,11 +126,11 @@ - - - 0 - 0 - + + + 50 + 16777215 + Move down @@ -175,8 +178,6 @@ - stackedWidget - stackedWidget diff --git a/src/ui/qgsvectorlayerpropertiesbase.ui b/src/ui/qgsvectorlayerpropertiesbase.ui index 4838bdc174f..81f4eb98c90 100644 --- a/src/ui/qgsvectorlayerpropertiesbase.ui +++ b/src/ui/qgsvectorlayerpropertiesbase.ui @@ -6,10 +6,16 @@ 0 0 - 932 - 856 + 966 + 879 + + + 825 + 0 + + Layer Properties @@ -17,760 +23,1430 @@ :/images/icons/qgis-icon-16x16.png:/images/icons/qgis-icon-16x16.png - - true - - - - - - - - Restore Default Style - - - - - - - Save As Default - - - - - - - Load Style ... - - - - - - - Save Style ... - - - - - - - + + + Qt::Horizontal - - QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok + + false - - - - - - 0 - - - - 22 - 22 - - - - - - :/images/themes/default/propertyicons/symbology.png:/images/themes/default/propertyicons/symbology.png - - - Style - - - - + + + + 0 + 0 + + + + QFrame::NoFrame + + + QFrame::Raised + + + + 0 + + + + + + 58 + 0 + + + + + 150 + 16777215 + + + + Qt::ScrollBarAlwaysOff + + + QAbstractItemView::NoEditTriggers + + + + 32 + 32 + + + + Qt::ElideNone + + + QListView::Adjust + + + true + + + + General + + + General + + + + :/images/themes/default/propertyicons/general.png:/images/themes/default/propertyicons/general.png + + + + + Style + + + Style + + + + :/images/themes/default/propertyicons/symbology.png:/images/themes/default/propertyicons/symbology.png + + + + + Labels + + + Labels + + + + :/images/themes/default/propertyicons/labels.svg:/images/themes/default/propertyicons/labels.svg + + + + + Labels (deprecated) + + + Labels (deprecated) + + + + :/images/themes/default/propertyicons/labels.png:/images/themes/default/propertyicons/labels.png + + + + + Fields + + + Fields + + + + :/images/themes/default/propertyicons/attributes.png:/images/themes/default/propertyicons/attributes.png + + + + + Display + + + Display + + + + :/images/themes/default/propertyicons/display.svg:/images/themes/default/propertyicons/display.svg + + + + + Actions + + + Actions + + + + :/images/themes/default/propertyicons/action.png:/images/themes/default/propertyicons/action.png + + + + + Joins + + + Joins + + + + :/images/themes/default/propertyicons/join.png:/images/themes/default/propertyicons/join.png + + + + + Diagrams + + + Diagrams + + + + :/images/themes/default/propertyicons/diagram.png:/images/themes/default/propertyicons/diagram.png + + + + + Metadata + + + Metadata + + + + :/images/themes/default/propertyicons/metadata.svg:/images/themes/default/propertyicons/metadata.svg + + + + + + + + + + 1 + 0 + + + + QFrame::NoFrame + + + QFrame::Raised + + + + 0 + + + 0 0 - - QFrame::NoFrame - - - QFrame::Sunken - - -1 + 0 - - - - - - - - :/images/themes/default/propertyicons/labels.png:/images/themes/default/propertyicons/labels.png - - - Labels - - - - - - QFrame::NoFrame - - - QFrame::Plain - - - - - - - - - :/images/themes/default/propertyicons/labels.png:/images/themes/default/propertyicons/labels.png - - - Labels (deprecated) - - - - - - - 0 - 0 - - - - Display labels - - - - - - - false - - - - 0 - 0 - - - - QFrame::NoFrame - - - QFrame::Plain - - - - - - - - - :/images/themes/default/propertyicons/attributes.png:/images/themes/default/propertyicons/attributes.png - - - Fields - - - - 0 - - - - - QFrame::NoFrame - - - QFrame::Plain - - - - - - - - - :/images/themes/default/propertyicons/general.png:/images/themes/default/propertyicons/general.png - - - General - - - - 0 - - - - - QFrame::NoFrame - - - QFrame::Plain - - - true - - - - - 0 - 0 - 680 - 393 - - - - - - - Options + + + + 0 + + + + + font-weight:bold; + + + General - - - - - true - - - - - - - CRS - - - - - - - Create Spatial Index - - - - - - - Specify the coordinate reference system of the layer's geometry. - - - Specify the coordinate reference system of the layer's geometry. - - - Specify CRS - - - - - - - Update Extents - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - Use scale dependent rendering + + + + QFrame::NoFrame - + true - - - 11 + + + + 0 + 0 + 785 + 755 + - - - - Minimum scale, i.e. maximum scale denominator. This limit is exclusive, that means the layer will not be displayed on this scale. - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> -<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Minimum scale</p> -<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(exclusive)</p></body></html> - - - - - - - - 0 - 0 - - - - Maximum scale, i.e. minimum scale denominator. This limit is inclusive, that means the layer will be displayed on this scale. - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> -<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Maximum scale</p> -<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(inclusive)</p></body></html> - - - - - - - - 0 - 0 - - - - - 100 - 0 - - - - Maximum scale, i.e. minimum scale denominator. This limit is inclusive, that means the layer will be displayed on this scale. - - - - - - - - 0 - 0 - - - - - 100 - 0 - - - - Minimum scale, i.e. maximum scale denominator. This limit is exclusive, that means the layer will not be displayed on this scale. - - - - - - - Current - - - - - - - Current - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 22 - 22 - - - - - - - :/images/themes/default/mActionZoomIn.png - - - true - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 22 - 22 - - - - - - - :/images/themes/default/mActionZoomOut.png - - - true - - - - - - - - - - Subset - - - - 11 - - - - - false - - - false - - - false - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 480 - 21 - - - - - - - - Query Builder - - - - - - - - - - Provider-specific options - - - - QFormLayout::AllNonFixedFieldsGrow - - - - - Encoding - - - - - - - + + + 0 + + + 0 + + + + + Layer info + + + vectorgeneral + + + + + + + + Layer name + + + + + + + + + + displayed as + + + + + + + true + + + + + + + + + + 0 + + + + + + 0 + 0 + + + + Data source encoding + + + + + + + + + + Qt::Horizontal + + + + 0 + 20 + + + + + + + + + + + + + + Coordinate reference system + + + vectorgeneral + + + + 6 + + + + + + + + 100 + 0 + + + + true + + + + + + + Specify the coordinate reference system of the layer's geometry. + + + Specify the coordinate reference system of the layer's geometry. + + + Specify... + + + + + + + + + + + Create spatial index + + + + + + + Update extents + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + Qt::Vertical + + + + + + + + + + Scale dependent visibility + + + true + + + false + + + vectorgeneral + + + + 6 + + + 11 + + + + + Minimum scale, i.e. maximum scale denominator. This limit is exclusive, that means the layer will not be displayed on this scale. + + + Qt::LeftToRight + + + <html><head/><body><p align="center"><span style=" font-size:0.75em;">Minimum<br>(exclusive)</span></p></body></html> + + + + + + + + 0 + 0 + + + + + + + + Current + + + + + + + Current + + + + + + + + 0 + 0 + + + + + 100 + 0 + + + + + + + + Maximum scale, i.e. minimum scale denominator. This limit is inclusive, that means the layer will be displayed on this scale. + + + <html><head/><body><p align="center"><span style=" font-size:0.75em;">Maximum<br>(inclusive)</span></p></body></html> + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 22 + 22 + + + + + + + :/images/themes/default/mActionZoomIn.png + + + true + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 22 + 22 + + + + + + + :/images/themes/default/mActionZoomOut.png + + + true + + + + + + + + + + + 0 + 3 + + + + Feature subset + + + vectorgeneral + + + + 11 + + + + + false + + + false + + + false + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 0 + 21 + + + + + + + + Query Builder + + + + + + + + + + Qt::Vertical + + + + 20 + 0 + + + + + + - - - - - - - - :/images/themes/default/mActionMapTips.png:/images/themes/default/mActionMapTips.png - - - Display - - - - - - Map Tip display text - - - - - - - - false - - - - 0 - 0 - - - - Inserts an expression into the action - - - Insert expression... - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 40 - 20 - - - - - - - - false - - - The valid attribute names for this layer - - - - - - - false - - - - 0 - 0 - - - - Inserts the selected field into the action - - - Insert field - - - - - - - - - false - - - - - - - - - HTML - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - - Field - - - - - - - - - false - - - - - - - - - - - - Layer name + + + + 0 - - - - - - - - - displayed as - - - - - - - true - - - - - - - - - - - :/images/themes/default/propertyicons/metadata.png:/images/themes/default/propertyicons/metadata.png - - - Metadata - - - - - - QFrame::NoFrame - - - QFrame::Plain - - - true - - - - - 0 - 0 - 94 - 211 - - - - + + + font-weight:bold; + - Title + Style - - - - - - Abstract + + + QFrame::NoFrame - - - - - - - 0 - 50 - - - - - 0 - 50 - - - - - 16777215 - 80 - - - - - - - - 2 - - + true + + + + 0 + 0 + 949 + 776 + + + + + 0 + + + + + + 0 + 0 + + + + QFrame::NoFrame + + + QFrame::Sunken + + + -1 + + + + + + + + + + + + + 0 + + + + + font-weight:bold; + + + Labels + + + + + + + QFrame::NoFrame + + + true + + + + + 0 + 0 + 949 + 776 + + + + + 0 + + + 0 + + + + + QFrame::NoFrame + + + QFrame::Plain + + + + + + + + + + + + + 0 + + + + + font-weight:bold; + + + Labels (deprecated) + + + + + + + QFrame::NoFrame + + + true + + + + + 0 + 0 + 949 + 776 + + + + + 0 + + + 0 + + + + + + 0 + 0 + + + + Display labels + + + + + + + false + + + + 0 + 0 + + + + QFrame::NoFrame + + + QFrame::Plain + + + + + + + + + + + + + 0 + + + + + font-weight:bold; + + + Fields + + + + + + + QFrame::NoFrame + + + true + + + + + 0 + 0 + 949 + 776 + + + + + 0 + + + 0 + + + + + QFrame::NoFrame + + + QFrame::Plain + + + + + + + + + + + + + 0 + + + + + font-weight:bold; + + + Display + + + + + + + QFrame::NoFrame + + + true + + + + + 0 + 0 + 949 + 776 + + + + + 0 + + + 0 + + + + + Map Tip display text + + + vectordisplay + + + + + + + + false + + + + 0 + 0 + + + + Inserts an expression into the action + + + Insert expression... + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 40 + 20 + + + + + + + + false + + + The valid attribute names for this layer + + + + + + + false + + + + 0 + 0 + + + + Inserts the selected field into the action + + + Insert field + + + + + + + + + false + + + + + + + + + HTML + + + + + + + Qt::Vertical + + + + 20 + 0 + + + + + + + + + + + + Field + + + + + + + + + false + + + + + + + + + + + + + + + + 0 + + + + + font-weight:bold; + + + Actions + + + + + + + QFrame::NoFrame + + + true + + + + + 0 + 0 + 949 + 776 + + + + + 0 + + + 0 + + + + + + 0 + 0 + + + + QFrame::NoFrame + + + QFrame::Raised + + + + + + + + + + + + + 0 + + + + + font-weight:bold; + + + Joins + + + + + + + QFrame::NoFrame + + + true + + + + + 0 + 0 + 949 + 776 + + + + + 0 + + + 0 + + + + + + + + + + + 3 + + + + Join layer + + + + + Join field + + + + + Target field + + + + + + + + + + + + + + :/images/themes/default/symbologyAdd.png:/images/themes/default/symbologyAdd.png + + + + + + + + + + + :/images/themes/default/symbologyRemove.png:/images/themes/default/symbologyRemove.png + + + + + + + Qt::Horizontal + + + + 0 + 23 + + + + + + + + + + + + + + + + + + + 0 + + + + + font-weight:bold; + + + Diagrams + + + + + + + QFrame::NoFrame + + + true + + + + + 0 + 0 + 949 + 776 + + + + + 12 + + + 0 + + + 12 + + + 0 + + + + + QFrame::NoFrame + + + QFrame::Plain + + + + + + + + + + + + + 0 + + + + + font-weight:bold; + + + Metadata + + + + + + + QFrame::NoFrame + + + true + + + + + 0 + 0 + 949 + 776 + + + + + 0 + + + 0 + + + + + Description + + + vectormeta + + + + + + + 0 + 0 + + + + + 16777215 + 50 + + + + + + + + + + + Title + + + + + + + Abstract + + + + + + + + + + + 0 + 5 + + + + Properties + + + vectormeta + + + + + + 2 + + + true + + + + + + + + + + Qt::Vertical + + + + 20 + 0 + + + + + + @@ -779,246 +1455,99 @@ p, li { white-space: pre-wrap; } - - - - :/images/themes/default/propertyicons/action.png:/images/themes/default/propertyicons/action.png - - - Actions - - - - - - - 0 - 0 - - - - QFrame::NoFrame - - - QFrame::Raised - - - - - - - - - :/images/themes/default/propertyicons/join.png:/images/themes/default/propertyicons/join.png - - - Joins - - - - - - QFrame::NoFrame - - - QFrame::Plain - - - true - - - - - 0 - 0 - 96 - 112 - - - - - - - - - - - :/images/themes/default/symbologyAdd.png:/images/themes/default/symbologyAdd.png - - - - - - - - - - - :/images/themes/default/symbologyRemove.png:/images/themes/default/symbologyRemove.png - - - - - - - Qt::Horizontal - - - - 354 - 23 - - - - - - - - 3 - - - - Join layer - - - - - Join field - - - - - Target field - - - - - - - - - - - - - - :/images/themes/default/propertyicons/diagram.png:/images/themes/default/propertyicons/diagram.png - - - Diagrams - - - - - - QFrame::NoFrame - - - QFrame::Plain - - - - - + + + + + + + 0 + 0 + + + + QFrame::NoFrame + + + QFrame::Raised + + + + 0 + + + + + Save As Default + + + + + + + Load Style ... + + + + + + + Restore Default Style + + + + + + + Save Style ... + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok + + + + - QgsScaleComboBox QComboBox
qgsscalecombobox.h
 + + QgsCollapsibleGroupBox + QGroupBox +
qgscollapsiblegroupbox.h
+ 1 + - - cbMinimumScale - cbMaximumScale - txtSubsetSQL - pbnQueryBuilder - - fieldComboRadio - toggled(bool) - displayFieldComboBox - setEnabled(bool) + mOptionsListWidget + currentRowChanged(int) + mOptionsStackedWidget + setCurrentIndex(int) - 69 - 128 + 86 + 325 - 178 - 128 - - - - - htmlRadio - toggled(bool) - htmlMapTip - setEnabled(bool) - - - 57 - 155 - - - 149 - 183 - - - - - htmlRadio - toggled(bool) - insertFieldButton - setEnabled(bool) - - - 83 - 152 - - - 705 - 571 - - - - - htmlRadio - toggled(bool) - fieldComboBox - setEnabled(bool) - - - 51 - 157 - - - 606 - 571 - - - - - htmlRadio - toggled(bool) - insertExpressionButton - setEnabled(bool) - - - 73 - 151 - - - 247 - 571 + 794 + 14 diff --git a/src/ui/symbollayer/widget_symbolslist.ui b/src/ui/symbollayer/widget_symbolslist.ui index 22b335b68fc..587c95dd825 100644 --- a/src/ui/symbollayer/widget_symbolslist.ui +++ b/src/ui/symbollayer/widget_symbolslist.ui @@ -217,7 +217,7 @@ - 194 + 0 20 @@ -233,7 +233,7 @@ - 150 + 50 0 @@ -300,7 +300,7 @@ - 40 + 0 20