Massive UI revamping (v7): Restored channel highlighted by cursor function. Part of #1213

plugins/channelrx/chanalyzer/chanalyzergui.cpp

@@ -286,7 +286,7 @@ void ChannelAnalyzerGUI::channelMarkerChangedByCursor()
 
 void ChannelAnalyzerGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 void ChannelAnalyzerGUI::tick()

plugins/channelrx/demodadsb/adsbdemodgui.cpp

@@ -2209,7 +2209,7 @@ void ADSBDemodGUI::channelMarkerChangedByCursor()
 
 void ADSBDemodGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 void ADSBDemodGUI::on_deltaFrequency_changed(qint64 value)

plugins/channelrx/demodais/aisdemodgui.cpp

@@ -253,7 +253,7 @@ void AISDemodGUI::channelMarkerChangedByCursor()
 
 void AISDemodGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 void AISDemodGUI::on_deltaFrequency_changed(qint64 value)

plugins/channelrx/demodam/amdemodgui.cpp

@@ -131,7 +131,7 @@ void AMDemodGUI::channelMarkerChangedByCursor()
 
 void AMDemodGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 void AMDemodGUI::on_deltaFrequency_changed(qint64 value)

plugins/channelrx/demodapt/aptdemodgui.cpp

@@ -307,7 +307,7 @@ void APTDemodGUI::channelMarkerChangedByCursor()
 
 void APTDemodGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 void APTDemodGUI::on_deltaFrequency_changed(qint64 value)

plugins/channelrx/demodatv/atvdemodgui.cpp

@@ -194,7 +194,7 @@ void ATVDemodGUI::channelMarkerChangedByCursor()
 
 void ATVDemodGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 void ATVDemodGUI::handleSourceMessages()

plugins/channelrx/demodbfm/bfmdemodgui.cpp

@@ -149,7 +149,7 @@ void BFMDemodGUI::channelMarkerChangedByCursor()
 
 void BFMDemodGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 void BFMDemodGUI::on_deltaFrequency_changed(qint64 value)

plugins/channelrx/demodchirpchat/chirpchatdemodgui.cpp

@@ -162,7 +162,7 @@ void ChirpChatDemodGUI::on_deltaFrequency_changed(qint64 value)
 
 void ChirpChatDemodGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 void ChirpChatDemodGUI::on_BW_valueChanged(int value)

plugins/channelrx/demoddab/dabdemodgui.cpp

@@ -318,7 +318,7 @@ void DABDemodGUI::channelMarkerChangedByCursor()
 
 void DABDemodGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 void DABDemodGUI::on_deltaFrequency_changed(qint64 value)

plugins/channelrx/demoddatv/datvdemodgui.cpp

@@ -148,7 +148,7 @@ void DATVDemodGUI::channelMarkerChangedByCursor()
 
 void DATVDemodGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 

plugins/channelrx/demoddsd/dsddemodgui.cpp

@@ -534,7 +534,7 @@ void DSDDemodGUI::channelMarkerChangedByCursor()
 
 void DSDDemodGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 void DSDDemodGUI::audioSelect()

plugins/channelrx/demodfreedv/freedvdemodgui.cpp

@@ -133,7 +133,7 @@ void FreeDVDemodGUI::channelMarkerChangedByCursor()
 
 void FreeDVDemodGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 void FreeDVDemodGUI::on_deltaFrequency_changed(qint64 value)

plugins/channelrx/demodnfm/nfmdemodgui.cpp

@@ -125,7 +125,7 @@ void NFMDemodGUI::channelMarkerChangedByCursor()
 
 void NFMDemodGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 void NFMDemodGUI::on_deltaFrequency_changed(qint64 value)

plugins/channelrx/demodpacket/packetdemodgui.cpp

@@ -257,7 +257,7 @@ void PacketDemodGUI::channelMarkerChangedByCursor()
 
 void PacketDemodGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 void PacketDemodGUI::on_deltaFrequency_changed(qint64 value)

plugins/channelrx/demodpager/pagerdemodgui.cpp

@@ -313,7 +313,7 @@ void PagerDemodGUI::channelMarkerChangedByCursor()
 
 void PagerDemodGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 void PagerDemodGUI::on_deltaFrequency_changed(qint64 value)

plugins/channelrx/demodradiosonde/radiosondedemodgui.cpp

@@ -360,7 +360,7 @@ void RadiosondeDemodGUI::channelMarkerChangedByCursor()
 
 void RadiosondeDemodGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 void RadiosondeDemodGUI::on_deltaFrequency_changed(qint64 value)

plugins/channelrx/demodssb/ssbdemodgui.cpp

@@ -122,7 +122,7 @@ void SSBDemodGUI::channelMarkerChangedByCursor()
 
 void SSBDemodGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 void SSBDemodGUI::on_audioBinaural_toggled(bool binaural)

plugins/channelrx/demodvor/vordemodgui.cpp

@@ -889,7 +889,7 @@ void VORDemodGUI::channelMarkerChangedByCursor()
 
 void VORDemodGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 void VORDemodGUI::on_thresh_valueChanged(int value)

plugins/channelrx/demodvorsc/vordemodscgui.cpp

@@ -194,7 +194,7 @@ void VORDemodSCGUI::channelMarkerChangedByCursor()
 
 void VORDemodSCGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 void VORDemodSCGUI::on_deltaFrequency_changed(qint64 value)

plugins/channelrx/demodwfm/wfmdemodgui.cpp

@@ -113,7 +113,7 @@ void WFMDemodGUI::channelMarkerChangedByCursor()
 
 void WFMDemodGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 void WFMDemodGUI::on_deltaFrequency_changed(qint64 value)

