Merge lp:~verzegnassi-stefano/ubuntu-terminal-app/hide-terminal-data-on-auth into lp:~ubuntu-terminal-dev/ubuntu-terminal-app/reboot

Proposed by Stefano Verzegnassi
Status: Merged
Approved by: Stefano Verzegnassi
Approved revision: 183
Merged at revision: 185
Proposed branch: lp:~verzegnassi-stefano/ubuntu-terminal-app/hide-terminal-data-on-auth
Merge into: lp:~ubuntu-terminal-dev/ubuntu-terminal-app/reboot
Diff against target: 60 lines (+15/-0)
3 files modified
src/app/qml/AuthenticationService.qml (+5/-0)
src/app/qml/TerminalPage.qml (+9/-0)
src/app/qml/ubuntu-terminal-app.qml (+1/-0)
To merge this branch: bzr merge lp:~verzegnassi-stefano/ubuntu-terminal-app/hide-terminal-data-on-auth
Reviewer Review Type Date Requested Status
Evan McIntire Approve
Jenkins Bot continuous-integration Approve
Review via email: mp+288040@code.launchpad.net

Commit message

Hide terminal data until the access is granted (using a FastBlur).

Description of the change

Hide terminal data until the access is granted (using a FastBlur).

Screenshot (with 'top' command):
https://drive.google.com/open?id=0By4kAplbFcE6ek5XT2FiMXM2eWs

To post a comment you must log in.
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Evan McIntire (mcintire-evan) wrote :

Tested, LGTM :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/app/qml/AuthenticationService.qml'
--- src/app/qml/AuthenticationService.qml 2016-01-09 01:47:56 +0000
+++ src/app/qml/AuthenticationService.qml 2016-03-03 23:14:57 +0000
@@ -26,6 +26,9 @@
26Item {26Item {
27 id: authenticationService27 id: authenticationService
2828
29 property var __authDialog
30 readonly property bool isDialogVisible: __authDialog != null
31
29 signal granted()32 signal granted()
30 signal denied()33 signal denied()
3134
@@ -63,6 +66,8 @@
6366
64 authentication_dialog.passwordEntered.connect( verify_password );67 authentication_dialog.passwordEntered.connect( verify_password );
65 authentication_dialog.dialogCanceled.connect( denied );68 authentication_dialog.dialogCanceled.connect( denied );
69
70 __authDialog = authentication_dialog
66 }71 }
6772
68 PamAuthentication {73 PamAuthentication {
6974
=== modified file 'src/app/qml/TerminalPage.qml'
--- src/app/qml/TerminalPage.qml 2016-01-22 18:01:49 +0000
+++ src/app/qml/TerminalPage.qml 2016-03-03 23:14:57 +0000
@@ -3,6 +3,9 @@
3import Ubuntu.Components.Popups 1.33import Ubuntu.Components.Popups 1.3
4import QMLTermWidget 1.04import QMLTermWidget 1.0
55
6// For FastBlur
7import QtGraphicalEffects 1.0
8
6Page {9Page {
7 id: terminalPage10 id: terminalPage
8 property alias terminalContainer: terminalContainer11 property alias terminalContainer: terminalContainer
@@ -29,6 +32,12 @@
29 right: parent.right;32 right: parent.right;
30 bottom: keyboardBarLoader.top33 bottom: keyboardBarLoader.top
31 }34 }
35
36 // Hide terminal data when the access is still not granted
37 layer.enabled: authService.isDialogVisible
38 layer.effect: FastBlur {
39 radius: units.gu(6)
40 }
32 }41 }
3342
3443
3544
=== modified file 'src/app/qml/ubuntu-terminal-app.qml'
--- src/app/qml/ubuntu-terminal-app.qml 2016-02-07 18:24:56 +0000
+++ src/app/qml/ubuntu-terminal-app.qml 2016-03-03 23:14:57 +0000
@@ -16,6 +16,7 @@
16 height: units.gu(55)16 height: units.gu(55)
1717
18 AuthenticationService {18 AuthenticationService {
19 id: authService
19 onDenied: Qt.quit();20 onDenied: Qt.quit();
20 }21 }
2122

Subscribers

People subscribed via source and target branches