Skip to content
Permalink
Browse files
Backport some UI fixes to 2.18 (#4191)
* Set a name to the raster resampling dialog
* Fix "Configure container" dialog
  • Loading branch information
DelazJ authored and nirvn committed Mar 24, 2017
1 parent 5afdf6f commit 23e2202d6c37ca97e286bcc09c497adfb45a48f8
Showing with 6 additions and 5 deletions.
  1. +1 −0 src/app/qgsalignrasterdialog.cpp
  2. +5 −5 src/app/qgsfieldsproperties.cpp
@@ -380,6 +380,7 @@ void QgsAlignRasterDialog::runAlign()

QgsAlignRasterLayerConfigDialog::QgsAlignRasterLayerConfigDialog()
{
setWindowTitle( tr( "Configure Layer Resampling" ) );
QVBoxLayout* layout = new QVBoxLayout();

cboLayers = new QgsMapLayerComboBox( this );
@@ -1300,7 +1300,7 @@ void DesignerTree::onItemDoubleClicked( QTreeWidgetItem* item, int column )
baseData->setLayout( baseLayout );
QCheckBox* showLabelCheckbox = new QCheckBox( "Show label" );
showLabelCheckbox->setChecked( itemData.showLabel() );
baseLayout->addWidget( showLabelCheckbox );
baseLayout->addRow( showLabelCheckbox );
QWidget* baseWidget = new QWidget();
baseWidget->setLayout( baseLayout );

@@ -1310,12 +1310,12 @@ void DesignerTree::onItemDoubleClicked( QTreeWidgetItem* item, int column )
dlg.setWindowTitle( tr( "Configure container" ) );
QFormLayout* layout = new QFormLayout() ;
dlg.setLayout( layout );
layout->addWidget( baseWidget );
layout->addRow( baseWidget );

QCheckBox* showAsGroupBox = nullptr;
QLineEdit* title = new QLineEdit( itemData.name() );
QSpinBox* columnCount = new QSpinBox();
QGroupBox* visibilityExpressionGroupBox = new QGroupBox( tr( "Control visibility by expression " ) );
QGroupBox* visibilityExpressionGroupBox = new QGroupBox( tr( "Control visibility by expression" ) );
visibilityExpressionGroupBox->setCheckable( true );
visibilityExpressionGroupBox->setChecked( itemData.visibilityExpression().enabled() );
visibilityExpressionGroupBox->setLayout( new QGridLayout );
@@ -1330,13 +1330,13 @@ void DesignerTree::onItemDoubleClicked( QTreeWidgetItem* item, int column )

layout->addRow( tr( "Title" ), title );
layout->addRow( tr( "Column count" ), columnCount );
layout->addWidget( visibilityExpressionGroupBox );
layout->addRow( visibilityExpressionGroupBox );

if ( !item->parent() )
{
showAsGroupBox = new QCheckBox( tr( "Show as group box" ) );
showAsGroupBox->setChecked( itemData.showAsGroupBox() );
layout->addRow( tr( "Show as group box" ), showAsGroupBox );
layout->addRow( showAsGroupBox );
}

QDialogButtonBox* buttonBox = new QDialogButtonBox( QDialogButtonBox::Ok

0 comments on commit 23e2202

Please sign in to comment.