From 5df17b16bba055275fb1e94ab6781e45aaf2051e Mon Sep 17 00:00:00 2001 From: Ioannis Christoforidis Date: Mon, 5 Apr 2021 22:44:52 +0200 Subject: add Dialogue to add new Test --- src/addserver.cpp | 45 +++++++++++++++++++++ src/addserver.h | 29 +++++++++++++ src/speedcheck.cpp | 8 ++++ src/speedcheck.h | 1 + src/ui/addserver.ui | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++ src/ui/speedcheck.ui | 74 +++++++++++++++++++++------------- 6 files changed, 240 insertions(+), 29 deletions(-) create mode 100644 src/addserver.cpp create mode 100644 src/addserver.h create mode 100644 src/ui/addserver.ui diff --git a/src/addserver.cpp b/src/addserver.cpp new file mode 100644 index 0000000..be57ef4 --- /dev/null +++ b/src/addserver.cpp @@ -0,0 +1,45 @@ +#include "addserver.h" +#include "ui_addserver.h" +#include + +AddServer::AddServer(QWidget *parent) : + QWidget(parent), + _ui(new Ui::AddServer) +{ + _ui->setupUi(this); + connect(_ui->radioButton, SIGNAL(clicked(bool)), this, SLOT(serverClicked(bool))); + connect(_ui->radioButton_2, SIGNAL(clicked(bool)), this, SLOT(fileClicked(bool))); + connect(_ui->buttonBox,SIGNAL(rejected()), this, SLOT(rejected())); + connect(_ui->selectedFile_2,SIGNAL(clicked(bool)), this, SLOT(selectClicked(bool))); + +} + +void AddServer::serverClicked(bool) { + _ui->comboBox->setEnabled(true); + _ui->selectedFile_2->setEnabled(false); +} +void AddServer::fileClicked(bool) { + _ui->selectedFile_2->setEnabled(true); + _ui->comboBox->setEnabled(false); +} +void AddServer::selectClicked(bool) { + _filename = QFileDialog::getOpenFileName(this, tr("Select benchmark file")); + _ui->selectedFile->text() = _filename; +} +void AddServer::rejected() { + this->~AddServer(); +} +void AddServer::accepted() { + if (_ui->radioButton->isChecked()) { + _filename = _ui->comboBox->currentText(); + _ui->selectedFile->text() = _filename; + } + else if (_ui->radioButton_2->isChecked()) { + _filename = _ui->selectedFile_2->text(); + _ui->selectedFile->text() = _filename; + } +} +AddServer::~AddServer() +{ + delete _ui; +} diff --git a/src/addserver.h b/src/addserver.h new file mode 100644 index 0000000..561178b --- /dev/null +++ b/src/addserver.h @@ -0,0 +1,29 @@ +#ifndef ADDSERVER_H +#define ADDSERVER_H + +#include + +namespace Ui { +class AddServer; +} + +class AddServer : public QWidget +{ + Q_OBJECT + +public: + explicit AddServer(QWidget *parent = nullptr); + ~AddServer(); + +private slots: + void serverClicked(bool); + void fileClicked(bool); + void selectClicked(bool); + void rejected(); + void accepted(); +private: + Ui::AddServer *_ui; + QString _filename; +}; + +#endif // ADDSERVER_H diff --git a/src/speedcheck.cpp b/src/speedcheck.cpp index f26bb1e..344be46 100644 --- a/src/speedcheck.cpp +++ b/src/speedcheck.cpp @@ -11,6 +11,7 @@ #include #include #include +#include "addserver.h" SpeedCheck::SpeedCheck(QString fileName, bool cml) : _ui(new Ui::MainWindow), @@ -24,6 +25,7 @@ SpeedCheck::SpeedCheck(QString fileName, bool cml) connect(_ui->btnselect, SIGNAL(clicked(bool)), this, SLOT(selectClicked(bool))); connect(_ui->btnrefreshNetwork, SIGNAL(clicked(bool)), this, SLOT(networkrefreshClicked(bool))); connect(_ui->comboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(updateNetworkInfos(int))); + connect(_ui-> actionAdd_Server, SIGNAL(triggered(bool)), this, SLOT(addServerClicked(bool))); _ui->filelabel->setText("Selected File: " + _fileName); _timer.setInterval(200); connect(&_timer, SIGNAL(timeout()), this, SLOT(updateTimer())); @@ -90,6 +92,7 @@ void SpeedCheck::testFinished() _ui->comboBox->setEnabled(true); _ui->btnrefreshNetwork->setEnabled(true); quitClicked(true); + // TODO start next test if available } void SpeedCheck::networkrefreshClicked(bool) { @@ -139,3 +142,8 @@ void SpeedCheck::updateTimer() _ui->picCpu->readNextValue(); _ui->picSpeed->readNextValue(); } +void SpeedCheck::addServerClicked(bool) { + QWidget *wdg = new AddServer(); + wdg->show(); + logMessage("Hi"); +} diff --git a/src/speedcheck.h b/src/speedcheck.h index 37e3a25..bdb4a81 100644 --- a/src/speedcheck.h +++ b/src/speedcheck.h @@ -25,6 +25,7 @@ private slots: void selectClicked(bool); void quitClicked(bool); void networkrefreshClicked(bool); + void addServerClicked(bool); void updateNetworkInfos(int); void testFinished(); void updateTimer(); diff --git a/src/ui/addserver.ui b/src/ui/addserver.ui new file mode 100644 index 0000000..3e26a58 --- /dev/null +++ b/src/ui/addserver.ui @@ -0,0 +1,112 @@ + + + AddServer + + + + 0 + 0 + 400 + 187 + + + + Test hinzufügen + + + + + 30 + 30 + 110 + 25 + + + + Serverliste + + + true + + + + + + 30 + 80 + 110 + 25 + + + + File + + + + + + 70 + 130 + 187 + 27 + + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + 160 + 30 + 211 + 27 + + + + + server1 + + + + + server2 + + + + + server3 + + + + + + + 160 + 80 + 141 + 20 + + + + Select File... + + + + + + 290 + 80 + 88 + 27 + + + + Select + + + + + + diff --git a/src/ui/speedcheck.ui b/src/ui/speedcheck.ui index dfcce4a..095b86b 100644 --- a/src/ui/speedcheck.ui +++ b/src/ui/speedcheck.ui @@ -15,19 +15,6 @@ - - - - - 0 - 0 - - - - Network (100MBit / 1GBit) - - - @@ -158,6 +145,19 @@ + + + + + 0 + 0 + + + + Network (100MBit / 1GBit) + + + @@ -272,6 +272,13 @@ + + + + TextLabel + + + @@ -282,25 +289,34 @@ - - - - true - - - - 0 - 0 - - - - - - - + + + + 0 + 0 + 768 + 24 + + + + + Misc + + + + + + + + Add Test + + + Ctrl+A + + -- cgit v1.2.3-55-g7522