From 9ee5dc16e2c2eb70a0947e00ab28d53be964e401 Mon Sep 17 00:00:00 2001 From: barthess Date: Sun, 9 Sep 2012 21:17:15 +0300 Subject: [PATCH] support of new icons added to program --- qgroundcontrol.qrc | 12 +++++++++++ src/ui/MainWindow.cc | 36 +++++++++++++++++++++++++++++++ src/ui/QGCToolBar.cc | 50 +++++++++++++++++++++++++++++++++++++------ src/ui/uas/UASView.cc | 47 ++++++++++++++++++++++++++++++++++------ 4 files changed, 131 insertions(+), 14 deletions(-) diff --git a/qgroundcontrol.qrc b/qgroundcontrol.qrc index ab1675aeb..0eab6e9a1 100644 --- a/qgroundcontrol.qrc +++ b/qgroundcontrol.qrc @@ -39,6 +39,18 @@ files/images/mavs/generic.svg files/images/mavs/quadrotor.svg files/images/mavs/coaxial.svg + files/images/mavs/airship.svg + files/images/mavs/antenna-tracker.svg + files/images/mavs/flapping-wing.svg + files/images/mavs/free-balloon.svg + files/images/mavs/ground-rover.svg + files/images/mavs/hexarotor.svg + files/images/mavs/kite.svg + files/images/mavs/octorotor.svg + files/images/mavs/rocket.svg + files/images/mavs/submarine.svg + files/images/mavs/surface-boat.svg + files/images/mavs/tricopter.svg files/images/actions/system-shutdown.svg files/images/actions/system-log-out.svg files/images/actions/system-lock-screen.svg diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc index 1424ef945..a157583e9 100644 --- a/src/ui/MainWindow.cc +++ b/src/ui/MainWindow.cc @@ -1259,9 +1259,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; diff --git a/src/ui/QGCToolBar.cc b/src/ui/QGCToolBar.cc index 1996833b4..2b49cbc6f 100644 --- a/src/ui/QGCToolBar.cc +++ b/src/ui/QGCToolBar.cc @@ -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")); diff --git a/src/ui/uas/UASView.cc b/src/ui/uas/UASView.cc index c75254032..6954a34b7 100644 --- a/src/ui/uas/UASView.cc +++ b/src/ui/uas/UASView.cc @@ -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; -- 2.22.0