← Back to branch summary

~gerboland/unity8/initialSurfaceGeometry

« back to all changes in this revision

Viewing changes to qml/Dash/PageHeader.qml

  • Committer: Gerry Boland
  • Date: 2014-12-09 12:55:58 UTC
  • mfrom: (1139.1.343 unity8)
  • Revision ID: gerry.boland@canonical.com-20141209125558-d68labgupwxfz91r
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
qml/Dash/PageHeader.qml
28
28
    implicitHeight: headerContainer.height + bottomContainer.height + (showSignatureLine ? units.gu(2) : 0)
29
29
 
30
30
    property bool showBackButton: false
 
31
    property bool backIsClose: false
31
32
    property string title
32
33
 
 
34
    property bool storeEntryEnabled: false
33
35
    property bool searchEntryEnabled: false
34
36
    property bool settingsEnabled: false
35
37
    property bool favoriteEnabled: false
46
48
    property var scopeStyle: null
47
49
 
48
50
    signal backClicked()
 
51
    signal storeClicked()
49
52
    signal settingsClicked()
50
53
    signal favoriteClicked()
51
54
 
246
249
                property var config: PageHeadConfiguration {
247
250
                    foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : Theme.palette.normal.baseText
248
251
                    backAction: Action {
249
 
                        iconName: "back"
 
252
                        iconName: backIsClose ? "close" : "back"
250
253
                        visible: root.showBackButton
251
254
                        onTriggered: root.backClicked()
252
255
                    }
253
256
 
254
257
                    actions: [
255
258
                        Action {
 
259
                            objectName: "store"
 
260
                            text: i18n.tr("Store")
 
261
                            iconName: "ubuntu-store-symbolic"
 
262
                            visible: root.storeEntryEnabled
 
263
                            onTriggered: root.storeClicked();
 
264
                        },
 
265
                        Action {
256
266
                            objectName: "search"
257
267
                            text: i18n.tr("Search")
258
268
                            iconName: "search"