w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-09-18 22:48:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Allow user choice of "Not in LoTW" highlighting color.

Browse Source
This commit is contained in:
Joe Taylor 2018-09-01 15:42:02 -04:00
parent db713bfb26
commit 410cd2b9a1
9 changed files with 217 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Configuration.cpp
View File

@ -448,6 +448,7 @@ private:
Q_SLOT void on_pbNewCallBand_clicked(); Q_SLOT void on_pbNewCallBand_clicked();
Q_SLOT void on_pbNewGrid_clicked(); Q_SLOT void on_pbNewGrid_clicked();
Q_SLOT void on_pbNewGridBand_clicked(); Q_SLOT void on_pbNewGridBand_clicked();
Q_SLOT void on_pbLoTW_clicked();
Q_SLOT void on_pbResetDefaults_clicked(); Q_SLOT void on_pbResetDefaults_clicked();
Q_SLOT void on_cbFox_clicked (bool); Q_SLOT void on_cbFox_clicked (bool);
Q_SLOT void on_cbHound_clicked (bool); Q_SLOT void on_cbHound_clicked (bool);
@ -555,6 +556,9 @@ private:
QColor next_color_NewGrid_; QColor next_color_NewGrid_;
QColor color_NewGridBand_; QColor color_NewGridBand_;
QColor next_color_NewGridBand_; QColor next_color_NewGridBand_;
QColor color_LoTW_;
QColor next_color_LoTW_;
qint32 id_interval_; qint32 id_interval_;
qint32 ntrials_; qint32 ntrials_;
qint32 aggressive_; 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_NewCallBand () const {return m_->color_NewCallBand_;}
QColor Configuration::color_NewGrid () const {return m_->color_NewGrid_;} QColor Configuration::color_NewGrid () const {return m_->color_NewGrid_;}
QColor Configuration::color_NewGridBand () const {return m_->color_NewGridBand_;} 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::text_font () const {return m_->font_;}
QFont Configuration::decoded_text_font () const {return m_->decoded_text_font_;} QFont Configuration::decoded_text_font () const {return m_->decoded_text_font_;}
qint32 Configuration::id_interval () const {return m_->id_interval_;} 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_->labNewCallBand->setStyleSheet(QString("background: %1").arg(color_NewCallBand_.name()));
ui_->labNewGrid->setStyleSheet(QString("background: %1").arg(color_NewGrid_.name())); ui_->labNewGrid->setStyleSheet(QString("background: %1").arg(color_NewGrid_.name()));
ui_->labNewGridBand->setStyleSheet(QString("background: %1").arg(color_NewGridBand_.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_->CW_id_interval_spin_box->setValue (id_interval_);
ui_->sbNtrials->setValue (ntrials_); ui_->sbNtrials->setValue (ntrials_);
ui_->sbTxDelay->setValue (txDelay_); 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_NewCallBand_ = color_NewCallBand_ = settings_->value("colorNewCallBand","#99ffff").toString();
next_color_NewGrid_ = color_NewGrid_ = settings_->value("colorNewGrid","#ffaa00").toString(); next_color_NewGrid_ = color_NewGrid_ = settings_->value("colorNewGrid","#ffaa00").toString();
next_color_NewGridBand_ = color_NewGridBand_ = settings_->value("colorNewGridBand","#ffcc99").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 ()) if (next_font_.fromString (settings_->value ("Font", QGuiApplication::font ().toString ()).toString ())
&& next_font_ != font_) && next_font_ != font_)
{ {
@ -1502,6 +1509,7 @@ void Configuration::impl::write_settings ()
settings_->setValue("colorNewCallBand",color_NewCallBand_); settings_->setValue("colorNewCallBand",color_NewCallBand_);
settings_->setValue("colorNewGrid",color_NewGrid_); settings_->setValue("colorNewGrid",color_NewGrid_);
settings_->setValue("colorNewGridBand",color_NewGridBand_); settings_->setValue("colorNewGridBand",color_NewGridBand_);
settings_->setValue("colorLoTW",color_LoTW_);
settings_->setValue ("Font", font_.toString ()); settings_->setValue ("Font", font_.toString ());
settings_->setValue ("DecodedTextFont", decoded_text_font_.toString ()); settings_->setValue ("DecodedTextFont", decoded_text_font_.toString ());
settings_->setValue ("IDint", id_interval_); settings_->setValue ("IDint", id_interval_);
@ -1877,6 +1885,7 @@ void Configuration::impl::accept ()
color_NewCallBand_ = next_color_NewCallBand_; color_NewCallBand_ = next_color_NewCallBand_;
color_NewGrid_ = next_color_NewGrid_; color_NewGrid_ = next_color_NewGrid_;
color_NewGridBand_ = next_color_NewGridBand_; color_NewGridBand_ = next_color_NewGridBand_;
color_LoTW_ = next_color_LoTW_;
rig_params_ = temp_rig_params; // now we can go live with the rig rig_params_ = temp_rig_params; // now we can go live with the rig
// related configuration parameters // 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() void Configuration::impl::on_pbResetDefaults_clicked()
{ {
next_color_CQ_ = color_CQ_ = "#66ff66"; next_color_CQ_ = color_CQ_ = "#66ff66";
@ -2190,6 +2207,7 @@ void Configuration::impl::on_pbResetDefaults_clicked()
next_color_NewCallBand_ = color_NewCallBand_ = "#99ffff"; next_color_NewCallBand_ = color_NewCallBand_ = "#99ffff";
next_color_NewGrid_ = color_NewGrid_ = "#ffaa00"; next_color_NewGrid_ = color_NewGrid_ = "#ffaa00";
next_color_NewGridBand_ = color_NewGridBand_ = "#ffcc99"; next_color_NewGridBand_ = color_NewGridBand_ = "#ffcc99";
next_color_LoTW_ = color_LoTW_ = "#5500ff";
ui_->labCQ->setStyleSheet(QString("background: %1").arg(next_color_CQ_.name())); ui_->labCQ->setStyleSheet(QString("background: %1").arg(next_color_CQ_.name()));
ui_->labMyCall->setStyleSheet(QString("background: %1").arg(next_color_MyCall_.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_->labNewCallBand->setStyleSheet(QString("background: %1").arg(next_color_NewCallBand_.name()));
ui_->labNewGrid->setStyleSheet(QString("background: %1").arg(next_color_NewGrid_.name())); ui_->labNewGrid->setStyleSheet(QString("background: %1").arg(next_color_NewGrid_.name()));
ui_->labNewGridBand->setStyleSheet(QString("background: %1").arg(next_color_NewGridBand_.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 () void Configuration::impl::on_decoded_text_font_push_button_clicked ()

1
Configuration.hpp
View File

@ -177,6 +177,7 @@ public:
QColor color_NewCallBand () const; QColor color_NewCallBand () const;
QColor color_NewGrid () const; QColor color_NewGrid () const;
QColor color_NewGridBand () const; QColor color_NewGridBand () const;
QColor color_LoTW() const;
bool pwrBandTxMemory () const; bool pwrBandTxMemory () const;
bool pwrBandTuneMemory () const; bool pwrBandTuneMemory () const;

203
Configuration.ui
View File

@ -2152,43 +2152,35 @@ Right click for insert and delete options.</string>
<attribute name="title"> <attribute name="title">
<string>Colors</string> <string>Colors</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_5" rowstretch="1,1,2" columnstretch="1,1,2"> <layout class="QGridLayout" name="gridLayout_5" rowstretch="1,0,0" columnstretch="1,0,0">
<item row="0" column="1">
<spacer name="verticalSpacer_9">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="1"> <item row="1" column="1">
<layout class="QGridLayout" name="gridLayout_13"> <layout class="QGridLayout" name="gridLayout_13">
<item row="4" column="1"> <item row="9" column="1">
<widget class="QLabel" name="labDXCCband"> <widget class="QLabel" name="labLoTW">
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">QLabel{background-color: #ffaaff} <string notr="true">QLabel{color: #990000}</string>
</string>
</property> </property>
<property name="text"> <property name="text">
<string notr="true">K1ABC</string> <string>K1ABC</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0">
<widget class="QPushButton" name="pbNewDXCCband">
<property name="text">
<string>New DXCC on Band</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QPushButton" name="pbCQmsg">
<property name="minimumSize">
<size>
<width>140</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>CQ in message</string>
</property>
</widget>
</item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QPushButton" name="pbMyCall"> <widget class="QPushButton" name="pbMyCall">
<property name="minimumSize"> <property name="minimumSize">
@ -2202,25 +2194,40 @@ Right click for insert and delete options.</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="4" column="0">
<widget class="QLabel" name="labCQ"> <widget class="QPushButton" name="pbNewDXCCband">
<property name="minimumSize"> <property name="text">
<size> <string>New DXCC on Band</string>
<width>80</width>
<height>20</height>
</size>
</property> </property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLabel" name="labDXCCband">
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">QLabel{background-color: #66ff66}</string> <string notr="true">QLabel{background-color: #ffaaff}
</string>
</property> </property>
<property name="text"> <property name="text">
<string>K1ABC</string> <string notr="true">K1ABC</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0">
<widget class="QPushButton" name="pbCQmsg">
<property name="minimumSize">
<size>
<width>140</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>CQ in message</string>
</property>
</widget>
</item>
<item row="2" column="1"> <item row="2" column="1">
<widget class="QLabel" name="labTx"> <widget class="QLabel" name="labTx">
<property name="minimumSize"> <property name="minimumSize">
@ -2240,6 +2247,19 @@ Right click for insert and delete options.</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0">
<widget class="QPushButton" name="pbTxMsg">
<property name="minimumSize">
<size>
<width>140</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Transmitted message</string>
</property>
</widget>
</item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QLabel" name="labMyCall"> <widget class="QLabel" name="labMyCall">
<property name="minimumSize"> <property name="minimumSize">
@ -2259,16 +2279,22 @@ Right click for insert and delete options.</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="0" column="1">
<widget class="QPushButton" name="pbTxMsg"> <widget class="QLabel" name="labCQ">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>140</width> <width>80</width>
<height>0</height> <height>20</height>
</size> </size>
</property> </property>
<property name="styleSheet">
<string notr="true">QLabel{background-color: #66ff66}</string>
</property>
<property name="text"> <property name="text">
<string>Transmitted message</string> <string>K1ABC</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
@ -2291,6 +2317,13 @@ Right click for insert and delete options.</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="10" column="0">
<widget class="QPushButton" name="pbResetDefaults">
<property name="text">
<string>Reset Defaults</string>
</property>
</widget>
</item>
<item row="3" column="0"> <item row="3" column="0">
<widget class="QPushButton" name="pbNewDXCC"> <widget class="QPushButton" name="pbNewDXCC">
<property name="minimumSize"> <property name="minimumSize">
@ -2304,13 +2337,6 @@ Right click for insert and delete options.</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="9" column="0">
<widget class="QPushButton" name="pbResetDefaults">
<property name="text">
<string>Reset Defaults</string>
</property>
</widget>
</item>
<item row="5" column="1"> <item row="5" column="1">
<widget class="QLabel" name="labNewGrid"> <widget class="QLabel" name="labNewGrid">
<property name="styleSheet"> <property name="styleSheet">
@ -2324,6 +2350,19 @@ Right click for insert and delete options.</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="1">
<widget class="QLabel" name="labNewGridBand">
<property name="styleSheet">
<string notr="true">QLabel{background-color: #ffcc99}</string>
</property>
<property name="text">
<string notr="true">K1ABC</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="7" column="1"> <item row="7" column="1">
<widget class="QLabel" name="labNewCall"> <widget class="QLabel" name="labNewCall">
<property name="minimumSize"> <property name="minimumSize">
@ -2343,16 +2382,17 @@ Right click for insert and delete options.</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="1"> <item row="5" column="0">
<widget class="QLabel" name="labNewGridBand"> <widget class="QPushButton" name="pbNewGrid">
<property name="styleSheet">
<string notr="true">QLabel{background-color: #ffcc99}</string>
</property>
<property name="text"> <property name="text">
<string notr="true">K1ABC</string> <string>New grid</string>
</property> </property>
<property name="alignment"> </widget>
<set>Qt::AlignCenter</set> </item>
<item row="6" column="0">
<widget class="QPushButton" name="pbNewGridBand">
<property name="text">
<string>New Grid on Band</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -2369,13 +2409,6 @@ Right click for insert and delete options.</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="0">
<widget class="QPushButton" name="pbNewGrid">
<property name="text">
<string>New grid</string>
</property>
</widget>
</item>
<item row="7" column="0"> <item row="7" column="0">
<widget class="QPushButton" name="pbNewCall"> <widget class="QPushButton" name="pbNewCall">
<property name="minimumSize"> <property name="minimumSize">
@ -2389,13 +2422,6 @@ Right click for insert and delete options.</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="0">
<widget class="QPushButton" name="pbNewGridBand">
<property name="text">
<string>New Grid on Band</string>
</property>
</widget>
</item>
<item row="8" column="0"> <item row="8" column="0">
<widget class="QPushButton" name="pbNewCallBand"> <widget class="QPushButton" name="pbNewCallBand">
<property name="text"> <property name="text">
@ -2403,10 +2429,17 @@ Right click for insert and delete options.</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="9" column="0">
<widget class="QPushButton" name="pbLoTW">
<property name="text">
<string>LoTW</string>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
<item row="0" column="1"> <item row="2" column="1">
<spacer name="verticalSpacer_9"> <spacer name="verticalSpacer_10">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
@ -2431,19 +2464,6 @@ Right click for insert and delete options.</string>
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="2" column="1">
<spacer name="verticalSpacer_10">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="2"> <item row="1" column="2">
<spacer name="horizontalSpacer_8"> <spacer name="horizontalSpacer_8">
<property name="orientation"> <property name="orientation">
@ -2457,6 +2477,13 @@ Right click for insert and delete options.</string>
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="2" column="2">
<widget class="QPushButton" name="pushButton">
<property name="text">
<string>PushButton</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="advanced_tab"> <widget class="QWidget" name="advanced_tab">
@ -3074,12 +3101,12 @@ soundcard changes</string>
</connection> </connection>
</connections> </connections>
<buttongroups> <buttongroups>
<buttongroup name="CAT_stop_bits_button_group"/>
<buttongroup name="split_mode_button_group"/>
<buttongroup name="CAT_data_bits_button_group"/> <buttongroup name="CAT_data_bits_button_group"/>
<buttongroup name="CAT_handshake_button_group"/> <buttongroup name="split_mode_button_group"/>
<buttongroup name="TX_audio_source_button_group"/> <buttongroup name="TX_audio_source_button_group"/>
<buttongroup name="TX_mode_button_group"/>
<buttongroup name="PTT_method_button_group"/> <buttongroup name="PTT_method_button_group"/>
<buttongroup name="CAT_stop_bits_button_group"/>
<buttongroup name="CAT_handshake_button_group"/>
<buttongroup name="TX_mode_button_group"/>
</buttongroups> </buttongroups>
</ui> </ui>

3
colorhighlighting.cpp
View File

@ -36,7 +36,7 @@ void ColorHighlighting::write_settings ()
void ColorHighlighting::colorHighlightlingSetup(QColor color_CQ,QColor color_MyCall, void ColorHighlighting::colorHighlightlingSetup(QColor color_CQ,QColor color_MyCall,
QColor color_DXCC,QColor color_DXCCband,QColor color_NewCall, QColor color_DXCC,QColor color_DXCCband,QColor color_NewCall,
QColor color_NewCallBand,QColor color_NewGrid,QColor color_NewGridBand, QColor color_NewCallBand,QColor color_NewGrid,QColor color_NewGridBand,
QColor color_TxMsg) QColor color_TxMsg,QColor color_LoTW)
{ {
setWindowTitle(QApplication::applicationName() + " - Colors"); setWindowTitle(QApplication::applicationName() + " - Colors");
ui->label->setStyleSheet(QString("background: %1").arg(color_CQ.name())); 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_13->setStyleSheet(QString("background: %1").arg(color_NewCallBand.name()));
ui->label_15->setStyleSheet(QString("background: %1").arg(color_NewGrid.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_17->setStyleSheet(QString("background: %1").arg(color_NewGridBand.name()));
ui->label_19->setStyleSheet(QString("color: %1").arg(color_LoTW.name()));
} }

8
colorhighlighting.h
View File

@ -15,10 +15,10 @@ class ColorHighlighting : public QDialog
public: public:
explicit ColorHighlighting(QSettings *, QWidget *parent = 0); explicit ColorHighlighting(QSettings *, QWidget *parent = 0);
~ColorHighlighting(); ~ColorHighlighting();
void colorHighlightlingSetup(QColor color_CQ,QColor color_MyCall, void colorHighlightlingSetup(QColor color_CQ, QColor color_MyCall,
QColor color_DXCC,QColor color_DXCCband,QColor color_NewCall, QColor color_DXCC, QColor color_DXCCband, QColor color_NewCall,
QColor color_NewCallBand,QColor color_NewGrid,QColor color_NewGridBand, QColor color_NewCallBand, QColor color_NewGrid, QColor color_NewGridBand,
QColor color_TxMsg); QColor color_TxMsg, QColor color_LoTW);
private: private:
QSettings * settings_; QSettings * settings_;

117
colorhighlighting.ui
View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>212</width> <width>212</width>
<height>265</height> <height>253</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -16,16 +16,6 @@
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="5" column="0">
<widget class="QLabel" name="label_15">
<property name="text">
<string>K1ABC</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="6" column="0"> <item row="6" column="0">
<widget class="QLabel" name="label_17"> <widget class="QLabel" name="label_17">
<property name="text"> <property name="text">
@ -36,16 +26,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="0">
<widget class="QLabel" name="label_11">
<property name="text">
<string>K1ABC</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="8" column="0"> <item row="8" column="0">
<widget class="QLabel" name="label_13"> <widget class="QLabel" name="label_13">
<property name="text"> <property name="text">
@ -56,10 +36,30 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="1"> <item row="7" column="0">
<widget class="QLabel" name="label_12"> <widget class="QLabel" name="label_11">
<property name="text"> <property name="text">
<string>New Call</string> <string>K1ABC</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="label_15">
<property name="text">
<string>K1ABC</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="label_6">
<property name="text">
<string>Transmitted message</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -70,6 +70,13 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="1">
<widget class="QLabel" name="label_12">
<property name="text">
<string>New Call</string>
</property>
</widget>
</item>
<item row="5" column="1"> <item row="5" column="1">
<widget class="QLabel" name="label_16"> <widget class="QLabel" name="label_16">
<property name="text"> <property name="text">
@ -84,15 +91,8 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="1" column="0">
<widget class="QLabel" name="label_6"> <widget class="QLabel" name="label_3">
<property name="text">
<string>Transmitted message</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text"> <property name="text">
<string>K1ABC</string> <string>K1ABC</string>
</property> </property>
@ -101,8 +101,8 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_9"> <widget class="QLabel" name="label">
<property name="text"> <property name="text">
<string>K1ABC</string> <string>K1ABC</string>
</property> </property>
@ -121,8 +121,8 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="4" column="0">
<widget class="QLabel" name="label_3"> <widget class="QLabel" name="label_9">
<property name="text"> <property name="text">
<string>K1ABC</string> <string>K1ABC</string>
</property> </property>
@ -131,17 +131,10 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1"> <item row="0" column="1">
<widget class="QLabel" name="label_8"> <widget class="QLabel" name="label_2">
<property name="text"> <property name="text">
<string>New DXCC</string> <string>CQ in message</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLabel" name="label_10">
<property name="text">
<string>New DXCC on Band</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -162,10 +155,34 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="4" column="1">
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_10">
<property name="text"> <property name="text">
<string>CQ in message</string> <string>New DXCC on Band</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLabel" name="label_8">
<property name="text">
<string>New DXCC</string>
</property>
</widget>
</item>
<item row="9" column="0">
<widget class="QLabel" name="label_19">
<property name="text">
<string>K1ABC</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="9" column="1">
<widget class="QLabel" name="label_20">
<property name="text">
<string>Not in LoTW</string>
</property> </property>
</widget> </widget>
</item> </item>

5
displaytext.cpp
View File

@ -144,7 +144,7 @@ void DisplayText::appendText(QString const& text, QColor bg,
format.setBackground (bg); format.setBackground (bg);
format.clearForeground (); format.clearForeground ();
if(call2.size()>0 and !m_LoTW.contains(call2)) { 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); 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, void DisplayText::setDecodedTextColors(QColor color_CQ, QColor color_MyCall,
QColor color_DXCC, QColor color_DXCCband,QColor color_NewCall,QColor color_NewCallBand, 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. // Save the color highlighting scheme selected by the user.
m_color_CQ=color_CQ; 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_NewGrid=color_NewGrid;
m_color_NewGridBand=color_NewGridBand; m_color_NewGridBand=color_NewGridBand;
m_color_TxMsg=color_TxMsg; m_color_TxMsg=color_TxMsg;
m_color_LoTW=color_LoTW;
} }

4
displaytext.h
View File

@ -30,7 +30,8 @@ public:
void displayFoxToBeCalled(QString t, QColor bg); void displayFoxToBeCalled(QString t, QColor bg);
void setDecodedTextColors(QColor color_CQ, QColor color_MyCall, QColor color_DXCC, void setDecodedTextColors(QColor color_CQ, QColor color_MyCall, QColor color_DXCC,
QColor color_DXCCband, QColor color_NewCall, QColor color_NewCallBand, 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 selectCallsign (Qt::KeyboardModifiers);
Q_SIGNAL void erased (); Q_SIGNAL void erased ();
@ -58,6 +59,7 @@ private:
QColor m_color_NewCallBand; QColor m_color_NewCallBand;
QColor m_color_NewGrid; QColor m_color_NewGrid;
QColor m_color_NewGridBand; QColor m_color_NewGridBand;
QColor m_color_LoTW;
QColor m_color_TxMsg; QColor m_color_TxMsg;
}; };

6
mainwindow.cpp
View File

@ -1720,11 +1720,11 @@ void MainWindow::setColorHighlighting()
ui->decodedTextBrowser->setDecodedTextColors(m_config.color_CQ(),m_config.color_MyCall(), 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_DXCC(),m_config.color_DXCCband(),m_config.color_NewCall(),
m_config.color_NewCallBand(),m_config.color_NewGrid(),m_config.color_NewGridBand(), 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(), 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_DXCC(),m_config.color_DXCCband(),m_config.color_NewCall(),
m_config.color_NewCallBand(),m_config.color_NewGrid(),m_config.color_NewGridBand(), 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_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_DXCC(),m_config.color_DXCCband(),m_config.color_NewCall(),
m_config.color_NewCallBand(),m_config.color_NewGrid(),m_config.color_NewGridBand(), 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() void MainWindow::on_actionMessage_averaging_triggered()