diff --git a/scwx-qt/source/scwx/qt/main/main_window.cpp b/scwx-qt/source/scwx/qt/main/main_window.cpp index 57d0dffc..3712cb5f 100644 --- a/scwx-qt/source/scwx/qt/main/main_window.cpp +++ b/scwx-qt/source/scwx/qt/main/main_window.cpp @@ -66,6 +66,7 @@ public: level2ProductsGroup_ {nullptr}, level2SettingsGroup_ {nullptr}, level3ProductsGroup_ {nullptr}, + timelineGroup_ {nullptr}, level2ProductsWidget_ {nullptr}, level2SettingsWidget_ {nullptr}, level3ProductsWidget_ {nullptr}, @@ -151,6 +152,7 @@ public: ui::CollapsibleGroup* level2ProductsGroup_; ui::CollapsibleGroup* level2SettingsGroup_; ui::CollapsibleGroup* level3ProductsGroup_; + ui::CollapsibleGroup* timelineGroup_; ui::Level2ProductsWidget* level2ProductsWidget_; ui::Level2SettingsWidget* level2SettingsWidget_; @@ -202,21 +204,13 @@ MainWindow::MainWindow(QWidget* parent) : p->alertDockWidget_->setVisible(false); addDockWidget(Qt::BottomDockWidgetArea, p->alertDockWidget_); - // Animation Dock Widget - p->animationDockWidget_ = new ui::AnimationDockWidget(this); - p->animationDockWidget_->setVisible(true); - addDockWidget(Qt::LeftDockWidgetArea, p->animationDockWidget_); - // Configure Menu ui->menuView->insertAction(ui->actionRadarToolbox, ui->radarToolboxDock->toggleViewAction()); ui->radarToolboxDock->toggleViewAction()->setText(tr("Radar &Toolbox")); ui->actionRadarToolbox->setVisible(false); - ui->menuView->insertAction(ui->actionAnimationToolbox, - p->animationDockWidget_->toggleViewAction()); - p->animationDockWidget_->toggleViewAction()->setText( - tr("A&nimation Toolbox")); + // Deprecated: Hide Animation Toolbox Selection ui->actionAnimationToolbox->setVisible(false); ui->menuView->insertAction(ui->actionResourceExplorer, @@ -287,6 +281,12 @@ MainWindow::MainWindow(QWidget* parent) : ui->radarToolboxScrollAreaContents->layout()->addWidget( p->level2SettingsGroup_); + // Timeline + p->timelineGroup_ = new ui::CollapsibleGroup(tr("Timeline"), this); + p->animationDockWidget_ = new ui::AnimationDockWidget(this); + p->timelineGroup_->GetContentsLayout()->addWidget(p->animationDockWidget_); + ui->radarToolboxScrollAreaContents->layout()->addWidget(p->timelineGroup_); + // Reset toolbox spacer at the bottom ui->radarToolboxScrollAreaContents->layout()->removeItem( ui->radarToolboxSpacer); diff --git a/scwx-qt/source/scwx/qt/ui/animation_dock_widget.cpp b/scwx-qt/source/scwx/qt/ui/animation_dock_widget.cpp index 3d391407..34b1001a 100644 --- a/scwx-qt/source/scwx/qt/ui/animation_dock_widget.cpp +++ b/scwx-qt/source/scwx/qt/ui/animation_dock_widget.cpp @@ -51,7 +51,7 @@ public: }; AnimationDockWidget::AnimationDockWidget(QWidget* parent) : - QDockWidget(parent), + QFrame(parent), p {std::make_unique(this)}, ui(new Ui::AnimationDockWidget) { diff --git a/scwx-qt/source/scwx/qt/ui/animation_dock_widget.hpp b/scwx-qt/source/scwx/qt/ui/animation_dock_widget.hpp index 8b64d0c6..abc79c88 100644 --- a/scwx-qt/source/scwx/qt/ui/animation_dock_widget.hpp +++ b/scwx-qt/source/scwx/qt/ui/animation_dock_widget.hpp @@ -4,7 +4,7 @@ #include -#include +#include namespace Ui { @@ -20,7 +20,7 @@ namespace ui class AnimationDockWidgetImpl; -class AnimationDockWidget : public QDockWidget +class AnimationDockWidget : public QFrame { Q_OBJECT diff --git a/scwx-qt/source/scwx/qt/ui/animation_dock_widget.ui b/scwx-qt/source/scwx/qt/ui/animation_dock_widget.ui index 33485032..1c79eb48 100644 --- a/scwx-qt/source/scwx/qt/ui/animation_dock_widget.ui +++ b/scwx-qt/source/scwx/qt/ui/animation_dock_widget.ui @@ -1,353 +1,304 @@ AnimationDockWidget - + 0 0 - 200 - 543 + 189 + 264 - - Animation Toolbox + + QFrame::StyledPanel - - - - - - QFrame::NoFrame - - + + QFrame::Raised + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Auto Update: Enabled + + + + + + + Live View + + + true + + + + + + + Archive View + + + + + + + QAbstractSpinBox::CorrectToNearestValue + + + + 0 + 0 + 0 + 1991 + 6 + 1 + + + + yyyy-MM-dd + + + true + + + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + 0 - - Qt::ScrollBarAlwaysOff + + 0 - - true + + 0 - - - - 0 - 0 - 182 - 506 - - - - - 0 + + 0 + + + + + QAbstractSpinBox::CorrectToNearestValue - - 0 + + HH:mm - - 0 + + + + + + UTC - - 0 + + + + + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + QAbstractSpinBox::CorrectToNearestValue - - - - Timeline - - - - - - Auto Update: Enabled - - - - - - - Live View - - - true - - - - - - - Archive View - - - - - - - QAbstractSpinBox::CorrectToNearestValue - - - - 0 - 0 - 0 - 1991 - 6 - 1 - - - - yyyy-MM-dd - - - true - - - - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - QAbstractSpinBox::CorrectToNearestValue - - - HH:mm - - - - - - - UTC - - - - - - - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - QAbstractSpinBox::CorrectToNearestValue - - - min - - - 1 - - - 1440 - - - 30 - - - - - - - Loop Time - - - - - - - Loop Speed - - - - - - - QAbstractSpinBox::CorrectToNearestValue - - - x - - - 1.000000000000000 - - - 1.000000000000000 - - - - - - - Loop Delay - - - - - - - sec - - - 1 - - - 15.000000000000000 - - - 0.100000000000000 - - - 2.500000000000000 - - - - - - - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 1 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - ... - - - - :/res/icons/font-awesome-6/backward-step-solid.svg:/res/icons/font-awesome-6/backward-step-solid.svg - - - - - - - ... - - - - :/res/icons/font-awesome-6/angle-left-solid.svg:/res/icons/font-awesome-6/angle-left-solid.svg - - - - - - - ... - - - - :/res/icons/font-awesome-6/play-solid.svg:/res/icons/font-awesome-6/play-solid.svg - - - - - - - ... - - - - :/res/icons/font-awesome-6/angle-right-solid.svg:/res/icons/font-awesome-6/angle-right-solid.svg - - - - - - - ... - - - - :/res/icons/font-awesome-6/forward-step-solid.svg:/res/icons/font-awesome-6/forward-step-solid.svg - - - - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - + + min + + + 1 + + + 1440 + + + 30 + + + + + + + Loop Speed + + + + + + + Loop Delay + + + + + + + sec + + + 1 + + + 15.000000000000000 + + + 0.100000000000000 + + + 2.500000000000000 + + + + + + + QAbstractSpinBox::CorrectToNearestValue + + + x + + + 1.000000000000000 + + + 1.000000000000000 + + + + + + + Loop Time + + + + + + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 1 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + ... + + + + :/res/icons/font-awesome-6/backward-step-solid.svg:/res/icons/font-awesome-6/backward-step-solid.svg + + + + + + + ... + + + + :/res/icons/font-awesome-6/angle-left-solid.svg:/res/icons/font-awesome-6/angle-left-solid.svg + + + + + + + ... + + + + :/res/icons/font-awesome-6/play-solid.svg:/res/icons/font-awesome-6/play-solid.svg + + + + + + + ... + + + + :/res/icons/font-awesome-6/angle-right-solid.svg:/res/icons/font-awesome-6/angle-right-solid.svg + + + + + + + ... + + + + :/res/icons/font-awesome-6/forward-step-solid.svg:/res/icons/font-awesome-6/forward-step-solid.svg + + + + + + +