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

Show error dialog for CTY.DAT when there are error conditions

Browse Source
This commit is contained in:
Brian Moran 2023-03-17 08:59:19 -07:00
parent a321348dfa
commit 5d61d2bf17
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Configuration.cpp
View File

@ -567,6 +567,7 @@ private:
void delete_selected_macros (QModelIndexList); void delete_selected_macros (QModelIndexList);
void after_CTY_downloaded(); void after_CTY_downloaded();
void set_CTY_DAT_version(QString const& version); void set_CTY_DAT_version(QString const& version);
void error_during_CTY_download (QString const& reason);
Q_SLOT void on_udp_server_line_edit_textChanged (QString const&); Q_SLOT void on_udp_server_line_edit_textChanged (QString const&);
Q_SLOT void on_udp_server_line_edit_editingFinished (); Q_SLOT void on_udp_server_line_edit_editingFinished ();
Q_SLOT void on_save_path_select_push_button_clicked (bool); Q_SLOT void on_save_path_select_push_button_clicked (bool);
@ -2433,6 +2434,8 @@ void Configuration::impl::on_CTY_download_button_clicked (bool /*clicked*/)
// set up LoTW users CSV file fetching // set up LoTW users CSV file fetching
connect (&cty_download, &FileDownload::complete, this, &Configuration::impl::after_CTY_downloaded, Qt::UniqueConnection); connect (&cty_download, &FileDownload::complete, this, &Configuration::impl::after_CTY_downloaded, Qt::UniqueConnection);
connect (&cty_download, &FileDownload::error, this, &Configuration::impl::error_during_CTY_download, Qt::UniqueConnection);
cty_download.start_download(); cty_download.start_download();
} }
void Configuration::impl::set_CTY_DAT_version(QString const& version) void Configuration::impl::set_CTY_DAT_version(QString const& version)
@ -2440,6 +2443,12 @@ void Configuration::impl::set_CTY_DAT_version(QString const& version)
ui_->CTY_file_label->setText(QString{"CTY File Version: %1"}.arg(version)); ui_->CTY_file_label->setText(QString{"CTY File Version: %1"}.arg(version));
} }
void Configuration::impl::error_during_CTY_download (QString const& reason)
{
MessageBox::warning_message (this, tr ("Error Loading CTY.DAT"), reason);
after_CTY_downloaded();
}
void Configuration::impl::after_CTY_downloaded () void Configuration::impl::after_CTY_downloaded ()
{ {
ui_->CTY_download_button->setEnabled (true); ui_->CTY_download_button->setEnabled (true);

1
widgets/mainwindow.cpp
View File

@ -647,6 +647,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
MessageBox::warning_message (this, tr ("Error Loading LotW Users Data"), reason); MessageBox::warning_message (this, tr ("Error Loading LotW Users Data"), reason);
}, Qt::QueuedConnection); }, Qt::QueuedConnection);
QButtonGroup* txMsgButtonGroup = new QButtonGroup {this}; QButtonGroup* txMsgButtonGroup = new QButtonGroup {this};
txMsgButtonGroup->addButton(ui->txrb1,1); txMsgButtonGroup->addButton(ui->txrb1,1);
txMsgButtonGroup->addButton(ui->txrb2,2); txMsgButtonGroup->addButton(ui->txrb2,2);