Skip to content
Permalink
Browse files

Fix ellipsis characters in button text show incorrectly on windows

Fixes #33209

(cherry picked from commit e2e1bd3)
  • Loading branch information
nyalldawson committed Dec 11, 2019
1 parent be563c1 commit d7a3c67a8644b2b45ebc1b7603c34d6f3bdca22b
@@ -178,9 +178,9 @@ void QgsActionLocatorFilter::searchActions( const QString &string, QWidget *pare
tooltip = match.captured( 1 );
}
tooltip.replace( QStringLiteral( "..." ), QString() );
tooltip.replace( QStringLiteral( "" ), QString() );
tooltip.replace( QString( QChar( 0x2026 ) ), QString() );
searchText.replace( QStringLiteral( "..." ), QString() );
searchText.replace( QStringLiteral( "" ), QString() );
searchText.replace( QString( QChar( 0x2026 ) ), QString() );
bool uniqueTooltip = searchText.trimmed().compare( tooltip.trimmed(), Qt::CaseInsensitive ) != 0;
if ( action->isChecked() )
{
@@ -333,7 +333,7 @@ QVariant QgsLayerTreeModel::data( const QModelIndex &index, int role ) const
QString source( layer->publicSource() );
if ( source.size() > 1024 )
{
source = source.left( 1023 ) + QStringLiteral( "" );
source = source.left( 1023 ) + QString( QChar( 0x2026 ) );
}

parts << "<i>" + source.toHtmlEscaped() + "</i>";
@@ -42,7 +42,7 @@ QgsProcessingMapLayerComboBox::QgsProcessingMapLayerComboBox( const QgsProcessin
layout->setAlignment( mCombo, Qt::AlignTop );

mSelectButton = new QToolButton();
mSelectButton->setText( QStringLiteral( "" ) );
mSelectButton->setText( QString( QChar( 0x2026 ) ) );
mSelectButton->setToolTip( tr( "Select file" ) );
connect( mSelectButton, &QToolButton::clicked, this, &QgsProcessingMapLayerComboBox::triggerFileSelection );
layout->addWidget( mSelectButton );
@@ -146,7 +146,7 @@ QgsProcessingMatrixParameterPanel::QgsProcessingMatrixParameterPanel( QWidget *p
hl->addWidget( mLineEdit, 1 );

mToolButton = new QToolButton();
mToolButton->setText( QStringLiteral( "" ) );
mToolButton->setText( QString( QChar( 0x2026 ) ) );
hl->addWidget( mToolButton );

setLayout( hl );
@@ -1659,7 +1659,7 @@ QgsProcessingEnumPanelWidget::QgsProcessingEnumPanelWidget( QWidget *parent, con
hl->addWidget( mLineEdit, 1 );

mToolButton = new QToolButton();
mToolButton->setText( QStringLiteral( "" ) );
mToolButton->setText( QString( QChar( 0x2026 ) ) );
hl->addWidget( mToolButton );

setLayout( hl );
@@ -2371,7 +2371,7 @@ QgsProcessingPointPanel::QgsProcessingPointPanel( QWidget *parent )
mLineEdit->setShowClearButton( false );
l->addWidget( mLineEdit, 1 );
mButton = new QToolButton();
mButton->setText( QStringLiteral( "" ) );
mButton->setText( QString( QChar( 0x2026 ) ) );
l->addWidget( mButton );
setLayout( l );

@@ -35,7 +35,7 @@ QgsAbstractFileContentSourceLineEdit::QgsAbstractFileContentSourceLineEdit( QWid
mFileLineEdit = new QgsFilterLineEdit( this );
mFileLineEdit->setShowClearButton( true );
mFileToolButton = new QToolButton( this );
mFileToolButton->setText( QStringLiteral( "" ) );
mFileToolButton->setText( QString( QChar( 0x2026 ) ) );
layout->addWidget( mFileLineEdit, 1 );
layout->addWidget( mFileToolButton );
setLayout( layout );

0 comments on commit d7a3c67

Please sign in to comment.
You can’t perform that action at this time.