1
=== modified file 'qml/Components/Dialogs.qml'
2
--- qml/Components/Dialogs.qml	2014-07-29 14:07:04 +0000
3
+++ qml/Components/Dialogs.qml	2014-08-15 14:28:27 +0000
4
@@ -18,15 +18,18 @@
5
18
18
6
19
import Unity.Application 0.1
19
import Unity.Application 0.1
7
20
import Unity.Session 0.1
20
import Unity.Session 0.1
9
21
import Ubuntu.Components 0.1
21
import Ubuntu.Components 1.1
10
22
import Ubuntu.Components.Popups 0.1
22
import Ubuntu.Components.Popups 0.1
11
23
23
12
24
Item {
24
Item {
13
25
    id: root
25
    id: root
14
26
26
15
27
    function onPowerKeyPressed() {
27
    function onPowerKeyPressed() {
16
28
        // FIXME: event.isAutoRepeat is always false on Nexus 4.
17
29
        // So we use powerKeyTimer.running to avoid the PowerOff key repeat
18
30
        // https://launchpad.net/bugs/1349416
19
28
        if (!powerKeyTimer.running) {
31
        if (!powerKeyTimer.running) {
21
29
            powerKeyTimer.start();
32
            powerKeyTimer.restart();
22
30
        }
33
        }
23
31
    }
34
    }
24
32
35
25
@@ -64,17 +67,17 @@
26
64
        id: logoutDialog
67
        id: logoutDialog
27
65
        Dialog {
68
        Dialog {
28
66
            id: dialogueLogout
69
            id: dialogueLogout
31
67
            title: "Logout"
70
            title: i18n.tr("Log out")
32
68
            text: "Are you sure that you want to logout?"
71
            text: i18n.tr("Are you sure you want to log out?")
33
69
            Button {
72
            Button {
35
70
                text: "Cancel"
73
                text: i18n.tr("No")
36
71
                onClicked: {
74
                onClicked: {
37
72
                    PopupUtils.close(dialogueLogout);
75
                    PopupUtils.close(dialogueLogout);
38
73
                    d.dialogShown = false;
76
                    d.dialogShown = false;
39
74
                }
77
                }
40
75
            }
78
            }
41
76
            Button {
79
            Button {
43
77
                text: "Yes"
80
                text: i18n.tr("Yes")
44
78
                onClicked: {
81
                onClicked: {
45
79
                    DBusUnitySessionService.Logout();
82
                    DBusUnitySessionService.Logout();
46
80
                    PopupUtils.close(dialogueLogout);
83
                    PopupUtils.close(dialogueLogout);
47
@@ -88,17 +91,17 @@
48
88
        id: shutdownDialog
91
        id: shutdownDialog
49
89
        Dialog {
92
        Dialog {
50
90
            id: dialogueShutdown
93
            id: dialogueShutdown
53
91
            title: "Shutdown"
94
            title: i18n.tr("Shut down")
54
92
            text: "Are you sure that you want to shutdown?"
95
            text: i18n.tr("Are you sure you want to shut down?")
55
93
            Button {
96
            Button {
57
94
                text: "Cancel"
97
                text: i18n.tr("No")
58
95
                onClicked: {
98
                onClicked: {
59
96
                    PopupUtils.close(dialogueShutdown);
99
                    PopupUtils.close(dialogueShutdown);
60
97
                    d.dialogShown = false;
100
                    d.dialogShown = false;
61
98
                }
101
                }
62
99
            }
102
            }
63
100
            Button {
103
            Button {
65
101
                text: "Yes"
104
                text: i18n.tr("Yes")
66
102
                onClicked: {
105
                onClicked: {
67
103
                    dBusUnitySessionServiceConnection.closeAllApps();
106
                    dBusUnitySessionServiceConnection.closeAllApps();
68
104
                    DBusUnitySessionService.Shutdown();
107
                    DBusUnitySessionService.Shutdown();
69
@@ -113,17 +116,17 @@
70
113
        id: rebootDialog
116
        id: rebootDialog
71
114
        Dialog {
117
        Dialog {
72
115
            id: dialogueReboot
118
            id: dialogueReboot
75
116
            title: "Reboot"
119
            title: i18n.tr("Reboot")
76
117
            text: "Are you sure that you want to reboot?"
120
            text: i18n.tr("Are you sure you want to reboot?")
77
118
            Button {
121
            Button {
79
119
                text: "Cancel"
122
                text: i18n.tr("No")
80
120
                onClicked: {
123
                onClicked: {
81
121
                    PopupUtils.close(dialogueReboot)
124
                    PopupUtils.close(dialogueReboot)
82
122
                    d.dialogShown = false;
125
                    d.dialogShown = false;
83
123
                }
126
                }
84
124
            }
127
            }
85
125
            Button {
128
            Button {
87
126
                text: "Yes"
129
                text: i18n.tr("Yes")
88
127
                onClicked: {
130
                onClicked: {
89
128
                    dBusUnitySessionServiceConnection.closeAllApps();
131
                    dBusUnitySessionServiceConnection.closeAllApps();
90
129
                    DBusUnitySessionService.Reboot();
132
                    DBusUnitySessionService.Reboot();
91
@@ -138,8 +141,8 @@
92
138
        id: powerDialog
141
        id: powerDialog
93
139
        Dialog {
142
        Dialog {
94
140
            id: dialoguePower
143
            id: dialoguePower
97
141
            title: "Power"
144
            title: i18n.tr("Power")
98
142
            text: i18n.tr("Are you sure you would like to turn power off?")
145
            text: i18n.tr("Are you sure you would like\nto power off?")
99
143
            Button {
146
            Button {
100
144
                text: i18n.tr("Power off")
147
                text: i18n.tr("Power off")
101
145
                onClicked: {
148
                onClicked: {
102
@@ -148,15 +151,7 @@
103
148
                    d.dialogShown = false;
151
                    d.dialogShown = false;
104
149
                    root.powerOffClicked();
152
                    root.powerOffClicked();
105
150
                }
153
                }
115
151
            }
154
                color: UbuntuColors.red
107
152
            Button {
108
153
                text: i18n.tr("Restart")
109
154
                onClicked: {
110
155
                    dBusUnitySessionServiceConnection.closeAllApps();
111
156
                    DBusUnitySessionService.Reboot();
112
157
                    PopupUtils.close(dialoguePower);
113
158
                    d.dialogShown = false;
114
159
                }
116
160
            }
155
            }
117
161
            Button {
156
            Button {
118
162
                text: i18n.tr("Cancel")
157
                text: i18n.tr("Cancel")
119
@@ -164,6 +159,7 @@
120
164
                    PopupUtils.close(dialoguePower);
159
                    PopupUtils.close(dialoguePower);
121
165
                    d.dialogShown = false;
160
                    d.dialogShown = false;
122
166
                }
161
                }
123
162
                color: UbuntuColors.coolGrey
124
167
            }
163
            }
125
168
        }
164
        }
126
169
    }
165
    }
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2014-08-15
Michał Sawicz			Approve on 2014-08-15
Albert Astals Cid (community)		2014-07-28	Needs Information on 2014-08-05
Review via email: mp+228485@code.launchpad.net