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

Better behavior and tool tips for Txn buttons and radio buttons

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7952 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2017-07-26 01:39:23 +00:00
parent 074f6866bd
commit 54ec5b8413
2 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
mainwindow.cpp
View File

@ -2805,7 +2805,7 @@ void MainWindow::auto_sequence (QString const& message, unsigned tolerance)
&& !m_sentFirst73 // finished QSO
&& ((parts[5].contains (m_baseCall)
// being called and not already in a QSO
&& parts[6].contains (Radio::base_callsign (ui->dxCallEntry-> text ())))
&& parts[6].contains (Radio::base_callsign (ui->dxCallEntry->text ())))
// type 2 compound replies
|| (in_tolerance
&& ((m_QSOProgress >= ROGER_REPORT && message_is_73 (0, parts))
@ -3447,25 +3447,34 @@ void MainWindow::set_ntx(int n) //set_ntx()
m_ntx=n;
}
void MainWindow::on_txrb1_toggled(bool status)
void MainWindow::on_txrb1_toggled (bool status)
{
if (status) {
m_ntx=1;
set_dateTimeQSO(-1); // we reset here as tx2/tx3 is used for start times
if (ui->tx1->isEnabled ()) {
m_ntx = 1;
set_dateTimeQSO (-1); // we reset here as tx2/tx3 is used for start times
}
else {
QTimer::singleShot (0, ui->txrb2, SLOT (click ()));
}
}
}
void MainWindow::on_txrb1_doubleClicked()
void MainWindow::on_txrb1_doubleClicked ()
{
ui->tx1->setEnabled (!ui->tx1->isEnabled ());
if (!ui->tx1->isEnabled ()) {
// leave time for clicks to complete before setting txrb2
QTimer::singleShot (500, ui->txrb2, SLOT (click ()));
}
}
void MainWindow::on_txrb2_toggled(bool status)
void MainWindow::on_txrb2_toggled (bool status)
{
// Tx 2 means we already have CQ'd so good reference
if (status) {
m_ntx=2;
set_dateTimeQSO(m_ntx);
m_ntx = 2;
set_dateTimeQSO (m_ntx);
}
}
@ -3478,27 +3487,27 @@ void MainWindow::on_txrb3_toggled(bool status)
}
}
void MainWindow::on_txrb4_toggled(bool status)
void MainWindow::on_txrb4_toggled (bool status)
{
if (status) {
m_ntx=4;
}
}
void MainWindow::on_txrb4_doubleClicked()
void MainWindow::on_txrb4_doubleClicked ()
{
m_send_RR73 = !m_send_RR73;
genStdMsgs (m_rpt);
}
void MainWindow::on_txrb5_toggled(bool status)
void MainWindow::on_txrb5_toggled (bool status)
{
if (status) {
m_ntx=5;
m_ntx = 5;
}
}
void MainWindow::on_txrb5_doubleClicked()
void MainWindow::on_txrb5_doubleClicked ()
{
genStdMsgs (m_rpt, true);
}

8
mainwindow.ui
View File

@ -1099,7 +1099,7 @@ QLabel[oob="true"] {
<item row="1" column="1" alignment="Qt::AlignHCenter|Qt::AlignVCenter">
<widget class="DoubleClickableRadioButton" name="txrb1">
<property name="toolTip">
<string>Send this message in next Tx interval</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Send this message in next Tx interval&lt;/p&gt;&lt;p&gt;Double click to toggle the use of the Tx1 message to start a QSO with a station&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string/>
@ -1121,7 +1121,7 @@ QLabel[oob=&quot;true&quot;] {
</size>
</property>
<property name="toolTip">
<string>Switch to this Tx message NOW</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Switch to this Tx message NOW&lt;/p&gt;&lt;p&gt;Double click to toggle the use of the Tx1 message to start a QSO with a station&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
@ -1237,7 +1237,7 @@ QLabel[oob=&quot;true&quot;] {
<item row="4" column="1" alignment="Qt::AlignHCenter|Qt::AlignVCenter">
<widget class="DoubleClickableRadioButton" name="txrb4">
<property name="toolTip">
<string>Send this message in next Tx interval</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Send this message in next Tx interval&lt;/p&gt;&lt;p&gt;Double-click to toggle between RRR and RR73 messages in Tx4&lt;/p&gt;&lt;p&gt;RR73 messages should only be used when you are reasonably confident that no message repititions will be required&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string/>
@ -1259,7 +1259,7 @@ QLabel[oob=&quot;true&quot;] {
</size>
</property>
<property name="toolTip">
<string>Switch to this Tx message NOW</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Switch to this Tx message NOW&lt;/p&gt;&lt;p&gt;Double-click to toggle between RRR and RR73 messages in Tx4&lt;/p&gt;&lt;p&gt;RR73 messages should only be used when you are reasonably confident that no message repititions will be required&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Tx &amp;4</string>