Backport some UI fixes to 2.18 (#4191)

DelazJ · nirvn · commit 23e2202d6c37 · 2017-03-24T07:41:51.000+07:00
* Set a name to the raster resampling dialog
* Fix "Configure container" dialog
diff --git a/src/app/qgsalignrasterdialog.cpp b/src/app/qgsalignrasterdialog.cpp
@@ -380,6 +380,7 @@ void QgsAlignRasterDialog::runAlign()
 
 QgsAlignRasterLayerConfigDialog::QgsAlignRasterLayerConfigDialog()
 {
+  setWindowTitle( tr( "Configure Layer Resampling" ) );
   QVBoxLayout* layout = new QVBoxLayout();
 
   cboLayers = new QgsMapLayerComboBox( this );
diff --git a/src/app/qgsfieldsproperties.cpp b/src/app/qgsfieldsproperties.cpp
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -380,6 +380,7 @@ void QgsAlignRasterDialog::runAlign()`
`380`	`380`
`381`	`381`	`QgsAlignRasterLayerConfigDialog::QgsAlignRasterLayerConfigDialog()`
`382`	`382`	`{`
	`383`	`+ setWindowTitle( tr( "Configure Layer Resampling" ) );`
`383`	`384`	`QVBoxLayout* layout = new QVBoxLayout();`
`384`	`385`
`385`	`386`	`cboLayers = new QgsMapLayerComboBox( this );`