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
@@ -5,6 +5,7 @@ import QtQuick
|
||||
import QtQuick.Effects
|
||||
import QtQuick.Shapes
|
||||
import qs.Commons
|
||||
import qs.Commons as Commons
|
||||
import qs.Ui
|
||||
import "ImagePickerModel.js" as ImagePickerModel
|
||||
|
||||
@@ -37,14 +38,14 @@ Item {
|
||||
property string themeRows: ""
|
||||
property bool themeMode: false
|
||||
property bool themeOpenPending: false
|
||||
// Bound to the central [image-picker] section in shell.toml via Color.qml.
|
||||
// Bound to the central [image-picker] section in shell.toml via Commons.Color.qml.
|
||||
// `dimColor` tints unselected slices and text outlines on top of the scrim;
|
||||
// it intentionally tracks the foundational background, not a surface role.
|
||||
property color dimColor: Color.background
|
||||
property color foreground: Color.imagePicker.text
|
||||
property color scrim: Color.imagePicker.scrim
|
||||
property color selectedBorder: Color.imagePicker.selectedBorder
|
||||
property color unselectedBorder: Color.imagePicker.unselectedBorder
|
||||
property color dimColor: Commons.Color.background
|
||||
property color foreground: Commons.Color.imagePicker.text
|
||||
property color scrim: Commons.Color.imagePicker.scrim
|
||||
property color selectedBorder: Commons.Color.imagePicker.selectedBorder
|
||||
property color unselectedBorder: Commons.Color.imagePicker.unselectedBorder
|
||||
property int expandedWidth: 768
|
||||
property int expandedHeight: 475
|
||||
property int sliceWidth: 108
|
||||
@@ -274,7 +275,29 @@ Item {
|
||||
property var imageArray: []
|
||||
readonly property var matchingImageIndices: ImagePickerModel.matchingIndices(imageArray, filterText)
|
||||
onMatchingImageIndicesChanged: updateVisibleItems()
|
||||
onSelectedIndexChanged: updateVisibleItems()
|
||||
onSelectedIndexChanged: {
|
||||
updateVisibleItems()
|
||||
introPrepareTimer.restart()
|
||||
}
|
||||
onThemeModeChanged: if (themeMode) introPrepareTimer.restart()
|
||||
|
||||
Timer {
|
||||
id: introPrepareTimer
|
||||
interval: 75
|
||||
onTriggered: {
|
||||
if (root.opened && root.themeMode && !introPrepare.running) {
|
||||
introPrepare.theme = root.nameForPath(root.currentPath())
|
||||
introPrepare.command = ["omarchy-theme-bg-boot-intro", "--prepare-theme", root.nameForPath(root.currentPath())]
|
||||
introPrepare.running = true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Process {
|
||||
id: introPrepare
|
||||
property string theme: ""
|
||||
onExited: if (root.opened && root.themeMode && theme !== root.nameForPath(root.currentPath())) introPrepareTimer.restart()
|
||||
}
|
||||
|
||||
function updateVisibleItems() {
|
||||
ImagePickerModel.syncWindow(visibleImages, ImagePickerModel.visibleWindow(matchingImageIndices, selectedIndex, previewRadius))
|
||||
|
||||
Reference in new issue
Block a user