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

refs #697 BlackCore settings renamed and reorganized.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2016-08-03 02:13:57 +01:00
parent 8275b0d9bf
commit 7a34cc6d9a
43 changed files with 312 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,7 +12,7 @@
#ifndef BLACKGUI_AUDIOSETUPCOMPONENT_H
#define BLACKGUI_AUDIOSETUPCOMPONENT_H
#include "blackcore/settings/audio.h"
#include "blackcore/audio/audiosettings.h"
#include "blackgui/blackguiexport.h"
#include "blackmisc/audio/audiodeviceinfolist.h"
#include "blackmisc/settingscache.h"
@@ -72,7 +72,7 @@ namespace BlackGui
void initAudioDeviceLists();
QScopedPointer<Ui::CAudioSetupComponent> ui;
BlackMisc::CSetting<BlackCore::Settings::Audio::AudioSettings> m_audioSettings { this, &CAudioSetupComponent::ps_reloadSettings };
BlackMisc::CSetting<BlackCore::Audio::TSettings> m_audioSettings { this, &CAudioSetupComponent::ps_reloadSettings };
};
} // namespace

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

@@ -12,7 +12,7 @@
#ifndef BLACKGUI_COMPONENTS_DBOWNMODELSETCOMPONENT_H
#define BLACKGUI_COMPONENTS_DBOWNMODELSETCOMPONENT_H
#include "blackcore/settings/distributorpreferences.h"
#include "blackcore/simulator/simulatorsettings.h"
#include "blackgui/components/dbmappingcomponentaware.h"
#include "blackgui/menus/menudelegate.h"
#include "blackmisc/settingscache.h"
@@ -141,7 +141,7 @@ namespace BlackGui
QScopedPointer<Ui::CDbOwnModelSetComponent> ui;
QScopedPointer<CDbOwnModelSetDialog> m_modelSetDialog;
BlackMisc::Simulation::CAircraftModelSetLoader m_modelSetLoader { this };
BlackMisc::CSetting<BlackCore::Settings::DistributorListPreferences> m_distributorPreferences { this, &CDbOwnModelSetComponent::ps_distributorPreferencesChanged };
BlackMisc::CSetting<BlackCore::Simulator::TDistributorListPreferences> m_distributorPreferences { this, &CDbOwnModelSetComponent::ps_distributorPreferencesChanged };
// -------------------------- custom menus -----------------------------------

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

@@ -12,7 +12,7 @@
#ifndef BLACKGUI_COMPONENTS_DISTRIBUTORPREFERENCESCOMPONENT_H
#define BLACKGUI_COMPONENTS_DISTRIBUTORPREFERENCESCOMPONENT_H
#include "blackcore/settings/distributorpreferences.h"
#include "blackcore/simulator/simulatorsettings.h"
#include "blackmisc/settingscache.h"
#include "blackmisc/simulation/aircraftmodelsetloader.h"
#include "blackmisc/simulation/distributorlist.h"
@@ -72,7 +72,7 @@ namespace BlackGui
QScopedPointer<Ui::CDistributorPreferencesComponent> ui;
BlackGui::COverlayMessagesFrame *m_overlayMessageFrame = nullptr;
BlackMisc::Simulation::CAircraftModelSetLoader m_modelSetLoader { this };
BlackMisc::CSetting<BlackCore::Settings::DistributorListPreferences> m_distributorPreferences { this, &CDistributorPreferencesComponent::ps_preferencesChanged };
BlackMisc::CSetting<BlackCore::Simulator::TDistributorListPreferences> m_distributorPreferences { this, &CDistributorPreferencesComponent::ps_preferencesChanged };
//! Update
void updateContainerMaybeAsync(const BlackMisc::Simulation::CDistributorList &models, bool sortByOrder = true);

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

@@ -12,7 +12,7 @@
#ifndef BLACKGUI_LOGINCOMPONENT_H
#define BLACKGUI_LOGINCOMPONENT_H
#include "blackcore/settings/network.h"
#include "blackcore/vatsim/vatsimsettings.h"
#include "blackcore/data/vatsimsetup.h"
#include "blackgui/blackguiexport.h"
#include "blackgui/settings/guisettings.h"
@@ -165,7 +165,7 @@ namespace BlackGui
bool m_visible = false; //!< is this component selected?
const int LogoffIntervalSeconds = 10;
QTimer *m_logoffCountdownTimer { nullptr };
BlackMisc::CSettingReadOnly<BlackCore::Settings::Network::TrafficServers> m_otherTrafficNetworkServers { this, &CLoginComponent::ps_reloadSettings };
BlackMisc::CSettingReadOnly<BlackCore::Vatsim::TTrafficServers> m_otherTrafficNetworkServers { this, &CLoginComponent::ps_reloadSettings };
BlackMisc::CSetting<BlackGui::Settings::TOwnAircraftModel> m_currentAircraftModel { this };
BlackMisc::CData<BlackCore::Data::VatsimCurrentServer> m_currentVatsimServer { this };
};

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

