diff --git a/CMakeLists.txt b/CMakeLists.txt index d5e64f8..9bbb1b9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -297,6 +297,7 @@ set (wsjtx_CXXSRCS widegraph.cpp echograph.cpp echoplot.cpp + extendedqso.cpp fastgraph.cpp fastplot.cpp about.cpp @@ -649,6 +650,7 @@ set (wsjtx_UISRCS about.ui astro.ui echograph.ui + extendedqso.ui fastgraph.ui messageaveraging.ui widegraph.ui diff --git a/extendedqso.cpp b/extendedqso.cpp new file mode 100644 index 0000000..beaae68 --- /dev/null +++ b/extendedqso.cpp @@ -0,0 +1,14 @@ +#include "extendedqso.h" +#include "ui_extendedqso.h" + +ExtendedQSO::ExtendedQSO(QWidget *parent) : + QWidget(parent), + ui(new Ui::ExtendedQSO) +{ + ui->setupUi(this); +} + +ExtendedQSO::~ExtendedQSO() +{ + delete ui; +} diff --git a/extendedqso.h b/extendedqso.h new file mode 100644 index 0000000..fb40197 --- /dev/null +++ b/extendedqso.h @@ -0,0 +1,22 @@ +#ifndef EXTENDEDQSO_H +#define EXTENDEDQSO_H + +#include + +namespace Ui { +class ExtendedQSO; +} + +class ExtendedQSO : public QWidget +{ + Q_OBJECT + +public: + explicit ExtendedQSO(QWidget *parent = 0); + ~ExtendedQSO(); + +private: + Ui::ExtendedQSO *ui; +}; + +#endif // EXTENDEDQSO_H diff --git a/extendedqso.ui b/extendedqso.ui new file mode 100644 index 0000000..d8dd932 --- /dev/null +++ b/extendedqso.ui @@ -0,0 +1,189 @@ + + + ExtendedQSO + + + + 0 + 0 + 877 + 462 + + + + + 0 + 0 + + + + Form + + + + + 10 + 10 + 851 + 441 + + + + + + + Qt::Horizontal + + + + Qt::Vertical + + + + false + + + Your message, if longer than 13 characters, will be split into separate free text transmissions. At the start of each tx cycle, the next chunk of the message will be removed from this textbox for transmission. + + + + + + true + + + + true + + + QTextEdit { background:rgb(255, 250, 205); } + + + true + + + Messages from your receive frequency will appear here. + + + + + + + + + + + + CQ + + + + + + + Your Call + + + + + + + Their Call + + + + + + + Qt::Horizontal + + + QSizePolicy::Minimum + + + + 20 + 20 + + + + + + + + Macro 1 + + + + + + + Macro 2 + + + + + + + Macro 3 + + + + + + + Macro 4 + + + + + + + Qt::Horizontal + + + QSizePolicy::Preferred + + + + 20 + 0 + + + + + + + + Send Next + + + + + + + Halt + + + + + + + + + Remaining Tx Sequences: 0 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + listWidget + layoutWidget + verticalLayoutWidget + + + + diff --git a/mainwindow.cpp b/mainwindow.cpp index 601e573..c885240 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -35,6 +35,7 @@ #include "plotter.h" #include "echoplot.h" #include "echograph.h" +#include "extendedqso.h" #include "fastplot.h" #include "fastgraph.h" #include "about.h" @@ -201,6 +202,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple, , MessageBox::Cancel | MessageBox::Ok | MessageBox::Retry}, m_wideGraph (new WideGraph(m_settings)), m_echoGraph (new EchoGraph(m_settings)), + m_extendedQSO (new ExtendedQSO()), m_fastGraph (new FastGraph(m_settings)), m_logDlg (new LogQSO (program_title (), m_settings, &m_config, this)), m_lastDialFreq {0}, @@ -2104,6 +2106,11 @@ void MainWindow::on_actionEcho_Graph_triggered() m_echoGraph->show(); } +void MainWindow::on_actionExtended_QSO_triggered() +{ + m_extendedQSO->show(); +} + void MainWindow::on_actionFast_Graph_triggered() { m_fastGraph->show(); diff --git a/mainwindow.h b/mainwindow.h index 4a15c9e..3fde3c4 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -64,6 +64,7 @@ class QLineEdit; class QFont; class QHostInfo; class EchoGraph; +class ExtendedQSO; class FastGraph; class WideGraph; class LogQSO; @@ -272,6 +273,7 @@ private slots: void on_WSPRfreqSpinBox_valueChanged(int n); void on_pbTxNext_clicked(bool b); void on_actionEcho_Graph_triggered(); + void on_actionExtended_QSO_triggered(); void on_actionEcho_triggered(); void on_actionISCAT_triggered(); void on_actionFast_Graph_triggered(); @@ -340,6 +342,7 @@ private: QScopedPointer m_wideGraph; QScopedPointer m_echoGraph; + QScopedPointer m_extendedQSO; QScopedPointer m_fastGraph; QScopedPointer m_logDlg; QScopedPointer m_astroWidget; diff --git a/mainwindow.ui b/mainwindow.ui index f0c28e2..523101c 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -27,7 +27,7 @@ QTabWidget::Rounded - 1 + 0 @@ -2571,6 +2571,7 @@ QPushButton[state="ok"] { + @@ -3209,6 +3210,11 @@ QPushButton[state="ok"] { Shift+F1 + + + Extended QSO + + diff --git a/wsjtx.pro b/wsjtx.pro index 1a327c9..5ef1065 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 \ + extendedqso.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 \ + extendedqso.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 \ + extendedqso.ui RC_FILE = wsjtx.rc RESOURCES = wsjtx.qrc diff --git a/wsjtx.pro.user b/wsjtx.pro.user index 703ccc3..8c48500 100644 --- a/wsjtx.pro.user +++ b/wsjtx.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId