Move timeline to Radar Toolbox

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,
+   // Deprecated: Hide Animation Toolbox Selection
-                              p->animationDockWidget_->toggleViewAction());
-   p->animationDockWidget_->toggleViewAction()->setText(
-      tr("A&nimation Toolbox"));
    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);

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<AnimationDockWidgetImpl>(this)},
     ui(new Ui::AnimationDockWidget)
 {

scwx-qt/source/scwx/qt/ui/animation_dock_widget.hpp

@@ -4,7 +4,7 @@
 
 #include <chrono>
 
-#include <QDockWidget>
+#include <QFrame>
 
 namespace Ui
 {
@@ -20,7 +20,7 @@ namespace ui
 
 class AnimationDockWidgetImpl;
 
-class AnimationDockWidget : public QDockWidget
+class AnimationDockWidget : public QFrame
 {
    Q_OBJECT
 

scwx-qt/source/scwx/qt/ui/animation_dock_widget.ui

@@ -1,44 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>AnimationDockWidget</class>
- <widget class="QDockWidget" name="AnimationDockWidget">
+ <widget class="QFrame" name="AnimationDockWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>200</width>
+    <width>189</width>
-    <height>543</height>
+    <height>264</height>
    </rect>
   </property>
-  <property name="windowTitle">
-   <string>Animation Toolbox</string>
-  </property>
-  <widget class="QWidget" name="dockWidgetContents">
-   <layout class="QVBoxLayout" name="verticalLayout">
-    <item>
-     <widget class="QScrollArea" name="scrollArea">
   <property name="frameShape">
-       <enum>QFrame::NoFrame</enum>
+   <enum>QFrame::StyledPanel</enum>
   </property>
-      <property name="lineWidth">
+  <property name="frameShadow">
-       <number>0</number>
+   <enum>QFrame::Raised</enum>
   </property>
-      <property name="horizontalScrollBarPolicy">
+  <layout class="QVBoxLayout" name="verticalLayout_3">
-       <enum>Qt::ScrollBarAlwaysOff</enum>
-      </property>
-      <property name="widgetResizable">
-       <bool>true</bool>
-      </property>
-      <widget class="QWidget" name="scrollAreaContents">
-       <property name="geometry">
-        <rect>
-         <x>0</x>
-         <y>0</y>
-         <width>182</width>
-         <height>506</height>
-        </rect>
-       </property>
-       <layout class="QVBoxLayout" name="verticalLayout_2">
    <property name="leftMargin">
     <number>0</number>
    </property>
@@ -51,12 +29,6 @@
    <property name="bottomMargin">
     <number>0</number>
    </property>
-        <item>
-         <widget class="QGroupBox" name="timelineGroupBox">
-          <property name="title">
-           <string>Timeline</string>
-          </property>
-          <layout class="QVBoxLayout" name="verticalLayout_6">
    <item>
     <widget class="QLabel" name="autoUpdateLabel">
      <property name="text">
@@ -185,13 +157,6 @@
         </property>
        </widget>
       </item>
-              <item row="0" column="0">
-               <widget class="QLabel" name="loopTimeLabel">
-                <property name="text">
-                 <string>Loop Time</string>
-                </property>
-               </widget>
-              </item>
       <item row="1" column="0">
        <widget class="QLabel" name="loopSpeedLabel">
         <property name="text">
@@ -199,22 +164,6 @@
         </property>
        </widget>
       </item>
-              <item row="1" column="1">
-               <widget class="QDoubleSpinBox" name="loopSpeedSpinBox">
-                <property name="correctionMode">
-                 <enum>QAbstractSpinBox::CorrectToNearestValue</enum>
-                </property>
-                <property name="suffix">
-                 <string>x</string>
-                </property>
-                <property name="minimum">
-                 <double>1.000000000000000</double>
-                </property>
-                <property name="value">
-                 <double>1.000000000000000</double>
-                </property>
-               </widget>
-              </item>
       <item row="2" column="0">
        <widget class="QLabel" name="loopDelayLabel">
         <property name="text">
@@ -241,6 +190,29 @@
         </property>
        </widget>
       </item>
+      <item row="1" column="1">
+       <widget class="QDoubleSpinBox" name="loopSpeedSpinBox">
+        <property name="correctionMode">
+         <enum>QAbstractSpinBox::CorrectToNearestValue</enum>
+        </property>
+        <property name="suffix">
+         <string>x</string>
+        </property>
+        <property name="minimum">
+         <double>1.000000000000000</double>
+        </property>
+        <property name="value">
+         <double>1.000000000000000</double>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0">
+       <widget class="QLabel" name="loopTimeLabel">
+        <property name="text">
+         <string>Loop Time</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
@@ -328,27 +300,6 @@
    </item>
   </layout>
  </widget>
-        </item>
-        <item>
-         <spacer name="verticalSpacer">
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>20</width>
-            <height>40</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
-      </widget>
-     </widget>
-    </item>
-   </layout>
-  </widget>
- </widget>
  <resources>
   <include location="../../../../scwx-qt.qrc"/>
  </resources>