@@ -13,7 +13,7 @@
#define BLACKGUI_COMPONENTS_SETTINGSHOTKEYCOMPONENT_H
#include "blackcore/actionbind.h"
#include "blackcore/settings/application.h"
#include "blackcore/application/applicationsettings.h"
#include "blackgui/blackguiexport.h"
#include "blackgui/models/actionhotkeylistmodel.h"
#include "blackmisc/input/actionhotkey.h"
@@ -58,7 +58,7 @@ namespace BlackGui
QScopedPointer<Ui::CSettingsHotkeyComponent> ui;
BlackGui::Models::CActionHotkeyListModel m_model;
BlackMisc::CSetting<BlackCore::Settings::Application::ActionHotkeys> m_actionHotkeys { this };
BlackMisc::CSetting<BlackCore::Application::TActionHotkeys> m_actionHotkeys { this };
BlackCore::CActionBind m_action { "/Test/Message", this, &CSettingsHotkeyComponent::ps_hotkeySlot };
void ps_hotkeySlot(bool keyDown);

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

@@ -13,7 +13,7 @@
#define BLACKGUI_COMPONENTS_SETTINGSNETWORKCOMPONENT_H
#include "blackgui/blackguiexport.h"
#include "blackcore/settings/network.h"
#include "blackcore/vatsim/vatsimsettings.h"
#include <QFrame>
#include <QObject>

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

@@ -12,7 +12,7 @@
#ifndef BLACKGUI_COMPONENTS_SETTINGSNETWORKSERVERSCOMPONENT_H
#define BLACKGUI_COMPONENTS_SETTINGSNETWORKSERVERSCOMPONENT_H
#include "blackcore/settings/network.h"
#include "blackcore/vatsim/vatsimsettings.h"
#include "blackgui/blackguiexport.h"
#include "blackmisc/settingscache.h"
@@ -54,7 +54,7 @@ namespace BlackGui
private:
QScopedPointer<Ui::CSettingsNetworkServersComponent> ui;
BlackMisc::CSetting<BlackCore::Settings::Network::TrafficServers> m_trafficNetworkServers { this, &CSettingsNetworkServersComponent::ps_reloadSettings };
BlackMisc::CSetting<BlackCore::Vatsim::TTrafficServers> m_trafficNetworkServers { this, &CSettingsNetworkServersComponent::ps_reloadSettings };
};
} // ns
} // ns

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

@@ -12,7 +12,7 @@
#ifndef BLACKGUI_SETTINGSSIMULATORCOMPONENT_H
#define BLACKGUI_SETTINGSSIMULATORCOMPONENT_H
#include "blackcore/settings/application.h"
#include "blackcore/application/applicationsettings.h"
#include "blackgui/blackguiexport.h"
#include "blackmisc/settingscache.h"
#include "blackmisc/simulation/simulatorplugininfolist.h"
@@ -86,7 +86,7 @@ namespace BlackGui
QScopedPointer<Ui::CSettingsSimulatorComponent> ui; //!< UI
bool m_pluginLoaded = false; //!< plugin loaded
BlackCore::CPluginManagerSimulator* m_plugins = nullptr;
BlackMisc::CSetting<BlackCore::Settings::Application::EnabledSimulators> m_enabledSimulators { this, &CSettingsSimulatorComponent::ps_reloadPluginConfig };
BlackMisc::CSetting<BlackCore::Application::TEnabledSimulators> m_enabledSimulators { this, &CSettingsSimulatorComponent::ps_reloadPluginConfig };
};
}

8
src/blackgui/components/settingsvatsimreaderscomponent.cpp
View File

