Merge lp:~paulliu/unity8/logoutDialog into lp:unity8

Proposed by Ying-Chun Liu
Status: Rejected
Rejected by: Michał Sawicz
Proposed branch: lp:~paulliu/unity8/logoutDialog
Merge into: lp:unity8
Diff against target: 58 lines (+26/-5)
1 file modified
qml/Shell.qml (+26/-5)
To merge this branch: bzr merge lp:~paulliu/unity8/logoutDialog
Reviewer Review Type Date Requested Status
Michał Sawicz Disapprove
PS Jenkins bot (community) continuous-integration Approve
Michael Zanetti (community) Abstain
Review via email: mp+218992@code.launchpad.net

Commit message

Add a pop-up logout dialog for user to confirm logout or not.

Description of the change

* Are there any related MPs required for this MP to build/function as expected?
no

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

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

 * If you changed the UI, has there been a design review?
Need Design Review.

To post a comment you must log in.
Michael Zanetti (mzanetti) wrote :

21 + text: i18n.tr("Are you sure that you want to logout?")

Is this in the design spec? Seems strange to me that designers would use a term like "logout"... I'd have expected something like "Are you sure you want to turn off the phone?" or similar. Maybe I'm wrong...

review: Needs Information
Michael Zanetti (mzanetti) wrote :

Oh... seems I confused this with the shutdown dialog? Sorry for the noise then.

review: Abstain
lp:~paulliu/unity8/logoutDialog updated
845. By Ying-Chun Liu on 2014-07-03

Merge trunk. Fix FTBFS

* debian/control:
  list qtdeclarative5-ubuntu-ui-toolkit-plugin-gles as an alternative
  choice, since provides are not versionned, should restore installability
  on amd64 and i386
[ Michał Sawicz ]
* Adapt to suru theme.
[ Michael Terry ]
* Fix path in launcher mock after moving our mock icons, to avoid a
  lot of "icon not found" warnings during qmluitests.
