diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index a482cfd10..a85ae7bc2 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -5167,7 +5167,7 @@ void MainWindow::guiUpdate() //Once per second (onesec) if(nsec != m_sec0) { -// qDebug() << "AAA" << nsec%60; +// qDebug() << "AAA" << nsec%60 << ui->cbWorkDupes->isChecked(); // qint64 n64 = QDateTime::currentSecsSinceEpoch(); // n64=n64/30; @@ -10143,7 +10143,8 @@ void MainWindow::houndCallers() paddedHoundCall=houndCall + " "; //Don't list a hound already in the queue if(!ui->houndQueueTextBrowser->toPlainText().contains(paddedHoundCall)) { - if(m_loggedByFox[houndCall].contains(m_lastBand)) continue; //already logged on this band + if(m_loggedByFox[houndCall].contains(m_lastBand) and + !ui->cbWorkDupes->isChecked()) continue; //already logged on this band if(m_foxQSO.contains(houndCall)) continue; //still in the QSO map auto const& entity = m_logBook.countries ()->lookup (houndCall); auto const& continent = AD1CCty::continent (entity.continent); diff --git a/widgets/mainwindow.ui b/widgets/mainwindow.ui index d0fe8154c..f1c806a13 100644 --- a/widgets/mainwindow.ui +++ b/widgets/mainwindow.ui @@ -1696,7 +1696,7 @@ When not checked you can view the calibration results. QTabWidget::Triangular - 0 + 1 @@ -2063,7 +2063,154 @@ Double-click to reset to the standard 73 message 6 - + + + + + 9 + + + + Queue + + + Qt::AlignCenter + + + + + + + In Progress + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + QAbstractScrollArea::AdjustToContentsOnFirstShow + + + + + + + true + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + QAbstractScrollArea::AdjustToContentsOnFirstShow + + + + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + <html><head/><body><p>Select a desired sort order for callsigns in the queue.</p></body></html> + + + Random + + + 5 + + + + Random + + + + + Call + + + + + Grid + + + + + S/N (dB) + + + + + Distance + + + + + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + <html><head/><body><p>Maximum number of callsigns to be displayed in the queue.</p></body></html> + + + N List + + + 5 + + + 100 + + + 12 + + + + @@ -2094,22 +2241,7 @@ Double-click to reset to the standard 73 message - - - - - 9 - - - - Queue - - - Qt::AlignCenter - - - - + @@ -2146,37 +2278,7 @@ Double-click to reset to the standard 73 message - - - - In Progress - - - Qt::AlignCenter - - - - - - - <html><head/><body><p>Clear all queues.</p></body></html> - - - Reset - - - - - - - <html><head/><body><p>Include a CQ message along with other messages.</p></body></html> - - - More CQs - - - - + <html><head/><body><p>Select a specific CQ message.</p></body></html> @@ -2276,129 +2378,27 @@ Double-click to reset to the standard 73 message - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - QAbstractScrollArea::AdjustToContentsOnFirstShow - - - - - - - true - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - QAbstractScrollArea::AdjustToContentsOnFirstShow - - - - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - + + - <html><head/><body><p>Select a desired sort order for callsigns in the queue.</p></body></html> + <html><head/><body><p>Include a CQ message along with other messages.</p></body></html> - - Random + + More CQs - - 5 - - - - Random - - - - - Call - - - - - Grid - - - - - S/N (dB) - - - - - Distance - - - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - + + - <html><head/><body><p>Maximum number of callsigns to be displayed in the queue.</p></body></html> + <html><head/><body><p>Clear all queues.</p></body></html> - - N List - - - 5 - - - 100 - - - 12 + + Reset - + <html><head/><body><p>Enter a free text message.</p></body></html> @@ -2408,7 +2408,7 @@ Double-click to reset to the standard 73 message - + <html><head/><body><p>Transmit free text message at the next opportunity.</p></body></html> @@ -2418,6 +2418,13 @@ Double-click to reset to the standard 73 message + + + + Work Dupes + + +