flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-13 15:45:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Validation for XP model directory in simulator basics

Browse Source
This commit is contained in:
Klaus Basan
2019-07-13 03:41:47 +02:00
committed by Mat Sutcliffe
parent 5799e31d27
commit 18778ed97e
2 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/blackgui/components/settingssimulatorbasicscomponent.cpp
View File

@@ -140,21 +140,29 @@ namespace BlackGui
s.setSimulatorDirectory(simulatorDir); s.setSimulatorDirectory(simulatorDir);
s.setModelDirectories(modelDirs); s.setModelDirectories(modelDirs);
s.setModelExcludeDirectories(relativeDirs); s.setModelExcludeDirectories(relativeDirs);
const CStatusMessage m = m_settings.setAndSaveSettings(s, simulator); const CStatusMessageList msgs = m_settings.setAndValidateSettings(s, simulator);
if (!m.isEmpty()) { CLogMessage::preformatted(m); } if (msgs.isSuccess())
if (m.isSuccess())
{ {
this->showOverlayHTMLMessage("Saved settings", 5000); const CStatusMessage m = m_settings.setAndSaveSettings(s, simulator);
if (!m.isEmpty()) { CLogMessage::preformatted(m); }
if (m.isSuccess())
{
this->showOverlayHTMLMessage("Saved settings", 5000);
}
else
{
this->showOverlayMessage(m);
}
m_unsavedChanges = m_unsavedChanges && !m.isSuccess(); // reset if success, but only if there were changes
// display as it was saved
this->displaySettings(simulator);
} }
else else
{ {
this->showOverlayMessage(m); this->showOverlayHTMLMessageOrMessages(msgs);
} }
m_unsavedChanges = m_unsavedChanges && !m.isSuccess(); // reset if success, but only if there were changes
// display as saved
this->displaySettings(simulator);
} }
void CSettingsSimulatorBasicsComponent::copyDefaults() void CSettingsSimulatorBasicsComponent::copyDefaults()

6
src/blackgui/components/settingssimulatormessagescomponent.cpp
View File

@@ -35,7 +35,7 @@ namespace BlackGui
void CSettingsSimulatorMessagesComponent::save() void CSettingsSimulatorMessagesComponent::save()
{ {
CSimulatorMessagesSettings settings; CSimulatorMessagesSettings settings;
settings.setGloballyEnabled(ui->cb_Messages->isChecked()); settings.setRelayGloballyEnabled(ui->cb_Messages->isChecked());
if (ui->rb_NoTechnicalMessages->isChecked()) if (ui->rb_NoTechnicalMessages->isChecked())
{ {
settings.disableTechnicalMessages(); settings.disableTechnicalMessages();
@@ -53,7 +53,7 @@ namespace BlackGui
settings.setTechnicalLogSeverity(CStatusMessage::SeverityInfo); settings.setTechnicalLogSeverity(CStatusMessage::SeverityInfo);
} }
settings.setGloballyEnabled(ui->cb_Messages->isChecked()); settings.setRelayGloballyEnabled(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; }
@@ -69,7 +69,7 @@ namespace BlackGui
void CSettingsSimulatorMessagesComponent::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.isRelayGloballyEnabled());
if (settings.isRelayInfoMessages()) if (settings.isRelayInfoMessages())
{ {
ui->rb_ErrorWarningsInfo->setChecked(true); ui->rb_ErrorWarningsInfo->setChecked(true);