chris/js8call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added reply button back into the main window

Browse Source
This commit is contained in:
Jordan Sherer 2018-08-28 16:04:49 -04:00
parent b5cebe41e8
commit 0ecbbd0da1
3 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mainwindow.cpp
View File

@ -7181,12 +7181,12 @@ void MainWindow::on_cqMacroButton_clicked(){
addMessageText(text); addMessageText(text);
} }
void MainWindow::on_qtcMacroButton_clicked(){ void MainWindow::on_replyMacroButton_clicked(){
QString qtc = m_config.my_station(); QString call = callsignSelected();
if(qtc.isEmpty()){ if(call.isEmpty()){
return; return;
} }
addMessageText(QString("QTC %1").arg(qtc)); addMessageText(QString("%1 ").arg(call));
} }
void MainWindow::on_qthMacroButton_clicked(){ void MainWindow::on_qthMacroButton_clicked(){
@ -7439,7 +7439,11 @@ void MainWindow::buildQueryMenu(QMenu * menu, QString call){
menu->addSeparator(); menu->addSeparator();
bool emptyQTC = m_config.my_station().isEmpty();
bool emptyQTH = m_config.my_qth().isEmpty() && m_config.my_grid().isEmpty();
auto qtcAction = menu->addAction(QString("%1 QTC message - Send my station message").arg(call).trimmed()); auto qtcAction = menu->addAction(QString("%1 QTC message - Send my station message").arg(call).trimmed());
qtcAction->setDisabled(emptyQTC);
connect(qtcAction, &QAction::triggered, this, [this](){ connect(qtcAction, &QAction::triggered, this, [this](){
QString selectedCall = callsignSelected(); QString selectedCall = callsignSelected();
@ -7453,6 +7457,7 @@ void MainWindow::buildQueryMenu(QMenu * menu, QString call){
}); });
auto qthAction = menu->addAction(QString("%1 QTH message - Send my station location message").arg(call).trimmed()); auto qthAction = menu->addAction(QString("%1 QTH message - Send my station location message").arg(call).trimmed());
qthAction->setDisabled(emptyQTH);
connect(qthAction, &QAction::triggered, this, [this](){ connect(qthAction, &QAction::triggered, this, [this](){
QString selectedCall = callsignSelected(); QString selectedCall = callsignSelected();
@ -7466,7 +7471,7 @@ void MainWindow::buildQueryMenu(QMenu * menu, QString call){
}); });
auto grid = m_config.my_grid(); auto grid = m_config.my_grid();
auto gridAction = menu->addAction(QString("%1 GRID %2 - Send my current station grid location").arg(call).arg(grid).trimmed()); auto gridAction = menu->addAction(QString("%1 GRID %2 - Send my current station Maidenhead grid locator").arg(call).arg(grid).trimmed());
connect(gridAction, &QAction::triggered, this, [this](){ connect(gridAction, &QAction::triggered, this, [this](){
QString selectedCall = callsignSelected(); QString selectedCall = callsignSelected();
@ -8633,12 +8638,9 @@ void MainWindow::updateButtonDisplay(){
bool isTransmitting = m_transmitting || m_txFrameCount > 0; bool isTransmitting = m_transmitting || m_txFrameCount > 0;
bool emptyCallsign = callsignSelected().isEmpty(); bool emptyCallsign = callsignSelected().isEmpty();
bool emptyQTC = m_config.my_station().isEmpty();
bool emptyQTH = m_config.my_qth().isEmpty() && m_config.my_grid().isEmpty();
ui->cqMacroButton->setDisabled(isTransmitting); ui->cqMacroButton->setDisabled(isTransmitting);
ui->qtcMacroButton->setDisabled(isTransmitting || emptyQTC); ui->replyMacroButton->setDisabled(isTransmitting || emptyCallsign);
ui->qthMacroButton->setDisabled(isTransmitting || emptyQTH);
ui->macrosMacroButton->setDisabled(isTransmitting); ui->macrosMacroButton->setDisabled(isTransmitting);
ui->queryButton->setDisabled(isTransmitting || emptyCallsign); ui->queryButton->setDisabled(isTransmitting || emptyCallsign);
} }
@ -9463,7 +9465,7 @@ void MainWindow::displayBandActivity() {
age = since(item.utcTimestamp); age = since(item.utcTimestamp);
} }
auto joined = text.join(" "); auto joined = text.join("");
if (joined.isEmpty()) { if (joined.isEmpty()) {
continue; continue;
} }

2
mainwindow.h
View File

@ -258,7 +258,7 @@ private slots:
void on_rbFreeText_clicked(bool checked); void on_rbFreeText_clicked(bool checked);
void on_clearAction_triggered(QObject * sender); void on_clearAction_triggered(QObject * sender);
void on_cqMacroButton_clicked(); void on_cqMacroButton_clicked();
void on_qtcMacroButton_clicked(); void on_replyMacroButton_clicked();
void on_qthMacroButton_clicked(); void on_qthMacroButton_clicked();
void setSortBy(QString key, QString value); void setSortBy(QString key, QString value);
QString getSortBy(QString key, QString defaultValue); QString getSortBy(QString key, QString defaultValue);

9
mainwindow.ui
View File

@ -1303,10 +1303,7 @@ QTextEdit[transmitting="true"] {
</widget> </widget>
</item> </item>
<item row="1" column="2"> <item row="1" column="2">
<widget class="QPushButton" name="qtcMacroButton"> <widget class="QPushButton" name="replyMacroButton">
<property name="visible">
<bool>false</bool>
</property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
@ -1314,10 +1311,10 @@ QTextEdit[transmitting=&quot;true&quot;] {
</size> </size>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Send your station message&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Reply to a CQ&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="text"> <property name="text">
<string>QTC</string> <string>Reply</string>
</property> </property>
</widget> </widget>
</item> </item>