Closes ea4k#641, ea4k#690

Author: ea4k

src/Changelog

@@ -1,3 +1,5 @@
+WIP: Order of Logview columns
+BUG: Setup logview fields are added to the setup creating an infinite list
 WIP: QSOs are not shown for LOTW upload
 TODO: Colors when darkMode
     AI: add sub-issues in github one per class that is not working properly
@@ -21,6 +23,7 @@ TODO: Reuse the bool World::insertPrefixes to read QSOs from a file so we can in
 TODO: After update, it is needed to restart KLog to be able to use the primary subdivisions
 TODO-Bug: Review void tst_MainWindowInputQSO::test_GridLineEdit()
 
+
 WIP: Try to optimize bool DataProxy_SQLite::fillEmptyDXCCInTheLog()
 WIP: - Bugfix: DB in alternative locations was not always found. (WIP #706)
 
@@ -43,6 +46,8 @@ Close:  #396, #507, #508
 
 
 TBD - 2.4
+- Enhancement: Button without text label in message box. (Closes #641)
+- Enhancement: Refactor DataProxy_SQLite::addSatellite (Closes #690)
 - Enhancement: New DXCluster UI
 - Enhancement: Ported from Qt5 to Qt6.
 - Enhancement: Refactoring of several classes.

src/dataproxy_sqlite.cpp

@@ -4232,32 +4232,38 @@ bool DataProxy_SQLite::clearSatList()
 
 bool DataProxy_SQLite::addSatellite(const QString &_arrlId, const QString &_name, const QString &_downLink, const QString &_upLink, const QString &_mode, int id)
 {
-      //qDebug()  <<Q_FUNC_INFO << " - " << QString::number(id) ;
     QSqlQuery query;
     QString queryString;
 
-    if (id>0)
+    if (id > 0)
     {
-        queryString = QString("UPDATE satellites set satarrlid = '%1', satname = '%2', uplink = '%3', downlink = '%4', satmode = '%5' WHERE id = '%6'").arg(_arrlId).arg(_name).arg(_upLink).arg(_downLink).arg(_mode).arg(id);
+        queryString = QString(
+            "UPDATE satellites SET satarrlid = :arrlId, satname = :name, uplink = :upLink, downlink = :downLink, satmode = :mode WHERE id = :id"
+        );
+        query.prepare(queryString);
+        query.bindValue(":id", id);
     }
     else
     {
-        queryString = QString("INSERT INTO satellites (satarrlid, satname, uplink, downlink, satmode) VALUES ('%1', '%2', '%3', '%4', '%5')").arg(_arrlId).arg(_name).arg(_upLink).arg(_downLink).arg(_mode);
+        queryString = QString(
+            "INSERT INTO satellites (satarrlid, satname, uplink, downlink, satmode) VALUES (:arrlId, :name, :upLink, :downLink, :mode)"
+        );
+        query.prepare(queryString);
     }
 
-    bool sqlOK = query.exec(queryString);
-      //qDebug()  << Q_FUNC_INFO << " - - query: " <<  query.lastQuery();
+    query.bindValue(":arrlId", _arrlId);
+    query.bindValue(":name", _name);
+    query.bindValue(":upLink", _upLink);
+    query.bindValue(":downLink", _downLink);
+    query.bindValue(":mode", _mode);
 
-    if (sqlOK)
+    if (query.exec())
     {
-          //qDebug()  << Q_FUNC_INFO << " - - TRUE" ;
-          //qDebug()  << Q_FUNC_INFO << " - - TRUE - ERROR: " <<  QString::number(query.lastError().text());
         query.finish();
         return true;
     }
     else
     {
-          //qDebug()  << Q_FUNC_INFO << " - - FALSE" ;
         emit queryError(Q_FUNC_INFO, query.lastError().databaseText(), query.lastError().text(), query.lastQuery());
         query.finish();
         return false;
@@ -4266,34 +4272,30 @@ bool DataProxy_SQLite::addSatellite(const QString &_arrlId, const QString &_name
 
 int DataProxy_SQLite::getDBSatId(const QString &_arrlId)
 {
-    //qDebug()  << Q_FUNC_INFO << " - " << _arrlId;
     int aux = -1;
-    QString queryString = QString("SELECT id FROM satellites WHERE satarrlid='%1'").arg(_arrlId);
- QSqlQuery query;
+    QSqlQuery query;
+    QString queryString = "SELECT id FROM satellites WHERE satarrlid=:arrlId";
 
- bool sqlOK = query.exec(queryString);
+    query.prepare(queryString);
+    query.bindValue(":arrlId", _arrlId);
 
- if (sqlOK)
- {
-     query.next();
-     if (query.isValid())
-     {
-         aux = query.value(0).toInt();
-     }
-     else
-     {
-            //qDebug()  << Q_FUNC_INFO << " -  query not valid" ;
-         query.finish();
-     }
- }
- else
- {
-          //qDebug()  << Q_FUNC_INFO << ":  query failed: " << query.lastQuery() ;
-     emit queryError(Q_FUNC_INFO, query.lastError().databaseText(), query.lastError().text(), query.lastQuery());
-     query.finish();
- }
+    if (query.exec())
+    {
+        if (query.next())
+        {
+            aux = query.value(0).toInt();
+        }
+        else
+        {
+            query.finish();
+        }
+    }
+    else
+    {
+        emit queryError(Q_FUNC_INFO, query.lastError().databaseText(), query.lastError().text(), query.lastQuery());
+        query.finish();
+    }
 
-    //qDebug()  << ":: final: " << aux ;
     query.finish();
     return aux;
 }

src/inputwidgets/mainwindowinputothers.cpp

@@ -56,6 +56,7 @@ MainWindowInputOthers::MainWindowInputOthers(DataProxy_SQLite *dp, QWidget *pare
     // TODO: I should find the way to connect the SAT tabwidget's signal to set the propmode in this widget
     //       Now it is done though the mainwindow but I should avoid depending on that class for that, if possible
     //connect(satTabWidget, SIGNAL(setPropModeSat(QString)), this, SLOT(slotSetPropMode(QString)) ) ;
+    connect(entityNameComboBox,             SIGNAL(currentIndexChanged(int)),   this, SLOT(slotEntityNameComboBoxChanged() ) ) ;
     connect(propModeComboBox,               SIGNAL(currentIndexChanged(int)),   this, SLOT(slotPropModeComboBoxChanged() ) ) ;
     connect(userDefinedADIFComboBox,        SIGNAL(currentIndexChanged(int)),   this, SLOT(slotUSerDefinedADIFComboBoxChanged() ) ) ;
     connect(userDefinedADIFValueLineEdit,   SIGNAL(textChanged(QString)),       this, SLOT(slotSetCurrentUserData() ) );
@@ -792,7 +793,7 @@ void MainWindowInputOthers::setEntity(const int _entity)
 
 void MainWindowInputOthers::setEntityAndPrefix(const int _entity, const QString &_qrz)
 {
-  //qDebug() << Q_FUNC_INFO << " - Start: " << QString::number(_entity) << "/" << _qrz;
+    //qDebug() << Q_FUNC_INFO << " - Start: " << QString::number(_entity) << "/" << _qrz;
     if (_entity<=0)
     {
       //qDebug() << Q_FUNC_INFO << " -  10";
@@ -831,7 +832,7 @@ void MainWindowInputOthers::setEntityAndPrefix(const int _entity, const QString
     if ((hostFullPrefix.isEmpty()) && (hostPrefix.isEmpty()))
         return;
 
-  //qDebug() << Q_FUNC_INFO << " -  40";
+    //qDebug() << Q_FUNC_INFO << " -  40";
     QList<PrimarySubdivision> primarySubdivisions;
     primarySubdivisions.clear();
 
@@ -864,7 +865,11 @@ void MainWindowInputOthers::setEntityAndPrefix(const int _entity, const QString
     //qDebug() << Q_FUNC_INFO << " - 60";
     //qDebug() << Q_FUNC_INFO << " - count: " << QString::number(primarySubdivisions.count());
     if (primarySubdivisions.isEmpty())
+    {
+        entityPrimDivComboBox->clear();
         return;
+    }
+
     //qDebug() << Q_FUNC_INFO << " - 70 ";
     updatePrimarySubdivisionsComboBox(primarySubdivisions);
     //qDebug() << Q_FUNC_INFO << " - END";
@@ -1082,6 +1087,16 @@ void MainWindowInputOthers::slotShowAllCheckBoxChanged()
     setEntityAndPrefix(currentInt, currentPref);
 }
 
+void MainWindowInputOthers::slotEntityNameComboBoxChanged()
+{
+    //qDebug() << Q_FUNC_INFO << entityNameComboBox->currentText();
+    QString prefix = ((entityNameComboBox->currentText()).split("-")).at(0);
+    //qDebug() << Q_FUNC_INFO << " - " << prefix;
+    int entity = world->getQRZARRLId(prefix);
+    setEntityAndPrefix(entity, prefix);
+    //entityPrimDivComboBox->clear();
+    entityPrimDivComboBox->addItem("00-" + tr("None Identified") + " (000)");
+}
 
 
 bool MainWindowInputOthers::getDarkMode()

src/inputwidgets/mainwindowinputothers.h

@@ -108,6 +108,7 @@ private slots:
     void slotSetCurrentUserData();
     void slotPrimarySubdivisionsComboBoxChanged();
     void slotShowAllCheckBoxChanged();
+    void slotEntityNameComboBoxChanged();
 
 
 private:

src/logwindow.cpp

@@ -89,12 +89,28 @@ void LogWindow::createUI()
     logView->horizontalHeader ()->setSectionsMovable (true);
     //logView->setDragDropMode (QAbstractItemView::InternalMove);
     //logView->setDropIndicatorShown (true);
+    //retoreColumsOrder();
 
     QVBoxLayout *layout = new QVBoxLayout;
     layout->addWidget(logView);
     setLayout(layout);
 }
 
+void LogWindow::retoreColumsOrder()
+{
+    // Restore the column order from the settings
+    QSettings settings(util->getCfgFile (), QSettings::IniFormat);
+    settings.beginGroup("LogWindow");
+    QList<int> columnOrder = settings.value("columnOrder").value<QList<int>>();
+    settings.endGroup();
+
+    if (!columnOrder.isEmpty()) {
+        for (int i = 0; i < columnOrder.size(); ++i) {
+            logView->horizontalHeader()->moveSection(logView->horizontalHeader()->visualIndex(columnOrder[i]), i);
+        }
+    }
+}
+
 void LogWindow::setDefaultData()
 {
     //qDebug() << Q_FUNC_INFO << " - Start";
@@ -226,6 +242,8 @@ void LogWindow::createActionsCommon()
     //LOG VIEW
     connect(logView, SIGNAL(customContextMenuRequested( const QPoint& ) ), this, SLOT(slotRighButtonFromLog( const QPoint& ) ) );
     connect(logView, SIGNAL(doubleClicked ( const QModelIndex& ) ), this, SLOT(slotDoubleClickLog( const QModelIndex& ) ) );
+    connect(logView->horizontalHeader(), &QHeaderView::sectionMoved, this, &LogWindow::slotOnSectionMoved);
+
     //qDebug() << Q_FUNC_INFO << " - END";
 }
 
@@ -751,3 +769,22 @@ void LogWindow::slotCheckDXHeatCom()
     //qDebug() << Q_FUNC_INFO << " - END";
 }
 
+void LogWindow::slotOnSectionMoved(int logicalIndex, int oldVisualIndex, int newVisualIndex)
+{
+    Q_UNUSED(logicalIndex);
+    Q_UNUSED(oldVisualIndex);
+    Q_UNUSED(newVisualIndex);
+
+    // Get the current column order
+    QList<int> columnOrder;
+    for (int i = 0; i < logView->model()->columnCount(); ++i) {
+        columnOrder << logView->horizontalHeader()->visualIndex(i);
+    }
+
+
+    QSettings settings(util->getCfgFile (), QSettings::IniFormat);
+    settings.beginGroup("LogWindow");
+    settings.setValue("ColumnOrder", QVariant::fromValue(columnOrder));
+    settings.endGroup();
+}
+

src/logwindow.h

@@ -107,12 +107,13 @@ private slots:
     void slotMultipleQSLRecViaBureauFromLog();
     void slotMultipleQSLRecViaDirectFromLog();
     void slotQSOsQRZUploadFromLog();
+    void slotOnSectionMoved(int logicalIndex, int oldVisualIndex, int newVisualIndex);
 
 private:    
     void createUI();
     void createActionsCommon();
     void createActions();
-
+    void retoreColumsOrder();
     void deleteQSO(const int _qsoID);
     void rightButtonFromLogMenu(const int trow);
     void rightButtonMultipleFromLogMenu();

src/mainwindow.cpp

@@ -1172,24 +1172,41 @@ int MainWindow::checkDXCCBeforeAddingToLog(const int dxcc_Call, const int dxcc_q
 {
     if (dxcc_Call!=dxcc_qso)
     {
-        QString dxcc1_name = world->getEntityName(dxcc_Call);
-        dxcc1_name = dxcc1_name + " - " + world->getEntityMainPrefix(dxcc_Call);
+        QString dxcc1_name    = world->getEntityName(dxcc_Call);
+        QString dxcc1_prefix  = world->getEntityMainPrefix(dxcc_Call);
 
-        QString dxcc_qso_name = world->getEntityName(dxcc_qso);
-        dxcc_qso_name = dxcc_qso_name + " - " + world->getEntityMainPrefix(dxcc_qso);
+        QString dxcc2_name    = world->getEntityName(dxcc_qso);
+        QString dxcc2_prefix  = world->getEntityMainPrefix(dxcc_qso);
+
+        QString message           = QString(tr("The entity that is selected is different from the one proposed by KLog:") + "\n\n");
+
+        QString message_dxcc_qso  = dxcc1_prefix + " - " + dxcc1_name + "\n\n";
+        if (dxcc1_prefix.length()<1)
+        {
+          dxcc1_prefix      = tr ("Unknown", "Keep it short, its a button text");
+          message_dxcc_qso  = QString(tr("- There is no selected DXCC.") + "\n\n");
+        }
+
+        QString message_dxcc_klog = dxcc2_prefix + " - " + dxcc2_name;
+        if (dxcc2_prefix.length()<1)
+        {
+          dxcc2_prefix      = tr ("Unknown", "Keep it short, its a button text");
+          message_dxcc_klog = QString (tr("- KLog couldn't find a DXCC")  + "\n\n");
+        }
+
+        message = message + message_dxcc_qso + message_dxcc_klog + "\n\n" + tr("Please select the one you want to keep for this QSO.");
 
         QPushButton *button2 = new QPushButton(this);
         QPushButton *button1 = new QPushButton(this);
 
-        button1->setText(world->getEntityMainPrefix(dxcc_Call));
-        button2->setText(world->getEntityMainPrefix(dxcc_qso));
+        button1->setText(dxcc1_prefix);
+        button2->setText(dxcc2_prefix);
 
         int ret;
 
         QMessageBox msgBox;
         msgBox.setWindowTitle(tr("KLog - Select correct entity"));
-        msgBox.setText( tr("You have selected an entity:") + "\n\n"+"- "+dxcc_qso_name+"\n\n"+tr("that is different from the KLog proposed entity:") + "\n\n"+ "- "+dxcc1_name+"\n\n"
-                       +tr("Click on the prefix of the correct entity or Cancel to edit the QSO again."));
+        msgBox.setText(message);
 
         msgBox.addButton(button2, QMessageBox::AcceptRole);
         msgBox.addButton(button1, QMessageBox::ActionRole);