diff --git a/logqso.cpp b/logqso.cpp new file mode 100644 index 000000000..25f965254 --- /dev/null +++ b/logqso.cpp @@ -0,0 +1,26 @@ +#include "logqso.h" +#include "ui_logqso.h" +#include + +LogQSO::LogQSO(QWidget *parent) : + QDialog(parent), + ui(new Ui::LogQSO) +{ + ui->setupUi(this); +} + +LogQSO::~LogQSO() +{ + delete ui; +} + +void LogQSO::initLogQSO() +{ + qDebug() << "A"; +} + +void LogQSO::accept() +{ + qDebug() << "Z"; + QDialog::accept(); +} diff --git a/logqso.h b/logqso.h new file mode 100644 index 000000000..6ff2238a9 --- /dev/null +++ b/logqso.h @@ -0,0 +1,26 @@ +#ifndef LogQSO_H +#define LogQSO_H + +#include + +namespace Ui { +class LogQSO; +} + +class LogQSO : public QDialog +{ + Q_OBJECT + +public: + explicit LogQSO(QWidget *parent = 0); + ~LogQSO(); + void initLogQSO(); + +public slots: + void accept(); + +private: + Ui::LogQSO *ui; +}; + +#endif // LogQSO_H diff --git a/logqso.ui b/logqso.ui new file mode 100644 index 000000000..d648dbc16 --- /dev/null +++ b/logqso.ui @@ -0,0 +1,593 @@ + + + LogQSO + + + + 0 + 0 + 424 + 283 + + + + Dialog + + + + + 30 + 240 + 341 + 32 + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + 10 + 0 + 401 + 231 + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + 0 + 0 + + + + + 70 + 0 + + + + + 70 + 16777215 + + + + Call + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 100 + 0 + + + + + 100 + 16777215 + + + + Date + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 50 + 0 + + + + + 50 + 16777215 + + + + Time + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 50 + 0 + + + + + 50 + 16777215 + + + + Mode + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 50 + 0 + + + + + 50 + 16777215 + + + + Band + + + Qt::AlignCenter + + + + + + + + + + + + 0 + 0 + + + + + 70 + 0 + + + + + 70 + 16777215 + + + + + + + + + 0 + 0 + + + + + 100 + 0 + + + + + 100 + 16777215 + + + + + + + + + 50 + 0 + + + + + 50 + 16777215 + + + + + + + + + 0 + 0 + + + + + 50 + 0 + + + + + 50 + 16777215 + + + + + + + + + 0 + 0 + + + + + 50 + 0 + + + + + 50 + 16777215 + + + + + + + + + + Qt::Vertical + + + + 20 + 20 + + + + + + + + + + + 0 + 0 + + + + + 50 + 0 + + + + + 50 + 16777215 + + + + Rpt Sent + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 50 + 0 + + + + + 50 + 16777215 + + + + Rpt Rcvd + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 50 + 0 + + + + + 50 + 16777215 + + + + Grid + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 100 + 0 + + + + + 100 + 16777215 + + + + Op Name + + + Qt::AlignCenter + + + + + + + + + + + + 0 + 0 + + + + + 50 + 0 + + + + + 50 + 16777215 + + + + + + + + + 0 + 0 + + + + + 50 + 0 + + + + + 50 + 16777215 + + + + + + + + + 0 + 0 + + + + + 50 + 0 + + + + + 50 + 16777215 + + + + + + + + + 0 + 0 + + + + + 100 + 0 + + + + + 100 + 16777215 + + + + + + + + + + Qt::Vertical + + + + 20 + 20 + + + + + + + + + + Comments + + + + + + + + + + + + + + + buttonBox + accepted() + LogQSO + accept() + + + 248 + 254 + + + 157 + 274 + + + + + buttonBox + rejected() + LogQSO + reject() + + + 316 + 260 + + + 286 + 274 + + + + + diff --git a/mainwindow.cpp b/mainwindow.cpp index e226248a7..d9405b407 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -8,6 +8,7 @@ #include "sleep.h" #include "getfile.h" #include +#include "logqso.h" int itone[85]; //Tx audio tones for 85 symbols int rc; @@ -1749,8 +1750,12 @@ void MainWindow::on_logQSOButton_clicked() //Log QSO button t+=" "; out << t << endl; f2.close(); + LogQSO logDlg(this); + logDlg.initLogQSO(); + if(logDlg.exec() == QDialog::Accepted) { + qDebug() << "ZZ"; + } } - m_rptSent=""; m_rptRcvd=""; } diff --git a/wsjtx.pro b/wsjtx.pro index 91dfb2625..04f30155c 100644 --- a/wsjtx.pro +++ b/wsjtx.pro @@ -35,7 +35,8 @@ QMAKE_EXTRA_COMPILERS += gfortran SOURCES += main.cpp mainwindow.cpp plotter.cpp about.cpp \ soundin.cpp soundout.cpp devsetup.cpp \ widegraph.cpp getfile.cpp \ - displaytext.cpp getdev.cpp + displaytext.cpp getdev.cpp \ + logqso.cpp win32 { SOURCES += killbyname.cpp @@ -43,11 +44,13 @@ SOURCES += killbyname.cpp HEADERS += mainwindow.h plotter.h soundin.h soundout.h \ about.h devsetup.h widegraph.h getfile.h \ - commons.h sleep.h displaytext.h + commons.h sleep.h displaytext.h \ + logqso.h DEFINES += __cplusplus -FORMS += mainwindow.ui about.ui devsetup.ui widegraph.ui +FORMS += mainwindow.ui about.ui devsetup.ui widegraph.ui \ + logqso.ui RC_FILE = wsjtx.rc