Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions resources/Constants/Constants.qml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 {
Expand Down
16 changes: 8 additions & 8 deletions resources/SideNavBar.qml
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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()
Expand Down
8 changes: 8 additions & 0 deletions resources/console_resources.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,14 @@
<file>images/iconic/x.svg</file>
<file>images/icon.png</file>
<file>images/icon.ico</file>
<file>images/swift-nav/Advanced.svg</file>
<file>images/swift-nav/Baseline.svg</file>
<file>images/swift-nav/Connection.svg</file>
<file>images/swift-nav/Observations.svg</file>
<file>images/swift-nav/Settings.svg</file>
<file>images/swift-nav/Solution.svg</file>
<file>images/swift-nav/Tracking.svg</file>
<file>images/swift-nav/Update.svg</file>
<file>TableComponents/SortableColumnHeading.qml</file>
<file>TableComponents/TableCellDelegate.qml</file>
<file>TableComponents/SwiftTableView.qml</file>
Expand Down
1 change: 1 addition & 0 deletions resources/images/swift-nav/Advanced.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/images/swift-nav/Baseline.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/images/swift-nav/Connection.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/images/swift-nav/Observations.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/images/swift-nav/Settings.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/images/swift-nav/Solution.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/images/swift-nav/Tracking.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading