← Back to branch summary

~robertcarr/unity/phablet-integrate-mir-no-sw-cursor

« back to all changes in this revision

Viewing changes to Components/ApplicationManagerWrapper.qml

  • Committer: Tarmac
  • Author(s): Daniel d'Andrada
  • Date: 2013-04-30 17:25:47 UTC
  • mfrom: (641.1.4 ApplicationInfo)
  • Revision ID: tarmac-20130430172547-vgywjitu0rz1wrxl
Use real enum from ApplicationInfo instead of its counterfeit local version

Application from Ubuntu.Application got renamed to ApplicationInfo in the
real implementation to avoid conflict with the Application component from
QtQuick 2.0. Thus now we can use the enums from it.

Approved by PS Jenkins bot, Albert Astals Cid.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Components/ApplicationManagerWrapper.qml
16
16
 
17
17
import QtQuick 2.0
18
18
import Ubuntu.Application 0.1
19
 
import "../Applications/applications.js" as ApplicationsModel
20
19
 
21
20
Item {
22
21
    id: applicationManager
37
36
 
38
37
    function activateApplication(desktopFile, argument) {
39
38
        var application;
40
 
        application = getApplicationFromDesktopFile(desktopFile, ApplicationsModel.MainStage);
 
39
        application = getApplicationFromDesktopFile(desktopFile, ApplicationInfo.MainStage);
41
40
        if (application == null) {
42
 
            application = getApplicationFromDesktopFile(desktopFile, ApplicationsModel.SideStage);
 
41
            application = getApplicationFromDesktopFile(desktopFile, ApplicationInfo.SideStage);
43
42
        }
44
43
        if (application != null) {
45
44
            return application;
67
66
    }
68
67
 
69
68
    function unfocusCurrentApplication() {
70
 
        ApplicationManager.unfocusCurrentApplication(ApplicationsModel.MainStage);
 
69
        ApplicationManager.unfocusCurrentApplication(ApplicationInfo.MainStage);
71
70
    }
72
71
 
73
72
    function moveRunningApplicationStackPosition(from, to, stage) {
74
73
        var applications;
75
 
        if (stage == ApplicationsModel.SideStage) {
 
74
        if (stage == ApplicationInfo.SideStage) {
76
75
            applications = ApplicationManager.sideStageApplications;
77
76
        } else {
78
77
            applications = ApplicationManager.mainStageApplications;
83
82
 
84
83
    function getApplicationFromDesktopFile(desktopFile, stage) {
85
84
        var applications;
86
 
        if (stage == ApplicationsModel.SideStage) {
 
85
        if (stage == ApplicationInfo.SideStage) {
87
86
            applications = ApplicationManager.sideStageApplications;
88
87
        } else {
89
88
            applications = ApplicationManager.mainStageApplications;