From: Alexey Chernobaev Date: Fri, 30 Mar 2018 19:05:25 +0000 (+0300) Subject: about dialog text changed X-Git-Tag: submit/tizen/20180620.112952^2^2~26 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2cf2e0ffda9bea79b0784f89b89f72202fda371b;p=sdk%2Ftools%2Fheaptrack.git about dialog text changed --- diff --git a/src/analyze/gui/aboutdialog.cpp b/src/analyze/gui/aboutdialog.cpp index 1a4c99f..769d851 100644 --- a/src/analyze/gui/aboutdialog.cpp +++ b/src/analyze/gui/aboutdialog.cpp @@ -15,39 +15,44 @@ AboutDialog::AboutDialog(QWidget *parent) : setWindowTitle("About " + AboutData::DisplayName); - ui->textEdit->viewport()->setAutoFillBackground(false); + ui->textBrowser->viewport()->setAutoFillBackground(false); - ui->textEdit->setHtml(QString( + ui->textBrowser->setHtml(QString( "

%1 v.%2

" \ - "

%3

") - .arg(AboutData::DisplayName).arg(AboutData::Version) - .arg(AboutData::ShortDescription) - + + "

%3.

") + .arg(AboutData::DisplayName).arg(AboutData::Version) + .arg(AboutData::ShortDescription) + + QString( + "

%1.

") + .arg(AboutData::CopyrightStatement) + #ifdef SAMSUNG_TIZEN_BRANCH QString( - "

Based on Heaptrack memory profiler created by Milian Wolff " \ - "<mail@milianw.de>

") + + "

Based on Heaptrack memory profiler " \ + "created by Milian Wolff on terms of " \ + "LGPL.

") + #endif QString( - "

%4

") - .arg(AboutData::CopyrightStatement) + - QString( - "

GNU LESSER GENERAL PUBLIC LICENSE v.2.1

" \ - "

The application is based in part on the work of the Qwt project " \ - "(qwt.sf.net)

") + "

Uses Qt framework v.%1 libraries on terms of " \ + "LGPL.

" \ + "

Uses ThreadWeaver library " \ + "on terms of LGPL.

" \ + "

The application is based in part on the work of the " \ + "Qwt project on terms of " \ + "Qwt License.

") + .arg(QT_VERSION_STR) #ifdef WINDOWS + QString( "

Application icon (free for commercial use): Jack Cai " \ - "(www.doublejdesign.co.uk)

") + "(www.doublejdesign.co.uk).

") #endif ); - QFontMetrics fm(ui->textEdit->font()); - QRect rect = fm.boundingRect("The application is based in part on the work of the Qwt project (qwt.sf.net)"); + QFontMetrics fm(ui->textBrowser->font()); + QRect rect = fm.boundingRect("The application is based in part on the work of the Qwt project on terms of"); int m = ui->verticalLayout->margin(); int h = ui->buttonBox->height(); - int textWidth = (int)round(rect.width() * 1.03); - int textHeight = (int)round(rect.height() * 1.03 * 14); + int textWidth = (int)round(rect.width() * 1.05); + int textHeight = (int)round(rect.height() * 1.03 * 17); resize(std::max(420, 2 * m + textWidth), std::max(252, 2 * m + h + textHeight)); } diff --git a/src/analyze/gui/aboutdialog.ui b/src/analyze/gui/aboutdialog.ui index 8eea6e9..e3fe09e 100644 --- a/src/analyze/gui/aboutdialog.ui +++ b/src/analyze/gui/aboutdialog.ui @@ -24,7 +24,7 @@ - + true @@ -35,6 +35,9 @@ p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html> + + true +