mirror of
https://github.com/ea4k/klog.git
synced 2024-09-22 02:48:29 +00:00
Send a QSL and mark the DX's as requested at once
This commit is contained in:
jaime
parent
f38989a45e
commit
23c24dfdff
@ -1,5 +1,7 @@
|
||||
TBD - 0.9.1
|
||||
- Working on Satellite support.
|
||||
- GUI: It is possible to mark a QSL sent via bureau/direct & DX QSL as requested with one action from Search box.
|
||||
|
||||
|
||||
January-2015 - 0.9.0.3
|
||||
- Bugfix: ADIF was not properly imported when Fields where using the Type of data optional field preventing logs from Logger32 being imported. (TNX EB1TR)
|
||||
|
||||
@ -1,5 +1,7 @@
|
||||
TBD - 0.9.1
|
||||
- Working on Satellite support.
|
||||
- GUI: It is possible to mark a QSL sent via bureau/direct & DX QSL as requested with one action from Search box.
|
||||
|
||||
|
||||
January-2015 - 0.9.0.3
|
||||
- Bugfix: ADIF was not properly imported when Fields where using the Type of data optional field preventing logs from Logger32 being imported. (TNX EB1TR)
|
||||
|
||||
2
TODO
2
TODO
@ -6,7 +6,7 @@ Bug: Check if the dxcluster configuration to show or not confirmed/worked works
|
||||
|
||||
KLog 0.9.1
|
||||
TODO: Keep adapting to ADIF 3.0.4
|
||||
TODO: Add a QSL Sent via direct & Mark QSL Rec¡v as reuested
|
||||
|
||||
|
||||
KLog 0.9.2
|
||||
TODO: Add the awards functionality (to manage awa files, TPEA, WAS, ...)
|
||||
|
||||
101
mainwindow.cpp
101
mainwindow.cpp
@ -3741,6 +3741,13 @@ void MainWindow::righButtonSearchMenu(const int trow)
|
||||
menuSentQsl->addAction(qslSentViaBureauFromSearchAct);
|
||||
menuSentQsl->addAction(qslSentViaDirectFromSearchAct);
|
||||
menuSentQsl->addAction(qslSentRequestedAct);
|
||||
if (!qslReceived)
|
||||
{
|
||||
menuSentQsl->addAction(qslSentViaBureauMarkRcvReqFromSearchAct);
|
||||
menuSentQsl->addAction(qslSentViaDirectMarkRcvReqFromSearchAct);
|
||||
qslSentViaBureauMarkRcvReqFromSearchAct->setData(trow);
|
||||
qslSentViaDirectMarkRcvReqFromSearchAct->setData(trow);
|
||||
}
|
||||
qslSentViaBureauFromSearchAct->setData(trow);
|
||||
qslSentViaDirectFromSearchAct->setData(trow);
|
||||
qslSentRequestedAct->setData(trow);
|
||||
@ -3874,49 +3881,37 @@ void MainWindow::showMenuRightButtonSearchCreateActions()
|
||||
qslSentRequestedAct->setStatusTip(tr("Mark my QSL as requested"));
|
||||
connect(qslSentRequestedAct, SIGNAL(triggered()), this, SLOT( slotQSLSentMarkAsRequested() ));
|
||||
|
||||
qslSentViaDirectMarkRcvReqFromSearchAct = new QAction(tr("Via Direct && mark DX QSL as requested"), this);
|
||||
qslSentViaDirectMarkRcvReqFromSearchAct->setStatusTip(tr("Send this QSL via direct & mark DX QSL as requested"));
|
||||
connect(qslSentViaDirectMarkRcvReqFromSearchAct, SIGNAL(triggered()), this, SLOT( slotQSLSentViaDirectMarkDXReqFromSearch() ));
|
||||
|
||||
qslSentViaBureauMarkRcvReqFromSearchAct = new QAction(tr("Via Bureau && mark DX QSL as requested"), this);
|
||||
qslSentViaBureauMarkRcvReqFromSearchAct->setStatusTip(tr("Send this QSL via bureau & mark DX QSL as requested"));
|
||||
connect(qslSentViaBureauMarkRcvReqFromSearchAct, SIGNAL(triggered()), this, SLOT( slotQSLSentViaBureuMarkDXReqFromSearch() ));
|
||||
|
||||
|
||||
qslRecRequestedAct = new QAction(tr("&Request the QSL"), this);
|
||||
//qslSentRequestedAct->setShortcut(Qt::CTRL + Qt::Key_R);
|
||||
qslRecRequestedAct->setStatusTip(tr("Mark the QSL as requested"));
|
||||
connect(qslRecRequestedAct, SIGNAL(triggered()), this, SLOT( slotQSLRecMarkAsRequested() ));
|
||||
|
||||
|
||||
//if (sendQSLWhenRec)
|
||||
//{
|
||||
qslRecViaBureauMarkReqFromSearchAct = new QAction(tr("Via bureau && mark my QSL as requested"), this);
|
||||
qslRecViaBureauMarkReqFromSearchAct->setStatusTip(tr("QSL received via bureau & mark QSL as requested"));
|
||||
qslRecViaBureauMarkReqFromSearchAct = new QAction(tr("Via bureau && mark my QSL as requested"), this);
|
||||
qslRecViaBureauMarkReqFromSearchAct->setStatusTip(tr("QSL received via bureau & mark my QSL as requested"));
|
||||
connect(qslRecViaBureauMarkReqFromSearchAct, SIGNAL(triggered()), this, SLOT( slotQSLRecViaBureauMarkReqFromSearch() ));
|
||||
|
||||
//qslRecViaBureauMarkReqFromSearchAct->setShortcut(Qt::CTRL + Qt::Key_R);
|
||||
connect(qslRecViaBureauMarkReqFromSearchAct, SIGNAL(triggered()), this, SLOT( slotQSLRecViaBureauMarkReqFromSearch() ));
|
||||
|
||||
qslRecViaBureauFromSearchAct = new QAction(tr("Via bureau"), this);
|
||||
qslRecViaBureauFromSearchAct->setStatusTip(tr("QSL received via bureau"));
|
||||
//}
|
||||
//else
|
||||
//{
|
||||
qslRecViaBureauFromSearchAct = new QAction(tr("Via bureau"), this);
|
||||
qslRecViaBureauFromSearchAct->setStatusTip(tr("QSL received via bureau"));
|
||||
//}
|
||||
|
||||
|
||||
qslRecViaBureauFromSearchAct->setShortcut(Qt::CTRL + Qt::Key_R);
|
||||
qslRecViaBureauFromSearchAct = new QAction(tr("Via bureau"), this);
|
||||
qslRecViaBureauFromSearchAct->setStatusTip(tr("QSL received via bureau"));
|
||||
//qslRecViaBureauFromSearchAct->setShortcut(Qt::CTRL + Qt::Key_R);
|
||||
connect(qslRecViaBureauFromSearchAct, SIGNAL(triggered()), this, SLOT( slotQSLRecViaBureauFromSearch() ));
|
||||
|
||||
qslRecViaDirectMarkReqFromSearchAct = new QAction(tr("Direc&t && mark as my QSL requested"), this);
|
||||
qslRecViaDirectMarkReqFromSearchAct->setStatusTip(tr("QSL received via direct & mark my QSL as requested"));
|
||||
connect(qslRecViaDirectMarkReqFromSearchAct, SIGNAL(triggered()), this, SLOT( slotQSLRecViaDirectMarkReqFromSearch() ));
|
||||
|
||||
//if (sendQSLWhenRec)
|
||||
//{
|
||||
qslRecViaDirectMarkReqFromSearchAct = new QAction(tr("Direc&t && mark as my QSL requested"), this);
|
||||
qslRecViaDirectMarkReqFromSearchAct->setStatusTip(tr("QSL received via direct & mark my QSL as requested"));
|
||||
connect(qslRecViaDirectMarkReqFromSearchAct, SIGNAL(triggered()), this, SLOT( slotQSLRecViaDirectMarkReqFromSearch() ));
|
||||
|
||||
qslRecViaDirectFromSearchAct = new QAction(tr("Direc&t"), this);
|
||||
qslRecViaBureauFromSearchAct->setStatusTip(tr("QSL received via direct"));
|
||||
//}
|
||||
//else
|
||||
//{
|
||||
qslRecViaDirectFromSearchAct = new QAction(tr("Direc&t"), this);
|
||||
qslRecViaBureauFromSearchAct->setStatusTip(tr("QSL received via direct"));
|
||||
//}
|
||||
qslRecViaDirectFromSearchAct->setShortcut(Qt::CTRL + Qt::Key_T);
|
||||
qslRecViaDirectFromSearchAct = new QAction(tr("Direc&t"), this);
|
||||
qslRecViaBureauFromSearchAct->setStatusTip(tr("QSL received via direct"));
|
||||
//qslRecViaDirectFromSearchAct->setShortcut(Qt::CTRL + Qt::Key_T);
|
||||
connect(qslRecViaDirectFromSearchAct, SIGNAL(triggered()), this, SLOT( slotQSLRecViaDirectFromSearch() ));
|
||||
}
|
||||
|
||||
@ -3967,6 +3962,46 @@ void MainWindow::showMenuRightButtonFromLogCreateActions()
|
||||
connect(qslRecViaDirectFromLogAct, SIGNAL(triggered()), this, SLOT( slotQSLRecViaDirectFromLog() ));
|
||||
|
||||
}
|
||||
void MainWindow::slotQSLSentViaBureuMarkDXReqFromSearch()
|
||||
{
|
||||
qDebug() << "slotQSLSentViaBureuMarkDXReqFromSearch: " << (qslSentViaBureauMarkRcvReqFromSearchAct->data()).toString() << " - Id = " << QString::number( ((logModel->index( ( (qslSentViaBureauMarkRcvReqFromSearchAct->data()).toInt() ) , 0)).data(0).toInt()) ) << endl;
|
||||
int _qsoId = (qslSentViaBureauMarkRcvReqFromSearchAct->data()).toInt();
|
||||
|
||||
dataProxy->qslSentViaBureau(_qsoId, (dateTime->currentDateTime()).toString("yyyy/MM/dd"));
|
||||
dataProxy->qslRecAsRequested(_qsoId, (dateTime->currentDateTime()).toString("yyyy/MM/dd"));
|
||||
|
||||
|
||||
if(qslingNeeded)
|
||||
{
|
||||
slotToolSearchNeededQSLToSend();
|
||||
}
|
||||
else
|
||||
{
|
||||
slotSearchBoxTextChanged();
|
||||
}
|
||||
// Mark Sent, Bureau, date, update log.
|
||||
|
||||
}
|
||||
void MainWindow::slotQSLSentViaDirectMarkDXReqFromSearch()
|
||||
{
|
||||
qDebug() << "slotQSLSentViaDirectMarkDXReqFromSearch: " << (qslSentViaDirectMarkRcvReqFromSearchAct->data()).toString() << " - Id = " << QString::number( ((logModel->index( ( (qslSentViaDirectMarkRcvReqFromSearchAct->data()).toInt() ) , 0)).data(0).toInt()) ) << endl;
|
||||
|
||||
int _qsoId = (qslSentViaDirectMarkRcvReqFromSearchAct->data()).toInt();
|
||||
|
||||
dataProxy->qslSentViaDirect(_qsoId, (dateTime->currentDateTime()).toString("yyyy/MM/dd"));
|
||||
dataProxy->qslRecAsRequested(_qsoId, (dateTime->currentDateTime()).toString("yyyy/MM/dd"));
|
||||
|
||||
|
||||
if(qslingNeeded)
|
||||
{
|
||||
slotToolSearchNeededQSLToSend();
|
||||
}
|
||||
else
|
||||
{
|
||||
slotSearchBoxTextChanged();
|
||||
}
|
||||
// Mark Sent, Bureau, date, update log.
|
||||
}
|
||||
|
||||
void MainWindow::slotQSLSentViaBureauFromSearch()
|
||||
{
|
||||
|
||||
@ -147,6 +147,9 @@ private slots:
|
||||
void slotQsoDeleteFromSearch();
|
||||
void slotQSLSentViaBureauFromSearch();
|
||||
void slotQSLSentViaDirectFromSearch();
|
||||
void slotQSLSentViaDirectMarkDXReqFromSearch();
|
||||
|
||||
void slotQSLSentViaBureuMarkDXReqFromSearch();
|
||||
void slotQSLRecViaDirectFromSearch();
|
||||
void slotQSLRecViaBureauFromSearch();
|
||||
void slotQSLRecViaDirectMarkReqFromSearch();
|
||||
@ -409,6 +412,8 @@ private:
|
||||
QAction *qsoToEditFromSearchAct;
|
||||
QAction *qslSentViaBureauFromSearchAct;
|
||||
QAction *qslSentViaDirectFromSearchAct;
|
||||
QAction *qslSentViaDirectMarkRcvReqFromSearchAct;
|
||||
QAction *qslSentViaBureauMarkRcvReqFromSearchAct;
|
||||
QAction *qslRecViaBureauFromSearchAct;
|
||||
QAction *qslRecViaDirectFromSearchAct;
|
||||
QAction *qslRecViaBureauMarkReqFromSearchAct;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user