← Back to branch summary

~azzar1/unity8/record-test-failure

« back to all changes in this revision

Viewing changes to Panel/Indicators.qml

  • Committer: Tarmac
  • Author(s): Nick Dedekind, Launchpad Translations on behalf of unity-team
  • Date: 2013-07-11 19:50:27 UTC
  • mfrom: (2.5.114 indicators-client)
  • Revision ID: tarmac-20130711195027-yheu3w2oc42c1h7s
Moved indicators-client code into unity8. Fixes: https://bugs.launchpad.net/bugs/1191132, https://bugs.launchpad.net/bugs/1191822.

Approved by PS Jenkins bot, Michał Sawicz, Nicolas d'Offay.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Panel/Indicators.qml
17
17
import QtQuick 2.0
18
18
import Ubuntu.Components 0.1
19
19
import Ubuntu.Gestures 0.1
20
 
import Ubuntu.ChewieUI 0.1 as ChewieUI
21
20
 
22
21
import "../Components"
23
22
import "../Components/ListItems"
70
69
                // we dont want to switch to a indicator menu until we hit reveal state.
71
70
                if (menuContent.overviewActive) {
72
71
                    menuContent.showOverview()
73
 
                }
74
 
                else {
 
72
                } else {
75
73
                    menuContent.showMenu()
76
74
                }
77
75
                indicators.state = "locked"
272
270
 
273
271
    }
274
272
 
275
 
    ChewieUI.PluginModel {
 
273
    IndicatorsDataModel {
276
274
        id: indicatorsModel
277
 
        Component.onCompleted: load()
278
275
    }
279
276
 
280
277
    Connections {
294
291
            if (showAnimation.running) {
295
292
                if (indicators.state == "initial") {
296
293
                    openOverview()
297
 
                }
298
 
                else {
 
294
                } else {
299
295
                    indicators.calculateCurrentItem(dragHandle.touchX, false)
300
296
                    menuContent.showMenu()
301
297
                }