Unity 8

Merge lp:~mterry/unity8/shutdown-dialog-in-wizard into lp:unity8

  1. shutdown-dialog-in-wizard
  2. Merge into trunk
Proposed by Michael Terry
Status: Merged
Approved by: Daniel d'Andrada
Approved revision: 1367
Merged at revision: 1383
Proposed branch: lp:~mterry/unity8/shutdown-dialog-in-wizard
Merge into: lp:unity8
Diff against target: 112 lines (+21/-17)
1 file modified
qml/Components/Dialogs.qml (+21/-17)
To merge this branch: bzr merge lp:~mterry/unity8/shutdown-dialog-in-wizard
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Daniel d'Andrada (community) Approve
Review via email: mp+238499@code.launchpad.net

Commit message

Set domain explicitly for the Dialogs component because the welcome wizard wants to import it.

Description of the change

Set domain explicitly for the Dialogs component because the welcome wizard wants to import it.

See https://code.launchpad.net/~mterry/ubuntu-system-settings/shutdown-dialog-in-wizard/+merge/238497 for the other side of this.

== Checklist ==

 * Are there any related MPs required for this MP to build/function as expected? Please list.
 No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
 Yes

 * Did you make sure that your branch does not contain spurious tags?
 Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
 NA

 * If you changed the UI, has there been a design review?
 NA

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1367
http://jenkins.qa.ubuntu.com/job/unity8-ci/4669/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5978
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1655
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1765
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1763
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5619
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7230
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7230/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14742

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4669/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Daniel d'Andrada (dandrader) wrote :

* Did you perform an exploratory manual test run of the code change and any related functionality?
Yes

* Did CI run pass? If not, please explain why.
No. Unrelated autopilot failure

* Did you make sure that the branch does not contain spurious tags?
Yes.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1367
http://jenkins.qa.ubuntu.com/job/unity8-ci/4689/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6043
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1675
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1785
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1783
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5681
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7295
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7295/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14844

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4689/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qml/Components/Dialogs.qml'
2--- qml/Components/Dialogs.qml 2014-09-17 13:57:56 +0000
3+++ qml/Components/Dialogs.qml 2014-10-15 20:39:27 +0000
4@@ -24,6 +24,10 @@
5 Item {
6 id: root
7
8+ // Explicitly use the right domain for this widget because it might be used
9+ // in other applications like the welcome wizard.
10+ property string domain: "unity8"
11+
12 function onPowerKeyPressed() {
13 // FIXME: event.isAutoRepeat is always false on Nexus 4.
14 // So we use powerKeyTimer.running to avoid the PowerOff key repeat
15@@ -67,17 +71,17 @@
16 id: logoutDialog
17 Dialog {
18 id: dialogueLogout
19- title: i18n.tr("Log out")
20- text: i18n.tr("Are you sure you want to log out?")
21+ title: i18n.dtr(root.domain, "Log out")
22+ text: i18n.dtr(root.domain, "Are you sure you want to log out?")
23 Button {
24- text: i18n.tr("No")
25+ text: i18n.dtr(root.domain, "No")
26 onClicked: {
27 PopupUtils.close(dialogueLogout);
28 d.dialogShown = false;
29 }
30 }
31 Button {
32- text: i18n.tr("Yes")
33+ text: i18n.dtr(root.domain, "Yes")
34 onClicked: {
35 DBusUnitySessionService.Logout();
36 PopupUtils.close(dialogueLogout);
37@@ -91,17 +95,17 @@
38 id: shutdownDialog
39 Dialog {
40 id: dialogueShutdown
41- title: i18n.tr("Shut down")
42- text: i18n.tr("Are you sure you want to shut down?")
43+ title: i18n.dtr(root.domain, "Shut down")
44+ text: i18n.dtr(root.domain, "Are you sure you want to shut down?")
45 Button {
46- text: i18n.tr("No")
47+ text: i18n.dtr(root.domain, "No")
48 onClicked: {
49 PopupUtils.close(dialogueShutdown);
50 d.dialogShown = false;
51 }
52 }
53 Button {
54- text: i18n.tr("Yes")
55+ text: i18n.dtr(root.domain, "Yes")
56 onClicked: {
57 dBusUnitySessionServiceConnection.closeAllApps();
58 DBusUnitySessionService.Shutdown();
59@@ -116,17 +120,17 @@
60 id: rebootDialog
61 Dialog {
62 id: dialogueReboot
63- title: i18n.tr("Reboot")
64- text: i18n.tr("Are you sure you want to reboot?")
65+ title: i18n.dtr(root.domain, "Reboot")
66+ text: i18n.dtr(root.domain, "Are you sure you want to reboot?")
67 Button {
68- text: i18n.tr("No")
69+ text: i18n.dtr(root.domain, "No")
70 onClicked: {
71 PopupUtils.close(dialogueReboot)
72 d.dialogShown = false;
73 }
74 }
75 Button {
76- text: i18n.tr("Yes")
77+ text: i18n.dtr(root.domain, "Yes")
78 onClicked: {
79 dBusUnitySessionServiceConnection.closeAllApps();
80 DBusUnitySessionService.Reboot();
81@@ -141,10 +145,10 @@
82 id: powerDialog
83 Dialog {
84 id: dialoguePower
85- title: i18n.tr("Power")
86- text: i18n.tr("Are you sure you would like\nto power off?")
87+ title: i18n.dtr(root.domain, "Power")
88+ text: i18n.dtr(root.domain, "Are you sure you would like\nto power off?")
89 Button {
90- text: i18n.tr("Power off")
91+ text: i18n.dtr(root.domain, "Power off")
92 onClicked: {
93 dBusUnitySessionServiceConnection.closeAllApps();
94 PopupUtils.close(dialoguePower);
95@@ -154,7 +158,7 @@
96 color: UbuntuColors.red
97 }
98 Button {
99- text: i18n.tr("Restart")
100+ text: i18n.dtr(root.domain, "Restart")
101 onClicked: {
102 dBusUnitySessionServiceConnection.closeAllApps();
103 DBusUnitySessionService.Reboot();
104@@ -164,7 +168,7 @@
105 color: UbuntuColors.green
106 }
107 Button {
108- text: i18n.tr("Cancel")
109+ text: i18n.dtr(root.domain, "Cancel")
110 onClicked: {
111 PopupUtils.close(dialoguePower);
112 d.dialogShown = false;

Subscribers

People subscribed via source and target branches