version++ (2020.5.3) (+minor GUI fixes)

Mergin/metadata.txt

@@ -4,14 +4,17 @@ name=Mergin
 qgisMinimumVersion=3.4
 qgisMaximumVersion=3.99
 description=Handle Mergin projects
-version=2020.5.2
+version=2020.5.3
 author=Lutra Consulting
 [email protected]
 about=Mergin is a repository for storing and tracking changes to QGIS projects/data. It is linked with Input(a QGIS mobile app). With this plugin, users can upload and sync their data to Mergin service.
 ; end of mandatory metadata
 
 ; start of optional metadata
-changelog=2020.5.2
+changelog=2020.5.3
+  - Updated Mergin client to 0.5.4 - fixing an issue with renamed files
+  - Added sending of diagnostic logs upon client's request
+  <p>2020.5.2
   - Fixed compatibility issue with QGIS < 3.12 (#163)
   <p>2020.5.1
   - Upgraded Mergin client to 0.5.3 and geodiff to 0.8.5 (#160, #150)

Mergin/plugin.py

@@ -454,15 +454,18 @@ def submit_logs(self):
               "and briefly describe the problem to add more context to the diagnostic log.\n\n" \
               "Please click OK if you want to proceed.".format(logs_path)
 
-        btn_reply = QMessageBox.question(None, 'Submit diagnostic logs', msg, QMessageBox.Yes | QMessageBox.No, QMessageBox.Yes)
-        if btn_reply == QMessageBox.No:
+        btn_reply = QMessageBox.question(None, 'Submit diagnostic logs', msg, QMessageBox.Ok | QMessageBox.Cancel)
+        if btn_reply != QMessageBox.Ok:
             return
 
+        QApplication.setOverrideCursor(Qt.WaitCursor)
         log_file_name, error = send_logs(self.mc.username(), logs_path)
+        QApplication.restoreOverrideCursor()
+
         if error:
-            QMessageBox.warning(None, "Submit diagnostic logs", "Sending of logs failed, reason: {}".format(error))
+            QMessageBox.warning(None, "Submit diagnostic logs", "Sending of diagnostic logs failed!\n\n{}".format(error))
             return
-        QMessageBox.information(None, 'Submit diagnostic logs', "Logs successfully submitted:\n{}".format(log_file_name), QMessageBox.Close)
+        QMessageBox.information(None, 'Submit diagnostic logs', "Diagnostic logs successfully submitted - thank you!\n\n{}".format(log_file_name), QMessageBox.Close)
 
     def actions(self, parent):
         action_download = QAction(QIcon(os.path.join(icon_path, "cloud-download-alt-solid.svg")), "Download", parent)