← Back to branch summary

~mterry/+junk/u8.2

« back to all changes in this revision

Viewing changes to qml/Panel/Indicators/IndicatorBase.qml

  • Committer: Michael Terry
  • Date: 2014-11-17 14:56:04 UTC
  • mfrom: (1317.1.118 unity8)
  • Revision ID: michael.terry@canonical.com-20141117145604-96dn9p5nwkifq2f4
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
qml/Panel/Indicators/IndicatorBase.qml
23
23
Item {
24
24
    id: indicatorItem
25
25
 
26
 
    enabled: menuObjectPath != ""
27
 
 
28
26
    //const
29
27
    property string identifier
30
28
    property string busName
32
30
    property string menuObjectPath
33
31
    property string rootMenuType: "com.canonical.indicator.root"
34
32
 
35
 
    property string deviceMenuObjectPath: menuObjectPath
36
 
 
37
33
    property alias menuModel: cachedModel.model
38
34
    property alias rootActionState: rootAction
39
35
 
40
 
    CachedUnityMenuModel {
 
36
    SharedUnityMenuModel {
41
37
        id: cachedModel
42
38
        busName: indicatorItem.busName
43
 
        actionsObjectPath: indicatorItem.actionsObjectPath
44
 
        menuObjectPath: indicatorItem.deviceMenuObjectPath
 
39
        actions: { "indicator": indicatorItem.actionsObjectPath }
 
40
        menuObjectPath: indicatorItem.menuObjectPath
45
41
    }
46
42
 
47
43
    RootActionState {