Skip to content

Commit

Permalink
Fix corrupted text in buttons
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Oct 18, 2017
1 parent a66566a commit 5a14a92
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions src/app/qgsmaptoollabel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ QString QgsMapToolLabel::currentLabelText( int trunc )
if ( trunc > 0 && labelText.length() > trunc )
{
labelText.truncate( trunc );
labelText += QStringLiteral( "" );
labelText += QStringLiteral( "\u2026" );
}
return labelText;
}
Expand All @@ -169,7 +169,7 @@ QString QgsMapToolLabel::currentLabelText( int trunc )
if ( trunc > 0 && labelText.length() > trunc )
{
labelText.truncate( trunc );
labelText += QStringLiteral( "" );
labelText += QStringLiteral( "\u2026" );
}
return labelText;
}
Expand Down
2 changes: 1 addition & 1 deletion src/core/expression/qgsexpression.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,7 @@ QString QgsExpression::helpText( QString name )

if ( v.mVariableLenArguments )
{
helpContents += QStringLiteral( "" );
helpContents += QStringLiteral( "\u2026" );
}

helpContents += ')';
Expand Down
2 changes: 1 addition & 1 deletion src/gui/qgsfilewidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ QgsFileWidget::QgsFileWidget( QWidget *parent )
mLayout->addWidget( mLineEdit );

mFileWidgetButton = new QToolButton( this );
mFileWidgetButton->setText( QStringLiteral( "" ) );
mFileWidgetButton->setText( QStringLiteral( "\u2026" ) );
connect( mFileWidgetButton, &QAbstractButton::clicked, this, &QgsFileWidget::openFileDialog );
mLayout->addWidget( mFileWidgetButton );

Expand Down
4 changes: 2 additions & 2 deletions src/gui/qgspropertyoverridebutton.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ void QgsPropertyOverrideButton::aboutToShowMenu()
if ( expString.length() > 35 )
{
expString.truncate( 35 );
expString.append( "" );
expString.append( "\u2026" );
}

expString.prepend( tr( "Current: " ) );
Expand Down Expand Up @@ -708,7 +708,7 @@ void QgsPropertyOverrideButton::updateGui()
if ( deftip.length() > 75 )
{
deftip.truncate( 75 );
deftip.append( "" );
deftip.append( "\u2026" );
}

mFullDescription += tr( "<b>Current definition %1:</b><br>%2" ).arg( deftype, deftip );
Expand Down
2 changes: 1 addition & 1 deletion src/gui/qgssqlcomposerdialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ void QgsSQLComposerDialog::addTableNames( const QList<PairNameTitle> &listNameTi
if ( pair.second.size() < 40 )
entryText += " (" + pair.second + ")";
else
entryText += " (" + pair.second.mid( 0, 20 ) + "" + pair.second.mid( pair.second.size() - 20 ) + ")";
entryText += " (" + pair.second.mid( 0, 20 ) + "\u2026" + pair.second.mid( pair.second.size() - 20 ) + ")";
}
listCombo << entryText;
mapTableEntryTextToName[entryText] = pair.first;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ void QgsDelimitedTextSourceSelect::updateFieldLists()
for ( int i = 0; i < tblSample->columnCount(); i++ )
{
QString value = i < nv ? values[i] : QLatin1String( "" );
if ( value.length() > MAX_SAMPLE_LENGTH ) value = value.mid( 0, MAX_SAMPLE_LENGTH ) + "";
if ( value.length() > MAX_SAMPLE_LENGTH ) value = value.mid( 0, MAX_SAMPLE_LENGTH ) + "\u2026";
QTableWidgetItem *item = new QTableWidgetItem( value );
tblSample->setItem( counter - 1, i, item );
if ( ! value.isEmpty() )
Expand Down

0 comments on commit 5a14a92

Please sign in to comment.