Skip to content

Commit de400c6

Browse files
committed
now matches the actual version of ODS
Signed-off-by: ekkes-corner <ekke@ekkes-corner.org>
1 parent 41f5129 commit de400c6

File tree

4 files changed

+25
-24
lines changed

4 files changed

+25
-24
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,6 @@
1212
*.a
1313

1414
/.settings/
15+
/config.pri
1516
/arm/
1617
/x86/

assets/main.qml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ Page {
3636
sortOrder: FilePickerSortOrder.Default
3737
onFileSelected: {
3838
selectedFile = selectedFiles[0]
39+
picker.close()
3940
fileActions()
4041
}
4142
}
@@ -79,6 +80,7 @@ Page {
7980
// next trick: all properties from query are read-only
8081
// but we can use the data, which is read-write
8182
data = picker.selectedFile
83+
picker.close()
8284
resetFields()
8385
}
8486
},
@@ -200,17 +202,15 @@ Page {
200202
fileLabel.text = picker.selectedFile
201203
fileLabel.visible = true
202204
page.addAction(cloudActionPreviewer, 0)
203-
page.addAction(cloudActionComposer, 1)
204-
page.addAction(shareAction, 2)
205+
// page.addAction(shareAction, 2)
205206
//cloudActionPreviewer.enabled = true
206207
//cloudActionComposer.enabled = true
207208
//shareAction.enabled = true
208209
}
209210
function resetFields() {
210211
fileLabel.visible = false
211212
page.removeAction(cloudActionPreviewer)
212-
page.removeAction(cloudActionComposer)
213-
page.removeAction(shareAction)
213+
// page.removeAction(shareAction)
214214
//cloudActionPreviewer.enabled = false
215215
//cloudActionComposer.enabled = false
216216
//shareAction.enabled = false

translations/FileUpload2ODS.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,44 +9,44 @@
99
<translation type="unfinished"></translation>
1010
</message>
1111
<message>
12-
<location filename="../assets/main.qml" line="46"/>
12+
<location filename="../assets/main.qml" line="47"/>
1313
<source>ODS Upload</source>
1414
<translation type="unfinished"></translation>
1515
</message>
1616
<message>
17-
<location filename="../assets/main.qml" line="86"/>
18-
<location filename="../assets/main.qml" line="90"/>
17+
<location filename="../assets/main.qml" line="88"/>
18+
<location filename="../assets/main.qml" line="92"/>
1919
<source>Select Document</source>
2020
<translation type="unfinished"></translation>
2121
</message>
2222
<message>
23-
<location filename="../assets/main.qml" line="98"/>
23+
<location filename="../assets/main.qml" line="100"/>
2424
<source>Select | Capture Image</source>
2525
<translation type="unfinished"></translation>
2626
</message>
2727
<message>
28-
<location filename="../assets/main.qml" line="102"/>
28+
<location filename="../assets/main.qml" line="104"/>
2929
<source>Select Image</source>
3030
<translation type="unfinished"></translation>
3131
</message>
3232
<message>
33-
<location filename="../assets/main.qml" line="110"/>
33+
<location filename="../assets/main.qml" line="112"/>
3434
<source>Select | Capture Video</source>
3535
<translation type="unfinished"></translation>
3636
</message>
3737
<message>
38-
<location filename="../assets/main.qml" line="114"/>
38+
<location filename="../assets/main.qml" line="116"/>
3939
<source>Select Video</source>
4040
<translation type="unfinished"></translation>
4141
</message>
4242
<message>
43-
<location filename="../assets/main.qml" line="122"/>
44-
<location filename="../assets/main.qml" line="126"/>
43+
<location filename="../assets/main.qml" line="124"/>
44+
<location filename="../assets/main.qml" line="128"/>
4545
<source>Select Music</source>
4646
<translation type="unfinished"></translation>
4747
</message>
4848
<message>
49-
<location filename="../assets/main.qml" line="199"/>
49+
<location filename="../assets/main.qml" line="201"/>
5050
<source>File selected ... upload</source>
5151
<translation type="unfinished"></translation>
5252
</message>

translations/FileUpload2ODS_de.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,44 +9,44 @@
99
<translation type="unfinished">Dateiauswahl</translation>
1010
</message>
1111
<message>
12-
<location filename="../assets/main.qml" line="46"/>
12+
<location filename="../assets/main.qml" line="47"/>
1313
<source>ODS Upload</source>
1414
<translation type="unfinished"></translation>
1515
</message>
1616
<message>
17-
<location filename="../assets/main.qml" line="86"/>
18-
<location filename="../assets/main.qml" line="90"/>
17+
<location filename="../assets/main.qml" line="88"/>
18+
<location filename="../assets/main.qml" line="92"/>
1919
<source>Select Document</source>
2020
<translation type="unfinished">Dokument auswählen</translation>
2121
</message>
2222
<message>
23-
<location filename="../assets/main.qml" line="98"/>
23+
<location filename="../assets/main.qml" line="100"/>
2424
<source>Select | Capture Image</source>
2525
<translation type="unfinished">Foto auswählen | aufnehmen</translation>
2626
</message>
2727
<message>
28-
<location filename="../assets/main.qml" line="102"/>
28+
<location filename="../assets/main.qml" line="104"/>
2929
<source>Select Image</source>
3030
<translation type="unfinished">Foto auswählen</translation>
3131
</message>
3232
<message>
33-
<location filename="../assets/main.qml" line="110"/>
33+
<location filename="../assets/main.qml" line="112"/>
3434
<source>Select | Capture Video</source>
3535
<translation type="unfinished">Video auswählen | aufnehmen</translation>
3636
</message>
3737
<message>
38-
<location filename="../assets/main.qml" line="114"/>
38+
<location filename="../assets/main.qml" line="116"/>
3939
<source>Select Video</source>
4040
<translation type="unfinished">Video auswählen</translation>
4141
</message>
4242
<message>
43-
<location filename="../assets/main.qml" line="122"/>
44-
<location filename="../assets/main.qml" line="126"/>
43+
<location filename="../assets/main.qml" line="124"/>
44+
<location filename="../assets/main.qml" line="128"/>
4545
<source>Select Music</source>
4646
<translation type="unfinished">Audiodatei auswählen</translation>
4747
</message>
4848
<message>
49-
<location filename="../assets/main.qml" line="199"/>
49+
<location filename="../assets/main.qml" line="201"/>
5050
<source>File selected ... upload</source>
5151
<translation type="unfinished"></translation>
5252
</message>

0 commit comments

Comments
 (0)