Merge lp:~bfiller/gallery-app/fix-1311123 into lp:gallery-app

Proposed by Bill Filler
Status: Merged
Merged at revision: 959
Proposed branch: lp:~bfiller/gallery-app/fix-1311123
Merge into: lp:gallery-app
Diff against target: 19 lines (+2/-0)
1 file modified
rc/qml/MediaViewer/MediaViewer.qml (+2/-0)
To merge this branch: bzr merge lp:~bfiller/gallery-app/fix-1311123
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+216896@code.launchpad.net

Commit message

disable sharing option on desktop

Description of the change

disable sharing option on desktop

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'rc/qml/MediaViewer/MediaViewer.qml'
--- rc/qml/MediaViewer/MediaViewer.qml 2014-03-21 18:13:28 +0000
+++ rc/qml/MediaViewer/MediaViewer.qml 2014-04-23 14:28:13 +0000
@@ -496,6 +496,7 @@
496 ToolbarButton {496 ToolbarButton {
497 id: photoShareButton497 id: photoShareButton
498 objectName: "shareButton"498 objectName: "shareButton"
499 visible: !APP.desktopMode
499 action: Action {500 action: Action {
500 text: i18n.tr("Share photo")501 text: i18n.tr("Share photo")
501 iconSource: "../../img/share.png"502 iconSource: "../../img/share.png"
@@ -553,6 +554,7 @@
553 ToolbarButton {554 ToolbarButton {
554 id: videoShareButton555 id: videoShareButton
555 objectName: "shareButton"556 objectName: "shareButton"
557 visible: !APP.desktopMode
556 text: i18n.tr("Share")558 text: i18n.tr("Share")
557 iconSource: "../../img/share.png"559 iconSource: "../../img/share.png"
558 onTriggered: {560 onTriggered: {

Subscribers

People subscribed via source and target branches