@@ -13,7 +13,7 @@
using namespace BlackMisc;
using namespace BlackMisc::PhysicalQuantities;
using namespace BlackCore;
using namespace BlackCore::Settings;
using namespace BlackCore::Vatsim;
namespace BlackGui
{
@@ -46,17 +46,17 @@ namespace BlackGui
const int newMetarSec = ui->sb_Metar->value();
if (newMetarSec != metarSec)
{
this->m_settingsMetars.setAndSaveProperty(CSettingsReader::IndexPeriodicTime, CVariant::fromValue(CTime{static_cast<double>(newMetarSec), CTimeUnit::s()}));
this->m_settingsMetars.setAndSaveProperty(CReaderSettings::IndexPeriodicTime, CVariant::fromValue(CTime{static_cast<double>(newMetarSec), CTimeUnit::s()}));
}
const int newBookingsSec = ui->sb_Bookings->value();
if (newBookingsSec != bookingsSec)
{
this->m_settingsBookings.setAndSaveProperty(CSettingsReader::IndexPeriodicTime, CVariant::fromValue(CTime{static_cast<double>(newBookingsSec), CTimeUnit::s()}));
this->m_settingsBookings.setAndSaveProperty(CReaderSettings::IndexPeriodicTime, CVariant::fromValue(CTime{static_cast<double>(newBookingsSec), CTimeUnit::s()}));
}
const int newDataFileSec = ui->sb_DataFile->value();
if (newDataFileSec != dataFileSec)
{
this->m_settingsBookings.setAndSaveProperty(CSettingsReader::IndexPeriodicTime, CVariant::fromValue(CTime{static_cast<double>(newDataFileSec), CTimeUnit::s()}));
this->m_settingsBookings.setAndSaveProperty(CReaderSettings::IndexPeriodicTime, CVariant::fromValue(CTime{static_cast<double>(newDataFileSec), CTimeUnit::s()}));
}
}

8
src/blackgui/components/settingsvatsimreaderscomponent.h
View File

@@ -12,7 +12,7 @@
#ifndef BLACKGUI_COMPONENTS_SETTINGSVATSIMREADERSCOMPONENT_H
#define BLACKGUI_COMPONENTS_SETTINGSVATSIMREADERSCOMPONENT_H
#include "blackcore/settings/reader.h"
#include "blackcore/vatsim/vatsimsettings.h"
#include <QFrame>
#include <QScopedPointer>
@@ -45,9 +45,9 @@ namespace BlackGui
void initValues();
QScopedPointer<Ui::CSettingsVatsimReadersComponent> ui;
BlackMisc::CSetting<BlackCore::Settings::SettingsVatsimBookings> m_settingsBookings { this, &CSettingsVatsimReadersComponent::ps_settingsChanged };
BlackMisc::CSetting<BlackCore::Settings::SettingsVatsimDataFile> m_settingsDataFile { this, &CSettingsVatsimReadersComponent::ps_settingsChanged };
BlackMisc::CSetting<BlackCore::Settings::SettingsVatsimMetars> m_settingsMetars { this, &CSettingsVatsimReadersComponent::ps_settingsChanged };
BlackMisc::CSetting<BlackCore::Vatsim::TVatsimBookings> m_settingsBookings { this, &CSettingsVatsimReadersComponent::ps_settingsChanged };
BlackMisc::CSetting<BlackCore::Vatsim::TVatsimDataFile> m_settingsDataFile { this, &CSettingsVatsimReadersComponent::ps_settingsChanged };
BlackMisc::CSetting<BlackCore::Vatsim::TVatsimMetars> m_settingsMetars { this, &CSettingsVatsimReadersComponent::ps_settingsChanged };
};
} // ns
} // ns

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

@@ -15,7 +15,7 @@
#include "blackgui/blackguiexport.h"
#include "blackgui/components/enablefordockwidgetinfoarea.h"
#include "blackgui/components/updatetimer.h"
#include "blackcore/settings/simulator.h"
#include "blackcore/simulator/simulatorsettings.h"
#include "blackmisc/geo/coordinategeodetic.h"
#include "blackmisc/identifiable.h"
#include "blackmisc/weather/weatherscenario.h"
@@ -77,7 +77,7 @@ namespace BlackGui
QVector<BlackMisc::Weather::CWeatherScenario> m_weatherScenarios;
QTimer m_weatherUpdateTimer { this };
BlackMisc::Geo::CCoordinateGeodetic m_lastOwnAircraftPosition;
BlackMisc::CSetting<BlackCore::Settings::Simulator::SelectedWeatherScenario> m_weatherScenarioSetting { this };
BlackMisc::CSetting<BlackCore::Simulator::TSelectedWeatherScenario> m_weatherScenarioSetting { this };
};
} // namespace
} // namespace