← Back to branch summary

~ubuntu-branches/ubuntu/saucy/unity8/saucy-proposed

« back to all changes in this revision

Viewing changes to plugins/Unity/Indicators/qml/IndicatorBase.qml

  • Committer: Package Import Robot
  • Author(s): Loïc Minier
  • Date: 2013-10-04 21:22:29 UTC
  • Revision ID: package-import@ubuntu.com-20131004212229-a2j9c8et8gfd7xue
Tags: 7.82+13.10.20131004.2-0ubuntu1
Revert 7.82+13.10.20131004.1-0ubuntu1 back to
7.81.3+13.10.20130927.3-0ubuntu1 due to CPU hogging issue with
7.82+13.10.20131004.1-0ubuntu1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/Unity/Indicators/qml/IndicatorBase.qml
27
27
    enabled: menuObjectPaths.hasOwnProperty(device)
28
28
 
29
29
    //const
 
30
    property string title
30
31
    property string busName
31
32
    property string actionsObjectPath
32
33
    property var menuObjectPaths: undefined
33
34
    readonly property string device: "phone"
34
35
    property string rootMenuType: "com.canonical.indicator.root"
 
36
    property bool active: false
35
37
 
36
38
    property string deviceMenuObjectPath: menuObjectPaths.hasOwnProperty(device) ? menuObjectPaths[device] : ""
37
39
 
39
41
 
40
42
    CachedUnityMenuModel {
41
43
        id: cachedModel
42
 
        busName: indicatorItem.busName
43
 
        actionsObjectPath: indicatorItem.actionsObjectPath
44
 
        menuObjectPath: indicatorItem.deviceMenuObjectPath
45
 
    }
46
 
 
47
 
    property var rootActionState: Indicators.RootActionState {
48
 
        menu: menuModel
49
 
        onUpdated: indicatorItem.rootActionStateChanged()
 
44
        busName: active ? indicatorItem.busName : ""
 
45
        actionsObjectPath: active ? indicatorItem.actionsObjectPath : ""
 
46
        menuObjectPath: active ? indicatorItem.deviceMenuObjectPath : ""
50
47
    }
51
48
}