w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2026-06-22 23:58:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use Qt signals to process configuration name changes

Browse Source 
This change maintains the encapsulation  of the MultiSettings class by
using  a  signal   to  notify  clients  of  changes   to  the  current
configuration name.

Modifications  to   the  MainWindow  class  to   display  the  current
configuration name in the status bar, if it is not "Default", based on
MultiSettings events rather than polling for changes.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7257 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville
2016-10-28 17:15:04 +00:00
parent 5fb0b05198
commit cfb1a3cbe2
4 changed files with 43 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mainwindow.cpp
+15 -14
View File
@@ -340,6 +340,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
m_manual {network_manager}
{
ui->setupUi(this);
createStatusBar();
add_child_to_event_filter (this);
ui->dxGridEntry->setValidator (new MaidenheadLocatorValidator {this});
ui->dxCallEntry->setValidator (new CallsignValidator {this});
@@ -580,6 +581,15 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
connect (&m_config, &Configuration::udp_server_port_changed, m_messageClient, &MessageClient::set_server_port);
// set up configurations menu
connect (m_multi_settings, &MultiSettings::configurationNameChanged, [this] (QString const& name) {
if ("Default" != name) {
config_label.setText (name);
config_label.show ();
}
else {
config_label.hide ();
}
});
m_multi_settings->create_menu_actions (this, ui->menuConfig);
m_configurations_button = m_rigErrorMessageBox.addButton (tr ("Configurations...")
, QMessageBox::ActionRole);
@@ -666,8 +676,6 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
ui->decodedTextLabel2->setText(t);
readSettings(); //Restore user's setup params
m_configName = m_multi_settings->common_value("CurrentName").toString();
createStatusBar();
m_audioThread.start (m_audioThreadPriority);
@@ -1701,13 +1709,11 @@ void MainWindow::createStatusBar() //createStatusBar
tx_status_label.setFrameStyle (QFrame::Panel | QFrame::Sunken);
statusBar()->addWidget (&tx_status_label);
if(m_configName!="Default") {
config_label.setAlignment (Qt::AlignHCenter);
config_label.setMinimumSize (QSize {80, 18});
config_label.setFrameStyle (QFrame::Panel | QFrame::Sunken);
config_label.setText(m_configName);
statusBar()->addWidget (&config_label);
}
config_label.setAlignment (Qt::AlignHCenter);
config_label.setMinimumSize (QSize {80, 18});
config_label.setFrameStyle (QFrame::Panel | QFrame::Sunken);
statusBar()->addWidget (&config_label);
config_label.hide (); // only shown for non-default configuration
mode_label.setAlignment (Qt::AlignHCenter);
mode_label.setMinimumSize (QSize {80, 18});
@@ -2952,11 +2958,6 @@ void MainWindow::guiUpdate()
//Once per second:
if(nsec != m_sec0) {
if(m_multi_settings->common_value("CurrentName").toString() != m_configName &&
m_configName!="Default") {
m_configName=m_multi_settings->common_value("CurrentName").toString();
config_label.setText(m_configName);
}
if(m_auto and m_mode=="Echo" and m_bEchoTxOK) {
progressBar.setMaximum(6);
progressBar.setValue(int(m_s6));