aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed pixmap and icon to const, removed setTextFormat

Browse Source 
--HG--
branch : feature
This commit is contained in:
Valentina Zhuravska 2015-11-16 17:54:45 +02:00
parent e0237e901f
commit fe23631251
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/libs/vtools/dialogs/tools/dialogdetail.cpp
View File

@ -455,20 +455,18 @@ void DialogDetail::ScrollDown()
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
bool DialogDetail::DetailIsValid() const bool DialogDetail::DetailIsValid() const
{ {
QIcon icon = QIcon::fromTheme("dialog-warning", const QIcon icon = QIcon::fromTheme("dialog-warning",
QIcon(":/icons/win.icon.theme/16x16/status/dialog-warning.png")); QIcon(":/icons/win.icon.theme/16x16/status/dialog-warning.png"));
QPixmap pixmap = icon.pixmap(QSize(16, 16)); const QPixmap pixmap = icon.pixmap(QSize(16, 16));
QByteArray byteArray; QByteArray byteArray;
QBuffer buffer(&byteArray); QBuffer buffer(&byteArray);
pixmap.save(&buffer, "PNG"); pixmap.save(&buffer, "PNG");
QString url = QString("<img src=\"data:image/png;base64,") + byteArray.toBase64() + "\"/>"; QString url = QString("<img src=\"data:image/png;base64,") + byteArray.toBase64() + "\"/>";
ui.helpLabel->setTextFormat(Qt::RichText);
if (ui.listWidget->count() < 3) if (ui.listWidget->count() < 3)
{ {
url += QString(tr(" You need more points!")); url += QString(" ") + tr("You need more points!");
ui.helpLabel->setText(url); ui.helpLabel->setText(url);
return false; return false;
} }
@ -476,7 +474,7 @@ bool DialogDetail::DetailIsValid() const
{ {
if (FirstPointEqualLast()) if (FirstPointEqualLast())
{ {
url += QString(tr(" First point can not equal the last point!")); url += QString(" ") +tr("First point can not equal the last point!");
ui.helpLabel->setText(url); ui.helpLabel->setText(url);
return false; return false;
} }
@ -489,14 +487,14 @@ bool DialogDetail::DetailIsValid() const
if (QString::compare(previousRow, nextRow) == 0) if (QString::compare(previousRow, nextRow) == 0)
{ {
url += QString(tr(" You have double points!")); url += QString(" ") +tr("You have double points!");
ui.helpLabel->setText(url); ui.helpLabel->setText(url);
return false; return false;
} }
} }
} }
} }
ui.helpLabel->setText(QString(tr("Ready!"))); ui.helpLabel->setText(tr("Ready!"));
return true; return true;
} }