Ref T613, added missing checkbox and style

This commit is contained in:
Klaus Basan
2019-04-15 16:34:03 +02:00
parent 139ae130db
commit 8cf79a512a
2 changed files with 12 additions and 10 deletions

View File

@@ -23,16 +23,16 @@ namespace BlackGui
ui(new Ui::CSettingsSimulatorMessagesComponent) ui(new Ui::CSettingsSimulatorMessagesComponent)
{ {
ui->setupUi(this); ui->setupUi(this);
connect(ui->pb_Save, &QPushButton::clicked, this, &CSettingsSimulatorMessagesComponent::ps_save); connect(ui->pb_Save, &QPushButton::clicked, this, &CSettingsSimulatorMessagesComponent::save, Qt::QueuedConnection);
connect(ui->pb_Cancel, &QPushButton::clicked, this, &CSettingsSimulatorMessagesComponent::ps_load); connect(ui->pb_Cancel, &QPushButton::clicked, this, &CSettingsSimulatorMessagesComponent::load, Qt::QueuedConnection);
this->ps_load(); this->load();
} }
CSettingsSimulatorMessagesComponent::~CSettingsSimulatorMessagesComponent() CSettingsSimulatorMessagesComponent::~CSettingsSimulatorMessagesComponent()
{ } { }
void CSettingsSimulatorMessagesComponent::ps_save() void CSettingsSimulatorMessagesComponent::save()
{ {
CSimulatorMessagesSettings settings; CSimulatorMessagesSettings settings;
settings.setGloballyEnabled(ui->cb_Messages->isChecked()); settings.setGloballyEnabled(ui->cb_Messages->isChecked());
@@ -53,8 +53,10 @@ namespace BlackGui
settings.setTechnicalLogSeverity(CStatusMessage::SeverityInfo); settings.setTechnicalLogSeverity(CStatusMessage::SeverityInfo);
} }
settings.setGloballyEnabled(ui->cb_Messages->isChecked());
CSimulatorMessagesSettings::TextMessageType mt = CSimulatorMessagesSettings::NoTextMessages; CSimulatorMessagesSettings::TextMessageType mt = CSimulatorMessagesSettings::NoTextMessages;
if (ui->cb_PrivateMessages->isChecked()) { mt |= CSimulatorMessagesSettings::TextMessagePrivate; }
if (ui->cb_PrivateMessages->isChecked()) { mt |= CSimulatorMessagesSettings::TextMessagePrivate; }
if (ui->cb_SupervisorMessages->isChecked()) { mt |= CSimulatorMessagesSettings::TextMessageSupervisor; } if (ui->cb_SupervisorMessages->isChecked()) { mt |= CSimulatorMessagesSettings::TextMessageSupervisor; }
if (ui->cb_Com1->isChecked()) { mt |= CSimulatorMessagesSettings::TextMessagesCom1; } if (ui->cb_Com1->isChecked()) { mt |= CSimulatorMessagesSettings::TextMessagesCom1; }
if (ui->cb_Com2->isChecked()) { mt |= CSimulatorMessagesSettings::TextMessagesCom2; }; if (ui->cb_Com2->isChecked()) { mt |= CSimulatorMessagesSettings::TextMessagesCom2; };
@@ -64,7 +66,7 @@ namespace BlackGui
this->m_settings.setAndSave(settings); this->m_settings.setAndSave(settings);
} }
void CSettingsSimulatorMessagesComponent::ps_load() void CSettingsSimulatorMessagesComponent::load()
{ {
const CSimulatorMessagesSettings settings(this->m_settings.get()); const CSimulatorMessagesSettings settings(this->m_settings.get());
ui->cb_Messages->setChecked(settings.isGloballyEnabled()); ui->cb_Messages->setChecked(settings.isGloballyEnabled());

View File

@@ -32,14 +32,14 @@ namespace BlackGui
explicit CSettingsSimulatorMessagesComponent(QWidget *parent = nullptr); explicit CSettingsSimulatorMessagesComponent(QWidget *parent = nullptr);
//! Destructor //! Destructor
~CSettingsSimulatorMessagesComponent(); virtual ~CSettingsSimulatorMessagesComponent() override;
private slots: private:
//! Save the data //! Save the data
void ps_save(); void save();
//! Load data //! Load data
void ps_load(); void load();
private: private:
QScopedPointer<Ui::CSettingsSimulatorMessagesComponent> ui; QScopedPointer<Ui::CSettingsSimulatorMessagesComponent> ui;