flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-31 04:25:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #697 BlackMisc settings renamed and reorganized.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2016-08-03 02:08:53 +01:00
parent e7c9d3b62f
commit 8275b0d9bf
28 changed files with 902 additions and 926 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/blackgui/components/audiosetupcomponent.cpp
View File

@@ -12,7 +12,7 @@
#include "blackgui/guiapplication.h"
#include "blackmisc/audio/audiodeviceinfo.h"
#include "blackmisc/audio/notificationsounds.h"
#include "blackmisc/audio/settings/settingsaudio.h"
#include "blackmisc/audio/audiosettings.h"
#include "blackmisc/sequence.h"
#include "ui_audiosetupcomponent.h"
@@ -27,7 +27,6 @@ using namespace BlackMisc;
using namespace BlackGui;
using namespace BlackMisc::Aviation;
using namespace BlackMisc::Audio;
using namespace BlackMisc::Audio::Settings;
using namespace BlackMisc::PhysicalQuantities;
namespace BlackGui
@@ -76,7 +75,7 @@ namespace BlackGui
void CAudioSetupComponent::ps_reloadSettings()
{
CSettingsAudio as(m_audioSettings.getThreadLocal());
CSettings as(m_audioSettings.getThreadLocal());
this->ui->cb_SetupAudioPlayNotificationSounds->setChecked(true);
this->ui->cb_SetupAudioNotificationTextMessage->setChecked(as.getNotificationFlag(CNotificationSounds::NotificationTextMessagePrivate));
this->ui->cb_SetupAudioNotificationVoiceRoom->setChecked(as.getNotificationFlag(CNotificationSounds::NotificationVoiceRoomJoined));

2
src/blackgui/components/dbownmodelscomponent.h
View File

@@ -104,7 +104,7 @@ namespace BlackGui
private:
QScopedPointer<Ui::CDbOwnModelsComponent> ui;
std::unique_ptr<BlackMisc::Simulation::IAircraftModelLoader> m_modelLoader; //!< read own aircraft models
BlackMisc::CData<BlackMisc::Simulation::Data::ModelCacheLastSelection> m_simulatorSelection {this }; //!< last selection
BlackMisc::CData<BlackMisc::Simulation::Data::TModelCacheLastSelection> m_simulatorSelection {this }; //!< last selection
//! Init or change model loader
bool initModelLoader(const BlackMisc::Simulation::CSimulatorInfo &simulator);

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

@@ -15,7 +15,6 @@
using namespace BlackMisc;
using namespace BlackMisc::Simulation;
using namespace BlackMisc::Simulation::Settings;
using namespace BlackConfig;
namespace BlackGui
@@ -104,7 +103,7 @@ namespace BlackGui
void CSettingsSimulatorBasicsComponent::ps_save()
{
const CSimulatorInfo simulator(ui->comp_SimulatorSelector->getValue());
CSettingsSimulator s = this->getSettings(simulator);
CSettings s = this->getSettings(simulator);
const QString sd(ui->le_SimulatorDirectory->text().trimmed());
const QStringList md(this->parseDirectories(ui->pte_ModelDirectories->toPlainText()));
const QStringList ed(this->parseDirectories(ui->pte_ExcludeDirectories->toPlainText()));
@@ -194,15 +193,15 @@ namespace BlackGui
ui->pte_ModelDirectories->setPlainText(d);
}
CSettingsSimulator CSettingsSimulatorBasicsComponent::getSettings(const CSimulatorInfo &simulator) const
CSettings CSettingsSimulatorBasicsComponent::getSettings(const CSimulatorInfo &simulator) const
{
const CSettingsSimulator s = this->m_settings.getSettings(simulator);
const CSettings s = this->m_settings.getSettings(simulator);
return s;
}
void CSettingsSimulatorBasicsComponent::displaySettings(const CSimulatorInfo &simulator)
{
const CSettingsSimulator s = this->getSettings(simulator);
const CSettings s = this->getSettings(simulator);
this->displayExcludeDirectoryPatterns(s.getModelExcludeDirectoryPatterns());
this->displayModelDirectories(s.getModelDirectories());
ui->le_SimulatorDirectory->setText(s.getSimulatorDirectory());

6
src/blackgui/components/settingssimulatorbasicscomponent.h
View File

@@ -12,7 +12,7 @@
#ifndef BLACKGUI_COMPONENTS_SETTINGSSIMULATORBASICSCOMPONENT_H
#define BLACKGUI_COMPONENTS_SETTINGSSIMULATORBASICSCOMPONENT_H
#include "blackmisc/simulation/settings/settingssimulator.h"
#include "blackmisc/simulation/simulationsettings.h"
#include <QFrame>
#include <QFileDialog>
@@ -54,7 +54,7 @@ namespace BlackGui
private:
QScopedPointer<Ui::CSettingsSimulatorBasicsComponent> ui;
BlackMisc::Simulation::Settings::CMultiSimulatorSimulatorSettings m_settings { this };
BlackMisc::Simulation::CMultiSimulatorSettings m_settings { this };
Qt::CaseSensitivity m_fileCaseSensitivity = BlackMisc::CFileUtils::osFileNameCaseSensitivity();
//! Optimize for small layout
@@ -73,7 +73,7 @@ namespace BlackGui
void displayModelDirectories(const QStringList &dirs);
//! Current settings
BlackMisc::Simulation::Settings::CSettingsSimulator getSettings(const BlackMisc::Simulation::CSimulatorInfo &simulator) const;
BlackMisc::Simulation::CSettings getSettings(const BlackMisc::Simulation::CSimulatorInfo &simulator) const;
//! Display simulator`s settings
void displaySettings(const BlackMisc::Simulation::CSimulatorInfo &simulator);

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

@@ -9,10 +9,10 @@
#include "settingssimulatormessagescomponent.h"
#include "ui_settingssimulatormessagescomponent.h"
#include "blackmisc/simulation/settings/settingssimulator.h"
#include "blackmisc/simulation/simulationsettings.h"
using namespace BlackMisc;
using namespace BlackMisc::Simulation::Settings;
using namespace BlackMisc::Simulation;
namespace BlackGui
{

4
src/blackgui/components/settingssimulatormessagescomponent.h
View File

@@ -12,7 +12,7 @@
#ifndef BLACKGUI_COMPONENTS_SETTINGSSIMULATORMESSAGESCOMPONENT_H
#define BLACKGUI_COMPONENTS_SETTINGSSIMULATORMESSAGESCOMPONENT_H
#include "blackmisc/simulation/settings/settingssimulator.h"
#include "blackmisc/simulation/simulationsettings.h"
#include <QFrame>
#include <QScopedPointer>
@@ -44,7 +44,7 @@ namespace BlackGui
private:
QScopedPointer<Ui::CSettingsSimulatorMessagesComponent> ui;
BlackMisc::CSetting<BlackMisc::Simulation::Settings::SettingsSimulatorMessages> m_settings { this }; //!< settings for messages
BlackMisc::CSetting<BlackMisc::Simulation::TSimulatorMessages> m_settings { this }; //!< settings for messages
};
} // ns
} // ns