Removal of 'SwiftNav' Qt Quick Control style

Because QTBUG-108518 will not be resolved in time for 6.5, we must
remove the use of custom Qt Quick Control Styles that require fallback
to another style, as the fallback style's theme does not properly
initialize. (See bug).

This removes the SwiftNav style Qt Quick Controls.

Some additional things done here:
    * Remove use of SwiftButton where the customization done in
      SwiftButton was not used, and Material button is more appropriate
      to use with the same look and feel.
    * Remove use of SwiftComboBox where the customization done in
      SwiftComboBox was not used, and Material ComboBox is more
      appropriate to use with the same look and feel.
    * Remove access to change orientation of TabBar, as this was never
      used. It was originally added, as the original implementation of
      the SideNavBar was originally implemented with an altered Vertical
      TabBar, however when I refactored it, I found that TabBar was not
      the right tool for the job, and abandoned the TabBar based
      SideNavBar implementation. This was a vestige of that logic.
    * Use swiftWhite constant instead of literal "white".
    * Tweaks to the SwiftTabButtons on the TabInfoBar to make it
      display correctly.

Author: keithel-qt

resources/styles/SwiftNav/TabBar.qml renamed to resources/BaseComponents/SwiftTabBar.qml

@@ -36,24 +36,23 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+import "../Constants"
 import QtQuick
+import QtQuick.Templates as T
 import QtQuick.Controls.Material
 import QtQuick.Controls.Material.impl
