Skip to content

Q
qgroundcontrol
Commit 7d28c274 authored by Lorenz Meier's avatar Lorenz Meier
Browse files
Options

Merge branch 'master' of github.com:mavlink/qgroundcontrol

parents bbdc9a84 7a29c5aa
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 13648 additions and 14 deletions
files/images/mavs/airship.svg 0 → 100644
View file @ 7d28c274
This diff is collapsed.
files/images/mavs/antenna-tracker.svg 0 → 100644
View file @ 7d28c274
This diff is collapsed.
files/images/mavs/flapping-wing.svg 0 → 100644
View file @ 7d28c274
This diff is collapsed.
files/images/mavs/free-balloon.svg 0 → 100644
View file @ 7d28c274
This diff is collapsed.
files/images/mavs/ground-rover.svg 0 → 100644
View file @ 7d28c274
This diff is collapsed.
files/images/mavs/hexarotor.svg 0 → 100644
View file @ 7d28c274
This diff is collapsed.
files/images/mavs/kite.svg 0 → 100644
View file @ 7d28c274
This diff is collapsed.
files/images/mavs/octorotor.svg 0 → 100644
View file @ 7d28c274
This diff is collapsed.
files/images/mavs/rocket.svg 0 → 100644
View file @ 7d28c274
This diff is collapsed.
files/images/mavs/submarine.svg 0 → 100644
View file @ 7d28c274
This diff is collapsed.
files/images/mavs/surface-boat.svg 0 → 100644
View file @ 7d28c274
This diff is collapsed.
files/images/mavs/tricopter.svg 0 → 100644
View file @ 7d28c274
This diff is collapsed.
qgroundcontrol.qrc
View file @ 7d28c274
......@@ -39,6 +39,18 @@
<file>files/images/mavs/generic.svg</file>
<file>files/images/mavs/quadrotor.svg</file>
<file>files/images/mavs/coaxial.svg</file>
<file>files/images/mavs/airship.svg</file>
<file>files/images/mavs/antenna-tracker.svg</file>
<file>files/images/mavs/flapping-wing.svg</file>
<file>files/images/mavs/free-balloon.svg</file>
<file>files/images/mavs/ground-rover.svg</file>
<file>files/images/mavs/hexarotor.svg</file>
<file>files/images/mavs/kite.svg</file>
<file>files/images/mavs/octorotor.svg</file>
<file>files/images/mavs/rocket.svg</file>
<file>files/images/mavs/submarine.svg</file>
<file>files/images/mavs/surface-boat.svg</file>
<file>files/images/mavs/tricopter.svg</file>
<file>files/images/actions/system-shutdown.svg</file>
<file>files/images/actions/system-log-out.svg</file>
<file>files/images/actions/system-lock-screen.svg</file>
......
src/ui/MainWindow.cc
View file @ 7d28c274
......@@ -1261,9 +1261,45 @@ void MainWindow::UASCreated(UASInterface* uas)
case MAV_TYPE_HELICOPTER:
icon = QIcon(":files/images/mavs/helicopter.svg");
break;
case MAV_TYPE_ANTENNA_TRACKER:
icon = QIcon(":files/images/mavs/antenna-tracker.svg");
break;
case MAV_TYPE_GCS:
icon = QIcon(":files/images/mavs/groundstation.svg");
break;
case MAV_TYPE_AIRSHIP:
icon = QIcon(":files/images/mavs/airship.svg");
break;
case MAV_TYPE_FREE_BALLOON:
icon = QIcon(":files/images/mavs/free-balloon.svg");
break;
case MAV_TYPE_ROCKET:
icon = QIcon(":files/images/mavs/rocket.svg");
break;
case MAV_TYPE_GROUND_ROVER:
icon = QIcon(":files/images/mavs/ground-rover.svg");
break;
case MAV_TYPE_SURFACE_BOAT:
icon = QIcon(":files/images/mavs/surface-boat.svg");
break;
case MAV_TYPE_SUBMARINE:
icon = QIcon(":files/images/mavs/submarine.svg");
break;
case MAV_TYPE_HEXAROTOR:
icon = QIcon(":files/images/mavs/hexarotor.svg");
break;
case MAV_TYPE_OCTOROTOR:
icon = QIcon(":files/images/mavs/octorotor.svg");
break;
case MAV_TYPE_TRICOPTER:
icon = QIcon(":files/images/mavs/tricopter.svg");
break;
case MAV_TYPE_FLAPPING_WING:
icon = QIcon(":files/images/mavs/flapping-wing.svg");
break;
case MAV_TYPE_KITE:
icon = QIcon(":files/images/mavs/kite.svg");
break;
default:
icon = QIcon(":files/images/mavs/unknown.svg");
break;
......
src/ui/QGCToolBar.cc
View file @ 7d28c274
......@@ -405,23 +405,59 @@ void QGCToolBar::setSystemType(UASInterface* uas, unsigned int systemType)
Q_UNUSED(uas);
// Set matching icon
switch (systemType) {
case 0:
case MAV_TYPE_GENERIC:
symbolButton->setIcon(QIcon(":/files/images/mavs/generic.svg"));
break;
case 1:
case MAV_TYPE_FIXED_WING:
symbolButton->setIcon(QIcon(":/files/images/mavs/fixed-wing.svg"));
break;
case 2:
case MAV_TYPE_QUADROTOR:
symbolButton->setIcon(QIcon(":/files/images/mavs/quadrotor.svg"));
break;
case 3:
case MAV_TYPE_COAXIAL:
symbolButton->setIcon(QIcon(":/files/images/mavs/coaxial.svg"));
break;
case 4:
case MAV_TYPE_HELICOPTER:
symbolButton->setIcon(QIcon(":/files/images/mavs/helicopter.svg"));
break;
case 5:
symbolButton->setIcon(QIcon(":/files/images/mavs/unknown.svg"));
case MAV_TYPE_ANTENNA_TRACKER:
symbolButton->setIcon(QIcon(":/files/images/mavs/antenn-tracker.svg"));
break;
case MAV_TYPE_GCS:
symbolButton->setIcon(QIcon(":files/images/mavs/groundstation.svg"));
break;
case MAV_TYPE_AIRSHIP:
symbolButton->setIcon(QIcon(":files/images/mavs/airship.svg"));
break;
case MAV_TYPE_FREE_BALLOON:
symbolButton->setIcon(QIcon(":files/images/mavs/free-balloon.svg"));
break;
case MAV_TYPE_ROCKET:
symbolButton->setIcon(QIcon(":files/images/mavs/rocket.svg"));
break;
case MAV_TYPE_GROUND_ROVER:
symbolButton->setIcon(QIcon(":files/images/mavs/ground-rover.svg"));
break;
case MAV_TYPE_SURFACE_BOAT:
symbolButton->setIcon(QIcon(":files/images/mavs/surface-boat.svg"));
break;
case MAV_TYPE_SUBMARINE:
symbolButton->setIcon(QIcon(":files/images/mavs/submarine.svg"));
break;
case MAV_TYPE_HEXAROTOR:
symbolButton->setIcon(QIcon(":files/images/mavs/hexarotor.svg"));
break;
case MAV_TYPE_OCTOROTOR:
symbolButton->setIcon(QIcon(":files/images/mavs/octorotor.svg"));
break;
case MAV_TYPE_TRICOPTER:
symbolButton->setIcon(QIcon(":files/images/mavs/tricopter.svg"));
break;
case MAV_TYPE_FLAPPING_WING:
symbolButton->setIcon(QIcon(":files/images/mavs/flapping-wing.svg"));
break;
case MAV_TYPE_KITE:
symbolButton->setIcon(QIcon(":files/images/mavs/kite.svg"));
break;
default:
symbolButton->setIcon(QIcon(":/files/images/mavs/unknown.svg"));
......
src/ui/uas/UASView.cc
View file @ 7d28c274
......@@ -326,25 +326,25 @@ void UASView::setSystemType(UASInterface* uas, unsigned int systemType)
// Set matching icon
switch (systemType)
{
case 0:
case MAV_TYPE_GENERIC:
m_ui->typeButton->setIcon(QIcon(":/files/images/mavs/generic.svg"));
break;
case 1:
case MAV_TYPE_FIXED_WING:
m_ui->typeButton->setIcon(QIcon(":/files/images/mavs/fixed-wing.svg"));
break;
case 2:
case MAV_TYPE_QUADROTOR:
m_ui->typeButton->setIcon(QIcon(":/files/images/mavs/quadrotor.svg"));
break;
case 3:
case MAV_TYPE_COAXIAL:
m_ui->typeButton->setIcon(QIcon(":/files/images/mavs/coaxial.svg"));
break;
case 4:
case MAV_TYPE_HELICOPTER:
m_ui->typeButton->setIcon(QIcon(":/files/images/mavs/helicopter.svg"));
break;
case 5:
case MAV_TYPE_ANTENNA_TRACKER:
m_ui->typeButton->setIcon(QIcon(":/files/images/mavs/unknown.svg"));
break;
case 6: {
case MAV_TYPE_GCS: {
// A groundstation is a special system type, update widget
QString result;
m_ui->nameLabel->setText(tr("GCS ") + result.sprintf("%03d", uas->getUASID()));
......@@ -363,6 +363,39 @@ void UASView::setSystemType(UASInterface* uas, unsigned int systemType)
m_ui->typeButton->setIcon(QIcon(":/files/images/mavs/groundstation.svg"));
}
break;
case MAV_TYPE_AIRSHIP:
m_ui->typeButton->setIcon(QIcon(":files/images/mavs/airship.svg"));
break;
case MAV_TYPE_FREE_BALLOON:
m_ui->typeButton->setIcon(QIcon(":files/images/mavs/free-balloon.svg"));
break;
case MAV_TYPE_ROCKET:
m_ui->typeButton->setIcon(QIcon(":files/images/mavs/rocket.svg"));
break;
case MAV_TYPE_GROUND_ROVER:
m_ui->typeButton->setIcon(QIcon(":files/images/mavs/ground-rover.svg"));
break;
case MAV_TYPE_SURFACE_BOAT:
m_ui->typeButton->setIcon(QIcon(":files/images/mavs/surface-boat.svg"));
break;
case MAV_TYPE_SUBMARINE:
m_ui->typeButton->setIcon(QIcon(":files/images/mavs/submarine.svg"));
break;
case MAV_TYPE_HEXAROTOR:
m_ui->typeButton->setIcon(QIcon(":files/images/mavs/hexarotor.svg"));
break;
case MAV_TYPE_OCTOROTOR:
m_ui->typeButton->setIcon(QIcon(":files/images/mavs/octorotor.svg"));
break;
case MAV_TYPE_TRICOPTER:
m_ui->typeButton->setIcon(QIcon(":files/images/mavs/tricopter.svg"));
break;
case MAV_TYPE_FLAPPING_WING:
m_ui->typeButton->setIcon(QIcon(":files/images/mavs/flapping-wing.svg"));
break;
case MAV_TYPE_KITE:
m_ui->typeButton->setIcon(QIcon(":files/images/mavs/kite.svg"));
break;
default:
m_ui->typeButton->setIcon(QIcon(":/files/images/mavs/unknown.svg"));
break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment