From d191988d1c145c7a3f75fd677dbc6ebceca3d231 Mon Sep 17 00:00:00 2001 From: Kiara Navarro Date: Sat, 18 Jun 2022 11:05:49 -0500 Subject: [PATCH] about: add to clipboard Signed-off-by: Kiara Navarro --- Software/PC_Application/about.cpp | 15 +++++++ Software/PC_Application/about.h | 3 ++ Software/PC_Application/aboutdialog.ui | 58 ++++++++++++++++++++++---- 3 files changed, 67 insertions(+), 9 deletions(-) diff --git a/Software/PC_Application/about.cpp b/Software/PC_Application/about.cpp index 3f33ee9..97d5d3a 100644 --- a/Software/PC_Application/about.cpp +++ b/Software/PC_Application/about.cpp @@ -4,6 +4,8 @@ #include "ui_aboutdialog.h" #include "appwindow.h" +#include + About About::instance; AboutDialog::AboutDialog(QWidget *parent) : @@ -12,6 +14,7 @@ AboutDialog::AboutDialog(QWidget *parent) : { ui->setupUi(this); setWindowTitle("About " + qlibrevnaApp->applicationName()); + ui->appVersionClipboard->setText("To Clipboard"); ui->appName->setText(qlibrevnaApp->applicationName()); ui->appVersion->setText(QString("Version: %1") .arg(qlibrevnaApp->applicationVersion())); @@ -35,3 +38,15 @@ void About::about() dialog->show(); } } + +void AboutDialog::on_appVersionClipboard_clicked() +{ + QApplication::clipboard()->setText(QString("LibreVNA Version (%1 bit): %2\n" + "OS: %3\n" + "CPU Arch: %4" ) + .arg(QSysInfo::WordSize) + .arg(qlibrevnaApp->applicationVersion()) + .arg(QSysInfo::prettyProductName()) + .arg(QSysInfo::currentCpuArchitecture())); +} + diff --git a/Software/PC_Application/about.h b/Software/PC_Application/about.h index 79c2a3e..7754f66 100644 --- a/Software/PC_Application/about.h +++ b/Software/PC_Application/about.h @@ -27,6 +27,9 @@ public: explicit AboutDialog(QWidget *parent = nullptr); ~AboutDialog(); +private slots: + void on_appVersionClipboard_clicked(); + private: Ui::AboutDialog *ui; }; diff --git a/Software/PC_Application/aboutdialog.ui b/Software/PC_Application/aboutdialog.ui index 9436e5a..f069d2c 100644 --- a/Software/PC_Application/aboutdialog.ui +++ b/Software/PC_Application/aboutdialog.ui @@ -33,14 +33,54 @@ - - - PLACEHOLDER_MAIN - - - Qt::AlignCenter - - + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + PLACEHOLDER_MAIN + + + Qt::AlignCenter + + + + + + + Qt::LeftToRight + + + PushButton + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + @@ -49,7 +89,7 @@ - 0 + 1