mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2024-11-19 10:32:02 -05:00
1. Blank line (gray background) to decoded text window at start of new
decoding minute. 2. LogQSO confirmation screen no longer blocks GUIupdate(). 3. Remove an unused item from Help menu. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3117 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
parent
f6cae35ee7
commit
87f17ecb04
@ -121,6 +121,10 @@ MainWindow::MainWindow(QWidget *parent) :
|
|||||||
ptt1Timer->setSingleShot(true);
|
ptt1Timer->setSingleShot(true);
|
||||||
connect(ptt1Timer, SIGNAL(timeout()), this, SLOT(startTx2()));
|
connect(ptt1Timer, SIGNAL(timeout()), this, SLOT(startTx2()));
|
||||||
|
|
||||||
|
logQSOTimer = new QTimer(this);
|
||||||
|
logQSOTimer->setSingleShot(true);
|
||||||
|
connect(logQSOTimer, SIGNAL(timeout()), this, SLOT(on_logQSOButton_clicked()));
|
||||||
|
|
||||||
m_auto=false;
|
m_auto=false;
|
||||||
m_waterfallAvg = 1;
|
m_waterfallAvg = 1;
|
||||||
m_txFirst=false;
|
m_txFirst=false;
|
||||||
@ -155,6 +159,7 @@ MainWindow::MainWindow(QWidget *parent) :
|
|||||||
m_COMportOpen=0;
|
m_COMportOpen=0;
|
||||||
m_secID=0;
|
m_secID=0;
|
||||||
m_promptToLog=false;
|
m_promptToLog=false;
|
||||||
|
m_blankLine=false;
|
||||||
decodeBusy(false);
|
decodeBusy(false);
|
||||||
|
|
||||||
ui->xThermo->setFillBrush(Qt::green);
|
ui->xThermo->setFillBrush(Qt::green);
|
||||||
@ -1157,6 +1162,7 @@ void MainWindow::readFromStdout() //readFromStdout
|
|||||||
decodeBusy(false);
|
decodeBusy(false);
|
||||||
m_RxLog=0;
|
m_RxLog=0;
|
||||||
m_startAnother=m_loopall;
|
m_startAnother=m_loopall;
|
||||||
|
m_blankLine=true;
|
||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
@ -1172,17 +1178,30 @@ void MainWindow::readFromStdout() //readFromStdout
|
|||||||
out << t.mid(0,n-2) << endl;
|
out << t.mid(0,n-2) << endl;
|
||||||
f.close();
|
f.close();
|
||||||
|
|
||||||
|
QTextCursor cursor;
|
||||||
|
QTextBlockFormat bf;
|
||||||
|
if(m_blankLine) {
|
||||||
|
QString bg="#9fb6cd";
|
||||||
|
bf.setBackground(QBrush(QColor(bg)));
|
||||||
|
QString s = "<table border=0 cellspacing=0 width=100%><tr><td bgcolor=\"" +
|
||||||
|
bg + "\"><pre>" + " " + "</pre></td></tr></table>";
|
||||||
|
cursor = ui->decodedTextBrowser->textCursor();
|
||||||
|
cursor.movePosition(QTextCursor::End);
|
||||||
|
bf = cursor.blockFormat();
|
||||||
|
bf.setBackground(QBrush(QColor(bg)));
|
||||||
|
cursor.insertHtml(s);
|
||||||
|
m_blankLine=false;
|
||||||
|
}
|
||||||
|
|
||||||
QString bg="white";
|
QString bg="white";
|
||||||
if(t.indexOf(" CQ ")>0) bg="#66ff66"; //Light green
|
if(t.indexOf(" CQ ")>0) bg="#66ff66"; //Light green
|
||||||
if(m_myCall!="" and t.indexOf(" "+m_myCall+" ")>0) bg="#ff6666"; //Light red
|
if(m_myCall!="" and t.indexOf(" "+m_myCall+" ")>0) bg="#ff6666"; //Light red
|
||||||
//ui->decodedTextBrowser->setTextBackgroundColor(bg);
|
|
||||||
//t=t.mid(0,n-2) + " ";
|
|
||||||
//ui->decodedTextBrowser->append(t);
|
|
||||||
|
|
||||||
QString s = "<table border=0 cellspacing=0 width=100%><tr><td bgcolor=\""+ bg + "\"><pre>" + t.replace("\n","") + "</pre></td></tr></table>";
|
QString s = "<table border=0 cellspacing=0 width=100%><tr><td bgcolor=\"" +
|
||||||
QTextCursor cursor = ui->decodedTextBrowser->textCursor();
|
bg + "\"><pre>" + t.replace("\n","") + "</pre></td></tr></table>";
|
||||||
|
cursor = ui->decodedTextBrowser->textCursor();
|
||||||
cursor.movePosition(QTextCursor::End);
|
cursor.movePosition(QTextCursor::End);
|
||||||
QTextBlockFormat bf = cursor.blockFormat();
|
bf = cursor.blockFormat();
|
||||||
bf.setBackground(QBrush(QColor(bg)));
|
bf.setBackground(QBrush(QColor(bg)));
|
||||||
cursor.insertHtml(s);
|
cursor.insertHtml(s);
|
||||||
ui->decodedTextBrowser->setTextCursor(cursor);
|
ui->decodedTextBrowser->setTextCursor(cursor);
|
||||||
@ -1353,7 +1372,8 @@ void MainWindow::guiUpdate()
|
|||||||
icw[0]=0;
|
icw[0]=0;
|
||||||
if(m_After73 and (t=="73" or itext!=0)) {
|
if(m_After73 and (t=="73" or itext!=0)) {
|
||||||
icw[0]=m_ncw;
|
icw[0]=m_ncw;
|
||||||
if(m_promptToLog) on_logQSOButton_clicked();
|
// if(m_promptToLog) on_logQSOButton_clicked();
|
||||||
|
if(m_promptToLog) logQSOTimer->start(200);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(m_idInt>0) {
|
if(m_idInt>0) {
|
||||||
@ -1485,7 +1505,7 @@ void MainWindow::guiUpdate()
|
|||||||
}
|
}
|
||||||
iptt0=m_iptt;
|
iptt0=m_iptt;
|
||||||
btxok0=btxok;
|
btxok0=btxok;
|
||||||
}
|
} //End of GUIupdate
|
||||||
|
|
||||||
QString MainWindow::rig_command()
|
QString MainWindow::rig_command()
|
||||||
{
|
{
|
||||||
|
@ -211,6 +211,7 @@ private:
|
|||||||
bool m_catEnabled;
|
bool m_catEnabled;
|
||||||
bool m_After73;
|
bool m_After73;
|
||||||
bool m_promptToLog;
|
bool m_promptToLog;
|
||||||
|
bool m_blankLine;
|
||||||
|
|
||||||
char m_decoded[80];
|
char m_decoded[80];
|
||||||
|
|
||||||
@ -237,8 +238,9 @@ private:
|
|||||||
QProcess proc_jt9;
|
QProcess proc_jt9;
|
||||||
QProcess p3;
|
QProcess p3;
|
||||||
|
|
||||||
QTimer* ptt0Timer;
|
QTimer* ptt1Timer; //StartTx delay
|
||||||
QTimer* ptt1Timer;
|
QTimer* ptt0Timer; //StopTx delay
|
||||||
|
QTimer* logQSOTimer;
|
||||||
|
|
||||||
QString m_path;
|
QString m_path;
|
||||||
QString m_pbdecoding_style1;
|
QString m_pbdecoding_style1;
|
||||||
|
@ -911,7 +911,7 @@ p, li { white-space: pre-wrap; }
|
|||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Tx first</string>
|
<string>Tx even</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@ -1717,7 +1717,6 @@ p, li { white-space: pre-wrap; }
|
|||||||
<addaction name="actionOnline_Users_Guide"/>
|
<addaction name="actionOnline_Users_Guide"/>
|
||||||
<addaction name="actionKeyboard_shortcuts"/>
|
<addaction name="actionKeyboard_shortcuts"/>
|
||||||
<addaction name="actionSpecial_mouse_commands"/>
|
<addaction name="actionSpecial_mouse_commands"/>
|
||||||
<addaction name="actionAvailable_suffixes_and_add_on_prefixes"/>
|
|
||||||
<addaction name="actionAbout"/>
|
<addaction name="actionAbout"/>
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="QMenu" name="menuMode">
|
<widget class="QMenu" name="menuMode">
|
||||||
|
Loading…
Reference in New Issue
Block a user