w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-17 17:42:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Corrected rpt when clicking GenStdMsgs button.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/jtms3@2493 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2012-07-05 20:12:38 +00:00
parent 43889b04bc
commit 1f870f2b53
2 changed files with 19 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
jtms3.iss
View File

@ -1,31 +1,22 @@
[Setup] [Setup]
AppName=MAP65 AppName=JTMS3
AppVerName=MAP65 Version 2.3.0 r2471 AppVerName=JTMS3 Version 0.1 r2493
AppCopyright=Copyright (C) 2001-2012 by Joe Taylor, K1JT AppCopyright=Copyright (C) 2001-2012 by Joe Taylor, K1JT
DefaultDirName=c:\MAP65 DefaultDirName=c:\JTMS3
DefaultGroupName=MAP65 DefaultGroupName=JTMS3
[Files] [Files]
Source: "c:\Users\joe\wsjt\map65_install\m65.exe"; DestDir: "{app}" Source: "c:\Users\joe\wsjt\jtms3_install\jtms3.exe"; DestDir: "{app}"
Source: "c:\Users\joe\wsjt\map65_install\map65.exe"; DestDir: "{app}" Source: "c:\Users\joe\wsjt\jtms3_install\wsjt.ico"; DestDir: "{app}"
Source: "c:\Users\joe\wsjt\map65_install\wsjt.ico"; DestDir: "{app}" Source: "c:\Users\joe\wsjt\jtms3_install\CALL3.TXT"; DestDir: "{app}"; Flags: onlyifdoesntexist
Source: "c:\Users\joe\wsjt\map65_install\kvasd.exe"; DestDir: "{app}" Source: "c:\Users\joe\wsjt\jtms3_install\afmhot.dat"; DestDir: "{app}";
Source: "c:\Users\joe\wsjt\map65_install\CALL3.TXT"; DestDir: "{app}"; Flags: onlyifdoesntexist Source: "c:\Users\joe\wsjt\jtms3_install\blue.dat"; DestDir: "{app}";
Source: "c:\Users\joe\wsjt\map65_install\fftwf-wisdom.exe"; DestDir: "{app}"; Flags: onlyifdoesntexist
Source: "c:\Users\joe\wsjt\map65_install\wisdom1.bat"; DestDir: "{app}";
Source: "c:\Users\joe\wsjt\map65_install\wisdom2.bat"; DestDir: "{app}";
Source: "c:\Users\joe\wsjt\map65_install\afmhot.dat"; DestDir: "{app}";
Source: "c:\Users\joe\wsjt\map65_install\blue.dat"; DestDir: "{app}";
Source: "c:\Users\joe\wsjt\map65_install\qthid.exe"; DestDir: "{app}";
Source: "c:\Users\joe\wsjt\QtSupport\*.dll"; DestDir: "{sys}"; Flags: onlyifdoesntexist Source: "c:\Users\joe\wsjt\QtSupport\*.dll"; DestDir: "{sys}"; Flags: onlyifdoesntexist
Source: "c:\Users\joe\wsjt\map65_install\save\dummy"; DestDir: "{app}\save"; Source: "c:\Users\joe\wsjt\jtms3_install\save\dummy"; DestDir: "{app}\save";
[Icons] [Icons]
Name: "{group}\MAP65"; Filename: "{app}\map65.exe"; WorkingDir: {app}; IconFilename: {app}\wsjt.ico Name: "{group}\JTMS3"; Filename: "{app}\jtms3.exe"; WorkingDir: {app}; IconFilename: {app}\wsjt.ico
Name: "{userdesktop}\MAP65"; Filename: "{app}\map65.exe"; WorkingDir: {app}; IconFilename: {app}\wsjt.ico Name: "{userdesktop}\JTMS3"; Filename: "{app}\jtms3.exe"; WorkingDir: {app}; IconFilename: {app}\wsjt.ico
[Run]
Filename: "{app}\wisdom1.bat"; Description: "Optimize plans for FFTs (takes a few minutes)"; Flags: postinstall
Filename: "{app}\wisdom2.bat"; Description: "Patiently optimize plans for FFTs (up to one hour)"; Flags: postinstall unchecked

12
mainwindow.cpp
View File

@ -174,7 +174,7 @@ MainWindow::MainWindow(QWidget *parent) :
border-style: outset; border-width: 1px; border-radius: 5px; \ border-style: outset; border-width: 1px; border-radius: 5px; \
border-color: black; min-width: 5em; padding: 3px;}"; border-color: black; min-width: 5em; padding: 3px;}";
genStdMsgs("-26"); genStdMsgs("26");
on_actionWide_Waterfall_triggered(); //### on_actionWide_Waterfall_triggered(); //###
future1 = new QFuture<void>; future1 = new QFuture<void>;
@ -618,13 +618,13 @@ void MainWindow::keyPressEvent( QKeyEvent *e ) //keyPressEvent
break; break;
case Qt::Key_G: case Qt::Key_G:
if(e->modifiers() & Qt::AltModifier) { if(e->modifiers() & Qt::AltModifier) {
genStdMsgs("-26"); genStdMsgs("26");
break; break;
} }
case Qt::Key_L: case Qt::Key_L:
if(e->modifiers() & Qt::ControlModifier) { if(e->modifiers() & Qt::ControlModifier) {
lookup(); lookup();
genStdMsgs("-26"); genStdMsgs("26");
break; break;
} }
} }
@ -1402,7 +1402,7 @@ void MainWindow::doubleClickOnCall(QString hiscall, bool ctrl)
QString rpt=""; QString rpt="";
if(ctrl) rpt=t2.mid(23,3); if(ctrl) rpt=t2.mid(23,3);
lookup(); lookup();
rpt="-26"; rpt="26";
genStdMsgs(rpt); genStdMsgs(rpt);
if(t2.indexOf(m_myCall)>0) { if(t2.indexOf(m_myCall)>0) {
m_ntx=2; m_ntx=2;
@ -1427,6 +1427,8 @@ void MainWindow::genStdMsgs(QString rpt) //genStdMsgs()
msgtype("RRR", ui->tx4); msgtype("RRR", ui->tx4);
msgtype("73", ui->tx5); msgtype("73", ui->tx5);
} else { } else {
if(rpt=="26") rpt="-26";
if(rpt=="27") rpt="-27";
t=t0 + rpt; t=t0 + rpt;
msgtype(t, ui->tx2); msgtype(t, ui->tx2);
t=t0 + "R" + rpt; t=t0 + "R" + rpt;
@ -1652,7 +1654,7 @@ void MainWindow::on_dxGridEntry_textChanged(const QString &t) //dxGrid changed
void MainWindow::on_genStdMsgsPushButton_clicked() //genStdMsgs button void MainWindow::on_genStdMsgsPushButton_clicked() //genStdMsgs button
{ {
genStdMsgs(""); genStdMsgs("26");
} }
void MainWindow::on_logQSOButton_clicked() //Log QSO button void MainWindow::on_logQSOButton_clicked() //Log QSO button