zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Set minimum to Qt 5.11 

Windows fixes
QGC4.4
Gus Grubba 6 years ago
parent
54483e9136
commit
29f6654743
13 changed files with 41 additions and 40 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      src/AnalyzeView/GeoTagController.cc
  2. 12
      src/AnalyzeView/GeoTagPage.qml
  3. 10
      src/FlightDisplay/MultiVehicleList.qml
  4. 2
      src/QmlControls/QGCViewDialogContainer.qml
  5. 18
      src/ui/MainQmlWindow.qml
  6. 4
      src/ui/toolbar/BatteryIndicator.qml
  7. 4
      src/ui/toolbar/GPSIndicator.qml
  8. 4
      src/ui/toolbar/GPSRTKIndicator.qml
  9. 4
      src/ui/toolbar/JoystickIndicator.qml
  10. 4
      src/ui/toolbar/MainToolBarIndicators.qml
  11. 4
      src/ui/toolbar/RCRSSIIndicator.qml
  12. 4
      src/ui/toolbar/TelemetryRSSIIndicator.qml

7
src/AnalyzeView/GeoTagController.cc
Unescape View File

@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@
#include <QDebug>
#include <cfloat>
#include <QDir>
#include <QUrl>
#include "ExifParser.h"
#include "ULogParser.h"
@ -38,7 +39,7 @@ GeoTagController::~GeoTagController() @@ -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) @@ -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) @@ -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);

12
src/AnalyzeView/GeoTagPage.qml
Unescape View File

@ -7,10 +7,10 @@ @@ -7,10 +7,10 @@
*
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
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
@ -40,7 +40,7 @@ AnalyzePage { @@ -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 { @@ -113,7 +113,7 @@ AnalyzePage {
selectFolder: true
selectExisting: true
onAccepted: {
geoController.imageDirectory = openLogFile.folder
geoController.selectImageDir = openLogFile.folder
close()
}
}
@ -141,7 +141,7 @@ AnalyzePage { @@ -141,7 +141,7 @@ AnalyzePage {
selectFolder: true
selectExisting: true
onAccepted: {
geoController.saveDirectory = openLogFile.folder
geoController.saveDirectory = selectDestDir.folder
close()
}
}

10
src/FlightDisplay/MultiVehicleList.qml
Unescape View File

@ -149,31 +149,31 @@ Item { @@ -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

2
src/QmlControls/QGCViewDialogContainer.qml
Unescape View File

@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
*
****************************************************************************/
import QtQuick 2.12
import QtQuick 2.11
import QtQuick.Controls 2.4
import QtQuick.Dialogs 1.3

18
src/ui/MainQmlWindow.qml
Unescape View File

@ -8,10 +8,10 @@ @@ -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 @@ -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 { @@ -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 { @@ -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 { @@ -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 { @@ -739,7 +740,6 @@ ApplicationWindow {
id: loader
onLoaded: {
indicatorDropdown.x = mapFromGlobal(indicatorDropdown.centerX, 0).x
console.log(indicatorDropdown.x)
}
}
onOpened: {

4
src/ui/toolbar/BatteryIndicator.qml
Unescape View File

@ -7,8 +7,8 @@ @@ -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

4
src/ui/toolbar/GPSIndicator.qml
Unescape View File

@ -7,8 +7,8 @@ @@ -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

4
src/ui/toolbar/GPSRTKIndicator.qml
Unescape View File

@ -7,8 +7,8 @@ @@ -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

4
src/ui/toolbar/JoystickIndicator.qml
Unescape View File

@ -7,8 +7,8 @@ @@ -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

4
src/ui/toolbar/MainToolBarIndicators.qml
Unescape View File

@ -7,10 +7,10 @@ @@ -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

4
src/ui/toolbar/RCRSSIIndicator.qml
Unescape View File

@ -7,8 +7,8 @@ @@ -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

4
src/ui/toolbar/TelemetryRSSIIndicator.qml
Unescape View File

@ -7,8 +7,8 @@ @@ -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

Write Preview
Loading…
Cancel
Save