Skip to content

Commit 41f5129

Browse files
ekkeekke
committed
target ids changed - so they work again together with OpenDataSpace newest release
Signed-off-by: ekkes-corner <ekke@ekkes-corner.org>
1 parent ff7187d commit 41f5129

File tree

7 files changed

+47
-73
lines changed

7 files changed

+47
-73
lines changed

‎assets/main.qml‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -43,21 +43,11 @@ Page {
4343
actions: [
4444
ActionItem {
4545
id: cloudActionPreviewer
46-
title: qsTr("Preview") + Retranslate.onLanguageChanged
46+
title: qsTr("ODS Upload") + Retranslate.onLanguageChanged
4747
imageSource: "asset:///images/ics/4-collections-cloud_newLabel81.png"
4848
ActionBar.placement: ActionBarPlacement.OnBar
4949
onTriggered: {
50-
app.invokeBoundODSPreviewer(picker.selectedFile)
51-
resetFields()
52-
}
53-
},
54-
ActionItem {
55-
id: cloudActionComposer
56-
title: qsTr("Compose") + Retranslate.onLanguageChanged
57-
imageSource: "asset:///images/ics/4-collections-cloud_newLabel81.png"
58-
ActionBar.placement: ActionBarPlacement.OnBar
59-
onTriggered: {
60-
app.invokeBoundODSComposer(picker.selectedFile)
50+
app.invokeBoundODSUpload(picker.selectedFile)
6151
resetFields()
6252
}
6353
},
@@ -206,7 +196,7 @@ Page {
206196
}
207197
}
208198
function fileActions() {
209-
theNextStep.text = qsTr("You have selected the file below.\n\nEmbed the card from ODS:\n* Cloud Action\n(Previewer || Composer)\n* Share Action (Previewer)") + Retranslate.onLanguageChanged
199+
theNextStep.text = qsTr("File selected ... upload") + Retranslate.onLanguageChanged
210200
fileLabel.text = picker.selectedFile
211201
fileLabel.visible = true
212202
page.addAction(cloudActionPreviewer, 0)
@@ -224,7 +214,7 @@ Page {
224214
//cloudActionPreviewer.enabled = false
225215
//cloudActionComposer.enabled = false
226216
//shareAction.enabled = false
227-
theNextStep.text = qsTr("Select a file from Overflow Menu:\n\nDocument, Image,\nVideo or Music)\n\nor invoke ODS as Application:\nOpen in... Action") + Retranslate.onLanguageChanged
217+
theNextStep.text = qsTr("Select a file from Overflow Menu:\n\nDocument, Image,\nVideo or Music)\n\nthen Upload to ODS") + Retranslate.onLanguageChanged
228218
}
229219
function onGreen() {
230220
redImage.visible = false

‎bar-descriptor.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<!-- A string value of the format <0-999>.<0-999>.<0-999> that represents application version which can be used to check for application upgrade.
3636
Values can also be 1-part or 2-part. It is not necessary to have a 3-part value.
3737
An updated version of application must have a versionNumber value higher than the previous version. Required. -->
38-
<versionNumber>0.9.3</versionNumber>
38+
<versionNumber>0.9.4</versionNumber>
3939
<packageLocale>de</packageLocale>
4040

4141
<!-- Fourth digit segment of the package version. First three segments are taken from the

‎src/FileUpload2ODS.cpp‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -62,17 +62,10 @@ FileUpload2ODS::FileUpload2ODS(bb::cascades::Application *app) :
6262
app->setScene(root);
6363
}
6464

65-
void FileUpload2ODS::invokeBoundODSPreviewer(QString data) {
65+
void FileUpload2ODS::invokeBoundODSUpload(QString data) {
6666
InvokeRequest cardRequest;
6767
cardRequest.setData(data.toLatin1());
68-
cardRequest.setTarget("io.ods.bb10.card.upload.previewer");
69-
m_invokeManager->invoke(cardRequest);
70-
}
71-
72-
void FileUpload2ODS::invokeBoundODSComposer(QString data) {
73-
InvokeRequest cardRequest;
74-
cardRequest.setData(data.toLatin1());
75-
cardRequest.setTarget("io.ods.bb10.card.upload.composer");
68+
cardRequest.setTarget("io.ods.bb10.card.upload");
7669
m_invokeManager->invoke(cardRequest);
7770
}
7871

‎src/FileUpload2ODS.hpp‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,8 @@ Q_OBJECT
4444
* as Previewer
4545
*/
4646
Q_INVOKABLE
47-
void invokeBoundODSPreviewer(QString data);
47+
void invokeBoundODSUpload(QString data);
4848

49-
/**
50-
* uses Invokation Framework to Invoke embedded Card
51-
* as Composer
52-
*/
53-
Q_INVOKABLE
54-
void invokeBoundODSComposer(QString data);
5549

5650
Q_SIGNALS:
5751

‎translations/FileUpload2ODS.ts‎

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -10,65 +10,54 @@
1010
</message>
1111
<message>
1212
<location filename="../assets/main.qml" line="46"/>
13-
<source>Preview</source>
13+
<source>ODS Upload</source>
1414
<translation type="unfinished"></translation>
1515
</message>
1616
<message>
17-
<location filename="../assets/main.qml" line="56"/>
18-
<source>Compose</source>
19-
<translation type="unfinished"></translation>
20-
</message>
21-
<message>
22-
<location filename="../assets/main.qml" line="96"/>
23-
<location filename="../assets/main.qml" line="100"/>
17+
<location filename="../assets/main.qml" line="86"/>
18+
<location filename="../assets/main.qml" line="90"/>
2419
<source>Select Document</source>
2520
<translation type="unfinished"></translation>
2621
</message>
2722
<message>
28-
<location filename="../assets/main.qml" line="108"/>
23+
<location filename="../assets/main.qml" line="98"/>
2924
<source>Select | Capture Image</source>
3025
<translation type="unfinished"></translation>
3126
</message>
3227
<message>
33-
<location filename="../assets/main.qml" line="112"/>
28+
<location filename="../assets/main.qml" line="102"/>
3429
<source>Select Image</source>
3530
<translation type="unfinished"></translation>
3631
</message>
3732
<message>
38-
<location filename="../assets/main.qml" line="120"/>
33+
<location filename="../assets/main.qml" line="110"/>
3934
<source>Select | Capture Video</source>
4035
<translation type="unfinished"></translation>
4136
</message>
4237
<message>
43-
<location filename="../assets/main.qml" line="124"/>
38+
<location filename="../assets/main.qml" line="114"/>
4439
<source>Select Video</source>
4540
<translation type="unfinished"></translation>
4641
</message>
4742
<message>
48-
<location filename="../assets/main.qml" line="132"/>
49-
<location filename="../assets/main.qml" line="136"/>
43+
<location filename="../assets/main.qml" line="122"/>
44+
<location filename="../assets/main.qml" line="126"/>
5045
<source>Select Music</source>
5146
<translation type="unfinished"></translation>
5247
</message>
5348
<message>
54-
<location filename="../assets/main.qml" line="209"/>
55-
<source>You have selected the file below.
56-
57-
Embed the card from ODS:
58-
* Cloud Action
59-
(Previewer || Composer)
60-
* Share Action (Previewer)</source>
49+
<location filename="../assets/main.qml" line="199"/>
50+
<source>File selected ... upload</source>
6151
<translation type="unfinished"></translation>
6252
</message>
6353
<message>
64-
<location filename="../assets/main.qml" line="227"/>
54+
<location filename="../assets/main.qml" line="217"/>
6555
<source>Select a file from Overflow Menu:
6656

6757
Document, Image,
6858
Video or Music)
6959

70-
or invoke ODS as Application:
71-
Open in... Action</source>
60+
then Upload to ODS</source>
7261
<translation type="unfinished"></translation>
7362
</message>
7463
</context>

‎translations/FileUpload2ODS_de.qm‎

-809 Bytes
Binary file not shown.

‎translations/FileUpload2ODS_de.ts‎

Lines changed: 26 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,71 +10,79 @@
1010
</message>
1111
<message>
1212
<location filename="../assets/main.qml" line="46"/>
13-
<source>Preview</source>
13+
<source>ODS Upload</source>
1414
<translation type="unfinished"></translation>
1515
</message>
1616
<message>
17-
<location filename="../assets/main.qml" line="56"/>
18-
<source>Compose</source>
19-
<translation type="unfinished"></translation>
20-
</message>
21-
<message>
22-
<location filename="../assets/main.qml" line="96"/>
23-
<location filename="../assets/main.qml" line="100"/>
17+
<location filename="../assets/main.qml" line="86"/>
18+
<location filename="../assets/main.qml" line="90"/>
2419
<source>Select Document</source>
2520
<translation type="unfinished">Dokument auswählen</translation>
2621
</message>
2722
<message>
28-
<location filename="../assets/main.qml" line="108"/>
23+
<location filename="../assets/main.qml" line="98"/>
2924
<source>Select | Capture Image</source>
3025
<translation type="unfinished">Foto auswählen | aufnehmen</translation>
3126
</message>
3227
<message>
33-
<location filename="../assets/main.qml" line="112"/>
28+
<location filename="../assets/main.qml" line="102"/>
3429
<source>Select Image</source>
3530
<translation type="unfinished">Foto auswählen</translation>
3631
</message>
3732
<message>
38-
<location filename="../assets/main.qml" line="120"/>
33+
<location filename="../assets/main.qml" line="110"/>
3934
<source>Select | Capture Video</source>
4035
<translation type="unfinished">Video auswählen | aufnehmen</translation>
4136
</message>
4237
<message>
43-
<location filename="../assets/main.qml" line="124"/>
38+
<location filename="../assets/main.qml" line="114"/>
4439
<source>Select Video</source>
4540
<translation type="unfinished">Video auswählen</translation>
4641
</message>
4742
<message>
48-
<location filename="../assets/main.qml" line="132"/>
49-
<location filename="../assets/main.qml" line="136"/>
43+
<location filename="../assets/main.qml" line="122"/>
44+
<location filename="../assets/main.qml" line="126"/>
5045
<source>Select Music</source>
5146
<translation type="unfinished">Audiodatei auswählen</translation>
5247
</message>
5348
<message>
54-
<location filename="../assets/main.qml" line="209"/>
49+
<location filename="../assets/main.qml" line="199"/>
50+
<source>File selected ... upload</source>
51+
<translation type="unfinished"></translation>
52+
</message>
53+
<message>
54+
<location filename="../assets/main.qml" line="217"/>
55+
<source>Select a file from Overflow Menu:
56+
57+
Document, Image,
58+
Video or Music)
59+
60+
then Upload to ODS</source>
61+
<translation type="unfinished"></translation>
62+
</message>
63+
<message>
5564
<source>You have selected the file below.
5665

5766
Embed the card from ODS:
5867
* Cloud Action
5968
(Previewer || Composer)
6069
* Share Action (Previewer)</source>
61-
<translation type="unfinished">Sie haben die unten gezeigte Datei gewählt.
70+
<translation type="obsolete">Sie haben die unten gezeigte Datei gewählt.
6271

6372
ODS Karte einbetten:
6473
* Cloud Aktion
6574
(Previewer || Composer)
6675
* Freigeben Aktion (Previewer)</translation>
6776
</message>
6877
<message>
69-
<location filename="../assets/main.qml" line="227"/>
7078
<source>Select a file from Overflow Menu:
7179

7280
Document, Image,
7381
Video or Music)
7482

7583
or invoke ODS as Application:
7684
Open in... Action</source>
77-
<translation type="unfinished">Datei auswählen (Überlaufmenu):
85+
<translation type="obsolete">Datei auswählen (Überlaufmenu):
7886

7987
Dokument, Foto,
8088
Video oder Audio

0 commit comments

Comments
 (0)