Near 0.6.2... :-)

ChangeLog

@@ -3,6 +3,9 @@ TBD - 2013 - 0.6.2
 - Bug fixed: IOTA data was not properly cleared when clicking the Cancel button.
 - Bug fixed: QSL combobox content was not properly managed. (TNX DF4FH).
 - GUI updated: You can click on RX or TX Frequency buttons to copy the frequency to the other one.
+- GUI updated: You can select eQSL in the QSL combobox as an option to mark the QSL information of a QSO.
+- GUI updated: Two new shortcuts: CTRL+W: deletes the current QSO. CTRL+Q: to (quick)edit the last QSO added.
+- GUI updated: Minor tab reorder.
 
 June - 2013 - 0.6.1
 - Bug fixed: Locator was not properly calculated due to a sign difference management from KLog and CTY.DAT.

TODO

@@ -13,14 +13,11 @@ text properly shown
 </BEFORE RELEASING>
 
 * Copy: Operator name, station, power and locator saved for next QSO entry (via setup) (TNX Jonas Stein)
-* Add eQSL to the list of QSL VIA.
 * Filters: Select a DXCC entity and a band to find QSO to QSL.
 * Check iterators and change by indexes as in modifyQso.
 * Check the ADIF QSL_VIA compatibility (B, D, E, M, ...)
-* ADD the STATION_CALLSIGN tag and relate it to OPERATOR
 * URGENT: rewrite the hamlib support code!!!
 * URGENT: The way the awards are deleted is not very smart.
-* When adding/editing a QRZ the cursor position should be keeped... to avoid mistakes while typing/copy&pasting
 * When importing a Log, if the imported  includes the seconds, dont loose them. It implies to add seconds support to KLog for all the QSO
 * Improve the way the cty.dat is downloaded, specially the GUI as it is not nice.
 

src/klog.cpp

@@ -24,7 +24,28 @@
 
 #include "klog.h"
 //#include "dxmap.h"
