diff --git a/plugins/channelrx/chanalyzerng/chanalyzernggui.cpp b/plugins/channelrx/chanalyzerng/chanalyzernggui.cpp index a7d0f3c78..dbf0573ab 100644 --- a/plugins/channelrx/chanalyzerng/chanalyzernggui.cpp +++ b/plugins/channelrx/chanalyzerng/chanalyzernggui.cpp @@ -171,8 +171,7 @@ void ChannelAnalyzerNGGUI::tick() { double powDb = CalcDb::dbPower(m_channelAnalyzer->getMagSq()); m_channelPowerDbAvg.feed(powDb); - ui->channelPower->setText(QString::number(m_channelPowerDbAvg.average(), 'f', 1)); -// ui->channelPower->setText(QString::number(powDb, 'f', 1)); + ui->channelPower->setText(tr("%1 dB").arg(m_channelPowerDbAvg.average(), 0, 'f', 1)); } void ChannelAnalyzerNGGUI::channelizerInputSampleRateChanged() diff --git a/plugins/channelrx/chanalyzerng/chanalyzernggui.ui b/plugins/channelrx/chanalyzerng/chanalyzernggui.ui index f5cb92639..ec3fd93c5 100644 --- a/plugins/channelrx/chanalyzerng/chanalyzernggui.ui +++ b/plugins/channelrx/chanalyzerng/chanalyzernggui.ui @@ -305,28 +305,26 @@ - - - - - Channel power - - - Qt::LeftToRight - - - 0.0 - - - - - - - dB - - - - + + + + 52 + 0 + + + + Channel power + + + Qt::LeftToRight + + + -100.0 dB + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + diff --git a/plugins/channelrx/demoddsd/dsddemodgui.cpp b/plugins/channelrx/demoddsd/dsddemodgui.cpp index adfc4ea40..95e1fb801 100644 --- a/plugins/channelrx/demoddsd/dsddemodgui.cpp +++ b/plugins/channelrx/demoddsd/dsddemodgui.cpp @@ -594,7 +594,7 @@ void DSDDemodGUI::tick() (100.0f + powDbPeak) / 100.0f, nbMagsqSamples); - ui->channelPower->setText(QString::number(powDbAvg, 'f', 1)); + ui->channelPower->setText(tr("%1 dB").arg(powDbAvg, 0, 'f', 1)); // Real powDb = CalcDb::dbPower(m_dsdDemod->getMagSq()); // m_channelPowerDbAvg.feed(powDb); diff --git a/plugins/channelrx/demoddsd/dsddemodgui.ui b/plugins/channelrx/demoddsd/dsddemodgui.ui index 5b81af8cd..b1a3527cd 100644 --- a/plugins/channelrx/demoddsd/dsddemodgui.ui +++ b/plugins/channelrx/demoddsd/dsddemodgui.ui @@ -6,7 +6,7 @@ 0 0 - 680 + 686 841 @@ -18,7 +18,7 @@ - 680 + 686 0 @@ -36,7 +36,7 @@ 0 0 - 678 + 684 172 @@ -48,7 +48,7 @@ - 678 + 684 0 @@ -123,8 +123,6 @@ Demod shift frequency from center in Hz - deltaFrequencyLabel - deltaFrequencyLabel @@ -357,43 +355,32 @@ - - - - - - 35 - 0 - - - - Channel power (dB) - - - Qt::RightToLeft - - - -00.0 - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 20 - 0 - - - - dB - - - - + + + + 0 + 0 + + + + + 60 + 0 + + + + Channel power (dB) + + + Qt::RightToLeft + + + -100.0 dB + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + diff --git a/plugins/channelrx/demodnfm/nfmdemodgui.cpp b/plugins/channelrx/demodnfm/nfmdemodgui.cpp index 50ca8b755..ff2bc0881 100644 --- a/plugins/channelrx/demodnfm/nfmdemodgui.cpp +++ b/plugins/channelrx/demodnfm/nfmdemodgui.cpp @@ -413,7 +413,7 @@ void NFMDemodGUI::tick() (100.0f + powDbPeak) / 100.0f, nbMagsqSamples); - ui->channelPower->setText(QString::number(powDbAvg, 'f', 1)); + ui->channelPower->setText(tr("%1 dB").arg(powDbAvg, 0, 'f', 1)); bool squelchOpen = m_nfmDemod->getSquelchOpen(); diff --git a/plugins/channelrx/demodnfm/nfmdemodgui.ui b/plugins/channelrx/demodnfm/nfmdemodgui.ui index 2cecce70a..8cbb68f42 100644 --- a/plugins/channelrx/demodnfm/nfmdemodgui.ui +++ b/plugins/channelrx/demodnfm/nfmdemodgui.ui @@ -142,28 +142,26 @@ - - - - - Channel power - - - Qt::RightToLeft - - - 0.0 - - - - - - - dB - - - - + + + + 60 + 0 + + + + Channel power + + + Qt::RightToLeft + + + -100.0 dB + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + diff --git a/plugins/channelrx/demodssb/ssbdemodgui.cpp b/plugins/channelrx/demodssb/ssbdemodgui.cpp index 38d09ae1e..8679fc394 100644 --- a/plugins/channelrx/demodssb/ssbdemodgui.cpp +++ b/plugins/channelrx/demodssb/ssbdemodgui.cpp @@ -494,5 +494,5 @@ void SSBDemodGUI::tick() (100.0f + powDbPeak) / 100.0f, nbMagsqSamples); - ui->channelPower->setText(QString::number(powDbAvg, 'f', 1)); + ui->channelPower->setText(tr("%1 dB").arg(powDbAvg, 0, 'f', 1)); } diff --git a/plugins/channelrx/demodssb/ssbdemodgui.ui b/plugins/channelrx/demodssb/ssbdemodgui.ui index d66c81c44..c701a14fe 100644 --- a/plugins/channelrx/demodssb/ssbdemodgui.ui +++ b/plugins/channelrx/demodssb/ssbdemodgui.ui @@ -139,34 +139,36 @@ - - - - - Channel power - - - Qt::RightToLeft - - - 0.0 - - - - - - - dB - - - - - - - Qt::Vertical - - - + + + + 60 + 0 + + + + Channel power + + + Qt::RightToLeft + + + -100.0 dB + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Qt::Vertical + + + + + diff --git a/plugins/channeltx/modam/ammodgui.cpp b/plugins/channeltx/modam/ammodgui.cpp index f002df397..125804ffe 100644 --- a/plugins/channeltx/modam/ammodgui.cpp +++ b/plugins/channeltx/modam/ammodgui.cpp @@ -432,7 +432,7 @@ void AMModGUI::tick() { double powDb = CalcDb::dbPower(m_amMod->getMagSq()); m_channelPowerDbAvg.feed(powDb); - ui->channelPower->setText(QString::number(m_channelPowerDbAvg.average(), 'f', 1)); + ui->channelPower->setText(tr("%1 dB").arg(m_channelPowerDbAvg.average(), 0, 'f', 1)); if (((++m_tickCount & 0xf) == 0) && (m_modAFInput == AMMod::AMModInputFile)) { diff --git a/plugins/channeltx/modam/ammodgui.ui b/plugins/channeltx/modam/ammodgui.ui index 98aa95f69..74d88fec7 100644 --- a/plugins/channeltx/modam/ammodgui.ui +++ b/plugins/channeltx/modam/ammodgui.ui @@ -139,12 +139,14 @@ - - - - + + + 60 + 0 + + Channel power @@ -152,37 +154,33 @@ Qt::RightToLeft - 0.0 + -100.0 dB - - - - - - dB - - - - - - - Mute/Unmute channel - - - ... - - - - :/txon.png - :/txoff.png:/txon.png - - - true + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + Mute/Unmute channel + + + ... + + + + :/txon.png + :/txoff.png:/txon.png + + + true + + + diff --git a/plugins/channeltx/modatv/atvmodgui.cpp b/plugins/channeltx/modatv/atvmodgui.cpp index 46398b4a8..0e1738d59 100644 --- a/plugins/channeltx/modatv/atvmodgui.cpp +++ b/plugins/channeltx/modatv/atvmodgui.cpp @@ -728,7 +728,7 @@ void ATVModGUI::tick() { double powDb = CalcDb::dbPower(m_atvMod->getMagSq()); m_channelPowerDbAvg.feed(powDb); - ui->channelPower->setText(QString::number(m_channelPowerDbAvg.average(), 'f', 1)); + ui->channelPower->setText(tr("%1 dB").arg(m_channelPowerDbAvg.average(), 0, 'f', 1)); if (((++m_tickCount & 0xf) == 0) && (ui->inputSelect->currentIndex() == (int) ATVMod::ATVModInputVideo)) { diff --git a/plugins/channeltx/modatv/atvmodgui.ui b/plugins/channeltx/modatv/atvmodgui.ui index 6ade06e17..fc93a4957 100644 --- a/plugins/channeltx/modatv/atvmodgui.ui +++ b/plugins/channeltx/modatv/atvmodgui.ui @@ -186,12 +186,14 @@ - - - - + + + 60 + 0 + + Channel power @@ -199,37 +201,33 @@ Qt::RightToLeft - 0.0 + -100.0 dB - - - - - - dB - - - - - - - Mute/Unmute channel (not implemented) - - - ... - - - - :/txon.png - :/txoff.png:/txon.png - - - true + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + Mute/Unmute channel (not implemented) + + + ... + + + + :/txon.png + :/txoff.png:/txon.png + + + true + + + diff --git a/plugins/channeltx/modnfm/nfmmodgui.cpp b/plugins/channeltx/modnfm/nfmmodgui.cpp index 54f845940..48845be99 100644 --- a/plugins/channeltx/modnfm/nfmmodgui.cpp +++ b/plugins/channeltx/modnfm/nfmmodgui.cpp @@ -488,7 +488,7 @@ void NFMModGUI::tick() { double powDb = CalcDb::dbPower(m_nfmMod->getMagSq()); m_channelPowerDbAvg.feed(powDb); - ui->channelPower->setText(QString::number(m_channelPowerDbAvg.average(), 'f', 1)); + ui->channelPower->setText(tr("%1 dB").arg(m_channelPowerDbAvg.average(), 0, 'f', 1)); if (((++m_tickCount & 0xf) == 0) && (m_modAFInput == NFMMod::NFMModInputFile)) { diff --git a/plugins/channeltx/modnfm/nfmmodgui.ui b/plugins/channeltx/modnfm/nfmmodgui.ui index 72755746c..db9377cfe 100644 --- a/plugins/channeltx/modnfm/nfmmodgui.ui +++ b/plugins/channeltx/modnfm/nfmmodgui.ui @@ -139,12 +139,14 @@ - - - - + + + 60 + 0 + + Channel power @@ -152,37 +154,33 @@ Qt::RightToLeft - 0.0 + -100.0 dB - - - - - - dB - - - - - - - Mute/Unmute channel - - - ... - - - - :/txon.png - :/txoff.png:/txon.png - - - true + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + Mute/Unmute channel + + + ... + + + + :/txon.png + :/txoff.png:/txon.png + + + true + + + diff --git a/plugins/channeltx/modssb/ssbmodgui.cpp b/plugins/channeltx/modssb/ssbmodgui.cpp index 802c48875..ace90beec 100644 --- a/plugins/channeltx/modssb/ssbmodgui.cpp +++ b/plugins/channeltx/modssb/ssbmodgui.cpp @@ -626,7 +626,7 @@ void SSBModGUI::tick() { double powDb = CalcDb::dbPower(m_ssbMod->getMagSq()); m_channelPowerDbAvg.feed(powDb); - ui->channelPower->setText(QString::number(m_channelPowerDbAvg.average(), 'f', 1)); + ui->channelPower->setText(tr("%1 dB").arg(m_channelPowerDbAvg.average(), 0, 'f', 1)); if (((++m_tickCount & 0xf) == 0) && (m_modAFInput == SSBMod::SSBModInputFile)) { diff --git a/plugins/channeltx/modssb/ssbmodgui.ui b/plugins/channeltx/modssb/ssbmodgui.ui index 8deee8448..c5389a63a 100644 --- a/plugins/channeltx/modssb/ssbmodgui.ui +++ b/plugins/channeltx/modssb/ssbmodgui.ui @@ -139,34 +139,36 @@ - - - - - Channel power - - - Qt::RightToLeft - - - 0.0 - - - - - - - dB - - - - - - - Qt::Vertical - - - + + + + 60 + 0 + + + + Channel power + + + Qt::RightToLeft + + + -100.0 dB + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Qt::Vertical + + + + + diff --git a/plugins/channeltx/modwfm/wfmmodgui.cpp b/plugins/channeltx/modwfm/wfmmodgui.cpp index 684c79a7d..7b84e6f13 100644 --- a/plugins/channeltx/modwfm/wfmmodgui.cpp +++ b/plugins/channeltx/modwfm/wfmmodgui.cpp @@ -451,7 +451,7 @@ void WFMModGUI::tick() { double powDb = CalcDb::dbPower(m_wfmMod->getMagSq()); m_channelPowerDbAvg.feed(powDb); - ui->channelPower->setText(QString::number(m_channelPowerDbAvg.average(), 'f', 1)); + ui->channelPower->setText(tr("%1 dB").arg(m_channelPowerDbAvg.average(), 0, 'f', 1)); if (((++m_tickCount & 0xf) == 0) && (m_modAFInput == WFMMod::WFMModInputFile)) { diff --git a/plugins/channeltx/modwfm/wfmmodgui.ui b/plugins/channeltx/modwfm/wfmmodgui.ui index e2f2911df..69566c531 100644 --- a/plugins/channeltx/modwfm/wfmmodgui.ui +++ b/plugins/channeltx/modwfm/wfmmodgui.ui @@ -139,12 +139,14 @@ - - - - + + + 60 + 0 + + Channel power @@ -152,37 +154,33 @@ Qt::RightToLeft - 0.0 + -100.0 dB - - - - - - dB - - - - - - - Mute/Unmute channel - - - ... - - - - :/txon.png - :/txoff.png:/txon.png - - - true + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + Mute/Unmute channel + + + ... + + + + :/txon.png + :/txoff.png:/txon.png + + + true + + +