3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 22:47:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix some dark theme styling (MoreInfoWindow, ToolboxLicenseDialog

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

1
plugins/SliceInfoPlugin/MoreInfoWindow.qml
View file

@ -72,6 +72,7 @@ Window
right: parent.right 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:") 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 wrapMode: Text.WordWrap
renderType: Text.NativeRendering renderType: Text.NativeRendering
} }

16
plugins/Toolbox/resources/qml/dialogs/ToolboxLicenseDialog.qml
View file

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

72
resources/qml/Widgets/ScrollableTextArea.qml
View file

@ -1,36 +1,36 @@
// Copyright (c) 2019 Ultimaker B.V. // Copyright (c) 2019 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher. // Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.10 import QtQuick 2.10
import QtQuick.Controls 2.3 import QtQuick.Controls 2.3
import UM 1.3 as UM import UM 1.3 as UM
import Cura 1.1 as Cura import Cura 1.1 as Cura
// //
// Cura-style TextArea with scrolls // Cura-style TextArea with scrolls
// //
ScrollView ScrollView
{ {
property alias textArea: _textArea property alias textArea: _textArea
clip: true clip: true
background: Rectangle // Border background: Rectangle // Border
{ {
color: UM.Theme.getColor("main_background") 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 border.width: UM.Theme.getSize("default_lining").width
} }
TextArea TextArea
{ {
id: _textArea id: _textArea
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
textFormat: TextEdit.PlainText textFormat: TextEdit.PlainText
renderType: Text.NativeRendering renderType: Text.NativeRendering
selectByMouse: true selectByMouse: true
} }
} }

2
resources/themes/cura-dark/theme.json
View file

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

2
resources/themes/cura-light/theme.json
View file

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