w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-05-29 12:52:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make the LogQSO dialog non-modal.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3236 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2013-04-28 13:35:01 +00:00
parent 979e400c6d
commit f1795eea6d
4 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
logqso.cpp
View File

@ -124,5 +124,6 @@ void LogQSO::accept()
out << t << endl; out << t << endl;
f2.close(); f2.close();
} }
emit(acceptQSO(true));
QDialog::accept(); QDialog::accept();
} }

3
logqso.h
View File

@ -28,6 +28,9 @@ public:
public slots: public slots:
void accept(); void accept();
signals:
void acceptQSO(bool accepted);
private: private:
Ui::LogQSO *ui; Ui::LogQSO *ui;
}; };

32
mainwindow.cpp
View File

@ -2205,27 +2205,33 @@ void MainWindow::on_genStdMsgsPushButton_clicked() //genStdMsgs button
void MainWindow::on_logQSOButton_clicked() //Log QSO button void MainWindow::on_logQSOButton_clicked() //Log QSO button
{ {
if(m_hisCall=="") return; if(m_hisCall=="") return;
QDateTime t = QDateTime::currentDateTimeUtc(); dateTimeQSO = QDateTime::currentDateTimeUtc();
QString date=t.toString("yyyyMMdd"); QString date=dateTimeQSO.toString("yyyyMMdd");
LogQSO* logDlg;
logDlg = new LogQSO(0);
logDlg->initLogQSO(m_hisCall,m_hisGrid,m_mode,m_rptSent,m_rptRcvd,date,
m_qsoStart,m_qsoStop,m_dialFreq,m_myCall,m_myGrid,
m_noSuffix,m_toRTTY,m_dBtoComments);
connect(logDlg, SIGNAL(acceptQSO(bool)),this,SLOT(acceptQSO2(bool)));
logDlg->show();
}
void MainWindow::acceptQSO2(bool accepted)
{
QString date=dateTimeQSO.toString("yyyyMMdd");
QFile f("wsjtx.log"); QFile f("wsjtx.log");
if(!f.open(QIODevice::Text | QIODevice::Append)) { if(!f.open(QIODevice::Text | QIODevice::Append)) {
msgBox("Cannot open file \"wsjtx.log\"."); msgBox("Cannot open file \"wsjtx.log\".");
} else { } else {
QString logEntry=t.date().toString("yyyy-MMM-dd,") + QString logEntry=dateTimeQSO.date().toString("yyyy-MMM-dd,") +
t.time().toString("hh:mm,") + m_hisCall + "," + m_hisGrid + "," + dateTimeQSO.time().toString("hh:mm,") + m_hisCall + "," +
QString::number(m_dialFreq) + "," + m_mode + "," + m_hisGrid + "," + QString::number(m_dialFreq) + "," + m_mode +
m_rptSent + "," + m_rptRcvd; "," + m_rptSent + "," + m_rptRcvd;
QTextStream out(&f); QTextStream out(&f);
out << logEntry << endl; out << logEntry << endl;
f.close(); f.close();
} }
LogQSO logDlg(this);
logDlg.initLogQSO(m_hisCall,m_hisGrid,m_mode,m_rptSent,m_rptRcvd,date,
m_qsoStart,m_qsoStop,m_dialFreq,m_myCall,m_myGrid,
m_noSuffix,m_toRTTY,m_dBtoComments);
if(logDlg.exec() == QDialog::Accepted) {
}
if(m_clearCallGrid) { if(m_clearCallGrid) {
m_hisCall=""; m_hisCall="";
ui->dxCallEntry->setText(""); ui->dxCallEntry->setText("");

6
mainwindow.h
View File

@ -150,12 +150,10 @@ private slots:
void on_actionTx2QSO_triggered(bool checked); void on_actionTx2QSO_triggered(bool checked);
void killFile(); void killFile();
void on_tuneButton_clicked(); void on_tuneButton_clicked();
void on_actionAllow_multiple_instances_triggered(bool checked); void on_actionAllow_multiple_instances_triggered(bool checked);
void on_pbR2T_clicked(); void on_pbR2T_clicked();
void on_pbT2R_clicked(); void on_pbT2R_clicked();
void acceptQSO2(bool accepted);
private: private:
Ui::MainWindow *ui; Ui::MainWindow *ui;
@ -317,6 +315,8 @@ private:
QStringList m_macro; QStringList m_macro;
QStringList m_dFreq; QStringList m_dFreq;
QDateTime dateTimeQSO;
SoundInThread soundInThread; //Instantiate the audio threads SoundInThread soundInThread; //Instantiate the audio threads
SoundOutThread soundOutThread; SoundOutThread soundOutThread;