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

[usersq] Back out color-scheme merge

Browse Source
This commit is contained in:
Adriaan de Groot 2021-07-15 16:54:02 +02:00
parent e361f52415
commit 56f71501cc
1 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,6 +23,9 @@ 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
@ -54,8 +57,8 @@ Kirigami.ScrollablePage {
text: config.fullName text: config.fullName
onTextChanged: config.setFullName(text) onTextChanged: config.setFullName(text)
palette.base: _userNameField.text.length ? Kirigami.Theme.backgroundColor : Kirigami.Theme.backgroundColor palette.base: _userNameField.text.length ? "#f0fff0" : "#FBFBFB"
palette.highlight : _userNameField.text.length ? Kirigami.Theme.positiveBackgroundColor : Kirigami.Theme.backgroundColor palette.highlight : _userNameField.text.length ? "#dcffdc" : "#FBFBFB"
} }
} }
@ -86,8 +89,8 @@ Kirigami.ScrollablePage {
palette.base: _userLoginField.text.length palette.base: _userLoginField.text.length
? ( acceptableInput ? ( acceptableInput
? ( _userLoginField.text === "root" ? ( _userLoginField.text === "root"
? Kirigami.Theme.negativeBackgroundColor : Kirigami.Theme.backgroundColor ) : Kirigami.Theme.negativeBackgroundColor ) : Kirigami.Theme.backgroundColor ? "#ffdae0" : "#f0fff0" ) : "#ffdae0" ) : "#FBFBFB"
palette.highlight : _userLoginField.text.length ? Kirigami.Theme.positiveBackgroundColor : Kirigami.Theme.backgroundColor palette.highlight : _userLoginField.text.length ? "#dcffdc" : "#FBFBFB"
} }
Label { Label {
@ -95,6 +98,7 @@ 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"
} }
} }
@ -129,7 +133,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
@ -139,10 +143,10 @@ Kirigami.ScrollablePage {
palette.base: _hostName.text.length palette.base: _hostName.text.length
? ( acceptableInput ? ( acceptableInput
? ( _hostName.text === "localhost" ? Kirigami.Theme.negativeBackgroundColor : Kirigami.Theme.backgroundColor ) ? ( _hostName.text === "localhost" ? "#ffdae0" : "#f0fff0" )
: Kirigami.Theme.negativeBackgroundColor) : "#ffdae0")
: Kirigami.Theme.backgroundColor : "#FBFBFB"
palette.highlight : _hostName.text.length ? Kirigami.Theme.positiveBackgroundColor : Kirigami.Theme.backgroundColor palette.highlight : _hostName.text.length ? "#dcffdc" : "#FBFBFB"
} }
Label { Label {
@ -150,6 +154,7 @@ 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"
} }
} }
@ -189,8 +194,8 @@ Kirigami.ScrollablePage {
text: config.userPassword text: config.userPassword
onTextChanged: config.setUserPassword(text) onTextChanged: config.setUserPassword(text)
palette.base: _passwordField.text.length ? Kirigami.Theme.backgroundColor : Kirigami.Theme.neutralBackgroundColor palette.base: _passwordField.text.length ? "#f0fff0" : "#FBFBFB"
palette.highlight : _passwordField.text.length ? Kirigami.Theme.positiveBackgroundColor : Kirigami.Theme.backgroundColor palette.highlight : _passwordField.text.length ? "#dcffdc" : "#FBFBFB"
echoMode: TextInput.Password echoMode: TextInput.Password
passwordMaskDelay: 300 passwordMaskDelay: 300
@ -212,9 +217,9 @@ Kirigami.ScrollablePage {
palette.base: _verificationPasswordField.text.length palette.base: _verificationPasswordField.text.length
? ( _passwordField.text === _verificationPasswordField.text ? ( _passwordField.text === _verificationPasswordField.text
? Kirigami.Theme.backgroundColor : Kirigami.Theme.negativeBackgroundColor ) ? "#f0fff0" : "#ffdae0" )
: Kirigami.Theme.backgroundColor : "#FBFBFB"
palette.highlight : _verificationPasswordField.text.length ? Kirigami.Theme.positiveBackgroundColor : Kirigami.Theme.backgroundColor palette.highlight : _verificationPasswordField.text.length ? "#dcffdc" : "#FBFBFB"
echoMode: TextInput.Password echoMode: TextInput.Password
passwordMaskDelay: 300 passwordMaskDelay: 300
@ -228,6 +233,7 @@ Kirigami.ScrollablePage {
font.weight: Font.Thin font.weight: Font.Thin
font.pointSize: 8 font.pointSize: 8
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
color: "#6D6D6D"
} }
} }
@ -266,6 +272,7 @@ 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 {
@ -290,8 +297,8 @@ Kirigami.ScrollablePage {
onTextChanged: config.setRootPassword(text) onTextChanged: config.setRootPassword(text)
palette.base: _rootPasswordField.text.length ? Kirigami.Theme.backgroundColor : Kirigami.Theme.neutralBackgroundColor palette.base: _rootPasswordField.text.length ? "#f0fff0" : "#FBFBFB"
palette.highlight : _rootPasswordField.text.length ? Kirigami.Theme.positiveBackgroundColor : Kirigami.Theme.backgroundColor palette.highlight : _rootPasswordField.text.length ? "#dcffdc" : "#FBFBFB"
echoMode: TextInput.Password echoMode: TextInput.Password
passwordMaskDelay: 300 passwordMaskDelay: 300
@ -313,8 +320,8 @@ Kirigami.ScrollablePage {
palette.base: _verificationRootPasswordField.text.length palette.base: _verificationRootPasswordField.text.length
? ( _rootPasswordField.text === _verificationRootPasswordField.text ? ( _rootPasswordField.text === _verificationRootPasswordField.text
? Kirigami.Theme.backgroundColor : Kirigami.Theme.negativeBackgroundColor) : Kirigami.Theme.backgroundColor ? "#f0fff0" : "#ffdae0") : "#FBFBFB"
palette.highlight : _verificationRootPasswordField.text.length ? Kirigami.Theme.positiveBackgroundColor : Kirigami.Theme.backgroundColor palette.highlight : _verificationRootPasswordField.text.length ? "#dcffdc" : "#FBFBFB"
echoMode: TextInput.Password echoMode: TextInput.Password
passwordMaskDelay: 300 passwordMaskDelay: 300
@ -376,6 +383,7 @@ 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"
} }
} }
} }