Merge upstream quattro for the Qt 6.12 palette fix (#14553)
Qt 6.12 shadows the bare Color singleton, so the bar and every Color role read undefined on fresh installs. Keep our I18n text in the four conflicting files, qualify #14433's notification button color, give the new dictation menu rows and notifications Chinese, and drop table entries for the removed Voxtype and FIDO2 texts.
This commit is contained in:
commit
fcd681c099
239 files changed
+3996
-616
No files matched your search
@@ -1,6 +1,7 @@
|
||||
import QtQuick
|
||||
import QtQuick.Layouts
|
||||
import qs.Commons
|
||||
import qs.Commons as Commons
|
||||
import qs.Ui
|
||||
import "Model.js" as Model
|
||||
import "Greetings.js" as Greet
|
||||
@@ -62,7 +63,7 @@ Rectangle {
|
||||
// arrow keys never reads darker than the daytime rows around it.
|
||||
readonly property bool picked: panel.focusIndex === index && !panel.addSelected
|
||||
readonly property bool lit: rowHover.hovered || picked
|
||||
color: Model.mix(Color.popups.background, foreground,
|
||||
color: Model.mix(Commons.Color.popups.background, foreground,
|
||||
picked ? dayFill + hoverLift : rowHover.hovered ? phaseFill + hoverLift : phaseFill)
|
||||
|
||||
// Transforms leave the Column's layout alone: the knock that clears the
|
||||
@@ -307,8 +308,8 @@ Rectangle {
|
||||
anchors.verticalCenter: parent.top
|
||||
size: fontSize + (Style.space(22) - fontSize) * 0.85
|
||||
radius: size / 2
|
||||
color: Model.mix(Color.popups.background, row.foreground, _hot ? 0.24 : 0.14)
|
||||
borderSpec: Border.flat(Model.mix(Color.popups.background, row.foreground, _hot ? 0.65 : 0.35), Style.space(1))
|
||||
color: Model.mix(Commons.Color.popups.background, row.foreground, _hot ? 0.24 : 0.14)
|
||||
borderSpec: Border.flat(Model.mix(Commons.Color.popups.background, row.foreground, _hot ? 0.65 : 0.35), Style.space(1))
|
||||
iconText: "\u00d7"
|
||||
tooltipText: I18n.tr("Remove")
|
||||
foreground: row.dim
|
||||
|
||||
Reference in new issue
Block a user