Move the application's version information out of the caption and into
the text box. So that it resides with the libraries' version information,
and is accessible via clipboard for reports.
This addresses part of bug #1213, and fixes all of #1264.
QLabel *icon = new QLabel();
icon->setPixmap(QPixmap(QString::fromUtf8(":/icons/pulseview.svg")));
QLabel *icon = new QLabel();
icon->setPixmap(QPixmap(QString::fromUtf8(":/icons/pulseview.svg")));
- /* Setup the version field */
- QLabel *version_info = new QLabel();
- version_info->setText(tr("%1 %2<br />%3<br /><a href=\"http://%4\">%4</a>")
- .arg(QApplication::applicationName(),
- QApplication::applicationVersion(),
+ /* Setup the license field, with the project homepage link. */
+ QLabel *gpl_home_info = new QLabel();
+ gpl_home_info->setText(tr("%1<br /><a href=\"http://%2\">%2</a>").arg(
tr("GNU GPL, version 3 or later"),
QApplication::organizationDomain()));
tr("GNU GPL, version 3 or later"),
QApplication::organizationDomain()));
- version_info->setOpenExternalLinks(true);
+ gpl_home_info->setOpenExternalLinks(true);
shared_ptr<sigrok::Context> context = device_manager_.context();
shared_ptr<sigrok::Context> context = device_manager_.context();
+ /* Application info */
+ s.append("<tr><td colspan=\"2\"><b>" +
+ tr("Application:") + "</b></td></tr>");
+
+ s.append(QString("<tr><td><i>%1</i></td><td>%2</td></tr>")
+ .arg(QApplication::applicationName(),
+ QApplication::applicationVersion()));
+
+ s.append("<tr><td colspan=\"2\"></td></tr>");
s.append("<tr><td colspan=\"2\"><b>" +
tr("Libraries and features:") + "</b></td></tr>");
s.append("<tr><td colspan=\"2\"><b>" +
tr("Libraries and features:") + "</b></td></tr>");
QGridLayout *layout = new QGridLayout();
layout->addWidget(icon, 0, 0, 1, 1);
QGridLayout *layout = new QGridLayout();
layout->addWidget(icon, 0, 0, 1, 1);
- layout->addWidget(version_info, 0, 1, 1, 1);
+ layout->addWidget(gpl_home_info, 0, 1, 1, 1);
layout->addWidget(support_list, 1, 1, 1, 1);
QWidget *page = new QWidget(parent);
layout->addWidget(support_list, 1, 1, 1, 1);
QWidget *page = new QWidget(parent);