From 6e07b11ebfa44046a1009b3bee65739fdff183a1 Mon Sep 17 00:00:00 2001 From: Gus Grubba Date: Mon, 24 Jun 2019 12:29:21 -0300 Subject: [PATCH] Update all files that use a QML Menu item to QtQuick.Controls 2.4 to solve the issue of a menu showing up in random places on Android. --- src/FlightDisplay/FlightDisplayViewMap.qml | 14 +++++--------- src/MissionManager/QGCMapPolygonVisuals.qml | 10 +++++----- src/MissionManager/QGCMapPolylineVisuals.qml | 10 +++++----- src/PlanView/MissionItemEditor.qml | 10 +++++----- src/PlanView/PlanView.qml | 8 +------- src/PlanView/RallyPointItemEditor.qml | 6 +++--- src/PlanView/SimpleItemEditor.qml | 9 ++++----- src/QmlControls/FlightModeMenu.qml | 4 ++-- src/QmlControls/ParameterEditor.qml | 8 ++++---- src/QmlControls/QGCFileDialog.qml | 8 ++++---- src/QmlControls/QmlTest.qml | 2 +- src/ui/toolbar/LinkIndicator.qml | 4 ++-- src/ui/toolbar/ModeIndicator.qml | 4 ++-- src/ui/toolbar/MultiVehicleSelector.qml | 4 ++-- 14 files changed, 45 insertions(+), 56 deletions(-) diff --git a/src/FlightDisplay/FlightDisplayViewMap.qml b/src/FlightDisplay/FlightDisplayViewMap.qml index 6aaea9570..7518731a5 100644 --- a/src/FlightDisplay/FlightDisplayViewMap.qml +++ b/src/FlightDisplay/FlightDisplayViewMap.qml @@ -8,11 +8,11 @@ ****************************************************************************/ -import QtQuick 2.4 -import QtQuick.Controls 1.2 -import QtLocation 5.3 -import QtPositioning 5.3 -import QtQuick.Dialogs 1.2 +import QtQuick 2.11 +import QtQuick.Controls 2.4 +import QtLocation 5.3 +import QtPositioning 5.3 +import QtQuick.Dialogs 1.2 import QGroundControl 1.0 import QGroundControl.Airspace 1.0 @@ -176,10 +176,6 @@ FlightMap { } } - ExclusiveGroup { - id: _mapTypeButtonsExclusiveGroup - } - MapFitFunctions { id: mapFitFunctions // The name for this id cannot be changed without breaking references outside of this code. Beware! map: mainWindow.flightDisplayMap diff --git a/src/MissionManager/QGCMapPolygonVisuals.qml b/src/MissionManager/QGCMapPolygonVisuals.qml index 5f1123aaa..e0ffa378a 100644 --- a/src/MissionManager/QGCMapPolygonVisuals.qml +++ b/src/MissionManager/QGCMapPolygonVisuals.qml @@ -7,11 +7,11 @@ * ****************************************************************************/ -import QtQuick 2.3 -import QtQuick.Controls 1.2 -import QtLocation 5.3 -import QtPositioning 5.3 -import QtQuick.Dialogs 1.2 +import QtQuick 2.11 +import QtQuick.Controls 2.4 +import QtLocation 5.3 +import QtPositioning 5.3 +import QtQuick.Dialogs 1.2 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/MissionManager/QGCMapPolylineVisuals.qml b/src/MissionManager/QGCMapPolylineVisuals.qml index 0d5ff3435..57381b8d1 100644 --- a/src/MissionManager/QGCMapPolylineVisuals.qml +++ b/src/MissionManager/QGCMapPolylineVisuals.qml @@ -7,11 +7,11 @@ * ****************************************************************************/ -import QtQuick 2.3 -import QtQuick.Controls 1.2 -import QtLocation 5.3 -import QtPositioning 5.3 -import QtQuick.Dialogs 1.2 +import QtQuick 2.11 +import QtQuick.Controls 2.4 +import QtLocation 5.3 +import QtPositioning 5.3 +import QtQuick.Dialogs 1.2 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/PlanView/MissionItemEditor.qml b/src/PlanView/MissionItemEditor.qml index dc82c4cb2..3685121eb 100644 --- a/src/PlanView/MissionItemEditor.qml +++ b/src/PlanView/MissionItemEditor.qml @@ -1,8 +1,8 @@ -import QtQuick 2.3 -import QtQuick.Controls 1.2 -import QtQuick.Controls.Styles 1.4 -import QtQuick.Dialogs 1.2 -import QtQml 2.2 +import QtQuick 2.11 +import QtQuick.Controls 2.4 +import QtQuick.Controls.Styles 1.4 +import QtQuick.Dialogs 1.2 +import QtQml 2.2 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/PlanView/PlanView.qml b/src/PlanView/PlanView.qml index aad7d681d..dbc8d402d 100644 --- a/src/PlanView/PlanView.qml +++ b/src/PlanView/PlanView.qml @@ -264,12 +264,6 @@ Item { } } - QGCPalette { id: qgcPal; colorGroupEnabled: enabled } - - ExclusiveGroup { - id: _mapTypeButtonsExclusiveGroup - } - /// Inserts a new simple mission item /// @param coordinate Location to insert item /// @param index Insert item at this index @@ -1031,7 +1025,7 @@ Item { } QGCButton { - text: qsTr("Save Mission Waypoints As KML...") + text: qsTr("Save Mission Waypoints As KML...") Layout.columnSpan: 2 enabled: !_planMasterController.syncInProgress && _visualItems.count > 1 onClicked: { diff --git a/src/PlanView/RallyPointItemEditor.qml b/src/PlanView/RallyPointItemEditor.qml index 9ec63847a..2aab07c53 100644 --- a/src/PlanView/RallyPointItemEditor.qml +++ b/src/PlanView/RallyPointItemEditor.qml @@ -1,6 +1,6 @@ -import QtQuick 2.3 -import QtQuick.Controls 1.2 -import QtQuick.Layouts 1.2 +import QtQuick 2.11 +import QtQuick.Controls 2.4 +import QtQuick.Layouts 1.11 import QGroundControl.ScreenTools 1.0 import QGroundControl.Vehicle 1.0 diff --git a/src/PlanView/SimpleItemEditor.qml b/src/PlanView/SimpleItemEditor.qml index 7ee452e86..070fd4d4b 100644 --- a/src/PlanView/SimpleItemEditor.qml +++ b/src/PlanView/SimpleItemEditor.qml @@ -1,8 +1,7 @@ -import QtQuick 2.3 -import QtQuick.Controls 1.2 -import QtQuick.Controls.Styles 1.4 -import QtQuick.Dialogs 1.2 -import QtQuick.Layouts 1.2 +import QtQuick 2.11 +import QtQuick.Controls 2.4 +import QtQuick.Controls.Styles 1.4 +import QtQuick.Layouts 1.11 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/QmlControls/FlightModeMenu.qml b/src/QmlControls/FlightModeMenu.qml index f66ba5175..a1d363533 100644 --- a/src/QmlControls/FlightModeMenu.qml +++ b/src/QmlControls/FlightModeMenu.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.3 -import QtQuick.Controls 1.2 +import QtQuick 2.11 +import QtQuick.Controls 2.4 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/QmlControls/ParameterEditor.qml b/src/QmlControls/ParameterEditor.qml index 3bf3ee573..71de4c74e 100644 --- a/src/QmlControls/ParameterEditor.qml +++ b/src/QmlControls/ParameterEditor.qml @@ -7,10 +7,10 @@ * ****************************************************************************/ -import QtQuick 2.3 -import QtQuick.Controls 1.2 -import QtQuick.Dialogs 1.2 -import QtQuick.Layouts 1.2 +import QtQuick 2.11 +import QtQuick.Controls 2.4 +import QtQuick.Dialogs 1.2 +import QtQuick.Layouts 1.11 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/QmlControls/QGCFileDialog.qml b/src/QmlControls/QGCFileDialog.qml index 41ddb97b2..0a0723f71 100644 --- a/src/QmlControls/QGCFileDialog.qml +++ b/src/QmlControls/QGCFileDialog.qml @@ -1,7 +1,7 @@ -import QtQuick 2.3 -import QtQuick.Controls 1.2 -import QtQuick.Dialogs 1.2 -import QtQuick.Layouts 1.2 +import QtQuick 2.11 +import QtQuick.Controls 2.4 +import QtQuick.Dialogs 1.2 +import QtQuick.Layouts 1.11 import QGroundControl 1.0 import QGroundControl.ScreenTools 1.0 diff --git a/src/QmlControls/QmlTest.qml b/src/QmlControls/QmlTest.qml index e62fd60f3..c075f33b2 100644 --- a/src/QmlControls/QmlTest.qml +++ b/src/QmlControls/QmlTest.qml @@ -1,7 +1,7 @@ import QtQuick 2.11 import QtQuick.Controls 2.4 import QtQuick.Controls.Styles 1.4 -import QtQuick.Layouts 1.2 +import QtQuick.Layouts 1.11 import QGroundControl.Palette 1.0 import QGroundControl.Controls 1.0 diff --git a/src/ui/toolbar/LinkIndicator.qml b/src/ui/toolbar/LinkIndicator.qml index e88a49373..6c739fdba 100644 --- a/src/ui/toolbar/LinkIndicator.qml +++ b/src/ui/toolbar/LinkIndicator.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.3 -import QtQuick.Controls 1.2 +import QtQuick 2.11 +import QtQuick.Controls 2.4 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/ui/toolbar/ModeIndicator.qml b/src/ui/toolbar/ModeIndicator.qml index de181304f..74f764190 100644 --- a/src/ui/toolbar/ModeIndicator.qml +++ b/src/ui/toolbar/ModeIndicator.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.3 -import QtQuick.Controls 1.2 +import QtQuick 2.11 +import QtQuick.Controls 2.4 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/ui/toolbar/MultiVehicleSelector.qml b/src/ui/toolbar/MultiVehicleSelector.qml index 0b1c8ca50..3360d597f 100644 --- a/src/ui/toolbar/MultiVehicleSelector.qml +++ b/src/ui/toolbar/MultiVehicleSelector.qml @@ -8,8 +8,8 @@ ****************************************************************************/ -import QtQuick 2.3 -import QtQuick.Controls 1.2 +import QtQuick 2.11 +import QtQuick.Controls 2.4 import QGroundControl 1.0 import QGroundControl.Controls 1.0 -- 2.22.0