From ec568966c820907815efdcb1e0a7e256b51d52a4 Mon Sep 17 00:00:00 2001
From: Jordan Sherer <jordan@widefido.com>
Date: Mon, 9 Jul 2018 21:49:38 -0400
Subject: [PATCH] Fixed macros menu

---
 Configuration.cpp |  4 +++-
 mainwindow.cpp    | 21 +++++++++++----------
 mainwindow.h      |  3 ++-
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/Configuration.cpp b/Configuration.cpp
index 9f82637..3b5682e 100644
--- a/Configuration.cpp
+++ b/Configuration.cpp
@@ -1347,7 +1347,9 @@ void Configuration::impl::read_settings ()
   tx_QSY_allowed_ = settings_->value ("TxQSYAllowed", false).toBool ();
   use_dynamic_grid_ = settings_->value ("AutoGrid", false).toBool ();
 
-  macros_.setStringList (settings_->value ("Macros", QStringList {"TNX 73 GL"}).toStringList ());
+  auto loadedMacros = settings_->value ("Macros", QStringList {"TNX 73 GL"}).toStringList();
+
+  macros_.setStringList (loadedMacros);
 
   region_ = settings_->value ("Region", QVariant::fromValue (IARURegions::ALL)).value<IARURegions::Region> ();
 
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 3d196b9..d8ad925 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -719,10 +719,10 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
   //ui->extFreeTextMsg->setValidator (new QRegExpValidator {message_alphabet, this});
 
   // Free text macros model to widget hook up.
-  ui->tx5->setModel (m_config.macros ());
-  connect (ui->tx5->lineEdit(), &QLineEdit::editingFinished,
-           [this] () {on_tx5_currentTextChanged (ui->tx5->lineEdit()->text());});
-  ui->freeTextMsg->setModel (m_config.macros ());
+  //ui->tx5->setModel (m_config.macros ());
+  //connect (ui->tx5->lineEdit(), &QLineEdit::editingFinished,
+  //         [this] () {on_tx5_currentTextChanged (ui->tx5->lineEdit()->text());});
+  //ui->freeTextMsg->setModel (m_config.macros ());
   connect (ui->freeTextMsg->lineEdit ()
            , &QLineEdit::editingFinished
            , [this] () {on_freeTextMsg_currentTextChanged (ui->freeTextMsg->lineEdit ()->text ());});
@@ -3092,11 +3092,7 @@ void MainWindow::readFromStdout()                             //readFromStdout
                m_config.ppfx(),(ui->cbCQonly->isVisible() and ui->cbCQonly->isChecked()));
 
           // TODO: parse decode...
-          //ui->textEditRXAll->append(decodedtext.messageWords().first().trimmed());
-          //ui->tableWidgetRXAll->insertRow(ui->tableWidgetRXAll->rowCount());
-          //ui->tableWidgetRXAll->setItem(ui->tableWidgetRXAll->rowCount()-1, 0, new QTableWidgetItem(QString("%1").arg(decodedtext.frequencyOffset())));
-          //ui->tableWidgetRXAll->setItem(ui->tableWidgetRXAll->rowCount()-1, 1, new QTableWidgetItem(decodedtext.messageWords().first().trimmed()));
-          if(decodedtext.messageWords().length() > 0){  
+          if(decodedtext.messageWords().length() > 0){
             int offset = decodedtext.frequencyOffset();
 
             if(!m_bandActivity.contains(offset)){
@@ -3110,6 +3106,7 @@ void MainWindow::readFromStdout()                             //readFromStdout
             }
 
             ActivityDetail d;
+            d.isLowConfidence = decodedtext.isLowConfidence();
             d.isFree = !decodedtext.isStandardMessage();
             d.firstCall = decodedtext.CQersCall();
             if(d.firstCall.isEmpty()){
@@ -6641,7 +6638,7 @@ void MainWindow::on_snrMacroButton_clicked(){
     }
 }
 
-void MainWindow::on_macrosMacroButton_clicked(){
+void MainWindow::on_macrosMacroButton_pressed(){
     if(m_config.macros()->stringList().isEmpty()){
         on_actionSettings_triggered();
         return;
@@ -7641,6 +7638,7 @@ void MainWindow::displayActivity(){
   clearTableWidget(ui->tableWidgetRXAll);
   QList<int> keys = m_bandActivity.keys();
 
+  // sort directed messages first
   qSort(keys.begin(), keys.end(), [this](const int left, int right){
       if(m_rxDirectedCache.contains(left/10*10)){
           return true;
@@ -7663,6 +7661,9 @@ void MainWindow::displayActivity(){
               if(item.text.isEmpty()){
                   continue;
               }
+              if(item.isLowConfidence){
+                  item.text = QString("[%1]").arg(item.text);
+              }
               text.append(item.text);
               snr = item.snr;
           }
diff --git a/mainwindow.h b/mainwindow.h
index a76528f..62bda71 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -239,7 +239,7 @@ private slots:
   void on_replyMacroButton_clicked();
   void on_qthMacroButton_clicked();
   void on_snrMacroButton_clicked();
-  void on_macrosMacroButton_clicked();
+  void on_macrosMacroButton_pressed();
   void on_tableWidgetRXAll_cellClicked(int row, int col);
   void on_tableWidgetRXAll_cellDoubleClicked(int row, int col);
   void on_tableWidgetRXAll_selectionChanged(const QItemSelection &selected, const QItemSelection &deselected);
@@ -643,6 +643,7 @@ private:
   struct ActivityDetail
   {
     bool isFree;
+    bool isLowConfidence;
     QString firstCall;
     QString secondCall;
     int freq;