Starting to implement a color-highlighting reminder window.

This commit is contained in:
Joe Taylor 2018-08-25 11:19:43 -04:00
parent ef3f084c5c
commit f1261076be
8 changed files with 88 additions and 5 deletions

View File

@ -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

18
colorhighlighting.cpp Normal file
View File

@ -0,0 +1,18 @@
#include "colorhighlighting.h"
#include "ui_colorhighlighting.h"
#include <QDebug>
ColorHighlighting::ColorHighlighting(QWidget *parent) :
QDialog(parent),
ui(new Ui::ColorHighlighting)
{
qDebug() << "AA";
ui->setupUi(this);
qDebug() << "BB";
}
ColorHighlighting::~ColorHighlighting()
{
delete ui;
}

22
colorhighlighting.h Normal file
View File

@ -0,0 +1,22 @@
#ifndef COLORHIGHLIGHTING_H
#define COLORHIGHLIGHTING_H
#include <QDialog>
namespace Ui {
class ColorHighlighting;
}
class ColorHighlighting : public QDialog
{
Q_OBJECT
public:
explicit ColorHighlighting(QWidget *parent = 0);
~ColorHighlighting();
private:
Ui::ColorHighlighting *ui;
};
#endif // COLORHIGHLIGHTING_H

18
colorhighlighting.ui Normal file
View File

@ -0,0 +1,18 @@
<ui version="4.0">
<class>ColorHighlighting</class>
<widget name="ColorHighlighting" class="QDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<height>300</height>
</rect>
</property>
<property name="windowTitle">
<string>Dialog</string>
</property>
</widget>
<resources/>
<connections/>
</ui>

View File

@ -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;

View File

@ -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<HelpTextWindow> m_prefixes;
QScopedPointer<HelpTextWindow> m_mouseCmnds;
QScopedPointer<MessageAveraging> m_msgAvgWidget;
QScopedPointer<ColorHighlighting> m_colorHighlighting;
Transceiver::TransceiverState m_rigState;
Frequency m_lastDialFreq;
QString m_lastBand;

View File

@ -2637,6 +2637,7 @@ QPushButton[state=&quot;ok&quot;] {
<addaction name="actionEcho_Graph"/>
<addaction name="actionFast_Graph"/>
<addaction name="actionFox_Log"/>
<addaction name="actionColors"/>
<addaction name="separator"/>
</widget>
<widget class="QMenu" name="menuDecode">
@ -3298,6 +3299,11 @@ QPushButton[state=&quot;ok&quot;] {
<string>Erase cabrillo.log</string>
</property>
</action>
<action name="actionColors">
<property name="text">
<string>Color highlighting scheme</string>
</property>
</action>
</widget>
<layoutdefault spacing="6" margin="11"/>
<customwidgets>

View File

@ -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