Fix some dark theme styling (MoreInfoWindow, ToolboxLicenseDialog

CURA-7152
This commit is contained in:
Nino van Hooff 2020-01-30 12:51:13 +01:00
parent 4e33f6849c
commit 8ea3004c73
5 changed files with 48 additions and 45 deletions

View file

@ -72,6 +72,7 @@ Window
right: parent.right
}
text: catalog.i18nc("@text:window", "Ultimaker Cura collects anonymous data in order to improve the print quality and user experience. Below is an example of all the data that is shared:")
color: UM.Theme.getColor("text")
wrapMode: Text.WordWrap
renderType: Text.NativeRendering
}

View file

@ -4,12 +4,10 @@
import QtQuick 2.10
import QtQuick.Dialogs 1.1
import QtQuick.Window 2.2
import QtQuick.Controls 1.4
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import QtQuick.Controls.Styles 1.4
// TODO: Switch to QtQuick.Controls 2.x and remove QtQuick.Controls.Styles
import UM 1.1 as UM
import Cura 1.6 as Cura
@ -36,6 +34,7 @@ UM.Dialog
id: licenseHeader
Layout.fillWidth: true
text: catalog.i18nc("@label", "You need to accept the license to install the package")
color: UM.Theme.getColor("text")
wrapMode: Text.Wrap
renderType: Text.NativeRendering
}
@ -63,6 +62,7 @@ UM.Dialog
{
id: packageName
text: licenseModel.packageName
color: UM.Theme.getColor("text")
font.bold: true
anchors.verticalCenter: icon.verticalCenter
height: contentHeight
@ -73,15 +73,17 @@ UM.Dialog
}
TextArea
Cura.ScrollableTextArea
{
id: licenseText
Layout.fillWidth: true
Layout.fillHeight: true
anchors.topMargin: UM.Theme.getSize("default_margin").height
readOnly: true
text: licenseModel.licenseText
textArea.text: licenseModel.licenseText
textArea.readOnly: true
}
}
rightButtons:
[

View file

@ -20,7 +20,7 @@ ScrollView
background: Rectangle // Border
{
color: UM.Theme.getColor("main_background")
border.color: UM.Theme.getColor("lining")
border.color: UM.Theme.getColor("thick_lining")
border.width: UM.Theme.getSize("default_lining").width
}

View file

@ -8,7 +8,7 @@
"main_background": [39, 44, 48, 255],
"message_background": [39, 44, 48, 255],
"wide_lining": [31, 36, 39, 255],
"thick_lining": [255, 255, 255, 30],
"thick_lining": [255, 255, 255, 60],
"lining": [64, 69, 72, 255],
"viewport_overlay": [30, 36, 39, 255],

View file

@ -149,7 +149,7 @@
"main_background": [255, 255, 255, 255],
"wide_lining": [245, 245, 245, 255],
"thick_lining": [127, 127, 127, 255],
"thick_lining": [180, 180, 180, 255],
"lining": [192, 193, 194, 255],
"viewport_overlay": [246, 246, 246, 255],