Keithel qt/orange styling tab info bar

resources/AdvancedTab.qml

@@ -5,66 +5,34 @@ import QtQuick 2.5
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.15
 
-Item {
+MainTab {
     id: advancedTab
 
-    width: parent.width
-    height: parent.height
+    subTabNames: ["System Monitor", "IMU", "Magnetometer", "Networking", "Spectrum Analyzer", "INS"]
+    curSubTabIndex: Globals.initialMainTabIndex == 6 ? Globals.initialSubTabIndex : 0
 
-    TabBar {
-        id: advancedBar
+    StackLayout {
+        id: advancedBarLayout
 
-        z: Constants.commonChart.zAboveCharts
-        currentIndex: Globals.initialMainTabIndex == 6 ? Globals.initialSubTabIndex : 0
-        contentHeight: Constants.tabBarHeight
-
-        Repeater {
-            model: ["System Monitor", "IMU", "Magnetometer", "Networking", "Spectrum Analyzer", "INS"]
-
-            TabButton {
-                text: modelData
-                width: implicitWidth
-            }
+        anchors.fill: parent
+        currentIndex: curSubTabIndex
 
+        AdvancedTabComponents.AdvancedSystemMonitorTab {
         }
 
-    }
-
-    Rectangle {
-        id: advancedTabBackground
-
-        width: parent.width
-        height: parent.height
-        anchors.top: advancedBar.bottom
-        anchors.bottom: advancedTab.bottom
-        Component.onCompleted: {
+        AdvancedTabComponents.AdvancedImuTab {
         }
 
-        StackLayout {
-            id: advancedBarLayout
-
-            width: parent.width
-            height: parent.height
-            currentIndex: advancedBar.currentIndex
-
-            AdvancedTabComponents.AdvancedSystemMonitorTab {
-            }
-
-            AdvancedTabComponents.AdvancedImuTab {
-            }
-
-            AdvancedTabComponents.AdvancedMagnetometerTab {
-            }
-
-            AdvancedTabComponents.AdvancedNetworkingTab {
-            }
+        AdvancedTabComponents.AdvancedMagnetometerTab {
+        }
 
-            AdvancedTabComponents.AdvancedSpectrumAnalyzerTab {
-            }
+        AdvancedTabComponents.AdvancedNetworkingTab {
+        }
 
-            AdvancedTabComponents.AdvancedInsTab {
-            }
+        AdvancedTabComponents.AdvancedSpectrumAnalyzerTab {
+        }
 
+        AdvancedTabComponents.AdvancedInsTab {
         }
 
     }

resources/BaselineTab.qml

@@ -5,12 +5,9 @@ import QtQuick 2.5
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
 
-Item {
+MainTab {
     id: baselineTab
 
-    width: parent.width
-    height: parent.height
-
     SplitView {
         id: baselineSplitView
 

resources/Constants/Constants.qml

@@ -49,10 +49,11 @@ QtObject {
     readonly property real smallPointSize: 7
     readonly property real mediumPointSize: 8
     readonly property real largePointSize: 9
+    readonly property string infoPath: "qrc:///images/fontawesome/info-circle-solid.svg"
     readonly property bool debugMode: false
     readonly property color swiftGrey: "#323F48"
     readonly property color swiftLightGrey: "#3C464F"
-    readonly property color swiftControlBackground: "#ECECEC"
+    readonly property color swiftControlBackground: "#E0E0E0"
     readonly property color tabButtonUnselectedTextColor: "#767676"
     readonly property color materialGrey: "dimgrey"
     readonly property color swiftOrange: "#FF8300"
@@ -95,13 +96,16 @@ QtObject {
         readonly property string settingsPath: "qrc:///images/fontawesome/cogs-solid.svg"
         readonly property string updatePath: "qrc:///images/fontawesome/chevron-circle-up-solid.svg"
         readonly property string advancedPath: "qrc:///images/fontawesome/lock-solid.svg"
-        readonly property real tabBarHeight: 45
-        readonly property real tabBarWidth: 50
+        readonly property real tabBarHeight: 48
+        readonly property real tabBarWidth: 62
         readonly property int buttonPadding: 0
         readonly property int buttonInset: 0
         readonly property int separatorMargin: 10
         readonly property int separatorHeight: 1
-        readonly property color backgroundColor: "#fafafa"
+        readonly property color backgroundColor: swiftGrey
+        readonly property color statusGoodColor: "#07DD01"
+        readonly property color statusOkColor: "yellow"
+        readonly property color statusBadColor: "red"
     }
 
     updateTab: QtObject {
@@ -572,6 +576,7 @@ QtObject {
         readonly property string solidCirclePath: "qrc:///images/fontawesome/circle-solid.svg"
         readonly property string squareSolidPath: "qrc:///images/fontawesome/square-solid.svg"
         readonly property string swiftLogoPath: "qrc:///images/icon.png"
+        readonly property string swiftLogoWidePath: "qrc:///images/swiftLogoWide.svg"
     }
 
     insSettingsPopup: QtObject {

resources/MainTab.qml

@@ -0,0 +1,6 @@
+import QtQuick 2.5
+
+Item {
+    property var subTabNames: []
+    property int curSubTabIndex: -1
+}

resources/MainTabs.qml

@@ -4,32 +4,43 @@ import QtQuick.Layouts 1.15
 import SwiftConsole 1.0
 
 Item {
+    id: mainTabs
+
     property alias currentIndex: stackLayout.currentIndex
+    property var subTabNames: mainTabs.currentIndex < 0 ? [] : stackLayout.children[stackLayout.currentIndex].subTabNames
+    property int curSubTabIndex: -1
 
     StackLayout {
         id: stackLayout
 
         anchors.fill: parent
 
         TrackingTab {
+            curSubTabIndex: mainTabs.curSubTabIndex
         }
 
         SolutionTab {
+            curSubTabIndex: mainTabs.curSubTabIndex
         }
 
         BaselineTab {
+            curSubTabIndex: mainTabs.curSubTabIndex
         }
 
         ObservationTab {
+            curSubTabIndex: mainTabs.curSubTabIndex
         }
 
         SettingsTab {
+            curSubTabIndex: mainTabs.curSubTabIndex
         }
 
         UpdateTab {
+            curSubTabIndex: mainTabs.curSubTabIndex
         }
 
         AdvancedTab {
+            curSubTabIndex: mainTabs.curSubTabIndex
         }
 
     }

resources/ObservationTab.qml

@@ -6,12 +6,9 @@ import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
 import SwiftConsole 1.0
 
-Item {
+MainTab {
     id: observationTab
 
-    width: parent.width
-    height: parent.height
-
     SplitView {
         id: observationView
 

resources/SettingsTab.qml

@@ -1,15 +1,13 @@
 import "Constants"
 import Qt.labs.platform 1.1 as LabsPlatform
-import QtCharts 2.2
-import QtQuick 2.7
-import QtQuick.Controls 1.4
+import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Dialogs 1.3
 import QtQuick.Layouts 1.15
 import "SettingsTabComponents" as SettingsTabComponents
 import SwiftConsole 1.0
 
-Item {
+MainTab {
     id: settingsTab
 
     function selectedRow() {
@@ -40,9 +38,6 @@ Item {
         return text;
     }
 
-    width: parent.width
-    height: parent.height
-
     SettingsTabData {
         id: settingsTabData
     }