Commit 62bc5a63 authored by Gus Grubba's avatar Gus Grubba

Qt 5.5.x doesn't know how to handle redirects.

parent a85cdd59
...@@ -460,7 +460,9 @@ MavlinkLogManager::_sendLog(const QString& logFile) ...@@ -460,7 +460,9 @@ MavlinkLogManager::_sendLog(const QString& logFile)
multiPart->append(logPart); multiPart->append(logPart);
file->setParent(multiPart); file->setParent(multiPart);
QNetworkRequest request(_uploadURL); QNetworkRequest request(_uploadURL);
#if QT_VERSION > 0x050600
request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
#endif
QNetworkReply* reply = _nam->post(request, multiPart); QNetworkReply* reply = _nam->post(request, multiPart);
connect(reply, &QNetworkReply::finished, this, &MavlinkLogManager::_uploadFinished); connect(reply, &QNetworkReply::finished, this, &MavlinkLogManager::_uploadFinished);
connect(this, &MavlinkLogManager::abortUpload, reply, &QNetworkReply::abort); connect(this, &MavlinkLogManager::abortUpload, reply, &QNetworkReply::abort);
......
...@@ -25,22 +25,28 @@ Rectangle { ...@@ -25,22 +25,28 @@ Rectangle {
color: qgcPal.window color: qgcPal.window
anchors.fill: parent anchors.fill: parent
property real _labelWidth: ScreenTools.defaultFontPixelWidth * 28 property real _labelWidth: ScreenTools.defaultFontPixelWidth * 28
property real _valueWidth: ScreenTools.defaultFontPixelWidth * 24 property real _valueWidth: ScreenTools.defaultFontPixelWidth * 24
property int _selectedCount: 0 property int _selectedCount: 0
property real _columnSpacing: ScreenTools.defaultFontPixelHeight * 0.25 property real _columnSpacing: ScreenTools.defaultFontPixelHeight * 0.25
property bool _uploadedSelected: false
QGCPalette { id: qgcPal } QGCPalette { id: qgcPal }
Connections { Connections {
target: QGroundControl.mavlinkLogManager target: QGroundControl.mavlinkLogManager
onSelectedCountChanged: { onSelectedCountChanged: {
_uploadedSelected = false
var selected = 0 var selected = 0
for(var i = 0; i < QGroundControl.mavlinkLogManager.logFiles.count; i++) { for(var i = 0; i < QGroundControl.mavlinkLogManager.logFiles.count; i++) {
var logFile = QGroundControl.mavlinkLogManager.logFiles.get(i) var logFile = QGroundControl.mavlinkLogManager.logFiles.get(i)
if(logFile.selected) if(logFile.selected) {
selected++ selected++
//-- If an uploaded file is selected, disable "Upload" button
if(logFile.uploaded) {
_uploadedSelected = true
}
}
} }
_selectedCount = selected _selectedCount = selected
} }
...@@ -425,7 +431,7 @@ Rectangle { ...@@ -425,7 +431,7 @@ Rectangle {
} }
QGCButton { QGCButton {
text: "Upload Selected" 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 visible: !QGroundControl.mavlinkLogManager.uploading
onClicked: { onClicked: {
QGroundControl.mavlinkLogManager.emailAddress = emailField.text QGroundControl.mavlinkLogManager.emailAddress = emailField.text
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment