From bd7768ef9e76f2d24565ff0c89fd69cf76821f93 Mon Sep 17 00:00:00 2001 From: John Michael Burke Date: Wed, 9 Feb 2022 15:11:52 -0800 Subject: [PATCH] Add new side nav bar icons. --- resources/Constants/Constants.qml | 16 ++++++++-------- resources/SideNavBar.qml | 16 ++++++++-------- resources/console_resources.qrc | 8 ++++++++ resources/images/swift-nav/Advanced.svg | 1 + resources/images/swift-nav/Baseline.svg | 1 + resources/images/swift-nav/Connection.svg | 1 + resources/images/swift-nav/Observations.svg | 1 + resources/images/swift-nav/Settings.svg | 1 + resources/images/swift-nav/Solution.svg | 1 + resources/images/swift-nav/Tracking.svg | 1 + resources/images/swift-nav/Update.svg | 1 + 11 files changed, 32 insertions(+), 16 deletions(-) create mode 100644 resources/images/swift-nav/Advanced.svg create mode 100644 resources/images/swift-nav/Baseline.svg create mode 100644 resources/images/swift-nav/Connection.svg create mode 100644 resources/images/swift-nav/Observations.svg create mode 100644 resources/images/swift-nav/Settings.svg create mode 100644 resources/images/swift-nav/Solution.svg create mode 100644 resources/images/swift-nav/Tracking.svg create mode 100644 resources/images/swift-nav/Update.svg diff --git a/resources/Constants/Constants.qml b/resources/Constants/Constants.qml index 8a7d7bd36..74cb58b6c 100644 --- a/resources/Constants/Constants.qml +++ b/resources/Constants/Constants.qml @@ -125,14 +125,6 @@ QtObject { sideNavBar: QtObject { readonly property int buttonSvgHeight: 15 - readonly property string hamburgerPath: "qrc:/images/fontawesome/bars-solid.svg" - readonly property string trackingPath: "qrc:/images/fontawesome/satellite-solid.svg" - readonly property string solutionPath: "qrc:/images/fontawesome/map-marker-alt-solid.svg" - readonly property string baselinePath: "qrc:/images/fontawesome/braille-solid.svg" - readonly property string observationsPath: "qrc:/images/fontawesome/table-solid.svg" - 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: 48 readonly property real tabBarWidth: 62 readonly property int buttonPadding: 0 @@ -657,6 +649,14 @@ QtObject { readonly property string swiftLogoWidePath: "qrc:/images/swiftLogoWide.svg" readonly property string folderPath: "qrc:/images/fontawesome/folder-regular.svg" readonly property string xPath: "qrc:/images/iconic/x.svg" + readonly property string advancedPath: "qrc:/images/swift-nav/Advanced.svg" + readonly property string baselinePath: "qrc:/images/swift-nav/Baseline.svg" + readonly property string connectionPath: "qrc:/images/swift-nav/Connection.svg" + readonly property string observationsPath: "qrc:/images/swift-nav/Observations.svg" + readonly property string trackingPath: "qrc:/images/swift-nav/Tracking.svg" + readonly property string solutionPath: "qrc:/images/swift-nav/Solution.svg" + readonly property string settingsPath: "qrc:/images/swift-nav/Settings.svg" + readonly property string updatePath: "qrc:/images/swift-nav/Update.svg" } insSettingsPopup: QtObject { diff --git a/resources/SideNavBar.qml b/resources/SideNavBar.qml index 1c73300a4..d4fe826c6 100644 --- a/resources/SideNavBar.qml +++ b/resources/SideNavBar.qml @@ -17,31 +17,31 @@ Item { property var tabModel: [{ "name": "Tracking", "tooltip": "Tracking", - "source": Constants.sideNavBar.trackingPath + "source": Constants.icons.trackingPath }, { "name": "Solution", "tooltip": "Solution", - "source": Constants.sideNavBar.solutionPath + "source": Constants.icons.solutionPath }, { "name": "Baseline", "tooltip": "Baseline", - "source": Constants.sideNavBar.baselinePath + "source": Constants.icons.baselinePath }, { "name": "Observations", "tooltip": "Observations", - "source": Constants.sideNavBar.observationsPath + "source": Constants.icons.observationsPath }, { "name": "Settings", "tooltip": "Settings", - "source": Constants.sideNavBar.settingsPath + "source": Constants.icons.settingsPath }, { "name": "Update", "tooltip": "Update", - "source": Constants.sideNavBar.updatePath + "source": Constants.icons.updatePath }, { "name": "Advanced", "tooltip": "Advanced", - "source": Constants.sideNavBar.advancedPath + "source": Constants.icons.advancedPath }] function clickButton(index) { @@ -129,7 +129,7 @@ Item { Layout.fillWidth: true implicitHeight: Constants.sideNavBar.tabBarHeight text: "Connection" - icon.source: Constants.icons.lightningBoltPath + icon.source: Constants.icons.connectionPath ToolTip.text: "Connection Dialog" checkable: false enabled: stack.mainViewVisible() diff --git a/resources/console_resources.qrc b/resources/console_resources.qrc index ee19378f1..77cc19def 100644 --- a/resources/console_resources.qrc +++ b/resources/console_resources.qrc @@ -105,6 +105,14 @@ images/iconic/x.svg images/icon.png images/icon.ico + images/swift-nav/Advanced.svg + images/swift-nav/Baseline.svg + images/swift-nav/Connection.svg + images/swift-nav/Observations.svg + images/swift-nav/Settings.svg + images/swift-nav/Solution.svg + images/swift-nav/Tracking.svg + images/swift-nav/Update.svg TableComponents/SortableColumnHeading.qml TableComponents/TableCellDelegate.qml TableComponents/SwiftTableView.qml diff --git a/resources/images/swift-nav/Advanced.svg b/resources/images/swift-nav/Advanced.svg new file mode 100644 index 000000000..f2ebb78e3 --- /dev/null +++ b/resources/images/swift-nav/Advanced.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/images/swift-nav/Baseline.svg b/resources/images/swift-nav/Baseline.svg new file mode 100644 index 000000000..caae0ea3d --- /dev/null +++ b/resources/images/swift-nav/Baseline.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/images/swift-nav/Connection.svg b/resources/images/swift-nav/Connection.svg new file mode 100644 index 000000000..6621a320b --- /dev/null +++ b/resources/images/swift-nav/Connection.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/images/swift-nav/Observations.svg b/resources/images/swift-nav/Observations.svg new file mode 100644 index 000000000..92a070226 --- /dev/null +++ b/resources/images/swift-nav/Observations.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/images/swift-nav/Settings.svg b/resources/images/swift-nav/Settings.svg new file mode 100644 index 000000000..cc25776bf --- /dev/null +++ b/resources/images/swift-nav/Settings.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/images/swift-nav/Solution.svg b/resources/images/swift-nav/Solution.svg new file mode 100644 index 000000000..17761dae3 --- /dev/null +++ b/resources/images/swift-nav/Solution.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/images/swift-nav/Tracking.svg b/resources/images/swift-nav/Tracking.svg new file mode 100644 index 000000000..22f4fe365 --- /dev/null +++ b/resources/images/swift-nav/Tracking.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/images/swift-nav/Update.svg b/resources/images/swift-nav/Update.svg new file mode 100644 index 000000000..aba2b602b --- /dev/null +++ b/resources/images/swift-nav/Update.svg @@ -0,0 +1 @@ + \ No newline at end of file