From 62bc5a63c4407407bad349db5fd16386b42aaba2 Mon Sep 17 00:00:00 2001 From: Gus Grubba Date: Tue, 25 Oct 2016 22:55:55 -0400 Subject: [PATCH] Qt 5.5.x doesn't know how to handle redirects. --- src/Vehicle/MavlinkLogManager.cc | 2 ++ src/ui/preferences/MavlinkSettings.qml | 20 +++++++++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/Vehicle/MavlinkLogManager.cc b/src/Vehicle/MavlinkLogManager.cc index bc9e14daa..7da59ae9a 100644 --- a/src/Vehicle/MavlinkLogManager.cc +++ b/src/Vehicle/MavlinkLogManager.cc @@ -460,7 +460,9 @@ MavlinkLogManager::_sendLog(const QString& logFile) multiPart->append(logPart); file->setParent(multiPart); QNetworkRequest request(_uploadURL); +#if QT_VERSION > 0x050600 request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); +#endif QNetworkReply* reply = _nam->post(request, multiPart); connect(reply, &QNetworkReply::finished, this, &MavlinkLogManager::_uploadFinished); connect(this, &MavlinkLogManager::abortUpload, reply, &QNetworkReply::abort); diff --git a/src/ui/preferences/MavlinkSettings.qml b/src/ui/preferences/MavlinkSettings.qml index 836e902fd..3beaa6067 100644 --- a/src/ui/preferences/MavlinkSettings.qml +++ b/src/ui/preferences/MavlinkSettings.qml @@ -25,22 +25,28 @@ Rectangle { color: qgcPal.window anchors.fill: parent - property real _labelWidth: ScreenTools.defaultFontPixelWidth * 28 - property real _valueWidth: ScreenTools.defaultFontPixelWidth * 24 - property int _selectedCount: 0 - property real _columnSpacing: ScreenTools.defaultFontPixelHeight * 0.25 - + property real _labelWidth: ScreenTools.defaultFontPixelWidth * 28 + property real _valueWidth: ScreenTools.defaultFontPixelWidth * 24 + property int _selectedCount: 0 + property real _columnSpacing: ScreenTools.defaultFontPixelHeight * 0.25 + property bool _uploadedSelected: false QGCPalette { id: qgcPal } Connections { target: QGroundControl.mavlinkLogManager onSelectedCountChanged: { + _uploadedSelected = false var selected = 0 for(var i = 0; i < QGroundControl.mavlinkLogManager.logFiles.count; i++) { var logFile = QGroundControl.mavlinkLogManager.logFiles.get(i) - if(logFile.selected) + if(logFile.selected) { selected++ + //-- If an uploaded file is selected, disable "Upload" button + if(logFile.uploaded) { + _uploadedSelected = true + } + } } _selectedCount = selected } @@ -425,7 +431,7 @@ Rectangle { } QGCButton { text: "Upload Selected" - enabled: _selectedCount > 0 && !QGroundControl.mavlinkLogManager.uploading && !QGroundControl.mavlinkLogManager.logRunning + enabled: _selectedCount > 0 && !QGroundControl.mavlinkLogManager.uploading && !QGroundControl.mavlinkLogManager.logRunning && !_uploadedSelected visible: !QGroundControl.mavlinkLogManager.uploading onClicked: { QGroundControl.mavlinkLogManager.emailAddress = emailField.text -- 2.22.0