+void Klog::keyPressEvent(QKeyEvent *e) 
+{
 
+  if (e->key() == Qt::Key_W)
+  {
+    qDebug() << "Klog::keyPressEvent CTRL+W: " << endl;
+    slotClearBtn();
+  }
+  else if (e->key() == Qt::Key_Q) 
+  {
+    qDebug() << "Klog::keyPressEvent CTRL+Q " << endl;
+    toEditLastQso();
+  }
+  else
+  {
+    qDebug() << "Klog::keyPressEvent OTHER: "  << endl;
+  
+  }
+
+}
+
+    
 Klog::Klog(const QString& tversion, QMainWindow *parent) : QMainWindow(parent) {
   //qDebug() << "KLog::Klog";
   setupUi( this );
@@ -1524,6 +1545,9 @@ void Klog::processLogLine (const QString& tLogLine){
             }else if (theData == "BUREAU"){
                 qso.setQslVia(theData);
                 qslViac = true;
+	    }else if (theData == "EQSL"){
+                qso.setQslVia(theData);
+                qslViac = true;
             }else if (theData == "QRZ.COM"){
                 qso.setQslVia(theData);
                 qslViac = true;
@@ -1531,7 +1555,7 @@ void Klog::processLogLine (const QString& tLogLine){
                 qso.setQslVia(theData);
                 qslViac = true;
             }else{
-                qso.setQslVia("Manager");
+                qso.setQslVia("MANAGER");
                 qso.setQslManager(theData);
                 qslViac = true;
             }
@@ -2031,6 +2055,27 @@ void Klog::slotQsoSelectedForEdit(QTreeWidgetItem *item){
     }
 }
 
+void Klog::toEditLastQso()
+{
+  //qDebug() << "KLog::toEditLastQso" << endl;
+  int tn, ln;
+  
+  if (!templogbook.isEmpty())
+  {
+    tn = (templogbook.last()).getNumb();
+    toEditQso();
+  }
+  else if (!logbook.isEmpty())
+  {
+    ln = (logbook.last()).getNumb();
+    
+    toEditQso();
+  }
+  else
+  {
+  
+  }
+}
 void Klog::slotQsoSelected(QTreeWidgetItem* item){
  //qDebug() << "KLog::slotQsoSelected" << endl;
     if (item){
@@ -2547,8 +2592,8 @@ void Klog::modifyQso(){
 void Klog::helpAbout() {
 //qDebug() << "KLog::helpAbout" << endl;
   
-    helpAboutDialog->show();
-/*
+    //helpAboutDialog->show();
+
   QString sAbout1 = i18n("KLog-%1 - The KDE Ham Radio Logging program\n\n", Klog::KLogVersion);
   //QString sAbout2 = i18n("You can find the last version on <a href=\"http://jaime.robles.es/klog\">http://jaime.robles.es/klog</a>\n2002 - 2013 - Jaime Robles, EA4TV, jaime@robles.es\n2009 - 2010 - Andrew Goldie, ZL2ACG, andrew.goldie@rocketmail.com", Klog::KLogVersion);
   QString sAbout2 = i18n("You can find the last version on ") + QString("http://jaime.robles.es/klog") + i18n("\n2002 - 2013 - Jaime Robles, EA4TV, jaime@robles.es\n2009 - 2010 - Andrew Goldie, ZL2ACG, andrew.goldie@rocketmail.com", Klog::KLogVersion);
@@ -2561,24 +2606,55 @@ void Klog::helpAbout() {
   msgBox.setStandardButtons(QMessageBox::Ok);
 
   msgBox.exec();
-  */
+  
   
 }
 
 void Klog::slotQSLcomboBoxChanged(){
 //qDebug() << "KLog::slotQSLcomboChanged" << endl;
-    QString combo = ((QSLcomboBox)->currentText()).toUpper();
+    //QString combo = ((QSLcomboBox)->currentText()).toUpper();
+/*
+  if (_text == "BUREAU")
+  {
+    return 0;
+  }
+  else if (_text == "NO QSL")
+  {
+    return 1;
+  }
+  else if (_text == "QRZ.COM")
+  {
+    return 2;
+  }
+  else if (_text == "MANAGER")
+  {
+    return 3;
+  }
+  else if (_text == "DIRECT")
+  {
+    return 4;
+  }
+  else if (_text == "EQSL")
+  {
+    return 5;
 
-    if (combo.compare("No QSL") == 0){
+*/
+    int i = getNumberOfQSLComboBoxFromText(((QSLcomboBox)->currentText()));
+
+    if (i == 1) // NO QSL
+    {
         qslVialineEdit->setDisabled(true);
         //    QSLInfotextEdit->setDisabled(true);
         qslVialineEdit->clear();
         //    QSLInfotextEdit->clear();
-    }else{
-        if (combo.compare("Manager") == 0)
-            qslVialineEdit->setEnabled(true);
-        else
-            qslVialineEdit->setDisabled(true);
+    }
+    else if ((i == 3) || (i == 5)) // MANAGER || EQSL
+    {
+      qslVialineEdit->setEnabled(true);
+    }
+    else
+    {
+      qslVialineEdit->setDisabled(true);
     //    QSLInfotextEdit->setEnabled(true);
     }
 }
@@ -5751,6 +5827,10 @@ int Klog::getNumberOfQSLComboBoxFromText(const QString &tqslvia)
   {
     return 4;
   }
+  else if (_text == "EQSL")
+  {
+    return 5;
+  }
   else
   {
     return 0;

src/klog.h

@@ -218,6 +218,7 @@ class Klog : public QMainWindow, private Ui::klog
   Qso getByNumber(const int n);
   void showQso(); // Gets data from the Input part and show in the botton widget
   void toEditQso(); //Puts the QSO data in the edit box
+  void toEditLastQso(); // Sends to toEditQso the last QSO added
   void accept();
 
   private slots:
@@ -275,6 +276,7 @@ class Klog : public QMainWindow, private Ui::klog
     HelpAboutDialog *helpAboutDialog;
     QStringList awardReferences;	// All the references of the current award to prepare the combobox
     QString DXClusterServerToUse;
+    void keyPressEvent(QKeyEvent *e);
     void processLogLine (const QString& tLogLine); // Process a line of data/qso from adifReadLog
     void clearGUI();
     bool didISave();