Skip to content

Conversation

@john-michaelburke
Copy link
Collaborator

  • Move the main tabs to a full height bar on the side with logos and text underneath.
  • Added side drawer (pull from left side) with a few dummy elements. This can kick off new components like an about me popup or connection box when we implement them. The drawer is a trimmed down version of this example:
    https://code.qt.io/cgit/qt/qtquickcontrols2.git/tree/examples/quickcontrols2/gallery/gallery.qml?h=5.15
  • Split up tab buttons and tab components to separate qml files.
  • Added the svgs for the respective tab logos.
  • Added a utility function to the utils file, although not used in this PR, it helps for debugging things by printing out all the elements of an object.
  • Removed monospace font from the "Display Units:" text in solutions tab.

Comment on lines 62 to 71
TrackingTab {
}

SolutionTab {
}

BaselineTab {
}

ObservationTab {
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This portion is what became MainTabs.qml

Comment on lines 37 to 46
TabBar {
id: tab

Layout.fillWidth: true
z: Constants.commonChart.zAboveCharts
currentIndex: Globals.initialMainTabIndex
contentHeight: Constants.tabBarHeight

Repeater {
model: ["Tracking", "Solution", "Baseline", "Observations", "Settings", "Update", "Advanced"]
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This portion is what became SideNavBar.qml

@john-michaelburke john-michaelburke marked this pull request as ready for review July 29, 2021 05:12
@john-michaelburke john-michaelburke requested review from a team and silverjam July 29, 2021 05:12
@jayvdb
Copy link
Contributor

jayvdb commented Jul 29, 2021

The initial Solution tab looks a bit odd now. Baseline is similar. Not caused by this PR, but it becomes more pronounced now. Perhaps the table outline could be rendered even when disconnected, as the table headers are constant.
Screen Shot 2021-07-29 at 1 34 38 pm

The License tab could be filled with license info for Roboto and fontawesome fonts/icons. wrt fontawesome license , it looks like were only using the Icons at https://fontawesome.com/license/free, in which case we only need to refer to https://creativecommons.org/licenses/by/4.0/ . https://github.com/swift-nav/console_pp/blob/858e13f4dcd41578530a3dad61e5a27f73c06caf/resources/images/fontawesome/LICENSE-OLD.txt can be deleted as that is only for code from fontawesome, and we're not reusing any of their code.

@silverjam
Copy link
Contributor

See an odd issue with Windows, no tabs / buttons are showing up:

Screenshot 2021-07-29 144604

@john-michaelburke
Copy link
Collaborator Author

See an odd issue with Windows, no tabs / buttons are showing up:

Screenshot 2021-07-29 144604

Looks like you can drag the sidebar as well to the left and see the icons. Something must not be consistent between operating systems I'll take a look.

@john-michaelburke
Copy link
Collaborator Author

@jayvdb Done. I enabled the solution/baseline tables whenever the app starts. I added a popup for the licenses with tabs for the icons license and the roboto license.
@silverjam I think my current solution should work on Windows now please give it a shot!!

Copy link
Contributor

@jayvdb jayvdb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM on mac

}

// Read text from file and store it into the "text" property of the "ele" object.
function readTextFile(path, ele){
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ele -> elem; but could be done in the next PR, if there are no other reasons to update this one.

Also would be great if the license links in the popup were clickable; IMO defer this for a rainy day.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I converted the variable name but I agree to put off the hyperlinks for a rainy day. I was going down a pretty gnarly regex rabbit hole 😂 https://swift-nav.atlassian.net/browse/CPP-274


// Read text from file and store it into the "text" property of the "ele" object.
function readTextFile(path, elem){
var req = new XMLHttpRequest;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this work correctly? I thought the syntax was like this:

Suggested change
var req = new XMLHttpRequest;
var req = new XMLHttpRequest();

Example: https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest/Using_XMLHttpRequest

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like it works either way. I just added the parentheses anyway.

@john-michaelburke john-michaelburke force-pushed the john-michaelburke/ui_fun branch from f2a584d to 759c867 Compare July 30, 2021 18:22
@john-michaelburke john-michaelburke merged commit f8e147d into main Jul 30, 2021
@john-michaelburke john-michaelburke deleted the john-michaelburke/ui_fun branch July 30, 2021 19:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants