Dock widget ui fixes

qgis · Mar 12, 2020 · 835f928 · 835f928
1 parent e6f285b
commit 835f928
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/src/gui/qgstemporalcontrollerdockwidget.cpp b/src/gui/qgstemporalcontrollerdockwidget.cpp
@@ -123,9 +123,9 @@ void QgsTemporalControllerDockWidget::updateSlider( const QgsDateTimeRange &rang
 void QgsTemporalControllerDockWidget::updateRangeLabel( const QgsDateTimeRange &range )
 {
   QLocale locale;
-  mCurrentRangeLabel->setText( tr( "Current temporal range is from %1 to %2" ).arg(
-                                 range.begin().toString( locale.dateTimeFormat() ),
-                                 range.end().toString( locale.dateTimeFormat() ) ) );
+  mCurrentRangeLabel->setText( tr( "%1 to %2" ).arg(
+                                 range.begin().toString( locale.dateTimeFormat( QLocale::NarrowFormat ) ),
+                                 range.end().toString( locale.dateTimeFormat( QLocale::NarrowFormat ) ) ) );
 }
 
 QgsTemporalController *QgsTemporalControllerDockWidget::temporalController()

diff --git a/src/gui/qgstemporalmapsettingsdialog.cpp b/src/gui/qgstemporalmapsettingsdialog.cpp
@@ -24,14 +24,18 @@
 QgsTemporalMapSettingsDialog::QgsTemporalMapSettingsDialog( QWidget *parent, Qt::WindowFlags flags )
   : QDialog( parent, flags )
 {
-  setupUi( this );
-
-  connect( this, &QDialog::accepted, this, &QgsTemporalMapSettingsDialog::accept );
-  connect( this, &QDialog::rejected, this, &QgsTemporalMapSettingsDialog::reject );
+  QVBoxLayout *vl = new QVBoxLayout( );
 
   mTemporalMapSettingsWidget = new QgsTemporalMapSettingsWidget( this );
-  QVBoxLayout *layout = new QVBoxLayout( frame );
-  layout->addWidget( mTemporalMapSettingsWidget );
+
+  vl->addWidget( mTemporalMapSettingsWidget, 1 );
+
+  QDialogButtonBox *box = new QDialogButtonBox( QDialogButtonBox::Ok | QDialogButtonBox::Cancel );
+  vl->addWidget( box );
+  setLayout( vl );
+
+  connect( box, &QDialogButtonBox::accepted, this, &QgsTemporalMapSettingsDialog::accept );
+  connect( box, &QDialogButtonBox::rejected, this, &QgsTemporalMapSettingsDialog::reject );
 
   setWindowTitle( tr( "Temporal Map Settings" ) );
 }