← Back to branch summary

~ubuntu-branches/ubuntu/wily/camera-app/wily

« back to all changes in this revision

Viewing changes to GalleryViewHeader.qml

  • Committer: Package Import Robot
  • Author(s): Ubuntu daily release, Bill Filler, Arthur Mello, Ugo Riboni, Florian Boucault, Ubuntu daily release
  • Date: 2015-02-12 19:41:11 UTC
  • mfrom: (1.1.57)
  • Revision ID: package-import@ubuntu.com-20150212194111-6ebhhxumzh7581gl
Tags: 3.0.0+15.04.20150212.3-0ubuntu1
https://launchpad.net/bugs/1368787
https://launchpad.net/bugs/1416043
https://launchpad.net/bugs/1368787
https://launchpad.net/bugs/1419022
[ Bill Filler ]
* dynamically check for editor (LP: #1368787)
* update depends on ui-extras new version

[ Arthur Mello ]
* Enable viewing full screen picture while in selection mode Remove
  actions from the slide show header if we are in selection mode Make
  it possible to toggle selection when on slide show view Scroll the
  last seem picture from slideshow into view when returning to the
  grid photo roll (LP: #1416043)

[ Ugo Riboni ]
* dynamically check for editor (LP: #1368787)

[ Florian Boucault ]
* Click packaging: add autopilot tests dependencies. (LP: #1419022)

[ Ubuntu daily release ]
* New rebuild forced

Show diffs side-by-side

added added

removed removed

Lines of Context:
GalleryViewHeader.qml
75
75
        }
76
76
 
77
77
        Label {
78
 
            text: userSelectionMode ? i18n.tr("Select") :
 
78
            text: main.contentExportMode || userSelectionMode ? i18n.tr("Select") :
79
79
                  (editMode ? i18n.tr("Edit Photo") : i18n.tr("Photo Roll"))
80
80
            fontSize: "x-large"
81
81
            color: Theme.palette.normal.foregroundText
106
106
        }
107
107
 
108
108
        IconButton {
 
109
            objectName: "singleActionButton"
 
110
            anchors {
 
111
                top: parent.top
 
112
                bottom: parent.bottom
 
113
            }
 
114
            action: actionsDrawer.actions[0]
 
115
            visible: actionsDrawer.actions.length == 1 && !editMode
 
116
            onTriggered: if (action) action.triggered()
 
117
        }
 
118
 
 
119
        IconButton {
109
120
            objectName: "additionalActionsButton"
110
121
            anchors {
111
122
                top: parent.top
112
123
                bottom: parent.bottom
113
124
            }
114
125
            iconName: "contextual-menu"
115
 
            visible: actionsDrawer.actions.length > 0 && !editMode
 
126
            visible: actionsDrawer.actions.length > 1 && !editMode
116
127
            onClicked: actionsDrawer.opened = !actionsDrawer.opened
117
128
        }
118
129