diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b1ed3a0e..258965d28 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -302,6 +302,7 @@ set (wsjtx_CXXSRCS about.cpp astro.cpp messageaveraging.cpp + colorhighlighting.cpp WsprTxScheduler.cpp mainwindow.cpp Configuration.cpp @@ -689,6 +690,7 @@ set (wsjtx_UISRCS mainwindow.ui about.ui astro.ui + colorhighlighting.ui echograph.ui fastgraph.ui messageaveraging.ui diff --git a/colorhighlighting.cpp b/colorhighlighting.cpp new file mode 100644 index 000000000..47865da09 --- /dev/null +++ b/colorhighlighting.cpp @@ -0,0 +1,18 @@ +#include "colorhighlighting.h" +#include "ui_colorhighlighting.h" + +#include + +ColorHighlighting::ColorHighlighting(QWidget *parent) : + QDialog(parent), + ui(new Ui::ColorHighlighting) +{ + qDebug() << "AA"; + ui->setupUi(this); + qDebug() << "BB"; +} + +ColorHighlighting::~ColorHighlighting() +{ + delete ui; +} diff --git a/colorhighlighting.h b/colorhighlighting.h new file mode 100644 index 000000000..7a51b8b97 --- /dev/null +++ b/colorhighlighting.h @@ -0,0 +1,22 @@ +#ifndef COLORHIGHLIGHTING_H +#define COLORHIGHLIGHTING_H + +#include + +namespace Ui { +class ColorHighlighting; +} + +class ColorHighlighting : public QDialog +{ + Q_OBJECT + +public: + explicit ColorHighlighting(QWidget *parent = 0); + ~ColorHighlighting(); + +private: + Ui::ColorHighlighting *ui; +}; + +#endif // COLORHIGHLIGHTING_H diff --git a/colorhighlighting.ui b/colorhighlighting.ui new file mode 100644 index 000000000..b560a01b0 --- /dev/null +++ b/colorhighlighting.ui @@ -0,0 +1,18 @@ + + ColorHighlighting + + + + 0 + 0 + 400 + 300 + + + + Dialog + + + + + diff --git a/mainwindow.cpp b/mainwindow.cpp index 496c31b76..6feba786d 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -39,6 +39,7 @@ #include "fastgraph.h" #include "about.h" #include "messageaveraging.h" +#include "colorhighlighting.h" #include "widegraph.h" #include "sleep.h" #include "logqso.h" @@ -2372,6 +2373,18 @@ void MainWindow::on_actionFox_Log_triggered() m_msgAvgWidget->foxLogSetup(); } +void MainWindow::on_actionColors_triggered() +{ + qDebug() << "aa"; + if (!m_colorHighlighting) { + m_colorHighlighting.reset (new ColorHighlighting); + } + m_colorHighlighting->showNormal(); + m_colorHighlighting->raise (); + m_colorHighlighting->activateWindow (); + qDebug() << "bb"; +} + void MainWindow::on_actionMessage_averaging_triggered() { if (!m_msgAvgWidget) @@ -5163,7 +5176,6 @@ void MainWindow::cabLog() if(m_freqNominal>50000000) nfreq=m_freqNominal/1000000; QString t; t.sprintf("QSO: %5d RY ",nfreq); - qDebug() << t; t=t + QDateTime::currentDateTimeUtc().toString("yyyy-MM-dd hhmm ") + m_config.my_callsign().leftJustified(13,' ') + m_xSent.leftJustified(14,' ') + m_hisCall.leftJustified(13,' ') + m_xRcvd; diff --git a/mainwindow.h b/mainwindow.h index 86e4ef13b..94f009871 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -68,6 +68,7 @@ class WideGraph; class LogQSO; class Transceiver; class MessageAveraging; +class ColorHighlighting; class MessageClient; class QTime; class WSPRBandHopping; @@ -243,6 +244,7 @@ private slots: void auto_tx_mode(bool); void on_actionMessage_averaging_triggered(); void on_actionFox_Log_triggered(); + void on_actionColors_triggered(); void on_actionInclude_averaging_toggled (bool); void on_actionInclude_correlation_toggled (bool); void on_actionEnable_AP_DXcall_toggled (bool); @@ -356,7 +358,7 @@ private: QScopedPointer m_prefixes; QScopedPointer m_mouseCmnds; QScopedPointer m_msgAvgWidget; - + QScopedPointer m_colorHighlighting; Transceiver::TransceiverState m_rigState; Frequency m_lastDialFreq; QString m_lastBand; diff --git a/mainwindow.ui b/mainwindow.ui index 9d85918b3..5b6dc38b0 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -2637,6 +2637,7 @@ QPushButton[state="ok"] { + @@ -3298,6 +3299,11 @@ QPushButton[state="ok"] { Erase cabrillo.log + + + Color highlighting scheme + + diff --git a/wsjtx.pro b/wsjtx.pro index 1a327c919..353bd4aea 100644 --- a/wsjtx.pro +++ b/wsjtx.pro @@ -67,7 +67,8 @@ SOURCES += \ echoplot.cpp echograph.cpp fastgraph.cpp fastplot.cpp Modes.cpp \ WSPRBandHopping.cpp MessageAggregator.cpp SampleDownloader.cpp qt_helpers.cpp\ MultiSettings.cpp PhaseEqualizationDialog.cpp IARURegions.cpp MessageBox.cpp \ - EqualizationToolsDialog.cpp + EqualizationToolsDialog.cpp \ + colorhighlighting.cpp HEADERS += qt_helpers.hpp \ pimpl_h.hpp pimpl_impl.hpp \ @@ -83,7 +84,8 @@ HEADERS += qt_helpers.hpp \ logbook/logbook.h logbook/countrydat.h logbook/countriesworked.h logbook/adif.h \ messageaveraging.h echoplot.h echograph.h fastgraph.h fastplot.h Modes.hpp WSPRBandHopping.hpp \ WsprTxScheduler.h SampleDownloader.hpp MultiSettings.hpp PhaseEqualizationDialog.hpp \ - IARURegions.hpp MessageBox.hpp EqualizationToolsDialog.hpp + IARURegions.hpp MessageBox.hpp EqualizationToolsDialog.hpp \ + colorhighlighting.h INCLUDEPATH += qmake_only @@ -95,7 +97,8 @@ HEADERS += OmniRigTransceiver.hpp FORMS += mainwindow.ui about.ui Configuration.ui widegraph.ui astro.ui \ logqso.ui wf_palette_design_dialog.ui messageaveraging.ui echograph.ui \ - fastgraph.ui + fastgraph.ui \ + colorhighlighting.ui RC_FILE = wsjtx.rc RESOURCES = wsjtx.qrc