Commit 4bf7cb30 authored by Lamarque Souza's avatar Lamarque Souza
Browse files

Do not unnecessarily show "Restart Computer" button and remove excess of

free space in shutdown dialog.

BUG: 306489
FIXED-IN: 4.9.2
(cherry picked from commit fab72922)
parent 479df843
......@@ -35,7 +35,7 @@ PlasmaCore.FrameSvgItem {
property int realMarginRight: margins.right
width: realMarginLeft + 2 * buttonsLayout.width + realMarginRight
height: Math.max(realMarginTop + leftPicture.height + realMarginBottom, 2*realMarginTop + automaticallyDoLabel.height + buttonsLayout.height + realMarginBottom)
height: realMarginTop + 4 + automaticallyDoLabel.height + 4 + buttonsLayout.height + realMarginBottom
imagePath: "dialogs/shutdowndialog"
......@@ -101,7 +101,7 @@ PlasmaCore.FrameSvgItem {
leftPicture.anchors.leftMargin = 2*realMarginLeft
buttonsLayout.anchors.rightMargin = 2*realMarginRight
} else {
var pictureWidth = shutdownUi.height * leftPicture.naturalSize.width / leftPicture.naturalSize.height
var pictureWidth = buttonsLayout.height * leftPicture.naturalSize.width / leftPicture.naturalSize.height
if (pictureWidth < leftPicture.naturalSize.width) {
leftPicture.width = pictureWidth;
......@@ -310,6 +310,7 @@ PlasmaCore.FrameSvgItem {
text: i18n("&Restart Computer")
iconSource: "system-reboot"
anchors.right: parent.right
visible: (choose || sdtype == ShutdownType.ShutdownTypeReboot)
menu: rebootOptions["options"].length > 0
tabStopNext: cancelButton
tabStopBack: shutdownButton
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment