diff --git a/scwx-qt/source/scwx/qt/main/main_window.cpp b/scwx-qt/source/scwx/qt/main/main_window.cpp index acf05368..913dd5e3 100644 --- a/scwx-qt/source/scwx/qt/main/main_window.cpp +++ b/scwx-qt/source/scwx/qt/main/main_window.cpp @@ -281,6 +281,7 @@ MainWindow::MainWindow(QWidget* parent) : // Configure Alert Dock bool alertDockVisible_ = uiSettings.alert_dock_visible().GetValue(); p->alertDockWidget_ = new ui::AlertDockWidget(this); + p->alertDockWidget_->setVisible(false); addDockWidget(Qt::BottomDockWidgetArea, p->alertDockWidget_); p->alertDockWidget_->setVisible(alertDockVisible_); diff --git a/scwx-qt/source/scwx/qt/settings/ui_settings.cpp b/scwx-qt/source/scwx/qt/settings/ui_settings.cpp index c5536230..316f31eb 100644 --- a/scwx-qt/source/scwx/qt/settings/ui_settings.cpp +++ b/scwx-qt/source/scwx/qt/settings/ui_settings.cpp @@ -19,7 +19,6 @@ public: level3ProductsExpanded_.SetDefault(true); mapSettingsExpanded_.SetDefault(true); timelineExpanded_.SetDefault(true); - alertDockVisible_.SetDefault(false); radarToolboxDockVisible_.SetDefault(true); mainUIState_.SetDefault(""); } @@ -31,7 +30,6 @@ public: SettingsVariable level3ProductsExpanded_ {"level3_products_expanded"}; SettingsVariable mapSettingsExpanded_ {"map_settings_expanded"}; SettingsVariable timelineExpanded_ {"timeline_expanded"}; - SettingsVariable alertDockVisible_ {"alert_dock_visible"}; SettingsVariable radarToolboxDockVisible_ {"radar_toolbox_dock_visible"}; SettingsVariable mainUIState_ {"main_ui_state"}; }; @@ -44,7 +42,6 @@ UiSettings::UiSettings() : &p->level3ProductsExpanded_, &p->mapSettingsExpanded_, &p->timelineExpanded_, - &p->alertDockVisible_, &p->radarToolboxDockVisible_, &p->mainUIState_}); SetDefaults(); @@ -79,10 +76,6 @@ SettingsVariable& UiSettings::timeline_expanded() const return p->timelineExpanded_; } -SettingsVariable& UiSettings::alert_dock_visible() const -{ - return p->alertDockVisible_; -} SettingsVariable& UiSettings::radar_toolbox_dock_visible() const { @@ -105,7 +98,6 @@ bool UiSettings::Shutdown() dataChanged |= p->level3ProductsExpanded_.Commit(); dataChanged |= p->mapSettingsExpanded_.Commit(); dataChanged |= p->timelineExpanded_.Commit(); - dataChanged |= p->alertDockVisible_.Commit(); dataChanged |= p->radarToolboxDockVisible_.Commit(); dataChanged |= p->mainUIState_.Commit(); @@ -125,7 +117,6 @@ bool operator==(const UiSettings& lhs, const UiSettings& rhs) lhs.p->level3ProductsExpanded_ == rhs.p->level3ProductsExpanded_ && lhs.p->mapSettingsExpanded_ == rhs.p->mapSettingsExpanded_ && lhs.p->timelineExpanded_ == rhs.p->timelineExpanded_ && - lhs.p->alertDockVisible_ == rhs.p->alertDockVisible_ && lhs.p->radarToolboxDockVisible_ == rhs.p->radarToolboxDockVisible_ && lhs.p->mainUIState_ == rhs.p->mainUIState_); } diff --git a/scwx-qt/source/scwx/qt/settings/ui_settings.hpp b/scwx-qt/source/scwx/qt/settings/ui_settings.hpp index 9fe9880b..6be8d48a 100644 --- a/scwx-qt/source/scwx/qt/settings/ui_settings.hpp +++ b/scwx-qt/source/scwx/qt/settings/ui_settings.hpp @@ -32,7 +32,6 @@ public: SettingsVariable& level3_products_expanded() const; SettingsVariable& map_settings_expanded() const; SettingsVariable& timeline_expanded() const; - SettingsVariable& alert_dock_visible() const; SettingsVariable& radar_toolbox_dock_visible() const; SettingsVariable& main_ui_state() const; diff --git a/scwx-qt/source/scwx/qt/ui/alert_dock_widget.cpp b/scwx-qt/source/scwx/qt/ui/alert_dock_widget.cpp index 242c847e..61fd160a 100644 --- a/scwx-qt/source/scwx/qt/ui/alert_dock_widget.cpp +++ b/scwx-qt/source/scwx/qt/ui/alert_dock_widget.cpp @@ -5,7 +5,6 @@ #include #include #include -#include #include #include #include @@ -82,15 +81,6 @@ AlertDockWidget::AlertDockWidget(QWidget* parent) : // Check Active Alerts and trigger signal ui->actionActiveAlerts->setChecked(true); - - // Update setting on visiblity change. - connect(toggleViewAction(), - &QAction::triggered, - this, - [](bool checked) { - settings::UiSettings::Instance().alert_dock_visible().StageValue( - checked); - }); } AlertDockWidget::~AlertDockWidget()