git.iko.soy/unity8
on xenial help sign in
Merge remote-tracking branch 'origin/xenial' into xenial_-_edge_-_wayland
173b58cRodney Dawes
qml/Components/Dialogs.qml+8
compare with xenial
unifiedsplit
@@ -271,6 +271,14 @@ MouseArea {
271 topLevelSurfaceList.closeAllWindows();
271 topLevelSurfaceList.closeAllWindows();
272 }
272 }
273 }
273 }
274+ Button {
275+ width: parent.width
276+ text: i18n.tr("Screenshot")
277+ onClicked: {
278+ powerDialog.hide();
279+ itemGrabber.capture(shell);
280+ }
281+ }
274 Button {
282 Button {
275 width: parent.width
283 width: parent.width
276 text: i18n.tr("Cancel")
284 text: i18n.tr("Cancel")
tests/qmltests/tst_OrientedShell.qml+3
@@ -1586,6 +1586,9 @@ Rectangle {
1586 keyClick(data.key);
1586 keyClick(data.key);
1587 tryCompare(buttons[2], "activeFocus", true);
1587 tryCompare(buttons[2], "activeFocus", true);
1588
1588
1589+ keyClick(data.key);
1590+ tryCompare(buttons[3], "activeFocus", true);
1591+
1589 keyClick(data.key);
1592 keyClick(data.key);
1590 tryCompare(buttons[0], "activeFocus", true);
1593 tryCompare(buttons[0], "activeFocus", true);
1591
1594