From aa84dba7ce8bb3b0889c6ee120e00f3f2400d360 Mon Sep 17 00:00:00 2001 From: f4exb Date: Tue, 17 Jan 2017 00:49:52 +0100 Subject: [PATCH] NFM and DSD demods: corrected squelch open GUI display --- plugins/channelrx/demoddsd/dsddemodgui.cpp | 8 +++++--- plugins/channelrx/demodnfm/nfmdemodgui.cpp | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/plugins/channelrx/demoddsd/dsddemodgui.cpp b/plugins/channelrx/demoddsd/dsddemodgui.cpp index 6b5c7186d..1279042a7 100644 --- a/plugins/channelrx/demoddsd/dsddemodgui.cpp +++ b/plugins/channelrx/demoddsd/dsddemodgui.cpp @@ -336,6 +336,8 @@ DSDDemodGUI::DSDDemodGUI(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI, QWidg connect(&m_pluginAPI->getMainWindow()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick())); + ui->audioMute->setStyleSheet("QToolButton { background:rgb(79,79,79); }"); + ui->deltaFrequency->setColorMapper(ColorMapper(ColorMapper::ReverseGold)); ui->channelPowerMeter->setColorTheme(LevelMeterSignalDB::ColorGreenAndBlue); @@ -608,13 +610,13 @@ void DSDDemodGUI::tick() if (squelchOpen != m_squelchOpen) { - m_squelchOpen = squelchOpen; - - if (m_squelchOpen) { + if (squelchOpen) { ui->audioMute->setStyleSheet("QToolButton { background-color : green; }"); } else { ui->audioMute->setStyleSheet("QToolButton { background:rgb(79,79,79); }"); } + + m_squelchOpen = squelchOpen; } // "slow" updates diff --git a/plugins/channelrx/demodnfm/nfmdemodgui.cpp b/plugins/channelrx/demodnfm/nfmdemodgui.cpp index bffe1929d..56a883008 100644 --- a/plugins/channelrx/demodnfm/nfmdemodgui.cpp +++ b/plugins/channelrx/demodnfm/nfmdemodgui.cpp @@ -290,6 +290,8 @@ NFMDemodGUI::NFMDemodGUI(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI, QWidg ui->ctcss->addItem(QString("%1").arg(ctcss_tones[i])); } + ui->audioMute->setStyleSheet("QToolButton { background:rgb(79,79,79); }"); // squelch closed + ui->deltaFrequency->setColorMapper(ColorMapper(ColorMapper::ReverseGold)); ui->channelPowerMeter->setColorTheme(LevelMeterSignalDB::ColorGreenAndBlue); @@ -401,12 +403,12 @@ void NFMDemodGUI::tick() if (squelchOpen != m_squelchOpen) { - m_squelchOpen = squelchOpen; - - if (m_squelchOpen) { + if (squelchOpen) { ui->audioMute->setStyleSheet("QToolButton { background-color : green; }"); } else { ui->audioMute->setStyleSheet("QToolButton { background:rgb(79,79,79); }"); } + + m_squelchOpen = squelchOpen; } }