From a4f286835d9d1ce535cead99ea0c799fe0261926 Mon Sep 17 00:00:00 2001 From: f4exb Date: Wed, 4 Jan 2017 21:11:51 +0100 Subject: [PATCH] Tx supoort: removed file record option. Unify play button status colors --- .../bladerfoutput/bladerfoutputgui.cpp | 14 -------- .../bladerfoutput/bladerfoutputgui.h | 1 - .../bladerfoutput/bladerfoutputgui.ui | 35 ------------------- plugins/samplesink/filesink/filesinkgui.cpp | 4 +-- plugins/samplesink/filesink/filesinkgui.ui | 4 +-- 5 files changed, 4 insertions(+), 54 deletions(-) diff --git a/plugins/samplesink/bladerfoutput/bladerfoutputgui.cpp b/plugins/samplesink/bladerfoutput/bladerfoutputgui.cpp index 3dc2dd2ca..88c1f37b0 100644 --- a/plugins/samplesink/bladerfoutput/bladerfoutputgui.cpp +++ b/plugins/samplesink/bladerfoutput/bladerfoutputgui.cpp @@ -324,20 +324,6 @@ void BladerfOutputGui::on_startStop_toggled(bool checked) } } -void BladerfOutputGui::on_record_toggled(bool checked) -{ -// if (checked) -// { -// ui->record->setStyleSheet("QToolButton { background-color : red; }"); -// m_fileSink->startRecording(); -// } -// else -// { -// ui->record->setStyleSheet("QToolButton { background:rgb(79,79,79); }"); -// m_fileSink->stopRecording(); -// } -} - void BladerfOutputGui::updateHardware() { qDebug() << "BladerfGui::updateHardware"; diff --git a/plugins/samplesink/bladerfoutput/bladerfoutputgui.h b/plugins/samplesink/bladerfoutput/bladerfoutputgui.h index 169b243a3..2aaae6bbc 100644 --- a/plugins/samplesink/bladerfoutput/bladerfoutputgui.h +++ b/plugins/samplesink/bladerfoutput/bladerfoutputgui.h @@ -76,7 +76,6 @@ private slots: void on_vga2_valueChanged(int value); void on_xb200_currentIndexChanged(int index); void on_startStop_toggled(bool checked); - void on_record_toggled(bool checked); void updateHardware(); void updateStatus(); }; diff --git a/plugins/samplesink/bladerfoutput/bladerfoutputgui.ui b/plugins/samplesink/bladerfoutput/bladerfoutputgui.ui index 877f21e60..10d2ca13b 100644 --- a/plugins/samplesink/bladerfoutput/bladerfoutputgui.ui +++ b/plugins/samplesink/bladerfoutput/bladerfoutputgui.ui @@ -59,21 +59,6 @@ - - - - Toggle record I/Q samples from device - - - - - - - :/record_off.png - :/record_on.png:/record_off.png - - - @@ -277,26 +262,6 @@ 2 - - - 4 - - - - - 8 - - - - - 16 - - - - - 32 - - diff --git a/plugins/samplesink/filesink/filesinkgui.cpp b/plugins/samplesink/filesink/filesinkgui.cpp index 166557b8a..df7694d99 100644 --- a/plugins/samplesink/filesink/filesinkgui.cpp +++ b/plugins/samplesink/filesink/filesinkgui.cpp @@ -229,10 +229,10 @@ void FileSinkGui::updateStatus() ui->startStop->setStyleSheet("QToolButton { background-color : blue; }"); break; case DSPDeviceSinkEngine::StRunning: - ui->startStop->setStyleSheet("QToolButton { background-color : green; }"); + ui->startStop->setStyleSheet("QToolButton { background-color : red; }"); break; case DSPDeviceSinkEngine::StError: - ui->startStop->setStyleSheet("QToolButton { background-color : red; }"); + ui->startStop->setStyleSheet("QToolButton { background-color : magenta; }"); QMessageBox::information(this, tr("Message"), m_deviceAPI->errorMessage()); break; default: diff --git a/plugins/samplesink/filesink/filesinkgui.ui b/plugins/samplesink/filesink/filesinkgui.ui index 30d97da9e..7a25a0622 100644 --- a/plugins/samplesink/filesink/filesinkgui.ui +++ b/plugins/samplesink/filesink/filesinkgui.ui @@ -54,8 +54,8 @@ - :/record_off.png - :/stop.png:/record_off.png + :/play.png + :/stop.png:/play.png