diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index db7e6afe3..44b098552 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -439,9 +439,6 @@ add_library(gui SHARED components/settingsvatsimreaderscomponent.cpp components/settingsvatsimreaderscomponent.h components/settingsvatsimreaderscomponent.ui - components/settingsviewupdatetimes.cpp - components/settingsviewupdatetimes.h - components/settingsviewupdatetimes.ui components/settingsxswiftbuscomponent.cpp components/settingsxswiftbuscomponent.h components/settingsxswiftbuscomponent.ui @@ -761,8 +758,6 @@ add_library(gui SHARED settings/textmessagesettings.cpp settings/textmessagesettings.h settings/updatenotification.h - settings/viewupdatesettings.cpp - settings/viewupdatesettings.h sharedstringlistcompleter.cpp sharedstringlistcompleter.h shortcut.cpp diff --git a/src/gui/components/aircraftcomponent.cpp b/src/gui/components/aircraftcomponent.cpp index 1295e1965..1a7db2503 100644 --- a/src/gui/components/aircraftcomponent.cpp +++ b/src/gui/components/aircraftcomponent.cpp @@ -58,7 +58,9 @@ namespace swift::gui::components &CAircraftComponent::onOwnAircraftMoved, Qt::QueuedConnection); connect(&m_updateTimer, &QTimer::timeout, this, &CAircraftComponent::update); - this->onSettingsChanged(); + using namespace std::chrono_literals; + m_updateTimer.setInterval(10s); + m_updateTimer.start(); } @@ -149,13 +151,6 @@ namespace swift::gui::components } } - void CAircraftComponent::onSettingsChanged() - { - const CViewUpdateSettings settings = m_settings.get(); - const int ms = settings.getAircraftUpdateTime().toMs(); - m_updateTimer.setInterval(ms); - } - void CAircraftComponent::onOwnAircraftMoved(const CLength &distance) { Q_UNUSED(distance) diff --git a/src/gui/components/aircraftcomponent.h b/src/gui/components/aircraftcomponent.h index 964b7942b..3e3999981 100644 --- a/src/gui/components/aircraftcomponent.h +++ b/src/gui/components/aircraftcomponent.h @@ -13,7 +13,6 @@ #include #include "gui/enablefordockwidgetinfoarea.h" -#include "gui/settings/viewupdatesettings.h" #include "gui/swiftguiexport.h" #include "misc/network/connectionstatus.h" @@ -88,16 +87,10 @@ namespace swift::gui void onConnectionStatusChanged(const swift::misc::network::CConnectionStatus &from, const swift::misc::network::CConnectionStatus &to); - //! Settings have been changed - void onSettingsChanged(); - //! Own aircraft has been moved void onOwnAircraftMoved(const swift::misc::physical_quantities::CLength &distance); QScopedPointer ui; - swift::misc::CSettingReadOnly m_settings { - this, &CAircraftComponent::onSettingsChanged - }; //!< settings changed QTimer m_updateTimer; int m_updateCounter = 0; }; diff --git a/src/gui/components/atcstationcomponent.cpp b/src/gui/components/atcstationcomponent.cpp index 99d7bb9f0..acdbe64a3 100644 --- a/src/gui/components/atcstationcomponent.cpp +++ b/src/gui/components/atcstationcomponent.cpp @@ -152,8 +152,8 @@ namespace swift::gui::components this->airportsRead(); } - // init settings - this->settingsChanged(); + using namespace std::chrono_literals; + m_updateTimer.setInterval(10ms); } CAtcStationComponent::~CAtcStationComponent() {} @@ -329,22 +329,6 @@ namespace swift::gui::components sGui->getIContextOwnAircraft()->updateActiveComFrequency(frequency, unit, identifier()); } - void CAtcStationComponent::settingsChanged() - { - if (!this->canAccessContext()) { return; } - const CViewUpdateSettings settings = m_settingsView.get(); - const int ms = settings.getAtcUpdateTime().toMs(); - const bool connected = sGui->getIContextNetwork()->isConnected(); - m_updateTimer.setInterval(ms); - if (connected) - { - m_timestampOnlineStationsChanged = QDateTime::currentDateTimeUtc(); - m_updateTimer.start(ms); // restart - this->update(); - } - else { m_updateTimer.stop(); } - } - void CAtcStationComponent::airportsRead() { this->initCompleters(); } void CAtcStationComponent::updateTreeView() diff --git a/src/gui/components/atcstationcomponent.h b/src/gui/components/atcstationcomponent.h index e98370df5..9b4b7ac0c 100644 --- a/src/gui/components/atcstationcomponent.h +++ b/src/gui/components/atcstationcomponent.h @@ -19,7 +19,6 @@ #include #include "gui/overlaymessagesframe.h" -#include "gui/settings/viewupdatesettings.h" #include "gui/swiftguiexport.h" #include "misc/aviation/atcstation.h" #include "misc/aviation/comsystem.h" @@ -130,9 +129,6 @@ namespace swift::gui //! Init the completers void initCompleters(); - //! Settings have been changed - void settingsChanged(); - //! Contexts? bool canAccessContext() const; @@ -154,9 +150,6 @@ namespace swift::gui swift::misc::aviation::CCallsign m_selectedCallsign; QDateTime m_timestampLastReadOnlineStations; //!< stations read QDateTime m_timestampOnlineStationsChanged; //!< stations marked as changed - swift::misc::CSettingReadOnly m_settingsView { - this, &CAtcStationComponent::settingsChanged - }; }; } // namespace components } // namespace swift::gui diff --git a/src/gui/components/copysettingsandcachescomponent.cpp b/src/gui/components/copysettingsandcachescomponent.cpp index ee927bc3c..fd84a25b7 100644 --- a/src/gui/components/copysettingsandcachescomponent.cpp +++ b/src/gui/components/copysettingsandcachescomponent.cpp @@ -71,8 +71,6 @@ namespace swift::gui::components !CCacheSettingsUtils::hasOtherVersionSettingsFile(info, m_settingsGuiGeneral.getFilename())); readOnlyCheckbox(ui->cb_SettingsDockWidget, !CCacheSettingsUtils::hasOtherVersionSettingsFile(info, m_settingsDockWidget.getFilename())); - readOnlyCheckbox(ui->cb_SettingsViewUpdate, - !CCacheSettingsUtils::hasOtherVersionSettingsFile(info, m_settingsViewUpdate.getFilename())); readOnlyCheckbox(ui->cb_SettingsEnabledSimulators, !CCacheSettingsUtils::hasOtherVersionSettingsFile( info, m_settingsEnabledSimulators.getFilename())); @@ -124,7 +122,6 @@ namespace swift::gui::components { ui->cb_SettingsGuiGeneral->setText(checkBoxText(TGeneralGui::humanReadable(), true)); ui->cb_SettingsDockWidget->setText(checkBoxText(TDockWidget::humanReadable(), true)); - ui->cb_SettingsViewUpdate->setText(checkBoxText(TViewUpdateSettings::humanReadable(), true)); } void CCopySettingsAndCachesComponent::initSimulator() @@ -294,19 +291,6 @@ namespace swift::gui::components } } - if (ui->cb_SettingsViewUpdate->isChecked()) - { - const QString joStr = CCacheSettingsUtils::otherVersionSettingsFileContent( - otherVersionInfo, m_settingsViewUpdate.getFilename()); - if (!joStr.isEmpty()) - { - const CViewUpdateSettings viewUpdate = - CViewUpdateSettings::fromJsonNoThrow(joStr, true, success, errMsg); - this->displayStatusMessage(m_settingsViewUpdate.setAndSave(viewUpdate), viewUpdate.toQString(true)); - copied++; - } - } - // ------- sims ------- if (ui->cb_SettingsEnabledSimulators->isChecked()) { diff --git a/src/gui/components/copysettingsandcachescomponent.h b/src/gui/components/copysettingsandcachescomponent.h index 30dffad27..b2cb6f3d9 100644 --- a/src/gui/components/copysettingsandcachescomponent.h +++ b/src/gui/components/copysettingsandcachescomponent.h @@ -20,7 +20,6 @@ #include "gui/settings/dockwidgetsettings.h" #include "gui/settings/guisettings.h" #include "gui/settings/textmessagesettings.h" -#include "gui/settings/viewupdatesettings.h" #include "gui/swiftguiexport.h" #include "misc/applicationinfo.h" #include "misc/audio/audiosettings.h" @@ -113,7 +112,6 @@ namespace swift::gui::components swift::misc::CSetting m_settingsAudioOutputDevice { this }; swift::misc::CSetting m_settingsGuiGeneral { this }; swift::misc::CSetting m_settingsDockWidget { this }; - swift::misc::CSetting m_settingsViewUpdate { this }; swift::misc::CSetting m_settingsConsolidation { this }; //!< consolidation time diff --git a/src/gui/components/copysettingsandcachescomponent.ui b/src/gui/components/copysettingsandcachescomponent.ui index bdeed111c..c4a0116fc 100644 --- a/src/gui/components/copysettingsandcachescomponent.ui +++ b/src/gui/components/copysettingsandcachescomponent.ui @@ -300,13 +300,6 @@ - - - - UI3 - - - diff --git a/src/gui/components/mappingcomponent.cpp b/src/gui/components/mappingcomponent.cpp index 36daf90ea..608fe975b 100644 --- a/src/gui/components/mappingcomponent.cpp +++ b/src/gui/components/mappingcomponent.cpp @@ -124,7 +124,9 @@ namespace swift::gui::components connect(&m_updateTimer, &QTimer::timeout, this, &CMappingComponent::timerUpdate); m_updateTimer.setObjectName(this->objectName() + "::updateTimer"); ui->tvp_AircraftModels->setDisplayAutomatically(false); - this->settingsChanged(); + + using namespace std::chrono_literals; + m_updateTimer.setInterval(10s); // selector ui->comp_SimulatorSelector->setRememberSelection(false); // pilot client UI @@ -563,13 +565,6 @@ namespace swift::gui::components this->updateRenderedAircraftView(true); // forced update } - void CMappingComponent::settingsChanged() - { - const CViewUpdateSettings settings = m_settings.get(); - const int ms = settings.getRenderingUpdateTime().toMs(); - m_updateTimer.setInterval(ms); - } - void CMappingComponent::onNetworkConnectionStatusChanged(const CConnectionStatus &from, const CConnectionStatus &to) { Q_UNUSED(from); diff --git a/src/gui/components/mappingcomponent.h b/src/gui/components/mappingcomponent.h index ddc328345..db44eef44 100644 --- a/src/gui/components/mappingcomponent.h +++ b/src/gui/components/mappingcomponent.h @@ -15,7 +15,6 @@ #include "gui/enablefordockwidgetinfoarea.h" #include "gui/overlaymessagesframe.h" -#include "gui/settings/viewupdatesettings.h" #include "gui/swiftguiexport.h" #include "misc/identifiable.h" #include "misc/identifier.h" @@ -161,9 +160,6 @@ namespace swift::gui //! Token bucket based update void tokenBucketUpdateAircraft(const swift::misc::simulation::CSimulatedAircraft &aircraft); - //! Settings have been changed - void settingsChanged(); - //! Connection status has been changed void onNetworkConnectionStatusChanged(const swift::misc::network::CConnectionStatus &from, const swift::misc::network::CConnectionStatus &to); @@ -191,9 +187,6 @@ namespace swift::gui QTimer m_updateTimer; bool m_missedRenderedAircraftUpdate = true; //! Rendered aircraft need update swift::misc::CTokenBucket m_bucket { 3, 5000, 1 }; - swift::misc::CSettingReadOnly m_settings { - this, &CMappingComponent::settingsChanged - }; //!< settings changed views::CCheckBoxDelegate *m_currentMappingsViewDelegate = nullptr; //! checkbox in view }; } // namespace components diff --git a/src/gui/components/settingscomponent.ui b/src/gui/components/settingscomponent.ui index 2ca64f7c7..8b49f9dc2 100644 --- a/src/gui/components/settingscomponent.ui +++ b/src/gui/components/settingscomponent.ui @@ -272,9 +272,6 @@ - - - @@ -692,12 +689,6 @@
gui/components/settingssimulatormessagescomponent.h
1 - - swift::gui::components::CSettingsViewUpdateTimes - QFrame -
gui/components/settingsviewupdatetimes.h
- 1 - swift::gui::components::CSettingsMatchingComponent QFrame diff --git a/src/gui/components/settingsviewupdatetimes.cpp b/src/gui/components/settingsviewupdatetimes.cpp deleted file mode 100644 index 341705984..000000000 --- a/src/gui/components/settingsviewupdatetimes.cpp +++ /dev/null @@ -1,54 +0,0 @@ -// SPDX-FileCopyrightText: Copyright (C) 2016 swift Project Community / Contributors -// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 - -#include "settingsviewupdatetimes.h" - -#include "ui_settingsviewupdatetimes.h" - -using namespace swift::gui::settings; -using namespace swift::misc::physical_quantities; - -namespace swift::gui::components -{ - CSettingsViewUpdateTimes::CSettingsViewUpdateTimes(QWidget *parent) - : QFrame(parent), ui(new Ui::CSettingsViewUpdateTimes) - { - ui->setupUi(this); - connect(ui->hs_RenderingUpdateTime, &QSlider::sliderReleased, this, - &CSettingsViewUpdateTimes::ps_sliderChanged); - connect(ui->hs_AircraftUpdateTime, &QSlider::sliderReleased, this, &CSettingsViewUpdateTimes::ps_sliderChanged); - connect(ui->hs_AtcUpdateTime, &QSlider::sliderReleased, this, &CSettingsViewUpdateTimes::ps_sliderChanged); - connect(ui->hs_UserUpdateTime, &QSlider::sliderReleased, this, &CSettingsViewUpdateTimes::ps_sliderChanged); - connect(ui->tb_ResetUser, &QToolButton::clicked, this, &CSettingsViewUpdateTimes::ps_resetUpdateTimes); - - this->ps_settingsChanged(); - } - - CSettingsViewUpdateTimes::~CSettingsViewUpdateTimes() {} - - void CSettingsViewUpdateTimes::ps_sliderChanged() - { - CViewUpdateSettings settings; - settings.setAircraftUpdateTime(CTime(ui->hs_AircraftUpdateTime->value(), CTimeUnit::s())); - settings.setAtcUpdateTime(CTime(ui->hs_AtcUpdateTime->value(), CTimeUnit::s())); - settings.setRenderingUpdateTime(CTime(ui->hs_RenderingUpdateTime->value(), CTimeUnit::s())); - settings.setUserUpdateTime(CTime(ui->hs_UserUpdateTime->value(), CTimeUnit::s())); - m_settings.setAndSave(settings); - } - - void CSettingsViewUpdateTimes::ps_settingsChanged() - { - const CViewUpdateSettings settings(this->m_settings.get()); - ui->hs_AircraftUpdateTime->setValue(settings.getAircraftUpdateTime().toSeconds()); - ui->hs_AtcUpdateTime->setValue(settings.getAtcUpdateTime().toSeconds()); - ui->hs_RenderingUpdateTime->setValue(settings.getRenderingUpdateTime().toSeconds()); - ui->hs_UserUpdateTime->setValue(settings.getUserUpdateTime().toSeconds()); - } - - void CSettingsViewUpdateTimes::ps_resetUpdateTimes() - { - CViewUpdateSettings settings; - m_settings.setAndSave(settings); - this->ps_settingsChanged(); - } -} // namespace swift::gui::components diff --git a/src/gui/components/settingsviewupdatetimes.h b/src/gui/components/settingsviewupdatetimes.h deleted file mode 100644 index fc8bfba0e..000000000 --- a/src/gui/components/settingsviewupdatetimes.h +++ /dev/null @@ -1,51 +0,0 @@ -// SPDX-FileCopyrightText: Copyright (C) 2016 swift Project Community / Contributors -// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 - -//! \file - -#ifndef SWIFT_GUI_COMPONENTS_SETTINGSVIEWUPDATETIMES_H -#define SWIFT_GUI_COMPONENTS_SETTINGSVIEWUPDATETIMES_H - -#include - -#include "gui/settings/viewupdatesettings.h" - -namespace Ui -{ - class CSettingsViewUpdateTimes; -} -namespace swift::gui::components -{ - /*! - * Update rates / times - */ - class CSettingsViewUpdateTimes : public QFrame - { - Q_OBJECT - - public: - //! Constructor - explicit CSettingsViewUpdateTimes(QWidget *parent = nullptr); - - //! Destructor - virtual ~CSettingsViewUpdateTimes(); - - private slots: - //! Slider changed - void ps_sliderChanged(); - - //! Settings have been changed - void ps_settingsChanged(); - - //! Reset all update times - void ps_resetUpdateTimes(); - - private: - QScopedPointer ui; - swift::misc::CSetting m_settings { - this, &CSettingsViewUpdateTimes::ps_settingsChanged - }; //!< settings changed - }; -} // namespace swift::gui::components - -#endif // SWIFT_GUI_COMPONENTS_SETTINGSVIEWUPDATETIMES_H diff --git a/src/gui/components/settingsviewupdatetimes.ui b/src/gui/components/settingsviewupdatetimes.ui deleted file mode 100644 index 20a1f8436..000000000 --- a/src/gui/components/settingsviewupdatetimes.ui +++ /dev/null @@ -1,213 +0,0 @@ - - - CSettingsViewUpdateTimes - - - - 0 - 0 - 304 - 77 - - - - Frame - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 1 - - - 1 - - - 1 - - - 1 - - - - - View update times - - - - 4 - - - 4 - - - 10 - - - 4 - - - 4 - - - - - 5 - - - 30 - - - 5 - - - 5 - - - 10 - - - Qt::Horizontal - - - - - - - ... - - - - :/pastel/icons/pastel/16/arrow-refresh-small.png:/pastel/icons/pastel/16/arrow-refresh-small.png - - - - - - - User update time (5-30s) - - - User - - - - - - - 5 - - - 30 - - - 5 - - - 5 - - - 10 - - - Qt::Horizontal - - - - - - - Aircraft update time (5-30s) - - - Aircraft - - - - - - - 5 - - - 30 - - - 5 - - - 5 - - - 10 - - - Qt::Horizontal - - - - - - - 5 - - - 30 - - - 5 - - - 5 - - - 10 - - - Qt::Horizontal - - - - - - - Rendering update time (5-30s) - - - Rendering - - - - - - - ATC update time (5-30s) - - - ATC - - - - - lbl_AircraftUpdateTime - hs_AircraftUpdateTime - lbl_RenderingUpdateTime - hs_RenderingUpdateTime - lbl_AtcUpdateTime - hs_AtcUpdateTime - lbl_UserUpdateTime - hs_UserUpdateTime - tb_ResetUser - - - - - - - - - diff --git a/src/gui/components/usercomponent.cpp b/src/gui/components/usercomponent.cpp index 9e01ab05a..5f59917c7 100644 --- a/src/gui/components/usercomponent.cpp +++ b/src/gui/components/usercomponent.cpp @@ -39,7 +39,9 @@ namespace swift::gui::components connect(sGui->getIContextNetwork(), &IContextNetwork::connectionStatusChanged, this, &CUserComponent::onConnectionStatusChanged); connect(&m_updateTimer, &QTimer::timeout, this, &CUserComponent::update); - this->onSettingsChanged(); + + using namespace std::chrono_literals; + m_updateTimer.setInterval(10s); } CUserComponent::~CUserComponent() {} @@ -103,11 +105,4 @@ namespace swift::gui::components } else if (to.isConnected()) { m_updateTimer.start(); } } - - void CUserComponent::onSettingsChanged() - { - const CViewUpdateSettings settings = m_settings.get(); - const int ms = settings.getAtcUpdateTime().toMs(); - m_updateTimer.setInterval(ms); - } } // namespace swift::gui::components diff --git a/src/gui/components/usercomponent.h b/src/gui/components/usercomponent.h index bc0cf6bb7..f9874e26c 100644 --- a/src/gui/components/usercomponent.h +++ b/src/gui/components/usercomponent.h @@ -13,7 +13,6 @@ #include #include "gui/enablefordockwidgetinfoarea.h" -#include "gui/settings/viewupdatesettings.h" #include "gui/swiftguiexport.h" #include "misc/aviation/callsign.h" #include "misc/network/connectionstatus.h" @@ -57,14 +56,8 @@ namespace swift::gui::components void onConnectionStatusChanged(const swift::misc::network::CConnectionStatus &from, const swift::misc::network::CConnectionStatus &to); - //! Settings have been changed - void onSettingsChanged(); - QScopedPointer ui; QTimer m_updateTimer; - swift::misc::CSettingReadOnly m_settings { - this, &CUserComponent::onSettingsChanged - }; }; } // namespace swift::gui::components #endif // SWIFT_GUI_USERCOMPONENT_H diff --git a/src/gui/registermetadata.cpp b/src/gui/registermetadata.cpp index 3e30d2ff0..a7f4d09b2 100644 --- a/src/gui/registermetadata.cpp +++ b/src/gui/registermetadata.cpp @@ -8,7 +8,6 @@ #include "gui/settings/guisettings.h" #include "gui/settings/navigatorsettings.h" #include "gui/settings/textmessagesettings.h" -#include "gui/settings/viewupdatesettings.h" namespace swift::gui { @@ -16,7 +15,6 @@ namespace swift::gui { swift::gui::settings::CDockWidgetSettings::registerMetadata(); swift::gui::settings::CNavigatorSettings::registerMetadata(); - swift::gui::settings::CViewUpdateSettings::registerMetadata(); swift::gui::settings::CGeneralGuiSettings::registerMetadata(); swift::gui::settings::CTextMessageSettings::registerMetadata(); swift::gui::components::registerMetadata(); diff --git a/src/gui/settings/viewupdatesettings.cpp b/src/gui/settings/viewupdatesettings.cpp deleted file mode 100644 index 965bdea97..000000000 --- a/src/gui/settings/viewupdatesettings.cpp +++ /dev/null @@ -1,79 +0,0 @@ -// SPDX-FileCopyrightText: Copyright (C) 2016 swift Project Community / Contributors -// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 - -#include "viewupdatesettings.h" - -#include - -#include "gui/guiutility.h" -#include "misc/stringutils.h" - -using namespace swift::misc; -using namespace swift::misc::physical_quantities; -using namespace swift::gui; - -SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::gui::settings, CViewUpdateSettings) - -namespace swift::gui::settings -{ - CViewUpdateSettings::CViewUpdateSettings() {} - - void CViewUpdateSettings::reset() - { - this->m_updateAircraft = CTime(10.0, CTimeUnit::s()); - this->m_updateAtc = CTime(10.0, CTimeUnit::s()); - this->m_updateRendering = CTime(10.0, CTimeUnit::s()); - this->m_updateUser = CTime(10.0, CTimeUnit::s()); - } - - bool CViewUpdateSettings::isValid() const - { - // too fast updates cause CPU overload - static const CTime min(5.0, CTimeUnit::s()); - return this->m_updateAircraft >= min && this->m_updateAtc >= min && this->m_updateRendering >= min && - this->m_updateUser >= min; - } - - QString CViewUpdateSettings::convertToQString(bool i18n) const - { - Q_UNUSED(i18n); - const QString s("Atc: %1 Aircraft: %2 User: %3 Rendering %4"); - return s.arg(m_updateAtc.valueRounded(CTimeUnit::s(), 2)) - .arg(m_updateAircraft.valueRounded(CTimeUnit::s(), 2)) - .arg(m_updateUser.valueRounded(CTimeUnit::s(), 2)) - .arg(m_updateRendering.valueRounded(CTimeUnit::s(), 2)); - } - - QVariant CViewUpdateSettings::propertyByIndex(CPropertyIndexRef index) const - { - if (index.isMyself()) { return QVariant::fromValue(*this); } - ColumnIndex i = index.frontCasted(); - switch (i) - { - case IndexAircraft: return QVariant::fromValue(this->m_updateAircraft); - case IndexAtc: return QVariant::fromValue(this->m_updateAtc); - case IndexRendering: return QVariant::fromValue(this->m_updateRendering); - case IndexUser: return QVariant::fromValue(this->m_updateUser); - default: return CValueObject::propertyByIndex(index); - } - } - - void CViewUpdateSettings::setPropertyByIndex(CPropertyIndexRef index, const QVariant &variant) - { - if (index.isMyself()) - { - (*this) = variant.value(); - return; - } - - ColumnIndex i = index.frontCasted(); - switch (i) - { - case IndexAircraft: this->m_updateAircraft = variant.value(); break; - case IndexAtc: this->m_updateAtc = variant.value(); break; - case IndexRendering: this->m_updateRendering = variant.value(); break; - case IndexUser: this->m_updateUser = variant.value(); break; - default: CValueObject::setPropertyByIndex(index, variant); break; - } - } -} // namespace swift::gui::settings diff --git a/src/gui/settings/viewupdatesettings.h b/src/gui/settings/viewupdatesettings.h deleted file mode 100644 index fae178298..000000000 --- a/src/gui/settings/viewupdatesettings.h +++ /dev/null @@ -1,121 +0,0 @@ -// SPDX-FileCopyrightText: Copyright (C) 2016 swift Project Community / Contributors -// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 - -//! \file - -#ifndef SWIFT_GUI_SETTINGS_VIEWUPDATESETTINGS_H -#define SWIFT_GUI_SETTINGS_VIEWUPDATESETTINGS_H - -#include -#include -#include - -#include "gui/swiftguiexport.h" -#include "misc/pq/time.h" -#include "misc/propertyindex.h" -#include "misc/settingscache.h" -#include "misc/variant.h" - -SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::gui::settings, CViewUpdateSettings) - -namespace swift::gui::settings -{ - //! Settings about view update rates - class SWIFT_GUI_EXPORT CViewUpdateSettings : public swift::misc::CValueObject - { - public: - //! Properties by index - enum ColumnIndex - { - IndexAtc = swift::misc::CPropertyIndexRef::GlobalIndexCViewUpdateSettings, - IndexAircraft, - IndexRendering, - IndexUser - }; - - //! Default constructor - CViewUpdateSettings(); - - //! Reset to defaults - void reset(); - - //! Get time - const swift::misc::physical_quantities::CTime &getAtcUpdateTime() const { return m_updateAtc; } - - //! Set time - void setAtcUpdateTime(const swift::misc::physical_quantities::CTime &time) { this->m_updateAtc = time; } - - //! Get time - const swift::misc::physical_quantities::CTime &getAircraftUpdateTime() const { return m_updateAircraft; } - - //! Set time - void setAircraftUpdateTime(const swift::misc::physical_quantities::CTime &time) - { - this->m_updateAircraft = time; - } - - //! Get time - const swift::misc::physical_quantities::CTime &getUserUpdateTime() const { return m_updateUser; } - - //! Set time - void setUserUpdateTime(const swift::misc::physical_quantities::CTime &time) { this->m_updateUser = time; } - - //! Get time - const swift::misc::physical_quantities::CTime &getRenderingUpdateTime() const { return m_updateRendering; } - - //! Set time - void setRenderingUpdateTime(const swift::misc::physical_quantities::CTime &time) - { - this->m_updateRendering = time; - } - - //! Valid? - bool isValid() const; - - //! \copydoc swift::misc::mixin::String::toQString - QString convertToQString(bool i18n = false) const; - - //! \copydoc swift::misc::mixin::Index::propertyByIndex - QVariant propertyByIndex(swift::misc::CPropertyIndexRef index) const; - - //! \copydoc swift::misc::mixin::Index::setPropertyByIndex - void setPropertyByIndex(swift::misc::CPropertyIndexRef index, const QVariant &variant); - - private: - swift::misc::physical_quantities::CTime m_updateAtc { 10.0, swift::misc::physical_quantities::CTimeUnit::s() }; - swift::misc::physical_quantities::CTime m_updateAircraft { 10.0, - swift::misc::physical_quantities::CTimeUnit::s() }; - swift::misc::physical_quantities::CTime m_updateRendering { 10.0, - swift::misc::physical_quantities::CTimeUnit::s() }; - swift::misc::physical_quantities::CTime m_updateUser { 10.0, swift::misc::physical_quantities::CTimeUnit::s() }; - - SWIFT_METACLASS( - CViewUpdateSettings, - SWIFT_METAMEMBER(updateAtc), - SWIFT_METAMEMBER(updateAircraft), - SWIFT_METAMEMBER(updateRendering), - SWIFT_METAMEMBER(updateUser)); - }; - - //! Trait for settings about update rates - struct TViewUpdateSettings : public swift::misc::TSettingTrait - { - //! \copydoc swift::misc::TSettingTrait::key - static const char *key() { return "guiviewupdate"; } - - //! \copydoc swift::misc::TSettingTrait::humanReadable - static const QString &humanReadable() - { - static const QString name("View update"); - return name; - } - - //! \copydoc swift::misc::TSettingTrait::isValid - static bool isValid(const CViewUpdateSettings &settings, QString &) { return settings.isValid(); } - }; -} // namespace swift::gui::settings - -Q_DECLARE_METATYPE(swift::gui::settings::CViewUpdateSettings) -Q_DECLARE_METATYPE(swift::misc::CCollection) - -#endif // SWIFT_GUI_SETTINGS_VIEWUPDATESETTINGS_H