Gabriel Brown
d96863b687
colour -> color, behaviour -> behavior, centre -> center, favourite -> favorite, and about twenty other pairs, applied consistently across comments, docs, error/UI copy, and a handful of QML identifiers that used the British spelling as their actual name: SystemSettings' serialiseValue/serialiseTable/normaliseGradient, Displays' normaliseModes, Wallpaper's normalisePolicy, SettingsBackup's serialiseHomeState, DateTime's ntpSynchronised property, Clipboard's _normalise helper, and ShortcutCapture's cancelled signal (with its onCancelled handler in ShortcutsPage.qml). Every call site and the two tests that assert on the literal source text (settings-ownership and settings-backup-live contracts) were updated in lockstep. Left untouched: config/dot/espanso/match/packages/misspell-en/ is a vendored third-party autocorrect dictionary -- its entries are typo corrections, not our prose, and rewriting them would fight the package's own purpose (and any future re-sync from upstream). The already-American `favorites` property (Home page pinned accessories) was never actually misspelled -- only nearby comments and error strings said "favourites" -- so no data migration was needed there. Claude-Session: https://claude.ai/code/session_01E6TJUAh41HaP25MVHWkhRZ
143 lines
4.4 KiB
QML
143 lines
4.4 KiB
QML
// The top bar: edge-to-edge system chrome with no surface of its own. Content
|
|
// floats directly over the desktop, while individual controls still provide
|
|
// hover and press feedback. The entire bar is a hit target so the top-left
|
|
// corner remains a dependable workspace-scroll gesture.
|
|
//
|
|
// Instantiate one per screen:
|
|
//
|
|
// Variants {
|
|
// model: Quickshell.screens
|
|
// Bar {}
|
|
// }
|
|
//
|
|
// Layout mirrors GNOME's: workspaces + vitals left, clock + weather center,
|
|
// media + tray + status cluster right.
|
|
|
|
import Quickshell
|
|
import Quickshell.Wayland
|
|
import QtQuick
|
|
import qs.config
|
|
import qs.modules.clipboard
|
|
import qs.modules.focus
|
|
|
|
PanelWindow {
|
|
id: root
|
|
|
|
// Set by Variants. Left as a plain property (not `required`) so the bar can
|
|
// also be instantiated standalone on the default screen while testing.
|
|
property var modelData: null
|
|
|
|
// Raised when the status cluster is clicked; the shell wires this to the
|
|
// quick settings panel, which this module does not own.
|
|
signal requestQuickSettings
|
|
|
|
// Bound by the shell when an idle inhibitor is held, so the cluster can
|
|
// show the caffeine glyph.
|
|
property alias idleInhibited: statusCluster.idleInhibited
|
|
|
|
screen: root.modelData
|
|
|
|
anchors {
|
|
top: true
|
|
left: true
|
|
right: true
|
|
}
|
|
|
|
// PanelWindow defaults to an opaque white background.
|
|
color: "transparent"
|
|
|
|
implicitHeight: Theme.barHeight
|
|
|
|
exclusiveZone: Theme.barHeight
|
|
|
|
// Stable namespace for compositor inspection and shell diagnostics.
|
|
WlrLayershell.namespace: "qs-bar"
|
|
WlrLayershell.layer: WlrLayer.Top
|
|
WlrLayershell.keyboardFocus: WlrKeyboardFocus.None
|
|
|
|
// The full-width region is intentional: unlike a floating island, a menu
|
|
// bar owns the screen edge. In particular, Workspaces starts at x=0 and
|
|
// spans the full height so scrolling at the literal corner always works.
|
|
mask: Region {
|
|
item: barContent
|
|
}
|
|
|
|
Item {
|
|
id: barContent
|
|
|
|
anchors.fill: parent
|
|
|
|
// ── Left ────────────────────────────────────────────────────────────
|
|
Row {
|
|
anchors.left: parent.left
|
|
anchors.verticalCenter: parent.verticalCenter
|
|
spacing: Theme.itemSpacing
|
|
|
|
Workspaces {
|
|
anchors.verticalCenter: parent.verticalCenter
|
|
screen: root.screen
|
|
}
|
|
|
|
VitalsWidget {
|
|
anchors.verticalCenter: parent.verticalCenter
|
|
}
|
|
}
|
|
|
|
// ── Center ──────────────────────────────────────────────────────────
|
|
Row {
|
|
anchors.horizontalCenter: parent.horizontalCenter
|
|
anchors.verticalCenter: parent.verticalCenter
|
|
spacing: 2
|
|
|
|
Clock {
|
|
anchors.verticalCenter: parent.verticalCenter
|
|
}
|
|
|
|
WeatherWidget {
|
|
anchors.verticalCenter: parent.verticalCenter
|
|
}
|
|
}
|
|
|
|
// ── Right ───────────────────────────────────────────────────────────
|
|
Row {
|
|
anchors.right: parent.right
|
|
anchors.verticalCenter: parent.verticalCenter
|
|
spacing: Theme.itemSpacing
|
|
|
|
CalendarIndicator {
|
|
anchors.verticalCenter: parent.verticalCenter
|
|
}
|
|
|
|
HealthIndicator {
|
|
anchors.verticalCenter: parent.verticalCenter
|
|
}
|
|
|
|
ActivityIndicator {
|
|
anchors.verticalCenter: parent.verticalCenter
|
|
}
|
|
|
|
FocusIndicator {
|
|
anchors.verticalCenter: parent.verticalCenter
|
|
}
|
|
|
|
MediaWidget {
|
|
anchors.verticalCenter: parent.verticalCenter
|
|
}
|
|
|
|
ClipboardWidget {
|
|
anchors.verticalCenter: parent.verticalCenter
|
|
}
|
|
|
|
Tray {
|
|
anchors.verticalCenter: parent.verticalCenter
|
|
}
|
|
|
|
StatusCluster {
|
|
id: statusCluster
|
|
anchors.verticalCenter: parent.verticalCenter
|
|
onRequestQuickSettings: root.requestQuickSettings()
|
|
}
|
|
}
|
|
}
|
|
}
|