alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use klocale to kill mnemonics

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=971913
This commit is contained in:
Marco Martin 2009-05-23 17:16:15 +00:00
parent 80621aa1a7
commit c96b3739db
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
widgets/iconwidget.cpp
View File

@ -915,13 +915,7 @@ void IconWidgetPrivate::drawTextItems(QPainter *painter,
// when applied to the canvas // when applied to the canvas
painter->translate(0.5, 0.5); painter->translate(0.5, 0.5);
if (action) {
QRectF textRect = labelLayout.boundingRect();
textRect.moveTopLeft(labelLayout.position());
painter->drawText(textRect, Qt::TextShowMnemonic, action->text());
} else {
labelLayout.draw(painter, QPointF()); labelLayout.draw(painter, QPointF());
}
if (!infoLayout.text().isEmpty()) { if (!infoLayout.text().isEmpty()) {
painter->setPen(textColor); painter->setPen(textColor);
@ -1044,7 +1038,7 @@ void IconWidget::drawActionButtonBase(QPainter *painter, const QSize &size, int
void IconWidget::setText(const QString &text) void IconWidget::setText(const QString &text)
{ {
d->text = text; d->text = KGlobal::locale()->removeAcceleratorMarker(text);
// cause a relayout // cause a relayout
d->currentSize = QSizeF(-1, -1); d->currentSize = QSizeF(-1, -1);
//try to relayout, needed if an icon was never shown before //try to relayout, needed if an icon was never shown before