napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1738 from Nitrux/calamares

Browse Source 
[usersq]: use system colorscheme instead of hardcoded colors
This commit is contained in:
Adriaan de Groot 2021-07-14 16:41:35 +02:00 committed by GitHub
commit e361f52415
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/modules/usersq/usersq.qml
View File

@ -23,9 +23,6 @@ Kirigami.ScrollablePage {
width: parent.width width: parent.width
height: parent.height height: parent.height
Kirigami.Theme.backgroundColor: "#EFF0F1"
Kirigami.Theme.textColor: "#1F1F1F"
header: Kirigami.Heading { header: Kirigami.Heading {
Layout.fillWidth: true Layout.fillWidth: true
height: 50 height: 50
@ -57,8 +54,8 @@ Kirigami.ScrollablePage {
text: config.fullName text: config.fullName
onTextChanged: config.setFullName(text) onTextChanged: config.setFullName(text)
palette.base: _userNameField.text.length ? "#f0fff0" : "#FBFBFB" palette.base: _userNameField.text.length ? Kirigami.Theme.backgroundColor : Kirigami.Theme.backgroundColor
palette.highlight : _userNameField.text.length ? "#dcffdc" : "#FBFBFB" palette.highlight : _userNameField.text.length ? Kirigami.Theme.positiveBackgroundColor : Kirigami.Theme.backgroundColor
} }
} }
@ -89,8 +86,8 @@ Kirigami.ScrollablePage {
palette.base: _userLoginField.text.length palette.base: _userLoginField.text.length
? ( acceptableInput ? ( acceptableInput
? ( _userLoginField.text === "root" ? ( _userLoginField.text === "root"
? "#ffdae0" : "#f0fff0" ) : "#ffdae0" ) : "#FBFBFB" ? Kirigami.Theme.negativeBackgroundColor : Kirigami.Theme.backgroundColor ) : Kirigami.Theme.negativeBackgroundColor ) : Kirigami.Theme.backgroundColor
palette.highlight : _userLoginField.text.length ? "#dcffdc" : "#FBFBFB" palette.highlight : _userLoginField.text.length ? Kirigami.Theme.positiveBackgroundColor : Kirigami.Theme.backgroundColor
} }
Label { Label {
@ -98,7 +95,6 @@ Kirigami.ScrollablePage {
text: qsTr("If more than one person will use this computer, you can create multiple accounts after installation.") text: qsTr("If more than one person will use this computer, you can create multiple accounts after installation.")
font.weight: Font.Thin font.weight: Font.Thin
font.pointSize: 8 font.pointSize: 8
color: "#6D6D6D"
} }
} }
@ -133,7 +129,7 @@ Kirigami.ScrollablePage {
placeholderText: qsTr("Computer Name") placeholderText: qsTr("Computer Name")
text: config.hostName text: config.hostName
validator: RegularExpressionValidator { regularExpression: /[a-zA-Z0-9][-a-zA-Z0-9_]+/ } validator: RegularExpressionValidator { regularExpression: /[a-zA-Z0-9][-a-zA-Z0-9_]+/ }
color: Kirigami.Theme.textColor
onTextChanged: acceptableInput onTextChanged: acceptableInput
? ( _hostName.text === "localhost" ? ( _hostName.text === "localhost"
? forbiddenHost.visible=true ? forbiddenHost.visible=true
@ -143,10 +139,10 @@ Kirigami.ScrollablePage {
palette.base: _hostName.text.length palette.base: _hostName.text.length
? ( acceptableInput ? ( acceptableInput
? ( _hostName.text === "localhost" ? "#ffdae0" : "#f0fff0" ) ? ( _hostName.text === "localhost" ? Kirigami.Theme.negativeBackgroundColor : Kirigami.Theme.backgroundColor )
: "#ffdae0") : Kirigami.Theme.negativeBackgroundColor)
: "#FBFBFB" : Kirigami.Theme.backgroundColor
palette.highlight : _hostName.text.length ? "#dcffdc" : "#FBFBFB" palette.highlight : _hostName.text.length ? Kirigami.Theme.positiveBackgroundColor : Kirigami.Theme.backgroundColor
} }
Label { Label {
@ -154,7 +150,6 @@ Kirigami.ScrollablePage {
text: qsTr("This name will be used if you make the computer visible to others on a network.") text: qsTr("This name will be used if you make the computer visible to others on a network.")
font.weight: Font.Thin font.weight: Font.Thin
font.pointSize: 8 font.pointSize: 8
color: "#6D6D6D"
} }
} }
@ -194,8 +189,8 @@ Kirigami.ScrollablePage {
text: config.userPassword text: config.userPassword
onTextChanged: config.setUserPassword(text) onTextChanged: config.setUserPassword(text)
palette.base: _passwordField.text.length ? "#f0fff0" : "#FBFBFB" palette.base: _passwordField.text.length ? Kirigami.Theme.backgroundColor : Kirigami.Theme.neutralBackgroundColor
palette.highlight : _passwordField.text.length ? "#dcffdc" : "#FBFBFB" palette.highlight : _passwordField.text.length ? Kirigami.Theme.positiveBackgroundColor : Kirigami.Theme.backgroundColor
echoMode: TextInput.Password echoMode: TextInput.Password
passwordMaskDelay: 300 passwordMaskDelay: 300
@ -217,9 +212,9 @@ Kirigami.ScrollablePage {
palette.base: _verificationPasswordField.text.length palette.base: _verificationPasswordField.text.length
? ( _passwordField.text === _verificationPasswordField.text ? ( _passwordField.text === _verificationPasswordField.text
? "#f0fff0" : "#ffdae0" ) ? Kirigami.Theme.backgroundColor : Kirigami.Theme.negativeBackgroundColor )
: "#FBFBFB" : Kirigami.Theme.backgroundColor
palette.highlight : _verificationPasswordField.text.length ? "#dcffdc" : "#FBFBFB" palette.highlight : _verificationPasswordField.text.length ? Kirigami.Theme.positiveBackgroundColor : Kirigami.Theme.backgroundColor
echoMode: TextInput.Password echoMode: TextInput.Password
passwordMaskDelay: 300 passwordMaskDelay: 300
@ -233,7 +228,6 @@ Kirigami.ScrollablePage {
font.weight: Font.Thin font.weight: Font.Thin
font.pointSize: 8 font.pointSize: 8
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
color: "#6D6D6D"
} }
} }
@ -272,7 +266,6 @@ Kirigami.ScrollablePage {
text: qsTr("Use the same password for the administrator account.") text: qsTr("Use the same password for the administrator account.")
font.weight: Font.Thin font.weight: Font.Thin
font.pointSize: 8 font.pointSize: 8
color: "#6D6D6D"
} }
Column { Column {
@ -297,8 +290,8 @@ Kirigami.ScrollablePage {
onTextChanged: config.setRootPassword(text) onTextChanged: config.setRootPassword(text)
palette.base: _rootPasswordField.text.length ? "#f0fff0" : "#FBFBFB" palette.base: _rootPasswordField.text.length ? Kirigami.Theme.backgroundColor : Kirigami.Theme.neutralBackgroundColor
palette.highlight : _rootPasswordField.text.length ? "#dcffdc" : "#FBFBFB" palette.highlight : _rootPasswordField.text.length ? Kirigami.Theme.positiveBackgroundColor : Kirigami.Theme.backgroundColor
echoMode: TextInput.Password echoMode: TextInput.Password
passwordMaskDelay: 300 passwordMaskDelay: 300
@ -320,8 +313,8 @@ Kirigami.ScrollablePage {
palette.base: _verificationRootPasswordField.text.length palette.base: _verificationRootPasswordField.text.length
? ( _rootPasswordField.text === _verificationRootPasswordField.text ? ( _rootPasswordField.text === _verificationRootPasswordField.text
? "#f0fff0" : "#ffdae0") : "#FBFBFB" ? Kirigami.Theme.backgroundColor : Kirigami.Theme.negativeBackgroundColor) : Kirigami.Theme.backgroundColor
palette.highlight : _verificationRootPasswordField.text.length ? "#dcffdc" : "#FBFBFB" palette.highlight : _verificationRootPasswordField.text.length ? Kirigami.Theme.positiveBackgroundColor : Kirigami.Theme.backgroundColor
echoMode: TextInput.Password echoMode: TextInput.Password
passwordMaskDelay: 300 passwordMaskDelay: 300
@ -383,7 +376,6 @@ Kirigami.ScrollablePage {
text: qsTr("When this box is checked, password-strength checking is done and you will not be able to use a weak password.") text: qsTr("When this box is checked, password-strength checking is done and you will not be able to use a weak password.")
font.weight: Font.Thin font.weight: Font.Thin
font.pointSize: 8 font.pointSize: 8
color: "#6D6D6D"
} }
} }
} }