-import QtQuick.Templates as T
 
 T.TabBar {
     id: control
 
-    property var orientation: ListView.Horizontal
-
     implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, contentWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, contentHeight + topPadding + bottomPadding)
 
     contentItem: ListView {
         model: control.contentModel
         currentIndex: control.currentIndex
         spacing: control.spacing
-        orientation: control.orientation
+        orientation: ListView.Horizontal
         boundsBehavior: Flickable.StopAtBounds
         flickableDirection: Flickable.AutoFlickIfNeeded
         snapMode: ListView.SnapToItem
@@ -79,7 +78,7 @@ T.TabBar {
     background: Item {
         Rectangle {
             anchors.fill: parent
-            color: "white"
+            color: Constants.swiftWhite
             layer.enabled: control.Material.elevation > 0
 
             layer.effect: ElevationEffect {

resources/BaseComponents/SwiftTabButton.qml

@@ -0,0 +1,60 @@
+import "../Constants"
+import QtQuick
+import QtQuick.Controls.Material
+import QtQuick.Controls.Material.impl
+import QtQuick.Controls.impl
+import QtQuick.Templates as T
+
+T.TabButton {
+    id: control
+
+    property color labelColor: !control.enabled ? control.Material.hintTextColor : control.down || control.checked ? Constants.swiftWhite : Constants.tabButtonUnselectedTextColor
+    property color gradientStartColor: down || checked ? Qt.lighter(Constants.swiftGrey, 1.7) : hovered ? Qt.lighter(Constants.swiftControlBackground, 1.1) : Constants.swiftWhite
+    property color backgroundColor: down || checked ? Constants.swiftGrey : hovered ? Qt.darker(Constants.swiftControlBackground, 1.1) : Constants.swiftControlBackground
+    property bool border: true
+
+    implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, implicitContentWidth + leftPadding + rightPadding)
+    implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, implicitContentHeight + topPadding + bottomPadding)
+    padding: 12
+    spacing: 6
+    icon.width: 24
+    icon.height: 24
+    icon.color: !enabled ? Material.hintTextColor : down || checked ? Constants.swiftWhite : Constants.tabButtonUnselectedTextColor
+
+    font {
+        family: "Roboto"
+        pixelSize: Constants.largePixelSize
+        bold: true
+        capitalization: Font.MixedCase
+    }
+
+    contentItem: IconLabel {
+        spacing: control.spacing
+        mirrored: control.mirrored
+        display: control.display
+        icon: control.icon
+        text: control.text
+        font: control.font
+        color: control.labelColor
+    }
+
+    background: Rectangle {
+        border.width: control.border ? 1 : 0
+        border.color: Constants.spacerColor
+        implicitHeight: control.Material.touchTarget
+        clip: true
+        color: backgroundColor
+
+        gradient: Gradient {
+            GradientStop {
+                position: 0
+                color: gradientStartColor
+            }
+
+            GradientStop {
+                position: 1
+                color: backgroundColor
+            }
+        }
+    }
+}

resources/LogoPopup.qml

@@ -21,7 +21,7 @@ Item {
         ColumnLayout {
             anchors.fill: parent
 
-            TabBar {
+            SwiftTabBar {
                 id: logoPopupBar
 
                 z: Constants.commonChart.zAboveCharts
@@ -31,7 +31,7 @@ Item {
                 Repeater {
                     model: ["About", "Licenses"]
 
-                    TabButton {
+                    SwiftTabButton {
                         text: modelData
                         width: implicitWidth
                     }

resources/TabInfoBar.qml

@@ -68,7 +68,6 @@ Rectangle {
         anchors.bottom: parent.bottom
         height: 1
         color: Constants.spacerColor
-        z: 2
     }
 
     RowLayout {
@@ -89,7 +88,7 @@ Rectangle {
             font: Constants.tabInfoBar.tabLabelFont
         }
 
-        TabBar {
+        SwiftTabBar {
             id: tabBar
 
             visible: tabBarRepeater.count > 0
@@ -108,11 +107,12 @@ Rectangle {
                 }
                 model: subTabNames
 
-                TabButton {
+                SwiftTabButton {
                     width: implicitWidth
-                    topPadding: 16
-                    bottomPadding: 16
-                    rightInset: -0.5
+                    topPadding: 17.5
+                    bottomPadding: 17.5
+                    rightInset: -1
+                    leftInset: -1
                     text: modelData
                 }
             }

resources/console_resources.qrc

@@ -128,10 +128,9 @@
     <file>BaseComponents/SwiftImage.qml</file>
     <file>BaseComponents/SwiftComboBox.qml</file>
     <file>BaseComponents/SwiftRoundButton.qml</file>
+    <file>BaseComponents/SwiftTabBar.qml</file>
+    <file>BaseComponents/SwiftTabButton.qml</file>
     <file>ChartLegend.qml</file>
-    <file>styles/SwiftNav/qmldir</file>
-    <file>styles/SwiftNav/TabBar.qml</file>
-    <file>styles/SwiftNav/TabButton.qml</file>
     <file>MainTab.qml</file>
     <file>TabInfoBar.qml</file>
     <file>PositionLoopAnimation.qml</file>

resources/qtquickcontrols2.conf

@@ -1,10 +1,5 @@
 [Controls]
 Style=Material
-FallbackStyle=Material
-
-[SwiftNav\Font]
-Family=Roboto Condensed
-PixelSize=9
 
 [Material]
 Variant=Dense

resources/styles/SwiftNav/TabButton.qml

@@ -82,6 +82,8 @@
         "resources/BaseComponents/SwiftValueAxis.qml",
         "resources/BaseComponents/SwiftComboBox.qml",
         "resources/BaseComponents/SwiftRoundButton.qml",
+        "resources/BaseComponents/SwiftTabBar.qml",
+        "resources/BaseComponents/SwiftTabButton.qml",
 
         "resources/BaselineTabComponents/BaselinePlot.qml",
         "resources/BaselineTabComponents/BaselineTable.qml",
@@ -184,10 +186,6 @@
         "resources/SolutionTabComponents/SolutionTable.qml",
         "resources/SolutionTabComponents/SolutionVelocityTab.qml",
 
-        "resources/styles/SwiftNav/qmldir",
-        "resources/styles/SwiftNav/TabBar.qml",
-        "resources/styles/SwiftNav/TabButton.qml",
-
         "resources/TableComponents/SortableColumnHeading.qml",
         "resources/TableComponents/SwiftTableView.qml",
         "resources/TableComponents/TableCellDelegate.qml",

resources/styles/SwiftNav/qmldir

@@ -739,7 +739,6 @@ def main(passed_args: Optional[Tuple[str, ...]] = None) -> int:
     QFontDatabase.addApplicationFont(":/fonts/Roboto-Bold.ttf")
     QFontDatabase.addApplicationFont(":/fonts/RobotoCondensed-Regular.ttf")
     QQuickStyle.setStyle("Material")
-    QQuickStyle.setFallbackStyle("Material")
     # We specifically *don't* want the RobotoCondensed-Bold.ttf font so we get the right look when bolded.
 
     qmlRegisterType(ConnectionData, "SwiftConsole", 1, 0, "ConnectionData")  # type: ignore