Skip to content

Commit

Permalink
Homogenize window title separator
Browse files Browse the repository at this point in the history
Fixes #35761
  • Loading branch information
elpaso authored and nyalldawson committed Jun 7, 2020
1 parent ce17f7f commit 8e368b9
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/app/mesh/qgsmeshlayerproperties.cpp
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ QgsMeshLayerProperties::QgsMeshLayerProperties( QgsMapLayer *lyr, QgsMapCanvas *
mOptStackedWidget->indexOf( mOptsPage_Style ) ); 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() ) ) if ( !mMeshLayer->styleManager()->isDefault( mMeshLayer->styleManager()->currentStyle() ) )
title += QStringLiteral( " (%1)" ).arg( mMeshLayer->styleManager()->currentStyle() ); title += QStringLiteral( " (%1)" ).arg( mMeshLayer->styleManager()->currentStyle() );
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgisapp.cpp
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -547,7 +547,7 @@ static void setTitleBarText_( QWidget &qgisApp )
} }
if ( !caption.isEmpty() ) if ( !caption.isEmpty() )
{ {
caption += QLatin1String( " - " ); caption += QStringLiteral( " " );
} }
if ( QgsProject::instance()->isDirty() ) if ( QgsProject::instance()->isDirty() )
caption.prepend( '*' ); caption.prepend( '*' );
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsattributetabledialog.cpp
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ void QgsAttributeTableDialog::updateTitle()
QWidget *w = mDock ? qobject_cast<QWidget *>( mDock ) QWidget *w = mDock ? qobject_cast<QWidget *>( mDock )
: mDialog ? qobject_cast<QWidget *>( mDialog ) : mDialog ? qobject_cast<QWidget *>( mDialog )
: qobject_cast<QWidget *>( this ); : qobject_cast<QWidget *>( 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( mLayer->name() )
.arg( std::max( static_cast< long >( mMainView->featureCount() ), mLayer->featureCount() ) ) // layer count may be estimated, so use larger of the two .arg( std::max( static_cast< long >( mMainView->featureCount() ), mLayer->featureCount() ) ) // layer count may be estimated, so use larger of the two
.arg( mMainView->filteredFeatureCount() ) .arg( mMainView->filteredFeatureCount() )
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsselectbyformdialog.cpp
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ QgsSelectByFormDialog::QgsSelectByFormDialog( QgsVectorLayer *layer, const QgsAt


QgsGui::enableAutoGeometryRestore( this ); QgsGui::enableAutoGeometryRestore( this );


setWindowTitle( tr( "%1 - Select Features" ).arg( layer->name() ) ); setWindowTitle( tr( "%1 Select Features" ).arg( layer->name() ) );
} }


void QgsSelectByFormDialog::setMessageBar( QgsMessageBar *messageBar ) void QgsSelectByFormDialog::setMessageBar( QgsMessageBar *messageBar )
Expand Down
2 changes: 1 addition & 1 deletion src/gui/qgsoptionsdialogbase.cpp
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ void QgsOptionsDialogBase::updateWindowTitle()
QListWidgetItem *curitem = mOptListWidget->currentItem(); QListWidgetItem *curitem = mOptListWidget->currentItem();
if ( curitem ) if ( curitem )
{ {
setWindowTitle( QStringLiteral( "%1 | %2" ).arg( mDialogTitle, curitem->text() ) ); setWindowTitle( QStringLiteral( "%1 %2" ).arg( mDialogTitle, curitem->text() ) );
} }
else else
{ {
Expand Down
2 changes: 1 addition & 1 deletion src/gui/raster/qgsrasterlayerproperties.cpp
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -543,7 +543,7 @@ QgsRasterLayerProperties::QgsRasterLayerProperties( QgsMapLayer *lyr, QgsMapCanv


mResetColorRenderingBtn->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionUndo.svg" ) ) ); 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() ) ) if ( !mRasterLayer->styleManager()->isDefault( mRasterLayer->styleManager()->currentStyle() ) )
title += QStringLiteral( " (%1)" ).arg( mRasterLayer->styleManager()->currentStyle() ); title += QStringLiteral( " (%1)" ).arg( mRasterLayer->styleManager()->currentStyle() );
Expand Down
2 changes: 1 addition & 1 deletion src/gui/vector/qgsvectorlayerproperties.cpp
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ QgsVectorLayerProperties::QgsVectorLayerProperties(
mOptStackedWidget->indexOf( mOptsPage_Style ) ); 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() ) ) if ( !mLayer->styleManager()->isDefault( mLayer->styleManager()->currentStyle() ) )
title += QStringLiteral( " (%1)" ).arg( mLayer->styleManager()->currentStyle() ); title += QStringLiteral( " (%1)" ).arg( mLayer->styleManager()->currentStyle() );
restoreOptionsBaseUi( title ); restoreOptionsBaseUi( title );
Expand Down

0 comments on commit 8e368b9

Please sign in to comment.