Merge lp:~ken-vandine/share-app/feedback into lp:share-app

Proposed by Ken VanDine
Status: Merged
Approved by: Bill Filler
Approved revision: 55
Merged at revision: 55
Proposed branch: lp:~ken-vandine/share-app/feedback
Merge into: lp:share-app
Diff against target: 47 lines (+11/-0)
2 files modified
debian/control (+1/-0)
main.qml (+10/-0)
To merge this branch: bzr merge lp:~ken-vandine/share-app/feedback
Reviewer Review Type Date Requested Status
Bill Filler (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+167847@code.launchpad.net

Commit message

provide some feedback to the user that the upload is in progress and disable the post button during upload

Description of the change

provide some feedback to the user that the upload is in progress and disable the post button during upload

To post a comment you must log in.
lp:~ken-vandine/share-app/feedback updated
54. By Ken VanDine

disable the Post button while an upload is in progress

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
lp:~ken-vandine/share-app/feedback updated
55. By Ken VanDine

added depends for qtdeclarative5-accounts-plugin

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Bill Filler (bfiller) wrote :

approved

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2013-04-24 17:34:10 +0000
3+++ debian/control 2013-06-07 14:50:36 +0000
4@@ -26,6 +26,7 @@
5 Architecture: i386 amd64 armhf
6 Depends: ${shlibs:Depends},
7 ${misc:Depends},
8+ qtdeclarative5-accounts-plugin,
9 qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
10 qtdeclarative5-hud1.0,
11 qtdeclarative5-qtquick2-plugin,
12
13=== modified file 'main.qml'
14--- main.qml 2013-05-29 15:38:30 +0000
15+++ main.qml 2013-06-07 14:50:36 +0000
16@@ -41,6 +41,7 @@
17 FriendsDispatcher {
18 id: friends
19 onUploadComplete: {
20+ activitySpinner.visible = false;
21 if (success) {
22 notifyOSD.notify("Your photo has been uploaded", null, "facebook");
23 } else {
24@@ -181,6 +182,13 @@
25 focus: true
26 }
27
28+ ActivityIndicator {
29+ id: activitySpinner
30+ anchors.centerIn: message
31+ visible: false
32+ running: visible
33+ }
34+
35 UbuntuShape {
36 id: snapshot
37 anchors.top: parent.top
38@@ -226,7 +234,9 @@
39 color: "#dd4814"
40 width: units.gu(10)
41 height: units.gu(4)
42+ enabled: !activitySpinner.visible
43 onClicked: {
44+ activitySpinner.visible = true;
45 friends.uploadForAccountAsync(fileToShare.account,
46 "file://" + resizer.resizedFile,
47 message.text)

Subscribers

People subscribed via source and target branches