Better parsing of selected callsign. Blur edit box while transmitting
This commit is contained in:
parent
6ee0820659
commit
28df33b218
@ -4115,6 +4115,7 @@ void MainWindow::startTx()
|
|||||||
|
|
||||||
// disallow editing of the text while transmitting
|
// disallow editing of the text while transmitting
|
||||||
ui->extFreeTextMsgEdit->setReadOnly(true);
|
ui->extFreeTextMsgEdit->setReadOnly(true);
|
||||||
|
update_dynamic_property(ui->extFreeTextMsgEdit, "transmitting", true);
|
||||||
}
|
}
|
||||||
|
|
||||||
void MainWindow::startTx2()
|
void MainWindow::startTx2()
|
||||||
@ -4165,6 +4166,7 @@ void MainWindow::stopTx()
|
|||||||
} else {
|
} else {
|
||||||
// TODO: jsherer - split this up...
|
// TODO: jsherer - split this up...
|
||||||
ui->extFreeTextMsgEdit->setReadOnly(false);
|
ui->extFreeTextMsgEdit->setReadOnly(false);
|
||||||
|
update_dynamic_property(ui->extFreeTextMsgEdit, "transmitting", false);
|
||||||
on_stopTxButton_clicked();
|
on_stopTxButton_clicked();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -6889,7 +6891,6 @@ void MainWindow::on_tableWidgetCalls_cellDoubleClicked(int row, int col){
|
|||||||
addMessageText(call);
|
addMessageText(call);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void MainWindow::on_tableWidgetCalls_selectionChanged(const QItemSelection &selected, const QItemSelection &deselected){
|
void MainWindow::on_tableWidgetCalls_selectionChanged(const QItemSelection &selected, const QItemSelection &deselected){
|
||||||
on_tableWidgetRXAll_selectionChanged(selected, deselected);
|
on_tableWidgetRXAll_selectionChanged(selected, deselected);
|
||||||
|
|
||||||
@ -7793,7 +7794,8 @@ void MainWindow::displayTransmit(){
|
|||||||
}
|
}
|
||||||
|
|
||||||
void MainWindow::updateButtonDisplay(){
|
void MainWindow::updateButtonDisplay(){
|
||||||
if(ui->tableWidgetRXAll->selectedItems().isEmpty() && ui->tableWidgetCalls->selectedItems().isEmpty()){
|
QString callsign = callsignSelected();
|
||||||
|
if(callsign.isEmpty()){
|
||||||
ui->replyMacroButton->setDisabled(true);
|
ui->replyMacroButton->setDisabled(true);
|
||||||
ui->snrMacroButton->setDisabled(true);
|
ui->snrMacroButton->setDisabled(true);
|
||||||
ui->queryButton->setDisabled(true);
|
ui->queryButton->setDisabled(true);
|
||||||
@ -7804,6 +7806,26 @@ void MainWindow::updateButtonDisplay(){
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QString MainWindow::callsignSelected(){
|
||||||
|
if(!ui->tableWidgetCalls->selectedItems().isEmpty()){
|
||||||
|
auto selectedCalls = ui->tableWidgetCalls->selectedItems();
|
||||||
|
return selectedCalls.first()->text();
|
||||||
|
}
|
||||||
|
|
||||||
|
if(!ui->tableWidgetRXAll->selectedItems().isEmpty()){
|
||||||
|
int selectedOffset = -1;
|
||||||
|
auto selectedItems = ui->tableWidgetRXAll->selectedItems();
|
||||||
|
selectedOffset = selectedItems.first()->text().toInt();
|
||||||
|
foreach(auto call, m_callActivity.keys()){
|
||||||
|
if(m_callActivity[call].freq == selectedOffset){
|
||||||
|
return call;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return QString();
|
||||||
|
}
|
||||||
|
|
||||||
bool MainWindow::isRecentOffset(int offset){
|
bool MainWindow::isRecentOffset(int offset){
|
||||||
return (
|
return (
|
||||||
m_rxRecentCache.contains(offset/10*10) &&
|
m_rxRecentCache.contains(offset/10*10) &&
|
||||||
|
@ -757,6 +757,7 @@ private:
|
|||||||
void displayTransmit();
|
void displayTransmit();
|
||||||
void updateButtonDisplay();
|
void updateButtonDisplay();
|
||||||
bool isMyCallIncluded(QString const &text);
|
bool isMyCallIncluded(QString const &text);
|
||||||
|
QString callsignSelected();
|
||||||
bool isRecentOffset(int offset);
|
bool isRecentOffset(int offset);
|
||||||
bool isDirectedOffset(int offset);
|
bool isDirectedOffset(int offset);
|
||||||
void displayActivity(bool force=false);
|
void displayActivity(bool force=false);
|
||||||
|
@ -956,6 +956,11 @@ background-color: yellow;
|
|||||||
QTextEdit[readOnly="true"] {
|
QTextEdit[readOnly="true"] {
|
||||||
background:#EEE;
|
background:#EEE;
|
||||||
font-style:italic;
|
font-style:italic;
|
||||||
|
}
|
||||||
|
|
||||||
|
QTextEdit[transmitting="true"] {
|
||||||
|
background:#EEE;
|
||||||
|
font-style:italic;
|
||||||
}</string>
|
}</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="acceptRichText">
|
<property name="acceptRichText">
|
||||||
|
Loading…
Reference in New Issue
Block a user