mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-08-13 01:09:00 +08:00
Clean up styling of Changelog dialog
This prevents the button from being positioned on top of the scroll bar and the horizontal scrollbar from showing. Contributes to CURA-2519
This commit is contained in:
parent
cd2cbcbd66
commit
9a0946687b
@ -2,7 +2,7 @@
|
|||||||
// Cura is released under the terms of the AGPLv3 or higher.
|
// Cura is released under the terms of the AGPLv3 or higher.
|
||||||
|
|
||||||
import QtQuick 2.1
|
import QtQuick 2.1
|
||||||
import QtQuick.Controls 1.1
|
import QtQuick.Controls 1.3
|
||||||
import QtQuick.Layouts 1.1
|
import QtQuick.Layouts 1.1
|
||||||
import QtQuick.Window 2.1
|
import QtQuick.Window 2.1
|
||||||
|
|
||||||
@ -11,33 +11,31 @@ import UM 1.1 as UM
|
|||||||
UM.Dialog
|
UM.Dialog
|
||||||
{
|
{
|
||||||
id: base
|
id: base
|
||||||
minimumWidth: 400 * Screen.devicePixelRatio
|
minimumWidth: UM.Theme.getSize("modal_window_minimum").width * 0.75
|
||||||
minimumHeight: 300 * Screen.devicePixelRatio
|
minimumHeight: UM.Theme.getSize("modal_window_minimum").height * 0.75
|
||||||
width: minimumWidth
|
width: minimumWidth
|
||||||
height: minimumHeight
|
height: minimumHeight
|
||||||
title: catalog.i18nc("@label", "Changelog")
|
title: catalog.i18nc("@label", "Changelog")
|
||||||
|
|
||||||
ScrollView
|
TextArea
|
||||||
{
|
{
|
||||||
width: parent.width
|
anchors.fill: parent
|
||||||
height: parent.height - 25
|
text: manager.getChangeLogString()
|
||||||
Label
|
readOnly: true;
|
||||||
{
|
textFormat: TextEdit.RichText
|
||||||
text: manager.getChangeLogString()
|
|
||||||
width:base.width - 35
|
|
||||||
wrapMode: Text.Wrap;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
Button
|
|
||||||
{
|
rightButtons: [
|
||||||
UM.I18nCatalog
|
Button
|
||||||
{
|
{
|
||||||
id: catalog
|
UM.I18nCatalog
|
||||||
name: "cura"
|
{
|
||||||
|
id: catalog
|
||||||
|
name: "cura"
|
||||||
|
}
|
||||||
|
|
||||||
|
text: catalog.i18nc("@action:button", "Close")
|
||||||
|
onClicked: base.hide()
|
||||||
}
|
}
|
||||||
anchors.bottom:parent.bottom
|
]
|
||||||
text: catalog.i18nc("@action:button", "Close")
|
|
||||||
onClicked: base.hide()
|
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user