gallery-app

Merge lp:~schwann/gallery-app/gallery-no-album-share into lp:gallery-app

  1. gallery-no-album-share
  2. Merge into trunk
Proposed by Günter Schwann
Status: Merged
Merged at revision: 778
Proposed branch: lp:~schwann/gallery-app/gallery-no-album-share
Merge into: lp:gallery-app
Diff against target: 137 lines (+15/-30)
4 files modified
rc/qml/AlbumEditor/AlbumEditMenu.qml (+0/-9)
rc/qml/AlbumViewer/AlbumViewer.qml (+0/-6)
rc/qml/AlbumsOverview.qml (+0/-7)
rc/qml/MediaViewer/MediaViewer.qml (+15/-8)
To merge this branch: bzr merge lp:~schwann/gallery-app/gallery-no-album-share
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Thomas Moenicke (community) Approve
Review via email: mp+175275@code.launchpad.net

Commit message

Remove sharing of albums LP: #1163862

Description of the change

Remove sharing of albums LP: #1163862

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:777
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/363/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/173
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/173
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/173/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/173
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1199
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1203
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1203/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1024

Click here to trigger a rebuild:
http://s-jenkins:8080/job/gallery-app-ci/363/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Thomas Moenicke (thomas-moenicke) wrote :

good

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:778
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/365/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/175
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/175
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/175/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/175
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1208
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1212
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1212/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1033

Click here to trigger a rebuild:
http://s-jenkins:8080/job/gallery-app-ci/365/rebuild

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/gallery-app-autolanding/162/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-autolanding/75
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-autolanding/75/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-autolanding/75
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1215
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1219
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1219/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1039

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:778
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/366/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/176
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/176
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/176/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/176
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1240
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1244
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1244/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1048

Click here to trigger a rebuild:
http://s-jenkins:8080/job/gallery-app-ci/366/rebuild

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/gallery-app-autolanding/163/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-autolanding/76
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-autolanding/76
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1247
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1251
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1251/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1055

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'rc/qml/AlbumEditor/AlbumEditMenu.qml'
2--- rc/qml/AlbumEditor/AlbumEditMenu.qml 2013-06-20 11:54:49 +0000
3+++ rc/qml/AlbumEditor/AlbumEditMenu.qml 2013-07-17 15:14:26 +0000
4@@ -29,8 +29,6 @@
5
6 /// The user clicked on the edit button
7 signal editClicked()
8- /// The user clicked on the share button
9- signal shareClicked()
10 /// The user clicked on the delete button
11 signal deleteClicked()
12
13@@ -49,13 +47,6 @@
14 }
15 }
16 ListItem.Standard {
17- text: i18n.tr("Share")
18- onClicked: {
19- hide()
20- shareClicked()
21- }
22- }
23- ListItem.Standard {
24 text: i18n.tr("Delete")
25 onClicked: {
26 hide()
27
28=== modified file 'rc/qml/AlbumViewer/AlbumViewer.qml'
29--- rc/qml/AlbumViewer/AlbumViewer.qml 2013-07-01 07:40:13 +0000
30+++ rc/qml/AlbumViewer/AlbumViewer.qml 2013-07-17 15:14:26 +0000
31@@ -407,12 +407,6 @@
32 }
33 enabled: false // FIXME enable once the close animation is not shown anymore
34 }
35- ToolbarButton {
36- objectName: "shareButton"
37- text: i18n.tr("Share")
38- iconSource: Qt.resolvedUrl("../../img/share.png")
39- enabled: false
40- }
41 back: ToolbarButton {
42 text: i18n.tr("Back")
43 objectName: "backButton"
44
45=== modified file 'rc/qml/AlbumsOverview.qml'
46--- rc/qml/AlbumsOverview.qml 2013-06-20 11:54:49 +0000
47+++ rc/qml/AlbumsOverview.qml 2013-07-17 15:14:26 +0000
48@@ -147,13 +147,6 @@
49 albumEditor.open()
50 }
51
52- onShareClicked: {
53- for (var index = 0; index < album.allMediaSources.length; index++) {
54- // FIXME once the share component can handle more than one image
55- //shareImage(album.allMediaSources[index]);
56- }
57- }
58-
59 onDeleteClicked: {
60 albumTrashDialog.album = album
61 albumTrashDialog.caller = caller
62
63=== modified file 'rc/qml/MediaViewer/MediaViewer.qml'
64--- rc/qml/MediaViewer/MediaViewer.qml 2013-06-20 11:54:49 +0000
65+++ rc/qml/MediaViewer/MediaViewer.qml 2013-07-17 15:14:26 +0000
66@@ -420,20 +420,24 @@
67
68 property Item photoToolbar: ToolbarItems {
69 ToolbarButton {
70+ id: photoEditButton
71 objectName: "editButton"
72- text: i18n.tr("Edit")
73- iconSource: "../../img/edit.png"
74- onTriggered: {
75- PopupUtils.open(editPopoverComponent, caller);
76+ action: Action {
77+ text: i18n.tr("Edit")
78+ iconSource: "../../img/edit.png"
79+ onTriggered: {
80+ PopupUtils.open(editPopoverComponent, photoEditButton);
81+ }
82 }
83 }
84 ToolbarButton {
85+ id: photoAddButton
86 objectName: "addButton"
87 action: Action {
88 text: i18n.tr("Add photo to album")
89 iconSource: "../../img/add.png"
90 onTriggered: {
91- popupAlbumPicker.caller = caller;
92+ popupAlbumPicker.caller = photoAddButton;
93 popupAlbumPicker.show();
94 }
95 }
96@@ -451,12 +455,13 @@
97 text: i18n.tr("Delete")
98 }
99 ToolbarButton {
100+ id: photoShareButton
101 objectName: "shareButton"
102 action: Action {
103 text: i18n.tr("Share photo")
104 iconSource: "../../img/share.png"
105 onTriggered: {
106- PopupUtils.open(sharePopoverComponent, caller);
107+ PopupUtils.open(sharePopoverComponent, photoShareButton);
108 }
109 }
110 text: i18n.tr("Share")
111@@ -488,11 +493,12 @@
112 }
113 }
114 ToolbarButton {
115+ id: videoAddButton
116 objectName: "addButton"
117 text: i18n.tr("Add")
118 iconSource: "../../img/add.png"
119 onTriggered: {
120- popupAlbumPicker.caller = caller;
121+ popupAlbumPicker.caller = videoAddButton;
122 popupAlbumPicker.show();
123 }
124 }
125@@ -505,11 +511,12 @@
126 }
127 }
128 ToolbarButton {
129+ id: videoShareButton
130 objectName: "shareButton"
131 text: i18n.tr("Share")
132 iconSource: "../../img/share.png"
133 onTriggered: {
134- PopupUtils.open(sharePopoverComponent, caller);
135+ PopupUtils.open(sharePopoverComponent, videoShareButton);
136 }
137 }
138

Subscribers

People subscribed via source and target branches