From 5bad3637f326de42617c48e33b104c97535f79df Mon Sep 17 00:00:00 2001 From: f4exb Date: Fri, 12 Jan 2018 00:57:05 +0100 Subject: [PATCH] Show REST API URL in about dialog --- sdrgui/gui/aboutdialog.cpp | 3 ++- sdrgui/gui/aboutdialog.h | 2 +- sdrgui/gui/aboutdialog.ui | 7 +++++++ sdrgui/mainwindow.cpp | 6 ++++-- sdrgui/mainwindow.h | 2 ++ 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/sdrgui/gui/aboutdialog.cpp b/sdrgui/gui/aboutdialog.cpp index 0a68698c6..80b227602 100644 --- a/sdrgui/gui/aboutdialog.cpp +++ b/sdrgui/gui/aboutdialog.cpp @@ -1,13 +1,14 @@ #include "gui/aboutdialog.h" #include "ui_aboutdialog.h" -AboutDialog::AboutDialog(QWidget* parent) : +AboutDialog::AboutDialog(const QString& apiHost, int apiPort, QWidget* parent) : QDialog(parent), ui(new Ui::AboutDialog) { ui->setupUi(this); ui->version->setText(QString("Version %1 - Copyright (C) 2015-2018 Edouard Griffiths, F4EXB.").arg(qApp->applicationVersion())); ui->build->setText(QString("Build info: Qt %1 %2 bits").arg(QT_VERSION_STR).arg(QT_POINTER_SIZE*8)); + ui->restApiUrl->setText(QString("REST API base URL: http://%1:%2/sdrangel").arg(apiHost).arg(apiPort)); } AboutDialog::~AboutDialog() diff --git a/sdrgui/gui/aboutdialog.h b/sdrgui/gui/aboutdialog.h index cf5559d6f..52190fd2c 100644 --- a/sdrgui/gui/aboutdialog.h +++ b/sdrgui/gui/aboutdialog.h @@ -11,7 +11,7 @@ class AboutDialog : public QDialog { Q_OBJECT public: - explicit AboutDialog(QWidget* parent = NULL); + explicit AboutDialog(const QString& apiHost, int apiPort, QWidget* parent = 0); ~AboutDialog(); private: diff --git a/sdrgui/gui/aboutdialog.ui b/sdrgui/gui/aboutdialog.ui index 1521b5826..a09acee10 100644 --- a/sdrgui/gui/aboutdialog.ui +++ b/sdrgui/gui/aboutdialog.ui @@ -95,6 +95,13 @@ + + + + Here goes the REST API URL + + + diff --git a/sdrgui/mainwindow.cpp b/sdrgui/mainwindow.cpp index 65308668f..428006433 100644 --- a/sdrgui/mainwindow.cpp +++ b/sdrgui/mainwindow.cpp @@ -183,7 +183,9 @@ MainWindow::MainWindow(qtwebapp::LoggerWithFile *logger, const MainParser& parse m_apiAdapter = new WebAPIAdapterGUI(*this); m_requestMapper = new WebAPIRequestMapper(this); m_requestMapper->setAdapter(m_apiAdapter); - m_apiServer = new WebAPIServer(parser.getServerAddress(), parser.getServerPort(), m_requestMapper); + m_apiHost = parser.getServerAddress(); + m_apiPort = parser.getServerPort(); + m_apiServer = new WebAPIServer(m_apiHost, m_apiPort, m_requestMapper); m_apiServer->start(); connect(qApp, SIGNAL(focusChanged(QWidget *, QWidget *)), this, SLOT(focusHasChanged(QWidget *, QWidget *))); @@ -1647,7 +1649,7 @@ void MainWindow::channelAddClicked(bool checked __attribute__((unused))) void MainWindow::on_action_About_triggered() { - AboutDialog dlg(this); + AboutDialog dlg(m_apiHost, m_apiPort, this); dlg.exec(); } diff --git a/sdrgui/mainwindow.h b/sdrgui/mainwindow.h index 8f8a34894..f423ea50b 100644 --- a/sdrgui/mainwindow.h +++ b/sdrgui/mainwindow.h @@ -331,6 +331,8 @@ private: WebAPIRequestMapper *m_requestMapper; WebAPIServer *m_apiServer; WebAPIAdapterGUI *m_apiAdapter; + QString m_apiHost; + int m_apiPort; CommandKeyReceiver *m_commandKeyReceiver;