diff --git a/mainwindow.cpp b/mainwindow.cpp index fb92f4db1..b0c25f396 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1579,7 +1579,7 @@ void MainWindow::guiUpdate() g_pAstro->astroUpdate(t, m_myGrid, m_hisGrid, fQSO, m_setftx, m_txFreq, m_azelDir); m_setftx=0; - QString utc = " " + t.time().toString() + " "; + QString utc = t.date().toString(" yyyy MMM dd \n") + t.time().toString(); ui->labUTC->setText(utc); if((!m_monitoring and !m_diskData) or (khsym==m_hsym0)) { xSignalMeter->setValue(0); @@ -1819,10 +1819,18 @@ void MainWindow::on_addButton_clicked() //Add button } QString call3File = m_appDir + "/CALL3.TXT"; QFile f1(call3File); - if(!f1.open(QIODevice::ReadOnly | QIODevice::Text)) { + if(!f1.open(QIODevice::ReadWrite | QIODevice::Text)) { msgBox("Cannot open " + call3File); return; } + + if(f1.size()==0) { + QTextStream out(&f1); + out << "ZZZZZZ" << endl; + f1.close(); + f1.open(QIODevice::ReadOnly | QIODevice::Text); + } + QString tmpFile = m_appDir + "/CALL3.TMP"; QFile f2(tmpFile); if(!f2.open(QIODevice::WriteOnly | QIODevice::Text)) { @@ -1833,7 +1841,7 @@ void MainWindow::on_addButton_clicked() //Add button QTextStream out(&f2); QString hc=hiscall; QString hc1=""; - QString hc2=""; + QString hc2="000000"; QString s; do { s=in.readLine(); @@ -1845,6 +1853,7 @@ void MainWindow::on_addButton_clicked() //Add button hc2=s.mid(0,i1); if(hc>hc1 && hchc1 && !m_call3Modified) - out << newEntry + "\n"; + if(hc>hc1 && !m_call3Modified) out << newEntry + "\n"; if(m_call3Modified) { QFile f0(m_appDir + "/CALL3.OLD"); if(f0.exists()) f0.remove(); diff --git a/mainwindow.ui b/mainwindow.ui index 916719897..1dcbe9962 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -246,22 +246,6 @@ p, li { white-space: pre-wrap; } - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 20 - - - - @@ -428,20 +412,24 @@ p, li { white-space: pre-wrap; } - 150 - 40 + 165 + 70 - 20 + 18 QFrame::Panel - 01:23:45 + 2014 Dec 02 +01:23:45 + + + Qt::AlignCenter diff --git a/map65-jtsdk.iss b/map65-jtsdk.iss index bf4266f85..30d00e30e 100644 --- a/map65-jtsdk.iss +++ b/map65-jtsdk.iss @@ -1,6 +1,6 @@ [Setup] AppName=MAP65 -AppVerName=MAP65 Version 2.5 r4597 +AppVerName=MAP65 Version 2.5 r4705 AppCopyright=Copyright (C) 2001-2014 by Joe Taylor, K1JT DefaultDirName=C:\WSJT\MAP65 DefaultGroupName=WSJT\MAP65