* Fix the testMultiGreeter qmluitest. Incoming method variables are
  apparently read-only in Qt5.3. (LP: #1332488)
[ CI bot ]
* Resync trunk
[ Michał Sawicz ]
* Adapt scope mock to new api and quiet unused variable warnings.
* Fix dynamic overlay height. (LP: #1334879)
* Don't center items in CardVerticalJournal, kind of beats the
  purpose... Also don't bind unnecessarily.
[ Ying-Chun Liu ]
* Fix LP:1330957 Fix some failed test cases. (LP: #1330957)
[ Albert Astals ]
* Don't seem to need this waitForRendering And makes test fail in 5.3
[ Alberto Aguirre ]
* Update Powerd plugin and Shell.qml to accommodate changes in the
  display power state notification.

Michał Sawicz (saviq) wrote :

Let's merge this with the reboot branch?

review: Disapprove

Unmerged revisions

845. By Ying-Chun Liu on 2014-07-03

Merge trunk. Fix FTBFS

* debian/control:
  list qtdeclarative5-ubuntu-ui-toolkit-plugin-gles as an alternative
  choice, since provides are not versionned, should restore installability
  on amd64 and i386
[ Michał Sawicz ]
* Adapt to suru theme.
[ Michael Terry ]
* Fix path in launcher mock after moving our mock icons, to avoid a
  lot of "icon not found" warnings during qmluitests.
* Fix the testMultiGreeter qmluitest. Incoming method variables are
  apparently read-only in Qt5.3. (LP: #1332488)
[ CI bot ]
* Resync trunk
[ Michał Sawicz ]
* Adapt scope mock to new api and quiet unused variable warnings.
* Fix dynamic overlay height. (LP: #1334879)
* Don't center items in CardVerticalJournal, kind of beats the
  purpose... Also don't bind unnecessarily.
[ Ying-Chun Liu ]
* Fix LP:1330957 Fix some failed test cases. (LP: #1330957)
[ Albert Astals ]
* Don't seem to need this waitForRendering And makes test fail in 5.3
[ Alberto Aguirre ]
* Update Powerd plugin and Shell.qml to accommodate changes in the
  display power state notification.

844. By Ying-Chun Liu on 2014-06-25

Add translation.

843. By Ying-Chun Liu on 2014-06-25

Merge trunk.

[ Ying-Chun Liu ]
* Add logout support. Reviewed by: Daniel d'Andrada (LP: #1302213)
[ Michał Sawicz ]
* Make so that fixedArtShapeSize actually fixes artShapeSize.
[ Albert Astals ]
* Add VerticalJournal integration to Dash/scopes/QML (LP: #1326467)
* Make so that fixedArtShapeSize actually fixes artShapeSize.
[ Mirco Müller ]
* Added the frontend-part of sound-hint support for notifications with
  updated QML-tests.
* New rebuild forced
[ Albert Astals ]
* Departments support (LP: #1320847)
[ Pawel Stolowski ]
* Extend the hack for click scope categories with the upcoming 'store'
  category: single-tap on results from the 'store' category should
  activate them, instead of requesting a preview. (LP: #1326292)
[ Albert Astals ]
* Drop the " Preview" suffix from Preview title As requested in
  https://bugs.launchpad.net/unity8/+bug/1316671 (LP: #1316671)
[ Michael Terry ]
* Revert split greeter for now. We will bring it back as an option
  for Desktop, but use a big hammer revert right now to get Touch back
  in shape.
[ CI bot ]
* Fix build problems. Reviewed by: Michael Terry (LP: #1328850)
[ Michał Sawicz ]
* Make lockscreen buttons translatable.
[ Albert Astals ]
* Correctly mark these functions as overrides
* Remove connections to non existant signal
* Better test name
* Improvements for headerless categories LVPWH: No section name -> no
  header LVPWH: New hasSectionHeader context property for delegates
  GSV: Add topMargin if no hasSectionHeader (LP: #1326415)
* Make tryVerticalJournal, tryHorizontalJournal and tryOrganicGrid
  work again
[ Michael Zanetti ]
* Don't crash when we get an invalid app from ApplicationManager (LP:
  #1309162)
[ Andrea Cimitan ]
* Workaround for lp1324159 (LP: #1322233, #1324159)
[ CI bot ]
* Resync trunk
[ Florian Boucault ]
* Application startup: changed splash rectangle to be black instead of
  white and added a neat little animation. (LP: #1124265)
[ Michael Terry ]
* Bump version so ubuntu-touch-session can reference this one
[ CI bot ]
* Resync trunk
[ Michał Sawicz ]
* Move env setup past session init in greeter wrapper. (LP: #1325882)
* no change rebuild
* drop dbus-x11 dependency of unity8-greeter, it makes us end up with
  multiple session dbus daemons which breaks many AP tests in the lab
[ Michael Terry ]
* Bump version for Breaks due to unity8-greeter
* In split mode, determine whether the application identifiers in
  AccountsService are click packages or not, so we know the correct
  url prefix to use.
* Start logrotate in the greeter's session.
[ Andrea Cimitan ]
* Passes to make tryCommand -qmljsdebugger=port:3768 to enable
  debug/profiling test apps
* Fixes carousel shadow
[ Michał Sawicz ]
* Use dpkg-architecture, not gcc, to determine the machine triplet.
[ Ying-Chun Liu ]
* Fix ZoomableImage test failure. (LP: #1317254)
[ Albert Astals ]
* We don't need iconutils in this mock
* Don't reserve space for mascot if no mascot is specified (LP:
  #1319343)
* CardHeader is no more, remove stale line in CMakeLists.txt
* GenericScopeViewTest: Wait a bit more Otherwise sometimes we end
  getting up the wrong delegate (maybe one that will be garbage
  collected?) (LP: #1322279)
* Fix crash in organicgridtest
[ Daniel d'Andrada ]
* Remove Shell's underlay background image as it cannot be seen
  anymore Now that the Dash has its own, opaque, background, the
  underlay's background image can no longer be seen. So it's just a
  waste of resources to have it.
[ Michael Terry ]
* Use the same animation when dismissing a greeter slide from the
  launcher as from a normal greeter drag. (LP: #1316513)
[ Michael Zanetti ]
* enhance lockscreen add a retry indication label (e.g. 3 attempts
  left). add an additional label (e.g. phone number for multi sim).
  add a infoPopup (e.g. to display a warning for last retry). add min
  and max limit values. add tests for the above (LP: #1302050)
[ Albert Astals ]
* Use Interface classes from unity-api
[ Ubuntu daily release ]
* New rebuild forced
[ Albert Astals ]
* Use the new displayMargin feature Also port our DashViews to use
  same naming and behaviour + update tests

842. By Ying-Chun Liu on 2014-05-28

Change ID.

841. By Ying-Chun Liu on 2014-05-21

merge trunk
[ Michal Hruby ]
* Updated scope tool to create proper config files after recent
  libunity-scopes-api changes.
[ Michał Sawicz ]
* Refactor export_qmlfiles and export_qmlplugins to be more generic
  and clean up installed mocks.
[ Albert Astals ]
* Remove empty dirs
* Set the tabbarmodel index as we do on real code It works better :D
  (LP: #1317255)
[ Thomi Richards ]
* Use new import location for ProcessSearchError in process_helpers
  script.
[ Andrea Cimitan ]
* Adds shadow for the carousel
[ Daniel d'Andrada ]
* Remove Revealer component It's not used anywhere anymore. It's been
  replaced by DragHandle.
[ Andy Doan ]
* unlock_device: support more complex reboot/wait cycles Currently
  this script only allows you to override how to "wait" on the device.
  This changes the logic to also support how you go about rebooting
  the device. This is handy for the ubuntu-emulator because adb-reboot
  is not currently supported. However, we also have a more
  sophisticated, fool-proof way we reboot/wait in the CI lab that
  would be nice to take advantage of:
  http://bazaar.launchpad.net/~ubuntu-test-case-dev/ubuntu-test-
  cases/touch/view/head:/scripts/reboot-and-wait
[ CI bot ]
* Resync trunk
[ Michael Zanetti ]
* support appid:// entries in gsettings schema and make
  findDesktopFile work with short-appid (LP: #1239750)
[ Antti Kaijanmäki ]
* Indicators/RootActionState: use g_variant_iter_loop to extract
  icons.
[ Andrea Cimitan ]
* Improve padding in Text preview widget. (LP: #1316683)
[ CI bot ]
* Resync trunk
[ Nick Dedekind ]
* Removed binding loop from Unity.Indicators.MenuContentActivator
  Change handler for QMLListProperty used by MenuContent.qml:
  menuActivator.content[index].active If we're already asking for the
  index, we know it exists already. No need to send a
  changeNotification on an implied creation.
[ Josh Arenson ]
* Implements usage-style documentation for unity8 executable. Fixes
  lp:1269282 (LP: #1269282)
[ Albert Astals ]
* Create specialized Card code in Javascript instead of having various
  copied&pasted files (LP: #1297197)
[ Michał Sawicz ]
* Remove HUD from the bottom edge. Again.
[ Ted Gould ]
* Provide a dbus interface for setting the count and countVisible
  properties. (LP: #1301400)
[ Michał Sawicz ]
* Pass env variables to initctl start.
* Suffix .sh to our scripts and clean up debian/rules.
* Adapt to Debian Qt package renames and drop unneeded Dee plugin
  dependency.
[ Ying-Chun Liu ]
* Add Zoomable Image for Preview widgets.
[ Albert Astals ]
* Remove support for Qt <= 5.2.1
[ Mirco Müller ]
* Implemented feature-request from Design for modal snap-decision
  notifications on the phone. See LP #1285712 (LP: #1285712)
[ Andrea Cimitan ]
* Make progressbas in preview widget big as the button
[ CI bot ]
* Resync trunk
[ tpeeters ]
* Adapt to new TabBar
[ Tim Peeters ]
* Adapt to new TabBar

840. By Ying-Chun Liu on 2014-05-09

Add dialog.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qml/Shell.qml'
2--- qml/Shell.qml 2014-06-24 16:27:07 +0000
3+++ qml/Shell.qml 2014-07-03 14:11:19 +0000
4@@ -19,6 +19,7 @@
5 import GSettings 1.0
6 import Unity.Application 0.1
7 import Ubuntu.Components 0.1
8+import Ubuntu.Components.Popups 0.1
9 import Ubuntu.Gestures 0.1
10 import Unity.Launcher 0.1
11 import LightDM 0.1 as LightDM
12@@ -268,9 +269,34 @@
13 }
14 }
15
16+ Component {
17+ id: logoutDialog
18+ Dialog {
19+ id: dialogueLogout
20+ title: "Logout"
21+ text: i18n.tr("Are you sure that you want to logout?")
22+ Button {
23+ text: i18n.tr("Cancel")
24+ onClicked: PopupUtils.close(dialogueLogout)
25+ }
26+ Button {
27+ text: i18n.tr("Confirm")
28+ onClicked: {
29+ DBusUnitySessionService.Logout();
30+ PopupUtils.close(dialogueLogout);
31+ }
32+ }
33+ }
34+ }
35+
36 Connections {
37 target: DBusUnitySessionService
38
39+ onLogoutRequested: {
40+ // Display a dialog to ask the user to confirm.
41+ PopupUtils.open(logoutDialog);
42+ }
43+
44 function closeAllApps() {
45 while (true) {
46 var app = ApplicationManager.get(0);
47@@ -281,11 +307,6 @@
48 }
49 }
50
51- onLogoutRequested: {
52- // TODO: Display a dialog to ask the user to confirm.
53- DBusUnitySessionService.Logout();
54- }
55-
56 onLogoutReady: {
57 closeAllApps();
58 Qt.quit();

Subscribers

People subscribed via source and target branches