diff --git a/Configuration.cpp b/Configuration.cpp index 2afdfffc9..783086721 100644 --- a/Configuration.cpp +++ b/Configuration.cpp @@ -448,6 +448,7 @@ private: Q_SLOT void on_pbNewCallBand_clicked(); Q_SLOT void on_pbNewGrid_clicked(); Q_SLOT void on_pbNewGridBand_clicked(); + Q_SLOT void on_pbLoTW_clicked(); Q_SLOT void on_pbResetDefaults_clicked(); Q_SLOT void on_cbFox_clicked (bool); Q_SLOT void on_cbHound_clicked (bool); @@ -555,6 +556,9 @@ private: QColor next_color_NewGrid_; QColor color_NewGridBand_; QColor next_color_NewGridBand_; + QColor color_LoTW_; + QColor next_color_LoTW_; + qint32 id_interval_; qint32 ntrials_; qint32 aggressive_; @@ -661,6 +665,7 @@ QColor Configuration::color_NewCall () const {return m_->color_NewCall_;} QColor Configuration::color_NewCallBand () const {return m_->color_NewCallBand_;} QColor Configuration::color_NewGrid () const {return m_->color_NewGrid_;} QColor Configuration::color_NewGridBand () const {return m_->color_NewGridBand_;} +QColor Configuration::color_LoTW() const {return m_->color_LoTW_;} QFont Configuration::text_font () const {return m_->font_;} QFont Configuration::decoded_text_font () const {return m_->decoded_text_font_;} qint32 Configuration::id_interval () const {return m_->id_interval_;} @@ -1176,6 +1181,7 @@ void Configuration::impl::initialize_models () ui_->labNewCallBand->setStyleSheet(QString("background: %1").arg(color_NewCallBand_.name())); ui_->labNewGrid->setStyleSheet(QString("background: %1").arg(color_NewGrid_.name())); ui_->labNewGridBand->setStyleSheet(QString("background: %1").arg(color_NewGridBand_.name())); + ui_->labLoTW->setStyleSheet(QString("color: %1").arg(color_LoTW_.name())); ui_->CW_id_interval_spin_box->setValue (id_interval_); ui_->sbNtrials->setValue (ntrials_); ui_->sbTxDelay->setValue (txDelay_); @@ -1307,6 +1313,7 @@ void Configuration::impl::read_settings () next_color_NewCallBand_ = color_NewCallBand_ = settings_->value("colorNewCallBand","#99ffff").toString(); next_color_NewGrid_ = color_NewGrid_ = settings_->value("colorNewGrid","#ffaa00").toString(); next_color_NewGridBand_ = color_NewGridBand_ = settings_->value("colorNewGridBand","#ffcc99").toString(); + next_color_LoTW_ = color_LoTW_ = settings_->value("colorLoTW","#990000").toString(); if (next_font_.fromString (settings_->value ("Font", QGuiApplication::font ().toString ()).toString ()) && next_font_ != font_) { @@ -1502,6 +1509,7 @@ void Configuration::impl::write_settings () settings_->setValue("colorNewCallBand",color_NewCallBand_); settings_->setValue("colorNewGrid",color_NewGrid_); settings_->setValue("colorNewGridBand",color_NewGridBand_); + settings_->setValue("colorLoTW",color_LoTW_); settings_->setValue ("Font", font_.toString ()); settings_->setValue ("DecodedTextFont", decoded_text_font_.toString ()); settings_->setValue ("IDint", id_interval_); @@ -1877,6 +1885,7 @@ void Configuration::impl::accept () color_NewCallBand_ = next_color_NewCallBand_; color_NewGrid_ = next_color_NewGrid_; color_NewGridBand_ = next_color_NewGridBand_; + color_LoTW_ = next_color_LoTW_; rig_params_ = temp_rig_params; // now we can go live with the rig // related configuration parameters @@ -2179,6 +2188,14 @@ void Configuration::impl::on_pbNewGridBand_clicked() } } +void Configuration::impl::on_pbLoTW_clicked() +{ + auto new_color = QColorDialog::getColor(next_color_LoTW_, this, "Not in LoTW Color"); + if (new_color.isValid ()) { + next_color_LoTW_ = new_color; + ui_->labLoTW->setStyleSheet(QString("color: %1").arg(next_color_LoTW_.name())); + } +} void Configuration::impl::on_pbResetDefaults_clicked() { next_color_CQ_ = color_CQ_ = "#66ff66"; @@ -2190,6 +2207,7 @@ void Configuration::impl::on_pbResetDefaults_clicked() next_color_NewCallBand_ = color_NewCallBand_ = "#99ffff"; next_color_NewGrid_ = color_NewGrid_ = "#ffaa00"; next_color_NewGridBand_ = color_NewGridBand_ = "#ffcc99"; + next_color_LoTW_ = color_LoTW_ = "#5500ff"; ui_->labCQ->setStyleSheet(QString("background: %1").arg(next_color_CQ_.name())); ui_->labMyCall->setStyleSheet(QString("background: %1").arg(next_color_MyCall_.name())); @@ -2200,7 +2218,7 @@ void Configuration::impl::on_pbResetDefaults_clicked() ui_->labNewCallBand->setStyleSheet(QString("background: %1").arg(next_color_NewCallBand_.name())); ui_->labNewGrid->setStyleSheet(QString("background: %1").arg(next_color_NewGrid_.name())); ui_->labNewGridBand->setStyleSheet(QString("background: %1").arg(next_color_NewGridBand_.name())); - + ui_->labLoTW->setStyleSheet(QString("color: %1").arg(next_color_LoTW_.name())); } void Configuration::impl::on_decoded_text_font_push_button_clicked () diff --git a/Configuration.hpp b/Configuration.hpp index 0228fc46b..2b6dab9bd 100644 --- a/Configuration.hpp +++ b/Configuration.hpp @@ -177,6 +177,7 @@ public: QColor color_NewCallBand () const; QColor color_NewGrid () const; QColor color_NewGridBand () const; + QColor color_LoTW() const; bool pwrBandTxMemory () const; bool pwrBandTuneMemory () const; diff --git a/Configuration.ui b/Configuration.ui index 72f4eb7ec..a93473e65 100644 --- a/Configuration.ui +++ b/Configuration.ui @@ -2152,43 +2152,35 @@ Right click for insert and delete options. Colors - + + + + + Qt::Vertical + + + + 0 + 0 + + + + - - + + - QLabel{background-color: #ffaaff} - + QLabel{color: #990000} - K1ABC + K1ABC Qt::AlignCenter - - - - New DXCC on Band - - - - - - - - 140 - 0 - - - - CQ in message - - - @@ -2202,25 +2194,40 @@ Right click for insert and delete options. - - - - - 80 - 20 - + + + + New DXCC on Band + + + + - QLabel{background-color: #66ff66} + QLabel{background-color: #ffaaff} + - K1ABC + K1ABC Qt::AlignCenter + + + + + 140 + 0 + + + + CQ in message + + + @@ -2240,6 +2247,19 @@ Right click for insert and delete options. + + + + + 140 + 0 + + + + Transmitted message + + + @@ -2259,16 +2279,22 @@ Right click for insert and delete options. - - + + - 140 - 0 + 80 + 20 + + QLabel{background-color: #66ff66} + - Transmitted message + K1ABC + + + Qt::AlignCenter @@ -2291,6 +2317,13 @@ Right click for insert and delete options. + + + + Reset Defaults + + + @@ -2304,13 +2337,6 @@ Right click for insert and delete options. - - - - Reset Defaults - - - @@ -2324,6 +2350,19 @@ Right click for insert and delete options. + + + + QLabel{background-color: #ffcc99} + + + K1ABC + + + Qt::AlignCenter + + + @@ -2343,16 +2382,17 @@ Right click for insert and delete options. - - - - QLabel{background-color: #ffcc99} - + + - K1ABC + New grid - - Qt::AlignCenter + + + + + + New Grid on Band @@ -2369,13 +2409,6 @@ Right click for insert and delete options. - - - - New grid - - - @@ -2389,13 +2422,6 @@ Right click for insert and delete options. - - - - New Grid on Band - - - @@ -2403,10 +2429,17 @@ Right click for insert and delete options. + + + + LoTW + + + - - + + Qt::Vertical @@ -2431,19 +2464,6 @@ Right click for insert and delete options. - - - - Qt::Vertical - - - - 0 - 0 - - - - @@ -2457,6 +2477,13 @@ Right click for insert and delete options. + + + + PushButton + + + @@ -3074,12 +3101,12 @@ soundcard changes - - - + - + + + diff --git a/colorhighlighting.cpp b/colorhighlighting.cpp index 5fd8803ff..0de3d7a14 100644 --- a/colorhighlighting.cpp +++ b/colorhighlighting.cpp @@ -36,7 +36,7 @@ void ColorHighlighting::write_settings () void ColorHighlighting::colorHighlightlingSetup(QColor color_CQ,QColor color_MyCall, QColor color_DXCC,QColor color_DXCCband,QColor color_NewCall, QColor color_NewCallBand,QColor color_NewGrid,QColor color_NewGridBand, - QColor color_TxMsg) + QColor color_TxMsg,QColor color_LoTW) { setWindowTitle(QApplication::applicationName() + " - Colors"); ui->label->setStyleSheet(QString("background: %1").arg(color_CQ.name())); @@ -48,4 +48,5 @@ void ColorHighlighting::colorHighlightlingSetup(QColor color_CQ,QColor color_MyC ui->label_13->setStyleSheet(QString("background: %1").arg(color_NewCallBand.name())); ui->label_15->setStyleSheet(QString("background: %1").arg(color_NewGrid.name())); ui->label_17->setStyleSheet(QString("background: %1").arg(color_NewGridBand.name())); + ui->label_19->setStyleSheet(QString("color: %1").arg(color_LoTW.name())); } diff --git a/colorhighlighting.h b/colorhighlighting.h index 3b612a27f..435168073 100644 --- a/colorhighlighting.h +++ b/colorhighlighting.h @@ -15,10 +15,10 @@ class ColorHighlighting : public QDialog public: explicit ColorHighlighting(QSettings *, QWidget *parent = 0); ~ColorHighlighting(); - void colorHighlightlingSetup(QColor color_CQ,QColor color_MyCall, - QColor color_DXCC,QColor color_DXCCband,QColor color_NewCall, - QColor color_NewCallBand,QColor color_NewGrid,QColor color_NewGridBand, - QColor color_TxMsg); + void colorHighlightlingSetup(QColor color_CQ, QColor color_MyCall, + QColor color_DXCC, QColor color_DXCCband, QColor color_NewCall, + QColor color_NewCallBand, QColor color_NewGrid, QColor color_NewGridBand, + QColor color_TxMsg, QColor color_LoTW); private: QSettings * settings_; diff --git a/colorhighlighting.ui b/colorhighlighting.ui index 933c363f6..78b6a757e 100644 --- a/colorhighlighting.ui +++ b/colorhighlighting.ui @@ -7,7 +7,7 @@ 0 0 212 - 265 + 253 @@ -16,16 +16,6 @@ - - - - K1ABC - - - Qt::AlignCenter - - - @@ -36,16 +26,6 @@ - - - - K1ABC - - - Qt::AlignCenter - - - @@ -56,10 +36,30 @@ - - + + - New Call + K1ABC + + + Qt::AlignCenter + + + + + + + K1ABC + + + Qt::AlignCenter + + + + + + + Transmitted message @@ -70,6 +70,13 @@ + + + + New Call + + + @@ -84,15 +91,8 @@ - - - - Transmitted message - - - - - + + K1ABC @@ -101,8 +101,8 @@ - - + + K1ABC @@ -121,8 +121,8 @@ - - + + K1ABC @@ -131,17 +131,10 @@ - - + + - New DXCC - - - - - - - New DXCC on Band + CQ in message @@ -162,10 +155,34 @@ - - + + - CQ in message + New DXCC on Band + + + + + + + New DXCC + + + + + + + K1ABC + + + Qt::AlignCenter + + + + + + + Not in LoTW diff --git a/displaytext.cpp b/displaytext.cpp index 5318762e8..7aeffe6b5 100644 --- a/displaytext.cpp +++ b/displaytext.cpp @@ -144,7 +144,7 @@ void DisplayText::appendText(QString const& text, QColor bg, format.setBackground (bg); format.clearForeground (); if(call2.size()>0 and !m_LoTW.contains(call2)) { - format.setForeground(QColor("#cc0000")); //Mark LoTW non-users + format.setForeground(m_color_LoTW); //Mark LoTW non-users } cursor.insertText(text.mid (text_index), format); @@ -432,7 +432,7 @@ void DisplayText::highlight_callsign (QString const& callsign, QColor const& bg, void DisplayText::setDecodedTextColors(QColor color_CQ, QColor color_MyCall, QColor color_DXCC, QColor color_DXCCband,QColor color_NewCall,QColor color_NewCallBand, - QColor color_NewGrid, QColor color_NewGridBand,QColor color_TxMsg) + QColor color_NewGrid, QColor color_NewGridBand,QColor color_TxMsg,QColor color_LoTW) { // Save the color highlighting scheme selected by the user. m_color_CQ=color_CQ; @@ -444,4 +444,5 @@ void DisplayText::setDecodedTextColors(QColor color_CQ, QColor color_MyCall, m_color_NewGrid=color_NewGrid; m_color_NewGridBand=color_NewGridBand; m_color_TxMsg=color_TxMsg; + m_color_LoTW=color_LoTW; } diff --git a/displaytext.h b/displaytext.h index f19ef2c71..ebf7761c7 100644 --- a/displaytext.h +++ b/displaytext.h @@ -30,7 +30,8 @@ public: void displayFoxToBeCalled(QString t, QColor bg); void setDecodedTextColors(QColor color_CQ, QColor color_MyCall, QColor color_DXCC, QColor color_DXCCband, QColor color_NewCall, QColor color_NewCallBand, - QColor color_NewGrid, QColor color_NewGridBand, QColor color_TxMsg); + QColor color_NewGrid, QColor color_NewGridBand, QColor color_TxMsg, + QColor color_LoTW); Q_SIGNAL void selectCallsign (Qt::KeyboardModifiers); Q_SIGNAL void erased (); @@ -58,6 +59,7 @@ private: QColor m_color_NewCallBand; QColor m_color_NewGrid; QColor m_color_NewGridBand; + QColor m_color_LoTW; QColor m_color_TxMsg; }; diff --git a/mainwindow.cpp b/mainwindow.cpp index ac6c06ec8..c1bc6ece4 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1720,11 +1720,11 @@ void MainWindow::setColorHighlighting() ui->decodedTextBrowser->setDecodedTextColors(m_config.color_CQ(),m_config.color_MyCall(), m_config.color_DXCC(),m_config.color_DXCCband(),m_config.color_NewCall(), m_config.color_NewCallBand(),m_config.color_NewGrid(),m_config.color_NewGridBand(), - m_config.color_TxMsg()); + m_config.color_TxMsg(),m_config.color_LoTW()); ui->decodedTextBrowser2->setDecodedTextColors(m_config.color_CQ(),m_config.color_MyCall(), m_config.color_DXCC(),m_config.color_DXCCband(),m_config.color_NewCall(), m_config.color_NewCallBand(),m_config.color_NewGrid(),m_config.color_NewGridBand(), - m_config.color_TxMsg()); + m_config.color_TxMsg(),m_config.color_LoTW()); } @@ -2410,7 +2410,7 @@ void MainWindow::on_actionColors_triggered() m_colorHighlighting->colorHighlightlingSetup(m_config.color_CQ(),m_config.color_MyCall(), m_config.color_DXCC(),m_config.color_DXCCband(),m_config.color_NewCall(), m_config.color_NewCallBand(),m_config.color_NewGrid(),m_config.color_NewGridBand(), - m_config.color_TxMsg()); + m_config.color_TxMsg(),m_config.color_LoTW()); } void MainWindow::on_actionMessage_averaging_triggered()