From 231c75715acfd0e88af79af71dbf4ecbc9ac0357 Mon Sep 17 00:00:00 2001 From: Jordan Sherer Date: Fri, 7 Sep 2018 10:33:53 -0400 Subject: [PATCH] Added deselect button to main button row --- mainwindow.cpp | 4 + mainwindow.h | 1 + mainwindow.ui | 195 ++++++++++++++++++++++++++----------------------- 3 files changed, 109 insertions(+), 91 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index 3445852..b99ec0c 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -7904,6 +7904,9 @@ void MainWindow::on_macrosMacroButton_pressed(){ ui->macrosMacroButton->showMenu(); } +void MainWindow::on_deselectButton_pressed(){ + clearCallsignSelected(); +} void MainWindow::on_tableWidgetRXAll_cellClicked(int row, int /*col*/){ auto item = ui->tableWidgetRXAll->item(row, 0); @@ -8930,6 +8933,7 @@ void MainWindow::updateButtonDisplay(){ ui->replyMacroButton->setDisabled(isTransmitting || emptyCallsign); ui->macrosMacroButton->setDisabled(isTransmitting); ui->queryButton->setDisabled(isTransmitting || emptyCallsign); + ui->deselectButton->setDisabled(isTransmitting || emptyCallsign); if(isTransmitting){ int count = m_txFrameCount; diff --git a/mainwindow.h b/mainwindow.h index f5d5bf6..d194460 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -270,6 +270,7 @@ private slots: void buildEditMenu(QTextEdit *, QMenu *); void on_queryButton_pressed(); void on_macrosMacroButton_pressed(); + void on_deselectButton_pressed(); void on_tableWidgetRXAll_cellClicked(int row, int col); void on_tableWidgetRXAll_cellDoubleClicked(int row, int col); void on_tableWidgetRXAll_selectionChanged(const QItemSelection &selected, const QItemSelection &deselected); diff --git a/mainwindow.ui b/mainwindow.ui index 67f1300..ffb8ee8 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -1242,6 +1242,22 @@ QTextEdit[transmitting="true"] { 0 + + + + 0 + 30 + + + + <html><head/><body><p>Send a directed message to another station</p></body></html> + + + Directed + + + + Qt::Horizontal @@ -1257,93 +1273,7 @@ QTextEdit[transmitting="true"] { - - - - - 0 - 30 - - - - false - - - <html><head/><body><p>Send your station location message</p></body></html> - - - QTH - - - - - - - - 0 - 30 - - - - <html><head/><body><p>Send a CQ message</p></body></html> - - - CQ - - - false - - - - - - - - 0 - 30 - - - - <html><head/><body><p>Stop transmitting</p></body></html> - - - Halt - - - - - - - - 0 - 30 - - - - <html><head/><body><p>Reply to a CQ</p></body></html> - - - Reply - - - - - - - - 0 - 30 - - - - <html><head/><body><p>Send a macro</p></body></html> - - - Macros - - - - + false @@ -1373,8 +1303,27 @@ background:yellow; - - + + + + + 0 + 30 + + + + false + + + <html><head/><body><p>Send your station location message</p></body></html> + + + QTH + + + + + 0 @@ -1382,10 +1331,74 @@ background:yellow; - <html><head/><body><p>Send a directed message to another station</p></body></html> + <html><head/><body><p>Stop transmitting</p></body></html> - Directed + Halt + + + + + + + + 0 + 30 + + + + <html><head/><body><p>Send a macro</p></body></html> + + + Macros + + + + + + + + 0 + 30 + + + + <html><head/><body><p>Reply to a CQ</p></body></html> + + + Reply + + + + + + + + 0 + 30 + + + + <html><head/><body><p>Send a CQ message</p></body></html> + + + CQ + + + false + + + + + + + + 0 + 30 + + + + Deselect