Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Q

qgroundcontrol
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

1a71942d

Commit 1a71942d authored 9 years ago by Lorenz Meier

Downloads
- Plain Diff

Merge pull request #2255 from dogmaphobic/messageScreen

New system message dialog.

parents eb13a148 921046bf

Branches

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

src/FlightDisplay/FlightDisplayView.qml 6 additions, 0 deletions

src/FlightDisplay/FlightDisplayView.qml
src/Vehicle/Vehicle.cc 21 additions, 3 deletions

src/Vehicle/Vehicle.cc
src/Vehicle/Vehicle.h 13 additions, 3 deletions

src/Vehicle/Vehicle.h
src/uas/UASMessageHandler.h 7 additions, 6 deletions

src/uas/UASMessageHandler.h
src/ui/MainWindow.qml 4 additions, 0 deletions

src/ui/MainWindow.qml
src/ui/toolbar/MainToolBar.qml 74 additions, 0 deletions

src/ui/toolbar/MainToolBar.qml
src/ui/toolbar/MainToolBarController.cc 11 additions, 48 deletions

src/ui/toolbar/MainToolBarController.cc
src/ui/toolbar/MainToolBarController.h 3 additions, 7 deletions

src/ui/toolbar/MainToolBarController.h
src/ui/toolbar/MainToolBarIndicators.qml 3 additions, 2 deletions

src/ui/toolbar/MainToolBarIndicators.qml
src/ui/uas/UASMessageView.cc 0 additions, 53 deletions

src/ui/uas/UASMessageView.cc
src/ui/uas/UASMessageView.h 1 addition, 22 deletions

src/ui/uas/UASMessageView.h

with 143 additions and 144 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment