w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-10-27 11:00:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make some right-click mouse press events more intuitive and consistent.

Browse Source
This commit is contained in:
Uwe Risse 2023-12-06 13:18:25 +01:00
parent 0456b3af8c
commit 05931313b3
2 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
widgets/mainwindow.cpp
View File

@ -3303,7 +3303,7 @@ void MainWindow::on_actionSpecial_mouse_commands_triggered()
<td><b>Click</b> to set Rx frequency.<br/> <td><b>Click</b> to set Rx frequency.<br/>
<b>Shift-click</b> to set Tx frequency.<br/> <b>Shift-click</b> to set Tx frequency.<br/>
<b>Ctrl-click</b> or <b>Right-click</b> to set Rx and Tx frequencies.<br/> <b>Ctrl-click</b> or <b>Right-click</b> to set Rx and Tx frequencies.<br/>
<b>Double-click</b> to also decode at Rx frequency.<br/> <b>Double-click</b> to also decode at Rx frequency.
</td> </td>
</tr> </tr>
<tr> <tr>
@ -3314,7 +3314,7 @@ void MainWindow::on_actionSpecial_mouse_commands_triggered()
messages.<br/> messages.<br/>
If <b>Hold Tx Freq</b> is checked or first callsign in message<br/> If <b>Hold Tx Freq</b> is checked or first callsign in message<br/>
is your own call, Tx frequency is not changed unless <br/> is your own call, Tx frequency is not changed unless <br/>
<b>Ctrl</b> is held down.<br/> <b>Ctrl</b> is held down.
</td> </td>
</tr> </tr>
<tr> <tr>
@ -3323,6 +3323,18 @@ void MainWindow::on_actionSpecial_mouse_commands_triggered()
<b>Double-click</b> to erase QSO and Band Activity windows. <b>Double-click</b> to erase QSO and Band Activity windows.
</td> </td>
</tr> </tr>
<tr>
<td align="right">Q65 Button:</td>
<td><b>Click</b> to switch to Q65 Mode.<br/>
<b>Right-click</b> to switch to Q65 Pileup Mode.
</td>
</tr>
<tr>
<td align="right">JT65 Button:</td>
<td><b>Click</b> to switch to JT65 Mode.<br/>
<b>Right-click</b> to switch to JT9 Mode.
</td>
</tr>
</table>)"), font}); </table>)"), font});
} }
m_mouseCmnds->showNormal (); m_mouseCmnds->showNormal ();
@ -6601,18 +6613,14 @@ void MainWindow::on_RoundRobin_currentTextChanged(QString text)
void MainWindow::mousePressEvent(QMouseEvent *event) void MainWindow::mousePressEvent(QMouseEvent *event)
{ {
if(ui->q65Button->hasFocus() && (event->button() & Qt::RightButton)) { if(ui->q65Button->hasFocus() && (event->button() & Qt::RightButton)) { // switch to Q65_Pileup mode
m_specOp=m_config.special_op_id();
if (m_specOp==SpecOp::Q65_PILEUP) {
m_config.setSpecial_None();
ui->tx1->setEnabled(true);
ui->txb1->setEnabled(true);
} else {
m_config.setSpecial_Q65_Pileup(); m_config.setSpecial_Q65_Pileup();
}
m_specOp=m_config.special_op_id(); m_specOp=m_config.special_op_id();
on_actionQ65_triggered(); on_actionQ65_triggered();
} }
if(ui->jt65Button->hasFocus() && (event->button() & Qt::RightButton)) { // switch to JT9 mode
on_actionJT9_triggered();
}
} }
void MainWindow::on_dxCallEntry_textChanged (QString const& call) void MainWindow::on_dxCallEntry_textChanged (QString const& call)
@ -10795,6 +10803,10 @@ void MainWindow::on_msk144Button_clicked()
void MainWindow::on_q65Button_clicked() void MainWindow::on_q65Button_clicked()
{ {
if (m_specOp==SpecOp::Q65_PILEUP) {
m_config.setSpecial_None();
m_specOp=m_config.special_op_id();
}
on_actionQ65_triggered(); on_actionQ65_triggered();
} }

7
widgets/mainwindow.ui
View File

@ -3017,7 +3017,7 @@ QLabel[oob=&quot;true&quot;] {
<enum>Qt::StrongFocus</enum> <enum>Qt::StrongFocus</enum>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Switch to Q65 mode. Right-click to toggle Q65 Pileup mode On/Off.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Switch to Q65 mode.&lt;br&gt; Right-click to switch to Q65 Pileup mode.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="text"> <property name="text">
<string>Q65</string> <string>Q65</string>
@ -3038,8 +3038,11 @@ QLabel[oob=&quot;true&quot;] {
<height>16777215</height> <height>16777215</height>
</size> </size>
</property> </property>
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<property name="toolTip"> <property name="toolTip">
<string>Switch to JT65 mode</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Switch to JT65 mode. &lt;br&gt;Right-click to switch to JT9 mode.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="text"> <property name="text">
<string>JT65</string> <string>JT65</string>