Merge lp:~kissiel/checkbox/fix-1399623 into lp:checkbox

Proposed by Maciej Kisielewski
Status: Merged
Approved by: Zygmunt Krynicki
Approved revision: 3499
Merged at revision: 3498
Proposed branch: lp:~kissiel/checkbox/fix-1399623
Merge into: lp:checkbox
Diff against target: 26 lines (+6/-3)
1 file modified
checkbox-touch/main.qml (+6/-3)
To merge this branch: bzr merge lp:~kissiel/checkbox/fix-1399623
Reviewer Review Type Date Requested Status
Sylvain Pineau (community) Needs Fixing
Zygmunt Krynicki (community) Approve
Review via email: mp+244516@code.launchpad.net

Description of the change

This MR shows dialog when reports are saved. It also rearranges how reports are saved internally, to have more linear behaviour.
This is how it looks on flo: http://imgur.com/KXuTQsT

fa47928 checkbox-touch: display dialog after saving reports
ee207ef checkbox-touch: make saving of reports sequential

To post a comment you must log in.
Revision history for this message
Zygmunt Krynicki (zyga) :
review: Approve
Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

I'd add two hyperlinks in this popup to call the urldispatcher:

file:///home/phablet/Documents/yadayadayadayada.xlsx
file:///home/phablet/Documents/yadayadayadayada.html

Using the following QML:

onLinkActivated: {
    Qt.openUrlExternally(link)
}

Reports have been saved to your Documents folder

     HTML version XLSX version

review: Needs Fixing

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'checkbox-touch/main.qml'
2--- checkbox-touch/main.qml 2014-12-08 08:02:15 +0000
3+++ checkbox-touch/main.qml 2014-12-11 22:39:37 +0000
4@@ -25,6 +25,7 @@
5 import io.thp.pyotherside 1.2
6 import "components"
7 import "components/ErrorLogic.js" as ErrorLogic
8+import "components/CbtDialogLogic.js" as CbtDialogLogic
9
10
11 /*!
12@@ -352,9 +353,11 @@
13 resultsPage.saveReportClicked.connect(function() {
14 app.exportResults('html', [], function(uri) {
15 console.log(uri)
16- });
17- app.exportResults('xlsx', ["with-sys-info", "with-summary", "with-job-description", "with-text-attachments", "with-unit-categories"], function(uri) {
18- console.log(uri)
19+ app.exportResults('xlsx', ["with-sys-info", "with-summary", "with-job-description", "with-text-attachments", "with-unit-categories"], function(uri) {
20+ console.log(uri)
21+ CbtDialogLogic.showDialog(resultsPage, i18n.tr("Reports have been saved to your Documents folder"),
22+ [{ "text": i18n.tr("OK"), "color": UbuntuColors.green}]);
23+ });
24 });
25 });
26 pageStack.push(resultsPage);

Subscribers

People subscribed via source and target branches