From 29f66547432912825eccdda3c4c413b1292a4308 Mon Sep 17 00:00:00 2001 From: Gus Grubba Date: Thu, 11 Apr 2019 20:07:13 -0300 Subject: [PATCH] Set minimum to Qt 5.11 Windows fixes --- src/AnalyzeView/GeoTagController.cc | 7 ++++--- src/AnalyzeView/GeoTagPage.qml | 14 +++++++------- src/AnalyzeView/LogDownloadPage.qml | 2 +- src/FlightDisplay/MultiVehicleList.qml | 10 +++++----- src/QmlControls/QGCViewDialogContainer.qml | 2 +- src/ui/MainQmlWindow.qml | 18 +++++++++--------- src/ui/toolbar/BatteryIndicator.qml | 4 ++-- src/ui/toolbar/GPSIndicator.qml | 4 ++-- src/ui/toolbar/GPSRTKIndicator.qml | 4 ++-- src/ui/toolbar/JoystickIndicator.qml | 4 ++-- src/ui/toolbar/MainToolBarIndicators.qml | 4 ++-- src/ui/toolbar/RCRSSIIndicator.qml | 4 ++-- src/ui/toolbar/TelemetryRSSIIndicator.qml | 4 ++-- 13 files changed, 41 insertions(+), 40 deletions(-) diff --git a/src/AnalyzeView/GeoTagController.cc b/src/AnalyzeView/GeoTagController.cc index ef1a18a..a9f8538 100644 --- a/src/AnalyzeView/GeoTagController.cc +++ b/src/AnalyzeView/GeoTagController.cc @@ -16,6 +16,7 @@ #include #include #include +#include #include "ExifParser.h" #include "ULogParser.h" @@ -38,7 +39,7 @@ GeoTagController::~GeoTagController() void GeoTagController::setLogFile(QString filename) { - filename.replace("file://",""); + filename = QUrl(filename).toLocalFile(); if (!filename.isEmpty()) { _worker.setLogFile(filename); emit logFileChanged(filename); @@ -47,7 +48,7 @@ void GeoTagController::setLogFile(QString filename) void GeoTagController::setImageDirectory(QString dir) { - dir.replace("file://",""); + dir = QUrl(dir).toLocalFile(); if (!dir.isEmpty()) { _worker.setImageDirectory(dir); emit imageDirectoryChanged(dir); @@ -56,7 +57,7 @@ void GeoTagController::setImageDirectory(QString dir) void GeoTagController::setSaveDirectory(QString dir) { - dir.replace("file://",""); + dir = QUrl(dir).toLocalFile(); if (!dir.isEmpty()) { _worker.setSaveDirectory(dir); emit saveDirectoryChanged(dir); diff --git a/src/AnalyzeView/GeoTagPage.qml b/src/AnalyzeView/GeoTagPage.qml index 9ad655d..7cf3270 100644 --- a/src/AnalyzeView/GeoTagPage.qml +++ b/src/AnalyzeView/GeoTagPage.qml @@ -7,10 +7,10 @@ * ****************************************************************************/ -import QtQuick 2.3 -import QtQuick.Controls 1.2 -import QtQuick.Dialogs 1.3 -import QtQuick.Layouts 1.12 +import QtQuick 2.11 +import QtQuick.Controls 2.4 +import QtQuick.Dialogs 1.3 +import QtQuick.Layouts 1.11 import QGroundControl 1.0 import QGroundControl.Palette 1.0 @@ -40,7 +40,7 @@ AnalyzePage { //----------------------------------------------------------------- ProgressBar { id: progressBar - maximumValue: 100 + to: 100 value: geoController.progress Layout.fillWidth: true Layout.alignment: Qt.AlignVCenter @@ -113,7 +113,7 @@ AnalyzePage { selectFolder: true selectExisting: true onAccepted: { - geoController.imageDirectory = openLogFile.folder + geoController.selectImageDir = openLogFile.folder close() } } @@ -141,7 +141,7 @@ AnalyzePage { selectFolder: true selectExisting: true onAccepted: { - geoController.saveDirectory = openLogFile.folder + geoController.saveDirectory = selectDestDir.folder close() } } diff --git a/src/AnalyzeView/LogDownloadPage.qml b/src/AnalyzeView/LogDownloadPage.qml index fa928db..159ea07 100644 --- a/src/AnalyzeView/LogDownloadPage.qml +++ b/src/AnalyzeView/LogDownloadPage.qml @@ -73,7 +73,7 @@ AnalyzePage { title: qsTr("Date") width: ScreenTools.defaultFontPixelWidth * 34 horizontalAlignment: Text.AlignHCenter - delegate : Text { + delegate: Text { text: { var o = logController.model.get(styleData.row) if (o) { diff --git a/src/FlightDisplay/MultiVehicleList.qml b/src/FlightDisplay/MultiVehicleList.qml index 82f7996..2a050c6 100644 --- a/src/FlightDisplay/MultiVehicleList.qml +++ b/src/FlightDisplay/MultiVehicleList.qml @@ -149,31 +149,31 @@ Item { QGCButton { text: "Arm" - visible: !_vehicle.armed + visible: _vehicle && !_vehicle.armed onClicked: _vehicle.armed = true } QGCButton { text: "Start Mission" - visible: _vehicle.armed && _vehicle.flightMode !== _vehicle.missionFlightMode + visible: _vehicle && _vehicle.armed && _vehicle.flightMode !== _vehicle.missionFlightMode onClicked: _vehicle.startMission() } QGCButton { text: "Pause" - visible: _vehicle.armed && _vehicle.pauseVehicleSupported + visible: _vehicle && _vehicle.armed && _vehicle.pauseVehicleSupported onClicked: _vehicle.pauseVehicle() } QGCButton { text: "RTL" - visible: _vehicle.armed && _vehicle.flightMode !== _vehicle.rtlFlightMode + visible: _vehicle && _vehicle.armed && _vehicle.flightMode !== _vehicle.rtlFlightMode onClicked: _vehicle.flightMode = _vehicle.rtlFlightMode } QGCButton { text: "Take control" - visible: _vehicle.armed && _vehicle.flightMode !== _vehicle.takeControlFlightMode + visible: _vehicle && _vehicle.armed && _vehicle.flightMode !== _vehicle.takeControlFlightMode onClicked: _vehicle.flightMode = _vehicle.takeControlFlightMode } } // Row diff --git a/src/QmlControls/QGCViewDialogContainer.qml b/src/QmlControls/QGCViewDialogContainer.qml index f31aa1d..5f72a14 100644 --- a/src/QmlControls/QGCViewDialogContainer.qml +++ b/src/QmlControls/QGCViewDialogContainer.qml @@ -7,7 +7,7 @@ * ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.11 import QtQuick.Controls 2.4 import QtQuick.Dialogs 1.3 diff --git a/src/ui/MainQmlWindow.qml b/src/ui/MainQmlWindow.qml index 95b8155..5d670d7 100644 --- a/src/ui/MainQmlWindow.qml +++ b/src/ui/MainQmlWindow.qml @@ -8,10 +8,10 @@ ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.11 import QtQuick.Controls 2.4 import QtQuick.Dialogs 1.3 -import QtQuick.Layouts 1.12 +import QtQuick.Layouts 1.11 import QGroundControl 1.0 import QGroundControl.Palette 1.0 @@ -23,8 +23,8 @@ import QGroundControl.FlightMap 1.0 /// Native QML top level window ApplicationWindow { id: mainWindow - width: 1024 - height: 768 + width: 1280 + height: 1024 visible: true readonly property real _topBottomMargins: ScreenTools.defaultFontPixelHeight * 0.5 @@ -517,8 +517,9 @@ ApplicationWindow { height: mainWindow.height * 0.666 modal: true focus: true + x: Math.round((mainWindow.width - width) * 0.5) + y: Math.round((mainWindow.height - height) * 0.5) closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside - anchors.centerIn: parent background: Rectangle { anchors.fill: parent color: qgcPal.window @@ -613,9 +614,9 @@ ApplicationWindow { Popup { id: systemMessageArea y: ScreenTools.defaultFontPixelHeight - x: (mainWindow.width - width) * 0.5 + x: Math.round((mainWindow.width - width) * 0.5) width: mainWindow.width * 0.55 - height: ScreenTools.defaultFontPixelHeight * 6 + height: ScreenTools.defaultFontPixelHeight * 4 modal: false focus: true closePolicy: Popup.CloseOnEscape @@ -651,7 +652,7 @@ ApplicationWindow { Flickable { id: systemMessageFlick - anchors.margins: ScreenTools.defaultFontPixelHeight + anchors.margins: ScreenTools.defaultFontPixelHeight * 0.5 anchors.fill: parent contentHeight: systemMessageText.height contentWidth: systemMessageText.width @@ -739,7 +740,6 @@ ApplicationWindow { id: loader onLoaded: { indicatorDropdown.x = mapFromGlobal(indicatorDropdown.centerX, 0).x - console.log(indicatorDropdown.x) } } onOpened: { diff --git a/src/ui/toolbar/BatteryIndicator.qml b/src/ui/toolbar/BatteryIndicator.qml index eba6571..3bb83b4 100644 --- a/src/ui/toolbar/BatteryIndicator.qml +++ b/src/ui/toolbar/BatteryIndicator.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 +import QtQuick 2.11 +import QtQuick.Layouts 1.11 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/ui/toolbar/GPSIndicator.qml b/src/ui/toolbar/GPSIndicator.qml index f628894..ac59b4a 100644 --- a/src/ui/toolbar/GPSIndicator.qml +++ b/src/ui/toolbar/GPSIndicator.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 +import QtQuick 2.11 +import QtQuick.Layouts 1.11 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/ui/toolbar/GPSRTKIndicator.qml b/src/ui/toolbar/GPSRTKIndicator.qml index 056e8ef..8ed5500 100644 --- a/src/ui/toolbar/GPSRTKIndicator.qml +++ b/src/ui/toolbar/GPSRTKIndicator.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 +import QtQuick 2.11 +import QtQuick.Layouts 1.11 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/ui/toolbar/JoystickIndicator.qml b/src/ui/toolbar/JoystickIndicator.qml index 473db52..d7c4876 100644 --- a/src/ui/toolbar/JoystickIndicator.qml +++ b/src/ui/toolbar/JoystickIndicator.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 +import QtQuick 2.11 +import QtQuick.Layouts 1.11 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/ui/toolbar/MainToolBarIndicators.qml b/src/ui/toolbar/MainToolBarIndicators.qml index 7964f95..ade60c8 100644 --- a/src/ui/toolbar/MainToolBarIndicators.qml +++ b/src/ui/toolbar/MainToolBarIndicators.qml @@ -7,10 +7,10 @@ * ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.11 import QtQuick.Controls 2.4 import QtQuick.Dialogs 1.3 -import QtQuick.Layouts 1.12 +import QtQuick.Layouts 1.11 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/ui/toolbar/RCRSSIIndicator.qml b/src/ui/toolbar/RCRSSIIndicator.qml index 06ef1ae..0f32a64 100644 --- a/src/ui/toolbar/RCRSSIIndicator.qml +++ b/src/ui/toolbar/RCRSSIIndicator.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 +import QtQuick 2.11 +import QtQuick.Layouts 1.11 import QGroundControl 1.0 import QGroundControl.Controls 1.0 diff --git a/src/ui/toolbar/TelemetryRSSIIndicator.qml b/src/ui/toolbar/TelemetryRSSIIndicator.qml index ff0b012..42cfc92 100644 --- a/src/ui/toolbar/TelemetryRSSIIndicator.qml +++ b/src/ui/toolbar/TelemetryRSSIIndicator.qml @@ -7,8 +7,8 @@ * ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 +import QtQuick 2.11 +import QtQuick.Layouts 1.11 import QGroundControl 1.0 import QGroundControl.Controls 1.0