Ad5001/LogarithmPlotter
Ad5001/LogarithmPlotter
1
0
Fork 0
Code Issues 6 Pull requests Projects Releases Wiki Activity

Fixing opening file in settings, updating CI images to PySide6.

Browse source
This commit is contained in:
Adsooi 2023-05-22 01:50:22 +02:00
parent f40c242877
commit 424eef6e17
Signed by: Ad5001
GPG key ID: EF45F9C6AFE20160
2 changed files with 19 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Settings.qml
View file

@ -135,7 +135,7 @@ ScrollView {
Popup.FileDialog { Popup.FileDialog {
id: fdiag id: fdiag
onAccepted: { onAccepted: {
var filePath = fileUrl.toString().substr(7) var filePath = fdiag.currentFile.toString().substr(7)
settings.saveFilename = filePath settings.saveFilename = filePath
if(exportMode) { if(exportMode) {
root.saveDiagram(filePath) root.saveDiagram(filePath)

38
ci/drone.yml
View file

@ -12,10 +12,8 @@ steps:
- git submodule update --init --recursive - git submodule update --init --recursive
- name: Linux test - name: Linux test
image: ad5001/ubuntu-pyside2-xvfb:hirsute-5.15.2 image: ad5001/ubuntu-pyside6-xvfb:jammy-6.5.0
commands: 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
- 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/test1.lpf
- xvfb-run python3 run.py --test-build --no-check-for-updates ./ci/test2.lpf - xvfb-run python3 run.py --test-build --no-check-for-updates ./ci/test2.lpf
@ -23,7 +21,7 @@ steps:
event: [ push, tag ] event: [ push, tag ]
- name: Windows test - name: Windows test
image: ad5001/ubuntu-pyside2-xvfb-wine:win7-5.15.2 image: ad5001/ubuntu-pyside6-xvfb-wine:jammy-6.5.0
commands: commands:
- # For some reason, launching GUI apps with wine, even with xvfb-run, fails. - # For some reason, launching GUI apps with wine, even with xvfb-run, fails.
- xvfb-run python run.py --test-build --no-check-for-updates - xvfb-run python run.py --test-build --no-check-for-updates
@ -33,19 +31,19 @@ steps:
event: [ push, tag ] event: [ push, tag ]
- name: Linux packaging # - name: Linux packaging
image: ad5001/accountfree-build-img:hirsute-5.15.2 # image: ad5001/accountfree-build-img:hirsute-5.15.2
commands: # commands:
- bash scripts/package-linux.sh # - bash scripts/package-linux.sh
when: # when:
event: [ push, tag ] # event: [ push, tag ]
#
#
- name: Windows building # - name: Windows building
image: ad5001/accountfree-build-img-wine:win7-5.15.2 # image: ad5001/accountfree-build-img-wine:win7-5.15.2
commands: # commands:
- bash scripts/build-wine.sh # - bash scripts/build-wine.sh
- bash scripts/package-wine.sh # - bash scripts/package-wine.sh
when: # when:
event: [ push, tag ] # event: [ push, tag ]
#