plugins/channelrx/filesink/filesinkgui.cpp

@@ -333,7 +333,7 @@ void FileSinkGUI::channelMarkerChangedByCursor()
 
 void FileSinkGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 void FileSinkGUI::handleSourceMessages()

plugins/channelrx/freqtracker/freqtrackergui.cpp

@@ -144,7 +144,7 @@ void FreqTrackerGUI::channelMarkerChangedByCursor()
 
 void FreqTrackerGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 void FreqTrackerGUI::on_deltaFrequency_changed(qint64 value)

plugins/channelrx/noisefigure/noisefiguregui.cpp

@@ -320,7 +320,7 @@ void NoiseFigureGUI::channelMarkerChangedByCursor()
 
 void NoiseFigureGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 void NoiseFigureGUI::on_deltaFrequency_changed(qint64 value)

plugins/channelrx/radioastronomy/radioastronomygui.cpp

@@ -1111,7 +1111,7 @@ void RadioAstronomyGUI::channelMarkerChangedByCursor()
 
 void RadioAstronomyGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 // Calculate Tsys0 - i.e. receiver noise temperature when there's no source signal, just unwanted noise

plugins/channelrx/radioclock/radioclockgui.cpp

@@ -168,7 +168,7 @@ void RadioClockGUI::channelMarkerChangedByCursor()
 
 void RadioClockGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 void RadioClockGUI::on_deltaFrequency_changed(qint64 value)

plugins/channelrx/sigmffilesink/sigmffilesinkgui.cpp

@@ -325,7 +325,7 @@ void SigMFFileSinkGUI::channelMarkerChangedByCursor()
 
 void SigMFFileSinkGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 void SigMFFileSinkGUI::handleSourceMessages()

plugins/channelrx/udpsink/udpsinkgui.cpp

@@ -120,7 +120,7 @@ void UDPSinkGUI::channelMarkerChangedByCursor()
 
 void UDPSinkGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 void UDPSinkGUI::tick()

sdrgui/channel/channelgui.cpp

@@ -46,8 +46,8 @@ ChannelGUI::ChannelGUI(QWidget *parent) :
     setWindowFlags(windowFlags() | Qt::FramelessWindowHint);
     setObjectName("ChannelGUI");
     setStyleSheet(QString(tr("#ChannelGUI { border: 1px solid %1; background-color: %2; }")
-        .arg(palette().highlight().color().darker(115).name()))
-        .arg(palette().dark().color().darker(115).name()));
+        .arg(palette().highlight().color().darker(115).name())
+        .arg(palette().dark().color().darker(115).name())));
 
     m_indexLabel = new QLabel();
     m_indexLabel->setFixedSize(50, 16);
@@ -395,6 +395,13 @@ bool ChannelGUI::isOnMovingPad()
     return m_indexLabel->underMouse() || m_titleLabel->underMouse() || m_statusFrequency->underMouse() || m_statusLabel->underMouse();
 }
 
+void ChannelGUI::setHighlighted(bool highlighted)
+{
+    setStyleSheet(QString(tr("#ChannelGUI { border: 1px solid %1; background-color: %2; }")
+        .arg(highlighted ? "#FFFFFF" : palette().highlight().color().darker(115).name())
+        .arg(palette().dark().color().darker(115).name())));
+}
+
 QString ChannelGUI::getDeviceTypeTag()
 {
     switch (m_deviceType)

sdrgui/channel/channelgui.h

@@ -96,6 +96,7 @@ protected:
     void resetContextMenuType() { m_contextMenuType = ContextMenuNone; }
     void updateIndexLabel();
     int getAdditionalHeight() const { return 25 + 22; }
+    void setHighlighted(bool highlighted);
 
     DeviceType m_deviceType;
     int m_deviceSetIndex;

sdrgui/gui/rollupcontents.cpp

@@ -28,7 +28,6 @@
 
 RollupContents::RollupContents(QWidget* parent) :
     QWidget(parent),
-    m_highlighted(false),
     m_streamIndicator("S"),
     // m_channelWidget(true),
     m_newHeight(0)
@@ -83,15 +82,6 @@ void RollupContents::restoreState(const RollupState& state)
     }
 }
 
-void RollupContents::setHighlighted(bool highlighted)
-{
-    if (m_highlighted != highlighted)
-    {
-        m_highlighted = highlighted;
-        update();
-    }
-}
-
 bool RollupContents::hasExpandableWidgets()
 {
     for (int i = 0; i < children().count(); ++i)
@@ -219,7 +209,7 @@ void RollupContents::paintEvent(QPaintEvent*)
     // p.drawRect(width() - 5, height() - 5, 5, 5);
 
     // Rahmen (frame)
-    p.setPen(m_highlighted ? Qt::white : frameColor);
+    // p.setPen(m_highlighted ? Qt::white : frameColor);
     p.setBrush(palette().window());
     QRectF r(rect());
     // r.adjust(0.5, 0.5, -0.5, -0.5);

sdrgui/gui/rollupcontents.h

@@ -30,7 +30,6 @@ class SDRGUI_API RollupContents : public QWidget {
 
 public:
     RollupContents(QWidget* parent = nullptr);
-    void setHighlighted(bool highlighted);
     void saveState(RollupState& state) const;
     void restoreState(const RollupState& state);
     int arrangeRollups();
@@ -44,7 +43,6 @@ protected:
         VersionMarker = 0xff
     };
 
-    bool m_highlighted;
     QString m_streamIndicator;
     QString m_helpURL;