mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2024-09-27 15:46:51 -04:00
Starting to implement a color-highlighting reminder window.
This commit is contained in:
parent
ef3f084c5c
commit
f1261076be
@ -302,6 +302,7 @@ set (wsjtx_CXXSRCS
|
|||||||
about.cpp
|
about.cpp
|
||||||
astro.cpp
|
astro.cpp
|
||||||
messageaveraging.cpp
|
messageaveraging.cpp
|
||||||
|
colorhighlighting.cpp
|
||||||
WsprTxScheduler.cpp
|
WsprTxScheduler.cpp
|
||||||
mainwindow.cpp
|
mainwindow.cpp
|
||||||
Configuration.cpp
|
Configuration.cpp
|
||||||
@ -689,6 +690,7 @@ set (wsjtx_UISRCS
|
|||||||
mainwindow.ui
|
mainwindow.ui
|
||||||
about.ui
|
about.ui
|
||||||
astro.ui
|
astro.ui
|
||||||
|
colorhighlighting.ui
|
||||||
echograph.ui
|
echograph.ui
|
||||||
fastgraph.ui
|
fastgraph.ui
|
||||||
messageaveraging.ui
|
messageaveraging.ui
|
||||||
|
18
colorhighlighting.cpp
Normal file
18
colorhighlighting.cpp
Normal 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
22
colorhighlighting.h
Normal 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
18
colorhighlighting.ui
Normal 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>
|
@ -39,6 +39,7 @@
|
|||||||
#include "fastgraph.h"
|
#include "fastgraph.h"
|
||||||
#include "about.h"
|
#include "about.h"
|
||||||
#include "messageaveraging.h"
|
#include "messageaveraging.h"
|
||||||
|
#include "colorhighlighting.h"
|
||||||
#include "widegraph.h"
|
#include "widegraph.h"
|
||||||
#include "sleep.h"
|
#include "sleep.h"
|
||||||
#include "logqso.h"
|
#include "logqso.h"
|
||||||
@ -2372,6 +2373,18 @@ void MainWindow::on_actionFox_Log_triggered()
|
|||||||
m_msgAvgWidget->foxLogSetup();
|
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()
|
void MainWindow::on_actionMessage_averaging_triggered()
|
||||||
{
|
{
|
||||||
if (!m_msgAvgWidget)
|
if (!m_msgAvgWidget)
|
||||||
@ -5163,7 +5176,6 @@ void MainWindow::cabLog()
|
|||||||
if(m_freqNominal>50000000) nfreq=m_freqNominal/1000000;
|
if(m_freqNominal>50000000) nfreq=m_freqNominal/1000000;
|
||||||
QString t;
|
QString t;
|
||||||
t.sprintf("QSO: %5d RY ",nfreq);
|
t.sprintf("QSO: %5d RY ",nfreq);
|
||||||
qDebug() << t;
|
|
||||||
t=t + QDateTime::currentDateTimeUtc().toString("yyyy-MM-dd hhmm ") +
|
t=t + QDateTime::currentDateTimeUtc().toString("yyyy-MM-dd hhmm ") +
|
||||||
m_config.my_callsign().leftJustified(13,' ') + m_xSent.leftJustified(14,' ') +
|
m_config.my_callsign().leftJustified(13,' ') + m_xSent.leftJustified(14,' ') +
|
||||||
m_hisCall.leftJustified(13,' ') + m_xRcvd;
|
m_hisCall.leftJustified(13,' ') + m_xRcvd;
|
||||||
|
@ -68,6 +68,7 @@ class WideGraph;
|
|||||||
class LogQSO;
|
class LogQSO;
|
||||||
class Transceiver;
|
class Transceiver;
|
||||||
class MessageAveraging;
|
class MessageAveraging;
|
||||||
|
class ColorHighlighting;
|
||||||
class MessageClient;
|
class MessageClient;
|
||||||
class QTime;
|
class QTime;
|
||||||
class WSPRBandHopping;
|
class WSPRBandHopping;
|
||||||
@ -243,6 +244,7 @@ private slots:
|
|||||||
void auto_tx_mode(bool);
|
void auto_tx_mode(bool);
|
||||||
void on_actionMessage_averaging_triggered();
|
void on_actionMessage_averaging_triggered();
|
||||||
void on_actionFox_Log_triggered();
|
void on_actionFox_Log_triggered();
|
||||||
|
void on_actionColors_triggered();
|
||||||
void on_actionInclude_averaging_toggled (bool);
|
void on_actionInclude_averaging_toggled (bool);
|
||||||
void on_actionInclude_correlation_toggled (bool);
|
void on_actionInclude_correlation_toggled (bool);
|
||||||
void on_actionEnable_AP_DXcall_toggled (bool);
|
void on_actionEnable_AP_DXcall_toggled (bool);
|
||||||
@ -356,7 +358,7 @@ private:
|
|||||||
QScopedPointer<HelpTextWindow> m_prefixes;
|
QScopedPointer<HelpTextWindow> m_prefixes;
|
||||||
QScopedPointer<HelpTextWindow> m_mouseCmnds;
|
QScopedPointer<HelpTextWindow> m_mouseCmnds;
|
||||||
QScopedPointer<MessageAveraging> m_msgAvgWidget;
|
QScopedPointer<MessageAveraging> m_msgAvgWidget;
|
||||||
|
QScopedPointer<ColorHighlighting> m_colorHighlighting;
|
||||||
Transceiver::TransceiverState m_rigState;
|
Transceiver::TransceiverState m_rigState;
|
||||||
Frequency m_lastDialFreq;
|
Frequency m_lastDialFreq;
|
||||||
QString m_lastBand;
|
QString m_lastBand;
|
||||||
|
@ -2637,6 +2637,7 @@ QPushButton[state="ok"] {
|
|||||||
<addaction name="actionEcho_Graph"/>
|
<addaction name="actionEcho_Graph"/>
|
||||||
<addaction name="actionFast_Graph"/>
|
<addaction name="actionFast_Graph"/>
|
||||||
<addaction name="actionFox_Log"/>
|
<addaction name="actionFox_Log"/>
|
||||||
|
<addaction name="actionColors"/>
|
||||||
<addaction name="separator"/>
|
<addaction name="separator"/>
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="QMenu" name="menuDecode">
|
<widget class="QMenu" name="menuDecode">
|
||||||
@ -3298,6 +3299,11 @@ QPushButton[state="ok"] {
|
|||||||
<string>Erase cabrillo.log</string>
|
<string>Erase cabrillo.log</string>
|
||||||
</property>
|
</property>
|
||||||
</action>
|
</action>
|
||||||
|
<action name="actionColors">
|
||||||
|
<property name="text">
|
||||||
|
<string>Color highlighting scheme</string>
|
||||||
|
</property>
|
||||||
|
</action>
|
||||||
</widget>
|
</widget>
|
||||||
<layoutdefault spacing="6" margin="11"/>
|
<layoutdefault spacing="6" margin="11"/>
|
||||||
<customwidgets>
|
<customwidgets>
|
||||||
|
@ -67,7 +67,8 @@ SOURCES += \
|
|||||||
echoplot.cpp echograph.cpp fastgraph.cpp fastplot.cpp Modes.cpp \
|
echoplot.cpp echograph.cpp fastgraph.cpp fastplot.cpp Modes.cpp \
|
||||||
WSPRBandHopping.cpp MessageAggregator.cpp SampleDownloader.cpp qt_helpers.cpp\
|
WSPRBandHopping.cpp MessageAggregator.cpp SampleDownloader.cpp qt_helpers.cpp\
|
||||||
MultiSettings.cpp PhaseEqualizationDialog.cpp IARURegions.cpp MessageBox.cpp \
|
MultiSettings.cpp PhaseEqualizationDialog.cpp IARURegions.cpp MessageBox.cpp \
|
||||||
EqualizationToolsDialog.cpp
|
EqualizationToolsDialog.cpp \
|
||||||
|
colorhighlighting.cpp
|
||||||
|
|
||||||
HEADERS += qt_helpers.hpp \
|
HEADERS += qt_helpers.hpp \
|
||||||
pimpl_h.hpp pimpl_impl.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 \
|
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 \
|
messageaveraging.h echoplot.h echograph.h fastgraph.h fastplot.h Modes.hpp WSPRBandHopping.hpp \
|
||||||
WsprTxScheduler.h SampleDownloader.hpp MultiSettings.hpp PhaseEqualizationDialog.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
|
INCLUDEPATH += qmake_only
|
||||||
@ -95,7 +97,8 @@ HEADERS += OmniRigTransceiver.hpp
|
|||||||
|
|
||||||
FORMS += mainwindow.ui about.ui Configuration.ui widegraph.ui astro.ui \
|
FORMS += mainwindow.ui about.ui Configuration.ui widegraph.ui astro.ui \
|
||||||
logqso.ui wf_palette_design_dialog.ui messageaveraging.ui echograph.ui \
|
logqso.ui wf_palette_design_dialog.ui messageaveraging.ui echograph.ui \
|
||||||
fastgraph.ui
|
fastgraph.ui \
|
||||||
|
colorhighlighting.ui
|
||||||
|
|
||||||
RC_FILE = wsjtx.rc
|
RC_FILE = wsjtx.rc
|
||||||
RESOURCES = wsjtx.qrc
|
RESOURCES = wsjtx.qrc
|
||||||
|
Loading…
Reference in New Issue
Block a user