From a8dc3b3ba35fd26421520f314bebe443572bf119 Mon Sep 17 00:00:00 2001 From: Alessandro Pasotti Date: Fri, 5 Jun 2020 12:32:27 +0200 Subject: [PATCH 1/2] Homogenize window title separator Fixes #35761 --- src/app/mesh/qgsmeshlayerproperties.cpp | 2 +- src/app/qgisapp.cpp | 2 +- src/app/qgsattributetabledialog.cpp | 2 +- src/app/qgsselectbyformdialog.cpp | 2 +- src/gui/qgsoptionsdialogbase.cpp | 2 +- src/gui/raster/qgsrasterlayerproperties.cpp | 2 +- src/gui/vector/qgsvectorlayerproperties.cpp | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/app/mesh/qgsmeshlayerproperties.cpp b/src/app/mesh/qgsmeshlayerproperties.cpp index 916cd0ca50ff..530e4b844d54 100644 --- a/src/app/mesh/qgsmeshlayerproperties.cpp +++ b/src/app/mesh/qgsmeshlayerproperties.cpp @@ -113,7 +113,7 @@ QgsMeshLayerProperties::QgsMeshLayerProperties( QgsMapLayer *lyr, QgsMapCanvas * mOptStackedWidget->indexOf( mOptsPage_Style ) ); } - QString title = QString( tr( "Layer Properties - %1" ) ).arg( lyr->name() ); + QString title = QString( tr( "Layer Properties — %1" ) ).arg( lyr->name() ); if ( !mMeshLayer->styleManager()->isDefault( mMeshLayer->styleManager()->currentStyle() ) ) title += QStringLiteral( " (%1)" ).arg( mMeshLayer->styleManager()->currentStyle() ); diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp index 47e51d920f4e..ce52c47e2695 100644 --- a/src/app/qgisapp.cpp +++ b/src/app/qgisapp.cpp @@ -547,7 +547,7 @@ static void setTitleBarText_( QWidget &qgisApp ) } if ( !caption.isEmpty() ) { - caption += QLatin1String( " - " ); + caption += QStringLiteral( " — " ); } if ( QgsProject::instance()->isDirty() ) caption.prepend( '*' ); diff --git a/src/app/qgsattributetabledialog.cpp b/src/app/qgsattributetabledialog.cpp index 13442d6e52c2..674ac510ab20 100644 --- a/src/app/qgsattributetabledialog.cpp +++ b/src/app/qgsattributetabledialog.cpp @@ -357,7 +357,7 @@ void QgsAttributeTableDialog::updateTitle() QWidget *w = mDock ? qobject_cast( mDock ) : mDialog ? qobject_cast( mDialog ) : qobject_cast( this ); - w->setWindowTitle( tr( " %1 :: Features Total: %2, Filtered: %3, Selected: %4" ) + w->setWindowTitle( tr( " %1 — Features Total: %2, Filtered: %3, Selected: %4" ) .arg( mLayer->name() ) .arg( std::max( static_cast< long >( mMainView->featureCount() ), mLayer->featureCount() ) ) // layer count may be estimated, so use larger of the two .arg( mMainView->filteredFeatureCount() ) diff --git a/src/app/qgsselectbyformdialog.cpp b/src/app/qgsselectbyformdialog.cpp index dc008cf4a2c7..21c503f5ab60 100644 --- a/src/app/qgsselectbyformdialog.cpp +++ b/src/app/qgsselectbyformdialog.cpp @@ -47,7 +47,7 @@ QgsSelectByFormDialog::QgsSelectByFormDialog( QgsVectorLayer *layer, const QgsAt QgsGui::enableAutoGeometryRestore( this ); - setWindowTitle( tr( "%1 - Select Features" ).arg( layer->name() ) ); + setWindowTitle( tr( "%1 — Select Features" ).arg( layer->name() ) ); } void QgsSelectByFormDialog::setMessageBar( QgsMessageBar *messageBar ) diff --git a/src/gui/qgsoptionsdialogbase.cpp b/src/gui/qgsoptionsdialogbase.cpp index 9a06977695ce..34d22fd8483a 100644 --- a/src/gui/qgsoptionsdialogbase.cpp +++ b/src/gui/qgsoptionsdialogbase.cpp @@ -367,7 +367,7 @@ void QgsOptionsDialogBase::updateWindowTitle() QListWidgetItem *curitem = mOptListWidget->currentItem(); if ( curitem ) { - setWindowTitle( QStringLiteral( "%1 | %2" ).arg( mDialogTitle, curitem->text() ) ); + setWindowTitle( QStringLiteral( "%1 — %2" ).arg( mDialogTitle, curitem->text() ) ); } else { diff --git a/src/gui/raster/qgsrasterlayerproperties.cpp b/src/gui/raster/qgsrasterlayerproperties.cpp index ecb4004f2f48..1da4ccffb328 100644 --- a/src/gui/raster/qgsrasterlayerproperties.cpp +++ b/src/gui/raster/qgsrasterlayerproperties.cpp @@ -543,7 +543,7 @@ QgsRasterLayerProperties::QgsRasterLayerProperties( QgsMapLayer *lyr, QgsMapCanv mResetColorRenderingBtn->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionUndo.svg" ) ) ); - QString title = QString( tr( "Layer Properties - %1" ) ).arg( lyr->name() ); + QString title = QString( tr( "Layer Properties — %1" ) ).arg( lyr->name() ); if ( !mRasterLayer->styleManager()->isDefault( mRasterLayer->styleManager()->currentStyle() ) ) title += QStringLiteral( " (%1)" ).arg( mRasterLayer->styleManager()->currentStyle() ); diff --git a/src/gui/vector/qgsvectorlayerproperties.cpp b/src/gui/vector/qgsvectorlayerproperties.cpp index d79765852c63..ceac8b0e674d 100644 --- a/src/gui/vector/qgsvectorlayerproperties.cpp +++ b/src/gui/vector/qgsvectorlayerproperties.cpp @@ -374,7 +374,7 @@ QgsVectorLayerProperties::QgsVectorLayerProperties( mOptStackedWidget->indexOf( mOptsPage_Style ) ); } - QString title = QString( tr( "Layer Properties - %1" ) ).arg( mLayer->name() ); + QString title = QString( tr( "Layer Properties — %1" ) ).arg( mLayer->name() ); if ( !mLayer->styleManager()->isDefault( mLayer->styleManager()->currentStyle() ) ) title += QStringLiteral( " (%1)" ).arg( mLayer->styleManager()->currentStyle() ); restoreOptionsBaseUi( title ); From b8811957aae9729c9804d05040fbeafee4c18c17 Mon Sep 17 00:00:00 2001 From: Alessandro Pasotti Date: Sun, 7 Jun 2020 10:30:40 +0200 Subject: [PATCH 2/2] Encode mdash in one place --- src/app/qgisapp.cpp | 2 +- src/gui/raster/qgsrasterlayerproperties.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp index ce52c47e2695..13d770b2ce65 100644 --- a/src/app/qgisapp.cpp +++ b/src/app/qgisapp.cpp @@ -547,7 +547,7 @@ static void setTitleBarText_( QWidget &qgisApp ) } if ( !caption.isEmpty() ) { - caption += QStringLiteral( " — " ); + caption += QStringLiteral( " %1 " ).arg( QChar( 0x2014 ) ); } if ( QgsProject::instance()->isDirty() ) caption.prepend( '*' ); diff --git a/src/gui/raster/qgsrasterlayerproperties.cpp b/src/gui/raster/qgsrasterlayerproperties.cpp index 1da4ccffb328..724d60bb99e5 100644 --- a/src/gui/raster/qgsrasterlayerproperties.cpp +++ b/src/gui/raster/qgsrasterlayerproperties.cpp @@ -543,7 +543,7 @@ QgsRasterLayerProperties::QgsRasterLayerProperties( QgsMapLayer *lyr, QgsMapCanv mResetColorRenderingBtn->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionUndo.svg" ) ) ); - QString title = QString( tr( "Layer Properties — %1" ) ).arg( lyr->name() ); + QString title = tr( "Layer Properties — %1" ).arg( lyr->name() ); if ( !mRasterLayer->styleManager()->isDefault( mRasterLayer->styleManager()->currentStyle() ) ) title += QStringLiteral( " (%1)" ).arg( mRasterLayer->styleManager()->currentStyle() );