From 72e9d74918603b400a7364457f5187009bac0057 Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Sat, 2 Mar 2024 15:46:12 -0800
Subject: [PATCH] Remove ROI Indicator from toolbar

Click ROI in map to delete instead
---
 qgroundcontrol.qrc                   |  1 -
 src/FirmwarePlugin/FirmwarePlugin.cc |  1 -
 src/FlightDisplay/FlyViewMap.qml     | 11 ++---------
 src/ui/toolbar/CMakeLists.txt        |  1 -
 4 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/qgroundcontrol.qrc b/qgroundcontrol.qrc
index 99940a5..f261e37 100644
--- a/qgroundcontrol.qrc
+++ b/qgroundcontrol.qrc
@@ -15,7 +15,6 @@
         <file alias="MultiVehicleSelector.qml">src/ui/toolbar/MultiVehicleSelector.qml</file>
         <file alias="RCRSSIIndicator.qml">src/ui/toolbar/RCRSSIIndicator.qml</file>
         <file alias="RemoteIDIndicator.qml">src/ui/toolbar/RemoteIDIndicator.qml</file>
-        <file alias="ROIIndicator.qml">src/ui/toolbar/ROIIndicator.qml</file>
         <file alias="TelemetryRSSIIndicator.qml">src/ui/toolbar/TelemetryRSSIIndicator.qml</file>
         <file alias="VTOLModeIndicator.qml">src/ui/toolbar/VTOLModeIndicator.qml</file>
         <file alias="APMSupportForwardingIndicator.qml">src/ui/toolbar/APMSupportForwardingIndicator.qml</file>
diff --git a/src/FirmwarePlugin/FirmwarePlugin.cc b/src/FirmwarePlugin/FirmwarePlugin.cc
index 32cd3a6..be223cc 100644
--- a/src/FirmwarePlugin/FirmwarePlugin.cc
+++ b/src/FirmwarePlugin/FirmwarePlugin.cc
@@ -343,7 +343,6 @@ const QVariantList& FirmwarePlugin::modeIndicators(const Vehicle*)
     //-- Default list of indicators for all vehicles.
     if(_modeIndicatorList.size() == 0) {
         _modeIndicatorList = QVariantList({
-            QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/ROIIndicator.qml")),
             QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/MultiVehicleSelector.qml")),
             QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/LinkIndicator.qml")),
         });
diff --git a/src/FlightDisplay/FlyViewMap.qml b/src/FlightDisplay/FlyViewMap.qml
index c3e3fbf..af6bb2f 100644
--- a/src/FlightDisplay/FlyViewMap.qml
+++ b/src/FlightDisplay/FlyViewMap.qml
@@ -494,25 +494,18 @@ FlightMap {
         z:              QGroundControl.zOrderMapItems
         anchorPoint.x:  sourceItem.anchorPointX
         anchorPoint.y:  sourceItem.anchorPointY
+
         sourceItem: MissionItemIndexLabel {
             checked:    true
             index:      -1
             label:      qsTr("ROI here", "Make this a Region Of Interest")
+            onClicked:  _activeVehicle.stopGuidedModeROI()
         }
 
         //-- Visibilty controlled by actual state
         function show(coord) {
             roiLocationItem.coordinate = coord
         }
-
-        function hide() {
-        }
-
-        function actionConfirmed() {
-        }
-
-        function actionCancelled() {
-        }
     }
 
     // Orbit telemetry visuals
diff --git a/src/ui/toolbar/CMakeLists.txt b/src/ui/toolbar/CMakeLists.txt
index a3bcb71..dabeb74 100644
--- a/src/ui/toolbar/CMakeLists.txt
+++ b/src/ui/toolbar/CMakeLists.txt
@@ -14,7 +14,6 @@ add_custom_target(UiToolbarQml
 		ModeIndicator.qml
 		MultiVehicleSelector.qml
 		RCRSSIIndicator.qml
-		ROIIndicator.qml
 		SignalStrength.qml
 		TelemetryRSSIIndicator.qml
 		VTOLModeIndicator.qml