From 32973132d921c7e9e72c223a3845a8bd6ff84a7f Mon Sep 17 00:00:00 2001 From: f4exb Date: Sun, 10 Apr 2022 02:19:26 +0200 Subject: [PATCH] Massive UI revamping (v7): unify custom widget borders --- .../bladerf2mimo/bladerf2mimogui.cpp | 3 +- .../samplemimo/limesdrmimo/limesdrmimogui.cpp | 3 +- plugins/samplemimo/metismiso/metismisogui.cpp | 3 +- .../plutosdrmimo/plutosdrmimogui.cpp | 3 +- plugins/samplemimo/testmi/testmigui.cpp | 3 +- .../samplemimo/testmosync/testmosyncgui.cpp | 3 +- plugins/samplemimo/xtrxmimo/xtrxmimogui.cpp | 3 +- .../samplesink/audiooutput/audiooutputgui.cpp | 3 +- .../bladerf1output/bladerf1outputgui.cpp | 3 +- .../bladerf2output/bladerf2outputgui.cpp | 3 +- .../samplesink/fileoutput/fileoutputgui.cpp | 3 +- .../hackrfoutput/hackrfoutputgui.cpp | 3 +- .../limesdroutput/limesdroutputgui.cpp | 3 +- .../samplesink/localoutput/localoutputgui.cpp | 3 +- .../plutosdroutput/plutosdroutputgui.cpp | 3 +- .../remoteoutput/remoteoutputgui.cpp | 3 +- .../soapysdroutput/soapysdroutputgui.cpp | 3 +- plugins/samplesink/testsink/testsinkgui.cpp | 3 +- .../samplesink/usrpoutput/usrpoutputgui.cpp | 3 +- .../samplesink/xtrxoutput/xtrxoutputgui.cpp | 3 +- plugins/samplesource/airspy/airspygui.cpp | 3 +- plugins/samplesource/airspyhf/airspyhfgui.cpp | 3 +- .../samplesource/audioinput/audioinputgui.cpp | 3 +- .../bladerf1input/bladerf1inputgui.cpp | 3 +- .../bladerf2input/bladerf2inputgui.cpp | 3 +- plugins/samplesource/fcdpro/fcdprogui.cpp | 3 +- .../samplesource/fcdproplus/fcdproplusgui.cpp | 3 +- .../samplesource/fileinput/fileinputgui.cpp | 3 +- .../hackrfinput/hackrfinputgui.cpp | 3 +- plugins/samplesource/kiwisdr/kiwisdrgui.cpp | 3 +- .../limesdrinput/limesdrinputgui.cpp | 3 +- .../samplesource/localinput/localinputgui.cpp | 3 +- plugins/samplesource/perseus/perseusgui.cpp | 3 +- .../plutosdrinput/plutosdrinputgui.cpp | 3 +- .../remoteinput/remoteinputgui.cpp | 3 +- plugins/samplesource/rtlsdr/rtlsdrgui.cpp | 4 +- plugins/samplesource/sdrplay/sdrplaygui.cpp | 3 +- .../samplesource/sdrplayv3/sdrplayv3gui.cpp | 3 +- .../sigmffileinput/sigmffileinputgui.cpp | 3 +- .../soapysdrinput/soapysdrinputgui.cpp | 3 +- .../samplesource/testsource/testsourcegui.cpp | 3 +- .../samplesource/usrpinput/usrpinputgui.cpp | 3 +- .../samplesource/xtrxinput/xtrxinputgui.cpp | 3 +- sdrgui/gui/rollupcontents.cpp | 224 ++---------------- sdrgui/gui/rollupcontents.h | 5 +- 45 files changed, 102 insertions(+), 257 deletions(-) diff --git a/plugins/samplemimo/bladerf2mimo/bladerf2mimogui.cpp b/plugins/samplemimo/bladerf2mimo/bladerf2mimogui.cpp index 608e7b388..6639a8b06 100644 --- a/plugins/samplemimo/bladerf2mimo/bladerf2mimogui.cpp +++ b/plugins/samplemimo/bladerf2mimo/bladerf2mimogui.cpp @@ -68,7 +68,8 @@ BladeRF2MIMOGui::BladeRF2MIMOGui(DeviceUISet *deviceUISet, QWidget* parent) : qDebug("BladeRF2MIMOGui::BladeRF2MIMOGui"); setAttribute(Qt::WA_DeleteOnClose, true); ui->setupUi(getContents()); - getContents()->setStyleSheet("#BladeRF2MIMOGui { border: 1px solid #C06900 }"); + getContents()->setStyleSheet(QString(tr("#BladeRF2MIMOGui { border: 1px solid %1 }") + .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplemimo/bladerf2mimo/readme.md"; m_sampleMIMO = (BladeRF2MIMO*) m_deviceUISet->m_deviceAPI->getSampleMIMO(); diff --git a/plugins/samplemimo/limesdrmimo/limesdrmimogui.cpp b/plugins/samplemimo/limesdrmimo/limesdrmimogui.cpp index 2022ce44e..ceeb25951 100644 --- a/plugins/samplemimo/limesdrmimo/limesdrmimogui.cpp +++ b/plugins/samplemimo/limesdrmimo/limesdrmimogui.cpp @@ -70,7 +70,8 @@ LimeSDRMIMOGUI::LimeSDRMIMOGUI(DeviceUISet *deviceUISet, QWidget* parent) : qDebug("LimeSDRMIMOGUI::LimeSDRMIMOGUI"); setAttribute(Qt::WA_DeleteOnClose, true); ui->setupUi(getContents()); - getContents()->setStyleSheet("#LimeSDRMIMOGUI { border: 1px solid #C06900 }"); + getContents()->setStyleSheet(QString(tr("#LimeSDRMIMOGUI { border: 1px solid %1 }") + .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplemimo/limesdrmimo/readme.md"; m_limeSDRMIMO = (LimeSDRMIMO*) m_deviceUISet->m_deviceAPI->getSampleMIMO(); diff --git a/plugins/samplemimo/metismiso/metismisogui.cpp b/plugins/samplemimo/metismiso/metismisogui.cpp index 98e91cd69..47b6b5b60 100644 --- a/plugins/samplemimo/metismiso/metismisogui.cpp +++ b/plugins/samplemimo/metismiso/metismisogui.cpp @@ -58,7 +58,8 @@ MetisMISOGui::MetisMISOGui(DeviceUISet *deviceUISet, QWidget* parent) : m_txSampleRate = 48000; ui->setupUi(getContents()); - getContents()->setStyleSheet("#MetisMISOGui { border: 1px solid #C06900 }"); + getContents()->setStyleSheet(QString(tr("#MetisMISOGui { border: 1px solid %1 }") + .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplemimo/metismiso/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); ui->centerFrequency->setValueRange(7, 0, m_absMaxFreq); diff --git a/plugins/samplemimo/plutosdrmimo/plutosdrmimogui.cpp b/plugins/samplemimo/plutosdrmimo/plutosdrmimogui.cpp index 6b741d057..412b34629 100644 --- a/plugins/samplemimo/plutosdrmimo/plutosdrmimogui.cpp +++ b/plugins/samplemimo/plutosdrmimo/plutosdrmimogui.cpp @@ -70,7 +70,8 @@ PlutoSDRMIMOGUI::PlutoSDRMIMOGUI(DeviceUISet *deviceUISet, QWidget* parent) : qDebug("PlutoSDRMIMOGui::PlutoSDRMIMOGui"); setAttribute(Qt::WA_DeleteOnClose, true); ui->setupUi(getContents()); - getContents()->setStyleSheet("#PlutoSDRMIMOGUI { border: 1px solid #C06900 }"); + getContents()->setStyleSheet(QString(tr("#PlutoSDRMIMOGUI { border: 1px solid %1 }") + .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplemimo/plutosdrmimo/readme.md"; m_sampleMIMO = (PlutoSDRMIMO*) m_deviceUISet->m_deviceAPI->getSampleMIMO(); diff --git a/plugins/samplemimo/testmi/testmigui.cpp b/plugins/samplemimo/testmi/testmigui.cpp index 49751eabf..41fc673c1 100644 --- a/plugins/samplemimo/testmi/testmigui.cpp +++ b/plugins/samplemimo/testmi/testmigui.cpp @@ -61,7 +61,8 @@ TestMIGui::TestMIGui(DeviceUISet *deviceUISet, QWidget* parent) : m_deviceSampleRates.push_back(m_settings.m_streams[1].m_sampleRate / (1<setupUi(getContents()); - getContents()->setStyleSheet("#TestMIGui { border: 1px solid #C06900 }"); + getContents()->setStyleSheet(QString(tr("#TestMIGui { border: 1px solid %1 }") + .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplemimo/testmi/readme.md"; ui->spectrumSource->addItem("0"); ui->spectrumSource->addItem("1"); diff --git a/plugins/samplemimo/testmosync/testmosyncgui.cpp b/plugins/samplemimo/testmosync/testmosyncgui.cpp index b9c3b8404..845844ac8 100644 --- a/plugins/samplemimo/testmosync/testmosyncgui.cpp +++ b/plugins/samplemimo/testmosync/testmosyncgui.cpp @@ -51,7 +51,8 @@ TestMOSyncGui::TestMOSyncGui(DeviceUISet *deviceUISet, QWidget* parent) : { setAttribute(Qt::WA_DeleteOnClose, true); ui->setupUi(getContents()); - getContents()->setStyleSheet("#TestMOSyncGui { border: 1px solid #C06900 }"); + getContents()->setStyleSheet(QString(tr("#TestMOSyncGui { border: 1px solid %1 }") + .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplemimo/testmosync/readme.md"; m_sampleMIMO = (TestMOSync*) m_deviceUISet->m_deviceAPI->getSampleMIMO(); diff --git a/plugins/samplemimo/xtrxmimo/xtrxmimogui.cpp b/plugins/samplemimo/xtrxmimo/xtrxmimogui.cpp index 98fc27e4f..b054ff5df 100644 --- a/plugins/samplemimo/xtrxmimo/xtrxmimogui.cpp +++ b/plugins/samplemimo/xtrxmimo/xtrxmimogui.cpp @@ -67,7 +67,8 @@ XTRXMIMOGUI::XTRXMIMOGUI(DeviceUISet *deviceUISet, QWidget* parent) : qDebug("XTRXMIMOGUI::XTRXMIMOGUI"); setAttribute(Qt::WA_DeleteOnClose, true); ui->setupUi(getContents()); - getContents()->setStyleSheet("#XTRXMIMOGUI { border: 1px solid #C06900 }"); + getContents()->setStyleSheet(QString(tr("#XTRXMIMOGUI { border: 1px solid %1 }") + .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplemimo/xtrxmimo/readme.md"; m_xtrxMIMO = (XTRXMIMO*) m_deviceUISet->m_deviceAPI->getSampleMIMO(); diff --git a/plugins/samplesink/audiooutput/audiooutputgui.cpp b/plugins/samplesink/audiooutput/audiooutputgui.cpp index 8aeddf0c8..d298dfe39 100644 --- a/plugins/samplesink/audiooutput/audiooutputgui.cpp +++ b/plugins/samplesink/audiooutput/audiooutputgui.cpp @@ -44,7 +44,8 @@ AudioOutputGui::AudioOutputGui(DeviceUISet *deviceUISet, QWidget* parent) : m_audioOutput = (AudioOutput*) m_deviceUISet->m_deviceAPI->getSampleSink(); ui->setupUi(getContents()); - getContents()->setStyleSheet("#AudioOutputGui { border: 1px solid #C06900 }"); + getContents()->setStyleSheet(QString(tr("#AudioOutputGui { border: 1px solid %1 }") + .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesink/audiooutput/readme.md"; connect(&m_updateTimer, SIGNAL(timeout()), this, SLOT(updateHardware())); diff --git a/plugins/samplesink/bladerf1output/bladerf1outputgui.cpp b/plugins/samplesink/bladerf1output/bladerf1outputgui.cpp index 4e96bb307..b8766bb00 100644 --- a/plugins/samplesink/bladerf1output/bladerf1outputgui.cpp +++ b/plugins/samplesink/bladerf1output/bladerf1outputgui.cpp @@ -47,7 +47,8 @@ Bladerf1OutputGui::Bladerf1OutputGui(DeviceUISet *deviceUISet, QWidget* parent) m_deviceSampleSink = (Bladerf1Output*) m_deviceUISet->m_deviceAPI->getSampleSink(); ui->setupUi(getContents()); - getContents()->setStyleSheet("#Bladerf1OutputGui { border: 1px solid #C06900 }"); + getContents()->setStyleSheet(QString(tr("#Bladerf1OutputGui { border: 1px solid %1 }") + .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "/plugins/samplesink/bladerf1output/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); ui->centerFrequency->setValueRange(7, BLADERF_FREQUENCY_MIN_XB200/1000, BLADERF_FREQUENCY_MAX/1000); diff --git a/plugins/samplesink/bladerf2output/bladerf2outputgui.cpp b/plugins/samplesink/bladerf2output/bladerf2outputgui.cpp index 7fa2bd767..fd40138d2 100644 --- a/plugins/samplesink/bladerf2output/bladerf2outputgui.cpp +++ b/plugins/samplesink/bladerf2output/bladerf2outputgui.cpp @@ -50,7 +50,8 @@ BladeRF2OutputGui::BladeRF2OutputGui(DeviceUISet *deviceUISet, QWidget* parent) uint64_t f_min, f_max; ui->setupUi(getContents()); - getContents()->setStyleSheet("#BladeRF2OutputGui { border: 1px solid #C06900 }"); + getContents()->setStyleSheet(QString(tr("#BladeRF2OutputGui { border: 1px solid %1 }") + .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesink/bladerf2output/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); m_sampleSink->getFrequencyRange(f_min, f_max, step, scale); diff --git a/plugins/samplesink/fileoutput/fileoutputgui.cpp b/plugins/samplesink/fileoutput/fileoutputgui.cpp index 60c61e310..918944a15 100644 --- a/plugins/samplesink/fileoutput/fileoutputgui.cpp +++ b/plugins/samplesink/fileoutput/fileoutputgui.cpp @@ -53,7 +53,8 @@ FileOutputGui::FileOutputGui(DeviceUISet *deviceUISet, QWidget* parent) : { setAttribute(Qt::WA_DeleteOnClose, true); ui->setupUi(getContents()); - getContents()->setStyleSheet("#FileOutputGui { border: 1px solid #C06900 }"); + getContents()->setStyleSheet(QString(tr("#FileOutputGui { border: 1px solid %1 }") + .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesink/fileoutput/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); diff --git a/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp b/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp index 1bfa6105e..03e613cd3 100644 --- a/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp +++ b/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp @@ -49,7 +49,8 @@ HackRFOutputGui::HackRFOutputGui(DeviceUISet *deviceUISet, QWidget* parent) : m_deviceSampleSink = (HackRFOutput*) m_deviceUISet->m_deviceAPI->getSampleSink(); ui->setupUi(getContents()); - getContents()->setStyleSheet("#HackRFOutputGui { border: 1px solid #C06900 }"); + getContents()->setStyleSheet(QString(tr("#HackRFOutputGui { border: 1px solid %1 }") + .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesink/hackrfoutput/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); ui->centerFrequency->setValueRange(7, 0U, 7250000U); diff --git a/plugins/samplesink/limesdroutput/limesdroutputgui.cpp b/plugins/samplesink/limesdroutput/limesdroutputgui.cpp index 7e4ebe7dc..c8e9f9777 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputgui.cpp +++ b/plugins/samplesink/limesdroutput/limesdroutputgui.cpp @@ -46,7 +46,8 @@ LimeSDROutputGUI::LimeSDROutputGUI(DeviceUISet *deviceUISet, QWidget* parent) : m_limeSDROutput = (LimeSDROutput*) m_deviceUISet->m_deviceAPI->getSampleSink(); ui->setupUi(getContents()); - getContents()->setStyleSheet("#LimeSDROutputGUI { border: 1px solid #C06900 }"); + getContents()->setStyleSheet(QString(tr("#LimeSDROutputGUI { border: 1px solid %1 }") + .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesink/limesdroutput/readme.md"; float minF, maxF; diff --git a/plugins/samplesink/localoutput/localoutputgui.cpp b/plugins/samplesink/localoutput/localoutputgui.cpp index 7fc23d47b..c85432967 100644 --- a/plugins/samplesink/localoutput/localoutputgui.cpp +++ b/plugins/samplesink/localoutput/localoutputgui.cpp @@ -63,7 +63,8 @@ LocalOutputGui::LocalOutputGui(DeviceUISet *deviceUISet, QWidget* parent) : m_paletteWhiteText.setColor(QPalette::WindowText, Qt::white); ui->setupUi(getContents()); - getContents()->setStyleSheet("#LocalOutputGui { border: 1px solid #C06900 }"); + getContents()->setStyleSheet(QString(tr("#LocalOutputGui { border: 1px solid %1 }") + .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesink/localoutput/readme.md"; CRightClickEnabler *startStopRightClickEnabler = new CRightClickEnabler(ui->startStop); diff --git a/plugins/samplesink/plutosdroutput/plutosdroutputgui.cpp b/plugins/samplesink/plutosdroutput/plutosdroutputgui.cpp index 006c31900..a0aaf5368 100644 --- a/plugins/samplesink/plutosdroutput/plutosdroutputgui.cpp +++ b/plugins/samplesink/plutosdroutput/plutosdroutputgui.cpp @@ -49,7 +49,8 @@ PlutoSDROutputGUI::PlutoSDROutputGUI(DeviceUISet *deviceUISet, QWidget* parent) m_sampleSink = (PlutoSDROutput*) m_deviceUISet->m_deviceAPI->getSampleSink(); ui->setupUi(getContents()); - getContents()->setStyleSheet("#PlutoSDROutputGUI { border: 1px solid #C06900 }"); + getContents()->setStyleSheet(QString(tr("#PlutoSDROutputGUI { border: 1px solid %1 }") + .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesink/plutosdroutput/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); updateFrequencyLimits(); diff --git a/plugins/samplesink/remoteoutput/remoteoutputgui.cpp b/plugins/samplesink/remoteoutput/remoteoutputgui.cpp index 447d0d232..65343e43f 100644 --- a/plugins/samplesink/remoteoutput/remoteoutputgui.cpp +++ b/plugins/samplesink/remoteoutput/remoteoutputgui.cpp @@ -68,7 +68,8 @@ RemoteOutputSinkGui::RemoteOutputSinkGui(DeviceUISet *deviceUISet, QWidget* pare m_paletteWhiteText.setColor(QPalette::WindowText, Qt::white); ui->setupUi(getContents()); - getContents()->setStyleSheet("#RemoteOutputGui { border: 1px solid #C06900 }"); + getContents()->setStyleSheet(QString(tr("#RemoteOutputGui { border: 1px solid %1 }") + .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesink/remoteoutput/readme.md"; connect(&(m_deviceUISet->m_deviceAPI->getMasterTimer()), SIGNAL(timeout()), this, SLOT(tick())); diff --git a/plugins/samplesink/soapysdroutput/soapysdroutputgui.cpp b/plugins/samplesink/soapysdroutput/soapysdroutputgui.cpp index 133925b01..fe7f7c800 100644 --- a/plugins/samplesink/soapysdroutput/soapysdroutputgui.cpp +++ b/plugins/samplesink/soapysdroutput/soapysdroutputgui.cpp @@ -60,7 +60,8 @@ SoapySDROutputGui::SoapySDROutputGui(DeviceUISet *deviceUISet, QWidget* parent) setAttribute(Qt::WA_DeleteOnClose, true); m_sampleSink = (SoapySDROutput*) m_deviceUISet->m_deviceAPI->getSampleSink(); ui->setupUi(getContents()); - getContents()->setStyleSheet("#SoapySDROutputGui { border: 1px solid #C06900 }"); + getContents()->setStyleSheet(QString(tr("#SoapySDROutputGui { border: 1px solid %1 }") + .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesink/soapysdroutput/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); diff --git a/plugins/samplesink/testsink/testsinkgui.cpp b/plugins/samplesink/testsink/testsinkgui.cpp index 9b22a7bec..e63ba074c 100644 --- a/plugins/samplesink/testsink/testsinkgui.cpp +++ b/plugins/samplesink/testsink/testsinkgui.cpp @@ -50,7 +50,8 @@ TestSinkGui::TestSinkGui(DeviceUISet *deviceUISet, QWidget* parent) : { setAttribute(Qt::WA_DeleteOnClose, true); ui->setupUi(getContents()); - getContents()->setStyleSheet("#TestSinkGui { border: 1px solid #C06900 }"); + getContents()->setStyleSheet(QString(tr("#TestSinkGui { border: 1px solid %1 }") + .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesink/testsink/readme.md"; m_sampleSink = (TestSinkOutput*) m_deviceUISet->m_deviceAPI->getSampleSink(); diff --git a/plugins/samplesink/usrpoutput/usrpoutputgui.cpp b/plugins/samplesink/usrpoutput/usrpoutputgui.cpp index c9848c106..4271c44de 100644 --- a/plugins/samplesink/usrpoutput/usrpoutputgui.cpp +++ b/plugins/samplesink/usrpoutput/usrpoutputgui.cpp @@ -47,7 +47,8 @@ USRPOutputGUI::USRPOutputGUI(DeviceUISet *deviceUISet, QWidget* parent) : m_usrpOutput = (USRPOutput*) m_deviceUISet->m_deviceAPI->getSampleSink(); ui->setupUi(getContents()); - getContents()->setStyleSheet("#USRPOutputGUI { border: 1px solid #C06900 }"); + getContents()->setStyleSheet(QString(tr("#USRPOutputGUI { border: 1px solid %1 }") + .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesink/usrpoutput/readme.md"; float minF, maxF; diff --git a/plugins/samplesink/xtrxoutput/xtrxoutputgui.cpp b/plugins/samplesink/xtrxoutput/xtrxoutputgui.cpp index 9bdc65f45..c20372447 100644 --- a/plugins/samplesink/xtrxoutput/xtrxoutputgui.cpp +++ b/plugins/samplesink/xtrxoutput/xtrxoutputgui.cpp @@ -48,7 +48,8 @@ XTRXOutputGUI::XTRXOutputGUI(DeviceUISet *deviceUISet, QWidget* parent) : m_XTRXOutput = (XTRXOutput*) m_deviceUISet->m_deviceAPI->getSampleSink(); ui->setupUi(getContents()); - getContents()->setStyleSheet("#XTRXOutputGUI { border: 1px solid #C06900 }"); + getContents()->setStyleSheet(QString(tr("#XTRXOutputGUI { border: 1px solid %1 }") + .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesink/xtrxoutput/readme.md"; float minF, maxF, stepF; diff --git a/plugins/samplesource/airspy/airspygui.cpp b/plugins/samplesource/airspy/airspygui.cpp index 9cc584157..b0d8de826 100644 --- a/plugins/samplesource/airspy/airspygui.cpp +++ b/plugins/samplesource/airspy/airspygui.cpp @@ -48,7 +48,8 @@ AirspyGui::AirspyGui(DeviceUISet *deviceUISet, QWidget* parent) : m_sampleSource = (AirspyInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(getContents()); - getContents()->setStyleSheet("#AirspyGui { border: 1px solid #C06900 }"); + getContents()->setStyleSheet(QString(tr("#AirspyGui { border: 1px solid %1 }") + .arg(palette().highlight().color().darker(115).name()))); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); updateFrequencyLimits(); diff --git a/plugins/samplesource/airspyhf/airspyhfgui.cpp b/plugins/samplesource/airspyhf/airspyhfgui.cpp index a2e3e2c54..3dcb22d42 100644 --- a/plugins/samplesource/airspyhf/airspyhfgui.cpp +++ b/plugins/samplesource/airspyhf/airspyhfgui.cpp @@ -47,7 +47,8 @@ AirspyHFGui::AirspyHFGui(DeviceUISet *deviceUISet, QWidget* parent) : m_sampleSource = (AirspyHFInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(getContents()); - getContents()->setStyleSheet("#AirspyHFGui { border: 1px solid #C06900 }"); + getContents()->setStyleSheet(QString(tr("#AirspyHFGui { border: 1px solid %1 }") + .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesource/airspyhf/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); updateFrequencyLimits(); diff --git a/plugins/samplesource/audioinput/audioinputgui.cpp b/plugins/samplesource/audioinput/audioinputgui.cpp index 29b4fd49f..c6497aa6f 100644 --- a/plugins/samplesource/audioinput/audioinputgui.cpp +++ b/plugins/samplesource/audioinput/audioinputgui.cpp @@ -44,7 +44,8 @@ AudioInputGui::AudioInputGui(DeviceUISet *deviceUISet, QWidget* parent) : m_sampleSource = (AudioInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(getContents()); - getContents()->setStyleSheet("#AudioInputGui { border: 1px solid #C06900 }"); + getContents()->setStyleSheet(QString(tr("#AudioInputGui { border: 1px solid %1 }") + .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesource/audioinput/readme.md"; connect(&m_updateTimer, SIGNAL(timeout()), this, SLOT(updateHardware())); diff --git a/plugins/samplesource/bladerf1input/bladerf1inputgui.cpp b/plugins/samplesource/bladerf1input/bladerf1inputgui.cpp index 06bf09a2c..11ac97b8d 100644 --- a/plugins/samplesource/bladerf1input/bladerf1inputgui.cpp +++ b/plugins/samplesource/bladerf1input/bladerf1inputgui.cpp @@ -49,7 +49,8 @@ Bladerf1InputGui::Bladerf1InputGui(DeviceUISet *deviceUISet, QWidget* parent) : m_sampleSource = (Bladerf1Input*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(getContents()); - getContents()->setStyleSheet("#Bladerf1InputGui { border: 1px solid #C06900 }"); + getContents()->setStyleSheet(QString(tr("#Bladerf1InputGui { border: 1px solid %1 }") + .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesource/bladerf1input/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); ui->centerFrequency->setValueRange(7, BLADERF_FREQUENCY_MIN_XB200/1000, BLADERF_FREQUENCY_MAX/1000); diff --git a/plugins/samplesource/bladerf2input/bladerf2inputgui.cpp b/plugins/samplesource/bladerf2input/bladerf2inputgui.cpp index 824c0e927..e05c5c149 100644 --- a/plugins/samplesource/bladerf2input/bladerf2inputgui.cpp +++ b/plugins/samplesource/bladerf2input/bladerf2inputgui.cpp @@ -52,7 +52,8 @@ BladeRF2InputGui::BladeRF2InputGui(DeviceUISet *deviceUISet, QWidget* parent) : uint64_t f_min, f_max; ui->setupUi(getContents()); - getContents()->setStyleSheet("#Bladerf2InputGui { border: 1px solid #C06900 }"); + getContents()->setStyleSheet(QString(tr("#Bladerf2InputGui { border: 1px solid %1 }") + .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesource/bladerf2input/readme.md"; m_sampleSource->getFrequencyRange(f_min, f_max, step, scale); diff --git a/plugins/samplesource/fcdpro/fcdprogui.cpp b/plugins/samplesource/fcdpro/fcdprogui.cpp index c3fbe5877..33840a7da 100644 --- a/plugins/samplesource/fcdpro/fcdprogui.cpp +++ b/plugins/samplesource/fcdpro/fcdprogui.cpp @@ -45,7 +45,8 @@ FCDProGui::FCDProGui(DeviceUISet *deviceUISet, QWidget* parent) : m_sampleSource = (FCDProInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(getContents()); - getContents()->setStyleSheet("#FCDProGui { border: 1px solid #C06900 }"); + getContents()->setStyleSheet(QString(tr("#FCDProGui { border: 1px solid %1 }") + .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesource/fcdpro/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); updateFrequencyLimits(); diff --git a/plugins/samplesource/fcdproplus/fcdproplusgui.cpp b/plugins/samplesource/fcdproplus/fcdproplusgui.cpp index 075eb4a05..3fa840b25 100644 --- a/plugins/samplesource/fcdproplus/fcdproplusgui.cpp +++ b/plugins/samplesource/fcdproplus/fcdproplusgui.cpp @@ -46,7 +46,8 @@ FCDProPlusGui::FCDProPlusGui(DeviceUISet *deviceUISet, QWidget* parent) : m_sampleSource = (FCDProPlusInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(getContents()); - getContents()->setStyleSheet("#FCDProPlusGui { border: 1px solid #C06900 }"); + getContents()->setStyleSheet(QString(tr("#FCDProPlusGui { border: 1px solid %1 }") + .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesource/fcdproplus/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); diff --git a/plugins/samplesource/fileinput/fileinputgui.cpp b/plugins/samplesource/fileinput/fileinputgui.cpp index d4f7aee5a..3a3d26dc3 100644 --- a/plugins/samplesource/fileinput/fileinputgui.cpp +++ b/plugins/samplesource/fileinput/fileinputgui.cpp @@ -57,7 +57,8 @@ FileInputGUI::FileInputGUI(DeviceUISet *deviceUISet, QWidget* parent) : { setAttribute(Qt::WA_DeleteOnClose, true); ui->setupUi(getContents()); - getContents()->setStyleSheet("#FileInputGUI { border: 1px solid #C06900 }"); + getContents()->setStyleSheet(QString(tr("#FileInputGUI { border: 1px solid %1 }") + .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesource/fileinput/readme.md"; ui->crcLabel->setStyleSheet("QLabel { background:rgb(79,79,79); }"); diff --git a/plugins/samplesource/hackrfinput/hackrfinputgui.cpp b/plugins/samplesource/hackrfinput/hackrfinputgui.cpp index 9bab88194..358c8b1b4 100644 --- a/plugins/samplesource/hackrfinput/hackrfinputgui.cpp +++ b/plugins/samplesource/hackrfinput/hackrfinputgui.cpp @@ -50,7 +50,8 @@ HackRFInputGui::HackRFInputGui(DeviceUISet *deviceUISet, QWidget* parent) : m_sampleSource = (HackRFInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(getContents()); - getContents()->setStyleSheet("#HackRFInputGui { border: 1px solid #C06900 }"); + getContents()->setStyleSheet(QString(tr("#HackRFInputGui { border: 1px solid %1 }") + .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesource/hackrfinput/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); ui->centerFrequency->setValueRange(7, 0U, 7250000U); diff --git a/plugins/samplesource/kiwisdr/kiwisdrgui.cpp b/plugins/samplesource/kiwisdr/kiwisdrgui.cpp index dc339541a..1b1799b0f 100644 --- a/plugins/samplesource/kiwisdr/kiwisdrgui.cpp +++ b/plugins/samplesource/kiwisdr/kiwisdrgui.cpp @@ -68,7 +68,8 @@ KiwiSDRGui::KiwiSDRGui(DeviceUISet *deviceUISet, QWidget* parent) : m_statusColors.push_back("rgb(232, 85, 232)"); // Disconnected (magenta) ui->setupUi(getContents()); - getContents()->setStyleSheet("#KiwiSDRGui { border: 1px solid #C06900 }"); + getContents()->setStyleSheet(QString(tr("#KiwiSDRGui { border: 1px solid %1 }") + .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesource/kiwisdr/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); ui->centerFrequency->setValueRange(7, 0, 9999999); diff --git a/plugins/samplesource/limesdrinput/limesdrinputgui.cpp b/plugins/samplesource/limesdrinput/limesdrinputgui.cpp index 1cdfcfe58..43937ca8c 100644 --- a/plugins/samplesource/limesdrinput/limesdrinputgui.cpp +++ b/plugins/samplesource/limesdrinput/limesdrinputgui.cpp @@ -50,7 +50,8 @@ LimeSDRInputGUI::LimeSDRInputGUI(DeviceUISet *deviceUISet, QWidget* parent) : m_limeSDRInput = (LimeSDRInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(getContents()); - getContents()->setStyleSheet("#LimeSDRInputGUI { border: 1px solid #C06900 }"); + getContents()->setStyleSheet(QString(tr("#LimeSDRInputGUI { border: 1px solid %1 }") + .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesource/limesdrinput/readme.md"; float minF, maxF; diff --git a/plugins/samplesource/localinput/localinputgui.cpp b/plugins/samplesource/localinput/localinputgui.cpp index dbfb078fb..81edc2066 100644 --- a/plugins/samplesource/localinput/localinputgui.cpp +++ b/plugins/samplesource/localinput/localinputgui.cpp @@ -76,7 +76,8 @@ LocalInputGui::LocalInputGui(DeviceUISet *deviceUISet, QWidget* parent) : m_startingTimeStampms = 0; ui->setupUi(getContents()); - getContents()->setStyleSheet("#LocalInputGui { border: 1px solid #C06900 }"); + getContents()->setStyleSheet(QString(tr("#LocalInputGui { border: 1px solid %1 }") + .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesource/localinput/readme.md"; CRightClickEnabler *startStopRightClickEnabler = new CRightClickEnabler(ui->startStop); diff --git a/plugins/samplesource/perseus/perseusgui.cpp b/plugins/samplesource/perseus/perseusgui.cpp index 5e1332f9a..a25a47957 100644 --- a/plugins/samplesource/perseus/perseusgui.cpp +++ b/plugins/samplesource/perseus/perseusgui.cpp @@ -45,7 +45,8 @@ PerseusGui::PerseusGui(DeviceUISet *deviceUISet, QWidget* parent) : m_sampleSource = (PerseusInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(getContents()); - getContents()->setStyleSheet("#PerseusGui { border: 1px solid #C06900 }"); + getContents()->setStyleSheet(QString(tr("#PerseusGui { border: 1px solid %1 }") + .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesource/perseus/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); updateFrequencyLimits(); diff --git a/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp b/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp index 70a037c63..7b9a71a29 100644 --- a/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp +++ b/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp @@ -50,7 +50,8 @@ PlutoSDRInputGui::PlutoSDRInputGui(DeviceUISet *deviceUISet, QWidget* parent) : m_sampleSource = (PlutoSDRInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(getContents()); - getContents()->setStyleSheet("#PlutoSDRInputGUI { border: 1px solid #C06900 }"); + getContents()->setStyleSheet(QString(tr("#PlutoSDRInputGUI { border: 1px solid %1 }") + .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesource/plutosdrinput/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); updateFrequencyLimits(); diff --git a/plugins/samplesource/remoteinput/remoteinputgui.cpp b/plugins/samplesource/remoteinput/remoteinputgui.cpp index 6de87f3e4..d4e821181 100644 --- a/plugins/samplesource/remoteinput/remoteinputgui.cpp +++ b/plugins/samplesource/remoteinput/remoteinputgui.cpp @@ -73,7 +73,8 @@ RemoteInputGui::RemoteInputGui(DeviceUISet *deviceUISet, QWidget* parent) : m_startingTimeStampms = 0; ui->setupUi(getContents()); - getContents()->setStyleSheet("#RemoteInputGui { border: 1px solid #C06900 }"); + getContents()->setStyleSheet(QString(tr("#RemoteInputGui { border: 1px solid %1 }") + .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesource/remoteinput/readme.md"; ui->remoteDeviceFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); diff --git a/plugins/samplesource/rtlsdr/rtlsdrgui.cpp b/plugins/samplesource/rtlsdr/rtlsdrgui.cpp index 36c7edee0..71a2f3b9d 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrgui.cpp +++ b/plugins/samplesource/rtlsdr/rtlsdrgui.cpp @@ -47,7 +47,9 @@ RTLSDRGui::RTLSDRGui(DeviceUISet *deviceUISet, QWidget* parent) : m_sampleSource = (RTLSDRInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(getContents()); - getContents()->setStyleSheet("#RTLSDRGui { border: 1px solid #C06900 }"); + QString s(tr("")); + getContents()->setStyleSheet(QString(tr("#RTLSDRGui { border: 1px solid %1 }") + .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesource/rtlsdr/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); updateFrequencyLimits(); diff --git a/plugins/samplesource/sdrplay/sdrplaygui.cpp b/plugins/samplesource/sdrplay/sdrplaygui.cpp index bba28d7e0..ddeddb627 100644 --- a/plugins/samplesource/sdrplay/sdrplaygui.cpp +++ b/plugins/samplesource/sdrplay/sdrplaygui.cpp @@ -44,7 +44,8 @@ SDRPlayGui::SDRPlayGui(DeviceUISet *deviceUISet, QWidget* parent) : m_sampleSource = (SDRPlayInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(getContents()); - getContents()->setStyleSheet("#SDRPlayGui { border: 1px solid #C06900 }"); + getContents()->setStyleSheet(QString(tr("#SDRPlayGui { border: 1px solid %1 }") + .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesource/sdrplay/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); ui->centerFrequency->setValueRange(7, 10U, 12000U); diff --git a/plugins/samplesource/sdrplayv3/sdrplayv3gui.cpp b/plugins/samplesource/sdrplayv3/sdrplayv3gui.cpp index 56344262e..73be322df 100644 --- a/plugins/samplesource/sdrplayv3/sdrplayv3gui.cpp +++ b/plugins/samplesource/sdrplayv3/sdrplayv3gui.cpp @@ -44,7 +44,8 @@ SDRPlayV3Gui::SDRPlayV3Gui(DeviceUISet *deviceUISet, QWidget* parent) : m_sdrPlayV3Input = (SDRPlayV3Input*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(getContents()); - getContents()->setStyleSheet("#SDRPlayV3Gui { border: 1px solid #C06900 }"); + getContents()->setStyleSheet(QString(tr("#SDRPlayV3Gui { border: 1px solid %1 }") + .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesource/sdrplayv3/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); updateFrequencyLimits(); diff --git a/plugins/samplesource/sigmffileinput/sigmffileinputgui.cpp b/plugins/samplesource/sigmffileinput/sigmffileinputgui.cpp index 1e07aab74..41bcd1979 100644 --- a/plugins/samplesource/sigmffileinput/sigmffileinputgui.cpp +++ b/plugins/samplesource/sigmffileinput/sigmffileinputgui.cpp @@ -63,7 +63,8 @@ SigMFFileInputGUI::SigMFFileInputGUI(DeviceUISet *deviceUISet, QWidget* parent) { setAttribute(Qt::WA_DeleteOnClose, true); ui->setupUi(getContents()); - getContents()->setStyleSheet("#SigMFFileInputGUI { border: 1px solid #C06900 }"); + getContents()->setStyleSheet(QString(tr("#SigMFFileInputGUI { border: 1px solid %1 }") + .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesource/sigmffileinput/readme.md"; ui->fileNameText->setText(m_metaFileName); diff --git a/plugins/samplesource/soapysdrinput/soapysdrinputgui.cpp b/plugins/samplesource/soapysdrinput/soapysdrinputgui.cpp index b13efebe3..500b3cedc 100644 --- a/plugins/samplesource/soapysdrinput/soapysdrinputgui.cpp +++ b/plugins/samplesource/soapysdrinput/soapysdrinputgui.cpp @@ -62,7 +62,8 @@ SoapySDRInputGui::SoapySDRInputGui(DeviceUISet *deviceUISet, QWidget* parent) : setAttribute(Qt::WA_DeleteOnClose, true); m_sampleSource = (SoapySDRInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(getContents()); - getContents()->setStyleSheet("#SoapySDRInputGui { border: 1px solid #C06900 }"); + getContents()->setStyleSheet(QString(tr("#SoapySDRInputGui { border: 1px solid %1 }") + .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesource/soapysdrinput/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); diff --git a/plugins/samplesource/testsource/testsourcegui.cpp b/plugins/samplesource/testsource/testsourcegui.cpp index 211d411cd..27a859af3 100644 --- a/plugins/samplesource/testsource/testsourcegui.cpp +++ b/plugins/samplesource/testsource/testsourcegui.cpp @@ -55,7 +55,8 @@ TestSourceGui::TestSourceGui(DeviceUISet *deviceUISet, QWidget* parent) : m_sampleSource = m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(getContents()); - getContents()->setStyleSheet("#TestSourceGui { border: 1px solid #C06900 }"); + getContents()->setStyleSheet(QString(tr("#TestSourceGui { border: 1px solid %1 }") + .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesource/testsource/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); ui->centerFrequency->setValueRange(7, 0, 9999999); diff --git a/plugins/samplesource/usrpinput/usrpinputgui.cpp b/plugins/samplesource/usrpinput/usrpinputgui.cpp index 3325f91d9..bdc8459d4 100644 --- a/plugins/samplesource/usrpinput/usrpinputgui.cpp +++ b/plugins/samplesource/usrpinput/usrpinputgui.cpp @@ -51,7 +51,8 @@ USRPInputGUI::USRPInputGUI(DeviceUISet *deviceUISet, QWidget* parent) : m_usrpInput = (USRPInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(getContents()); - getContents()->setStyleSheet("#USRPInputGUI { border: 1px solid #C06900 }"); + getContents()->setStyleSheet(QString(tr("#USRPInputGUI { border: 1px solid %1 }") + .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesource/usrpinput/readme.md"; float minF, maxF; diff --git a/plugins/samplesource/xtrxinput/xtrxinputgui.cpp b/plugins/samplesource/xtrxinput/xtrxinputgui.cpp index 17ff6f57c..4f46ed0da 100644 --- a/plugins/samplesource/xtrxinput/xtrxinputgui.cpp +++ b/plugins/samplesource/xtrxinput/xtrxinputgui.cpp @@ -51,7 +51,8 @@ XTRXInputGUI::XTRXInputGUI(DeviceUISet *deviceUISet, QWidget* parent) : m_XTRXInput = (XTRXInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(getContents()); - getContents()->setStyleSheet("#XTRXInputGUI { border: 1px solid #C06900 }"); + getContents()->setStyleSheet(QString(tr("#XTRXInputGUI { border: 1px solid %1 }") + .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesource/xtrxinput/readme.md"; float minF, maxF, stepF; diff --git a/sdrgui/gui/rollupcontents.cpp b/sdrgui/gui/rollupcontents.cpp index d8077c96c..19294e78e 100644 --- a/sdrgui/gui/rollupcontents.cpp +++ b/sdrgui/gui/rollupcontents.cpp @@ -41,44 +41,6 @@ RollupContents::RollupContents(QWidget* parent) : setAttribute(Qt::WA_OpaquePaintEvent, true); } -// QByteArray RollupWidget::saveState(int version) const -// { -// QByteArray state; -// QDataStream stream(&state, QIODevice::WriteOnly); -// int count = 0; - -// for (int i = 0; i < children().count(); ++i) -// { -// QWidget* r = qobject_cast(children()[i]); - -// if (r) { -// count++; -// } -// } - -// stream << VersionMarker; -// stream << version; -// stream << count; - -// for (int i = 0; i < children().count(); ++i) -// { -// QWidget* r = qobject_cast(children()[i]); - -// if (r) -// { -// stream << r->objectName(); - -// if (r->isHidden()) { -// stream << (int) 0; -// } else { -// stream << (int) 1; -// } -// } -// } - -// return state; -// } - void RollupContents::saveState(RollupState &state) const { QList& childrenStates = state.getChildren(); @@ -94,64 +56,6 @@ void RollupContents::saveState(RollupState &state) const } } -// bool RollupWidget::restoreState(const QByteArray& state, int version) -// { -// if (state.isEmpty()) { -// return false; -// } - -// QByteArray sd = state; -// QDataStream stream(&sd, QIODevice::ReadOnly); -// int marker, v; -// stream >> marker; -// stream >> v; - -// if ((stream.status() != QDataStream::Ok) || (marker != VersionMarker) || (v != version)) { -// return false; -// } - -// int count; -// stream >> count; - -// if (stream.status() != QDataStream::Ok) { -// return false; -// } - -// for (int i = 0; i < count; ++i) -// { -// QString name; -// int visible; - -// stream >> name; -// stream >> visible; - -// if (stream.status() != QDataStream::Ok) { -// return false; -// } - -// for (int j = 0; j < children().count(); ++j) -// { -// QWidget* r = qobject_cast(children()[j]); - -// if (r) -// { -// if (r->objectName() == name) -// { -// if (visible) { -// r->show(); -// } else { -// r->hide(); -// } - -// break; -// } -// } -// } -// } - -// return true; -// } - void RollupContents::restoreState(const RollupState& state) { const QList& childrenStates = state.getChildren(); @@ -284,7 +188,7 @@ int RollupContents::arrangeRollups() void RollupContents::paintEvent(QPaintEvent*) { QPainter p(this); - QColor frame = palette().highlight().color(); + QColor frameColor = palette().highlight().color().darker(115); // Eigenbau QFontMetrics fm(font()); @@ -292,82 +196,20 @@ void RollupContents::paintEvent(QPaintEvent*) p.setRenderHint(QPainter::Antialiasing, true); // Ecken (corners) - p.setPen(Qt::NoPen); - p.setBrush(palette().base()); - p.drawRect(0, 0, 5, 5); - p.drawRect(width() - 5, 0, 5, 5); - p.drawRect(0, height() - 5, 5, 5); - p.drawRect(width() - 5, height() - 5, 5, 5); + // p.setPen(Qt::NoPen); + // p.setBrush(palette().base()); + // p.drawRect(0, 0, 5, 5); + // p.drawRect(width() - 5, 0, 5, 5); + // p.drawRect(0, height() - 5, 5, 5); + // p.drawRect(width() - 5, height() - 5, 5, 5); // Rahmen (frame) - p.setPen(m_highlighted ? Qt::white : frame); + p.setPen(m_highlighted ? Qt::white : frameColor); p.setBrush(palette().window()); QRectF r(rect()); r.adjust(0.5, 0.5, -0.5, -0.5); - p.drawRoundedRect(r, 3.0, 3.0, Qt::AbsoluteSize); - - // // Titel-Hintergrund (Title background) - // p.setPen(Qt::NoPen); - // p.setBrush(m_titleColor); - // QPainterPath path; - // path.moveTo(1.5, fm.height() + 2.5); - // path.lineTo(width() - 1.5, fm.height() + 2.5); - // path.lineTo(width() - 1.5, 3.5); - // path.arcTo(QRectF(width() - 3.5, 0, 2.5, 2.5), 270, -90); - // path.lineTo(3.5, 1.5); - // path.arcTo(QRectF(1.5, 2.5, 2.5, 2.5), 90, 90); - // p.drawPath(path); - - // // Titel-Abschlusslinie (Title closing line) - // p.setPen(frame); - // p.drawLine(QPointF(0.5, 2 + fm.height() + 1.5), QPointF(width() - 1.5, 2 + fm.height() + 1.5)); - - // // Aktiv-Button links - // p.setPen(QPen(palette().windowText().color(), 1.0)); - // p.setBrush(palette().light()); - // p.drawRoundedRect(QRectF(3.5, 3.5, fm.ascent(), fm.ascent()), 2.0, 2.0, Qt::AbsoluteSize); - // p.setPen(QPen(Qt::white, 1.0)); - // p.drawText(QRectF(3.5, 2.5, fm.ascent(), fm.ascent()), Qt::AlignCenter, "c"); - - // if (m_channelWidget) - // { - // // Stromkanal-Button links (Current channel) - // p.setPen(QPen(palette().windowText().color(), 1.0)); - // p.setBrush(palette().light()); - // p.drawRoundedRect(QRectF(5.5 + fm.ascent(), 2.5, fm.ascent() + 2.0, fm.ascent() + 2.0), 2.0, 2.0, Qt::AbsoluteSize); - // p.setPen(QPen(Qt::white, 1.0)); - // p.drawText(QRectF(5.5 + fm.ascent(), 2.5, fm.ascent() + 2.0, fm.ascent() + 2.0), Qt::AlignCenter, m_streamIndicator); - // } - - // // Help button - // if (!m_helpURL.isEmpty()) - // { - // p.setRenderHint(QPainter::Antialiasing, true); - // p.setPen(QPen(palette().windowText().color(), 1.0)); - // p.setBrush(palette().light()); - // r = QRectF(width() - 2*(3.5 + fm.ascent()), 3.5, fm.ascent(), fm.ascent()); - // p.drawRoundedRect(r, 2.0, 2.0, Qt::AbsoluteSize); - // p.drawText(QRectF(width() - 2*(3.5 + fm.ascent()), 5, fm.ascent(), fm.ascent() - 2), Qt::AlignCenter, "?"); - // } - - // //p.drawLine(r.topLeft() + QPointF(1, 1), r.bottomRight() + QPointF(-1, -1)); - // //p.drawLine(r.bottomLeft() + QPointF(1, -1), r.topRight() + QPointF(-1, 1)); - - // // Schließen-Button rechts (Close button on the right) - // p.setRenderHint(QPainter::Antialiasing, true); - // p.setPen(QPen(palette().windowText().color(), 1.0)); - // p.setBrush(palette().light()); - // r = QRectF(width() - 3.5 - fm.ascent(), 3.5, fm.ascent(), fm.ascent()); - // p.drawRoundedRect(r, 2.0, 2.0, Qt::AbsoluteSize); - // p.setPen(QPen(palette().windowText().color(), 1.5)); - // p.drawLine(r.topLeft() + QPointF(1, 1), r.bottomRight() + QPointF(-1, -1)); - // p.drawLine(r.bottomLeft() + QPointF(1, -1), r.topRight() + QPointF(-1, 1)); - - // // Titel - // //p.setPen(palette().highlightedText().color()); - // p.setPen(m_titleTextColor); - // p.drawText(QRect(2 + 2*fm.height() + 2, 2, width() - 6 - 3*fm.height(), fm.height()), - // fm.elidedText(windowTitle(), Qt::ElideMiddle, width() - 6 - 3*fm.height(), 0)); + // p.drawRoundedRect(r, 3.0, 3.0, Qt::AbsoluteSize); + p.drawRect(r); // Rollups int pos = 2; // fm.height() + 4; @@ -396,11 +238,11 @@ void RollupContents::paintEvent(QPaintEvent*) } } - pos += paintRollup(qobject_cast(*w), pos, &p, n == c.end(), frame); + pos += paintRollup(qobject_cast(*w), pos, &p, n == c.end(), frameColor); } } -int RollupContents::paintRollup(QWidget* rollup, int pos, QPainter* p, bool last, const QColor& frame) +int RollupContents::paintRollup(QWidget* rollup, int pos, QPainter* p, bool last, const QColor& frameColor) { QFontMetrics fm(font()); int height = 1; @@ -418,7 +260,7 @@ int RollupContents::paintRollup(QWidget* rollup, int pos, QPainter* p, bool last { if (!last) { - p->setPen(frame); + p->setPen(frameColor); p->drawLine(QPointF(1.5, pos + fm.height() + 1.5), QPointF(width() - 1.5, pos + fm.height() + 1.5)); height++; } @@ -455,7 +297,7 @@ int RollupContents::paintRollup(QWidget* rollup, int pos, QPainter* p, bool last if (!rollup->isHidden() && (!last)) { // Rollup-Abschlusslinie - p->setPen(frame); + p->setPen(frameColor); p->drawLine(QPointF(1.5, pos + fm.height() + rollup->height() + 6.5), QPointF(width() - 1.5, pos + fm.height() + rollup->height() + 6.5)); height += rollup->height() + 4; @@ -475,44 +317,6 @@ void RollupContents::mousePressEvent(QMouseEvent* event) { QFontMetrics fm(font()); - // // menu box left - // if (QRectF(3.5, 3.5, fm.ascent(), fm.ascent()).contains(event->pos())) - // { - // m_contextMenuType = ContextMenuChannelSettings; - // emit customContextMenuRequested(event->globalPos()); - // return; - // } - - // if (m_channelWidget) - // { - // // Stream channel menu left - // if (QRectF(5.5 + fm.ascent(), 2.5, fm.ascent() + 2.0, fm.ascent() + 2.0).contains(event->pos())) - // { - // m_contextMenuType = ContextMenuStreamSettings; - // emit customContextMenuRequested(event->globalPos()); - // return; - // } - // } - - // // help button - // if(!m_helpURL.isEmpty() && QRectF(width() - 2*(3.5 + fm.ascent()), 3.5, fm.ascent(), fm.ascent()).contains(event->pos())) - // { - // QString url; - // if (m_helpURL.startsWith("http")) { - // url = m_helpURL; - // } else { - // url = QString("https://github.com/f4exb/sdrangel/blob/master/%1").arg(m_helpURL); // Something like "plugins/channelrx/chanalyzer/readme.md" - // } - // QDesktopServices::openUrl(QUrl(url)); - // return; - // } - - // // close button right - // if(QRectF(width() - 3.5 - fm.ascent(), 3.5, fm.ascent(), fm.ascent()).contains(event->pos())) { - // close(); - // return; - // } - // check if we need to change a rollup widget int pos = 2; // fm.height() + 4; diff --git a/sdrgui/gui/rollupcontents.h b/sdrgui/gui/rollupcontents.h index e4eeb3ca6..649398a17 100644 --- a/sdrgui/gui/rollupcontents.h +++ b/sdrgui/gui/rollupcontents.h @@ -31,10 +31,7 @@ class SDRGUI_API RollupContents : public QWidget { public: RollupContents(QWidget* parent = nullptr); void setHighlighted(bool highlighted); - // void setChannelWidget(bool channelWidget) { m_channelWidget = channelWidget; } - // QByteArray saveState(int version = 0) const; void saveState(RollupState& state) const; - // bool restoreState(const QByteArray& state, int version = 0); void restoreState(const RollupState& state); int arrangeRollups(); @@ -51,7 +48,7 @@ protected: QString m_helpURL; void paintEvent(QPaintEvent*); - int paintRollup(QWidget* rollup, int pos, QPainter* p, bool last, const QColor& frame); + int paintRollup(QWidget* rollup, int pos, QPainter* p, bool last, const QColor& frameColor); void resizeEvent(QResizeEvent* size); void mousePressEvent(QMouseEvent* event);