about: Layout change to use space more efficiently.

[pulseview.git] / pv / dialogs / settings.cpp

diff --git a/pv/dialogs/settings.cpp b/pv/dialogs/settings.cpp
index 5b33272bc11111c5589b86c1af338a15a9f6f2ef..4c0715a8b936ae67a61abf2faf08c716c0f3de2c 100644 (file)
--- a/pv/dialogs/settings.cpp
+++ b/pv/dialogs/settings.cpp
@@ -314,14 +314,12 @@ QWidget *Settings::get_about_page(QWidget *parent) const
        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()));
-       version_info->setOpenExternalLinks(true);
+       gpl_home_info->setOpenExternalLinks(true);
 
        shared_ptr<sigrok::Context> context = device_manager_.context();
 
@@ -331,10 +329,13 @@ QWidget *Settings::get_about_page(QWidget *parent) const
 
        s.append("<table>");
 
-       /* Library info */
+       /* Version, library, and feature info */
        s.append("<tr><td colspan=\"2\"><b>" +
-               tr("Libraries and features:") + "</b></td></tr>");
+               tr("Versions, libraries and features:") + "</b></td></tr>");
 
+       s.append(QString("<tr><td><i>%1</i></td><td>%2</td></tr>")
+               .arg(QApplication::applicationName(),
+               QApplication::applicationVersion()));
        s.append(QString("<tr><td><i>%1</i></td><td>%2</td></tr>")
                .arg(QString("Qt"), qVersion()));
        s.append(QString("<tr><td><i>%1</i></td><td>%2</td></tr>")
@@ -464,10 +465,14 @@ QWidget *Settings::get_about_page(QWidget *parent) const
        QTextBrowser *support_list = new QTextBrowser();
        support_list->setDocument(supported_doc);
 
-       QGridLayout *layout = new QGridLayout();
-       layout->addWidget(icon, 0, 0, 1, 1);
-       layout->addWidget(version_info, 0, 1, 1, 1);
-       layout->addWidget(support_list, 1, 1, 1, 1);
+       QHBoxLayout *h_layout = new QHBoxLayout();
+       h_layout->setAlignment(Qt::AlignLeft);
+       h_layout->addWidget(icon);
+       h_layout->addWidget(gpl_home_info);
+
+       QVBoxLayout *layout = new QVBoxLayout();
+       layout->addLayout(h_layout);
+       layout->addWidget(support_list);
 
        QWidget *page = new QWidget(parent);
        page->setLayout(layout);