From 424eef6e17c43a1b74ae620f55bfa7f646074baf Mon Sep 17 00:00:00 2001
From: Ad5001 <mail@ad5001.eu>
Date: Mon, 22 May 2023 01:50:22 +0200
Subject: [PATCH] Fixing opening file in settings, updating CI images to
 PySide6.

---
 .../eu/ad5001/LogarithmPlotter/Settings.qml   |  2 +-
 ci/drone.yml                                  | 38 +++++++++----------
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Settings.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Settings.qml
index af990de..39c508f 100644
--- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Settings.qml
+++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Settings.qml
@@ -135,7 +135,7 @@ ScrollView {
         Popup.FileDialog {
             id: fdiag
             onAccepted: {
-                var filePath = fileUrl.toString().substr(7)
+                var filePath = fdiag.currentFile.toString().substr(7)
                 settings.saveFilename = filePath
                 if(exportMode) {
                     root.saveDiagram(filePath)
diff --git a/ci/drone.yml b/ci/drone.yml
index 249cbc3..591934e 100644
--- a/ci/drone.yml
+++ b/ci/drone.yml
@@ -12,10 +12,8 @@ steps:
   - git submodule update --init --recursive
 
 - name: Linux test
-  image: ad5001/ubuntu-pyside2-xvfb:hirsute-5.15.2
+  image: ad5001/ubuntu-pyside6-xvfb:jammy-6.5.0
   commands:
-  #- apt update
-  #- apt install -y texlive-latex-base dvipng
   - xvfb-run python3 run.py --test-build --no-check-for-updates
   - xvfb-run python3 run.py --test-build --no-check-for-updates ./ci/test1.lpf
   - xvfb-run python3 run.py --test-build --no-check-for-updates ./ci/test2.lpf
@@ -23,7 +21,7 @@ steps:
     event: [ push, tag ]
 
 - name: Windows test
-  image: ad5001/ubuntu-pyside2-xvfb-wine:win7-5.15.2
+  image: ad5001/ubuntu-pyside6-xvfb-wine:jammy-6.5.0
   commands:
   - # For some reason, launching GUI apps with wine, even with xvfb-run, fails.
   - xvfb-run python run.py --test-build --no-check-for-updates
@@ -33,19 +31,19 @@ steps:
     event: [ push, tag ]
 
 
-- name: Linux packaging
-  image: ad5001/accountfree-build-img:hirsute-5.15.2
-  commands:
-  - bash scripts/package-linux.sh
-  when:
-    event: [ push, tag ]
-
-
-- name: Windows building
-  image: ad5001/accountfree-build-img-wine:win7-5.15.2
-  commands:
-  - bash scripts/build-wine.sh
-  - bash scripts/package-wine.sh
-  when:
-    event: [ push, tag ]
-  
+# - name: Linux packaging
+#   image: ad5001/accountfree-build-img:hirsute-5.15.2
+#   commands:
+#   - bash scripts/package-linux.sh
+#   when:
+#     event: [ push, tag ]
+# 
+# 
+# - name: Windows building
+#   image: ad5001/accountfree-build-img-wine:win7-5.15.2
+#   commands:
+#   - bash scripts/build-wine.sh
+#   - bash scripts/package-wine.sh
+#   when:
+#     event: [ push, tag ]
+#