diff --git a/quickshell/README.md b/quickshell/README.md index c2dea3b..c71600b 100644 --- a/quickshell/README.md +++ b/quickshell/README.md @@ -74,7 +74,7 @@ backdrop/ the wallpaper, drawn by the shell assets/ halftone and stripe tiles, generated with ImageMagick ``` -`P5Panel` is the base surface everything sits on. It does not auto-size — +`Panel` is the base surface everything sits on. It does not auto-size — callers set implicit sizes from their own layout (`row.implicitWidth + contentPad * 2`), which keeps the shape maths out of binding loops. @@ -441,7 +441,7 @@ zones itself, so every piece is placed from the screen edge. **Soft, everywhere else.** The porthole is the shape the desktop is built around, and every smaller surface is a gentler echo of it. `Theme.skew` and -`Theme.cut` are `0`; `P5Panel` and `Skew` draw `Geom.roundedRect` with +`Theme.cut` are `0`; `Panel` and `Skew` draw `Geom.roundedRect` with `Theme.radiusS` (pills, chips, meter tracks), `radiusM` (rows, buttons) or `radiusL`. `radiusL` is `frameRadius - padS`: anything inset by `padS` inside one of the frame's curves — a hovered notification in the drawer's corner — diff --git a/quickshell/bar/BarPill.qml b/quickshell/bar/BarPill.qml index d788484..14821e6 100644 --- a/quickshell/bar/BarPill.qml +++ b/quickshell/bar/BarPill.qml @@ -73,7 +73,7 @@ Item { anchors.fill: parent active: root.standalone - sourceComponent: P5Panel { + sourceComponent: Panel { lean: root.lean leanLeft: root.leanLeft chop: root.chop diff --git a/quickshell/bar/RailIcon.qml b/quickshell/bar/RailIcon.qml index 0dc90da..7eac43f 100644 --- a/quickshell/bar/RailIcon.qml +++ b/quickshell/bar/RailIcon.qml @@ -122,7 +122,7 @@ Item { } // Leading-edge wipe. On the rail this runs vertically down the left side, - // mirroring the accent bar P5Panel puts on horizontal modules. + // mirroring the accent bar Panel puts on horizontal modules. // // Held off the edge by `wipeInset`: the icon spans the rail's full width, so // at x = 0 this landed exactly on the slab's own border. @@ -162,7 +162,7 @@ Item { onWheel: event => root.scrolled(event.angleDelta.y) } - P5Tooltip { + Tooltip { anchorItem: root triggerHovered: root.hovered title: root.label diff --git a/quickshell/components/P5Button.qml b/quickshell/components/ActionButton.qml similarity index 99% rename from quickshell/components/P5Button.qml rename to quickshell/components/ActionButton.qml index b08b508..adeb362 100644 --- a/quickshell/components/P5Button.qml +++ b/quickshell/components/ActionButton.qml @@ -48,7 +48,7 @@ FocusScope { implicitWidth: wide ? 260 : (row.implicitWidth + panel.contentPad * 2) implicitHeight: 44 - P5Panel { + Panel { id: panel anchors.fill: parent lean: root.lean diff --git a/quickshell/components/ChromeSurface.qml b/quickshell/components/ChromeSurface.qml index c2f535e..d60d377 100644 --- a/quickshell/components/ChromeSurface.qml +++ b/quickshell/components/ChromeSurface.qml @@ -4,7 +4,7 @@ import "root:/components" // Calm, permanent-chrome preset. It is deliberately flat and opaque: one // neutral hairline, no texture, no ticks, and no accent unless active. -P5Panel { +Panel { property bool active: false property color tone: Theme.treatmentActiveMark diff --git a/quickshell/components/P5Slider.qml b/quickshell/components/LevelSlider.qml similarity index 100% rename from quickshell/components/P5Slider.qml rename to quickshell/components/LevelSlider.qml diff --git a/quickshell/components/P5Panel.qml b/quickshell/components/Panel.qml similarity index 100% rename from quickshell/components/P5Panel.qml rename to quickshell/components/Panel.qml diff --git a/quickshell/components/Skew.qml b/quickshell/components/Skew.qml index e691925..857ccc9 100644 --- a/quickshell/components/Skew.qml +++ b/quickshell/components/Skew.qml @@ -3,7 +3,7 @@ import QtQuick.Shapes import "root:/config" import "root:/components" -// A small block — the small-scale counterpart to P5Panel. Upright and rounded +// A small block — the small-scale counterpart to Panel. Upright and rounded // under the YoRHa theme; it still leans if given a lean. // // Every tick, rule, meter segment and slider rail in this shell leans at @@ -23,12 +23,12 @@ Shape { property color borderColor: "transparent" property real borderWidth: 0 - // Lean of the vertical edges as a fraction of height, matching P5Panel. + // Lean of the vertical edges as a fraction of height, matching Panel. property real lean: Theme.skew property bool leanLeft: false // Wide, short pieces — the rail's hairline rules — slant their horizontal - // edges by a fraction of width instead, exactly as P5Panel does for the + // edges by a fraction of width instead, exactly as Panel does for the // rail slab. property bool vertical: false diff --git a/quickshell/components/P5Tooltip.qml b/quickshell/components/Tooltip.qml similarity index 100% rename from quickshell/components/P5Tooltip.qml rename to quickshell/components/Tooltip.qml diff --git a/quickshell/overlays/Osd.qml b/quickshell/overlays/Osd.qml index 795e1bd..327d06f 100644 --- a/quickshell/overlays/Osd.qml +++ b/quickshell/overlays/Osd.qml @@ -124,7 +124,7 @@ PanelWindow { } } - P5Panel { + Panel { id: panel anchors.fill: parent anchors.margins: 4 diff --git a/quickshell/popouts/AudioInputBand.qml b/quickshell/popouts/AudioInputBand.qml index 78de898..d2c70f5 100644 --- a/quickshell/popouts/AudioInputBand.qml +++ b/quickshell/popouts/AudioInputBand.qml @@ -50,7 +50,7 @@ Item { } } - P5Button { + ActionButton { id: muteButton anchors.right: parent.right anchors.top: parent.top @@ -59,7 +59,7 @@ Item { onClicked: Audio.toggleMicMute() } - P5Slider { + LevelSlider { anchors.left: parent.left anchors.right: parent.right anchors.bottom: parent.bottom diff --git a/quickshell/popouts/AudioOutputHero.qml b/quickshell/popouts/AudioOutputHero.qml index c8b7e1a..383c8fb 100644 --- a/quickshell/popouts/AudioOutputHero.qml +++ b/quickshell/popouts/AudioOutputHero.qml @@ -57,7 +57,7 @@ Item { } } - P5Slider { + LevelSlider { anchors.left: parent.left anchors.right: parent.right anchors.bottom: parent.bottom diff --git a/quickshell/popouts/AudioPopout.qml b/quickshell/popouts/AudioPopout.qml index e3c8ade..0a74e18 100644 --- a/quickshell/popouts/AudioPopout.qml +++ b/quickshell/popouts/AudioPopout.qml @@ -50,7 +50,7 @@ Popout { width: parent.width spacing: Theme.padS - P5Button { + ActionButton { id: outputMuteButton width: parent.width text: Audio.muted ? "Unmute output" : "Mute output" @@ -58,7 +58,7 @@ Popout { onClicked: Audio.toggleMute() } - P5Button { + ActionButton { width: parent.width text: "Open audio mixer" icon: "󰕾" @@ -178,7 +178,7 @@ Popout { } } - P5Slider { + LevelSlider { anchors.bottom: parent.bottom anchors.left: parent.left anchors.right: parent.right diff --git a/quickshell/popouts/BatteryPopout.qml b/quickshell/popouts/BatteryPopout.qml index 573b875..52b9822 100644 --- a/quickshell/popouts/BatteryPopout.qml +++ b/quickshell/popouts/BatteryPopout.qml @@ -123,7 +123,7 @@ Popout { // Follows the detail line rather than being pinned to the bottom of a // fixed-height panel, which is what left a dead band above it. - P5Button { + ActionButton { id: suspendButton anchors.top: detailText.bottom anchors.topMargin: Theme.padL diff --git a/quickshell/popouts/BtPopout.qml b/quickshell/popouts/BtPopout.qml index 45c72ee..431b85f 100644 --- a/quickshell/popouts/BtPopout.qml +++ b/quickshell/popouts/BtPopout.qml @@ -40,14 +40,14 @@ Popout { anchors.left: parent.left spacing: Theme.padS - P5Button { + ActionButton { text: Bt.enabled ? "On" : "Off" icon: Bt.enabled ? "󰂯" : "󰂲" accent: Bt.enabled ? Theme.accent : Theme.muted onClicked: Bt.toggle() } - P5Button { + ActionButton { text: Bt.discovering ? "Scanning" : "Scan" icon: "󰐷" accent: Bt.discovering ? Theme.accent : Theme.primary diff --git a/quickshell/popouts/MediaPopout.qml b/quickshell/popouts/MediaPopout.qml index 64f2cbb..3e24617 100644 --- a/quickshell/popouts/MediaPopout.qml +++ b/quickshell/popouts/MediaPopout.qml @@ -172,7 +172,7 @@ Popout { renderType: Text.NativeRendering } - P5Slider { + LevelSlider { anchors.left: elapsed.right anchors.right: total.left anchors.leftMargin: Theme.padS diff --git a/quickshell/popouts/NetPopout.qml b/quickshell/popouts/NetPopout.qml index a76dacc..f27d4ab 100644 --- a/quickshell/popouts/NetPopout.qml +++ b/quickshell/popouts/NetPopout.qml @@ -62,14 +62,14 @@ Popout { anchors.left: parent.left spacing: Theme.padS - P5Button { + ActionButton { text: Net.wifiEnabled ? "Wi-Fi On" : "Wi-Fi Off" icon: Net.wifiEnabled ? "󰖩" : "󰖪" accent: Net.wifiEnabled ? Theme.primary : Theme.muted onClicked: Net.toggleWifi() } - P5Button { + ActionButton { text: "Settings" icon: "󰒓" onClicked: Actions.openNetworkSettings() diff --git a/quickshell/popouts/NotifPopout.qml b/quickshell/popouts/NotifPopout.qml index f9d3fdf..bcc12a4 100644 --- a/quickshell/popouts/NotifPopout.qml +++ b/quickshell/popouts/NotifPopout.qml @@ -34,14 +34,14 @@ Popout { anchors.left: parent.left spacing: Theme.padS - P5Button { + ActionButton { text: Notifs.dnd ? "Silenced" : "Silence" icon: Notifs.dnd ? "󰂛" : "󰂚" accent: Notifs.dnd ? Theme.treatmentOffText : Theme.primary onClicked: Notifs.toggleDnd() } - P5Button { + ActionButton { text: "Clear" icon: "󰎟" destructive: true diff --git a/quickshell/popouts/PopoutSurface.qml b/quickshell/popouts/PopoutSurface.qml index 0821894..394fbe7 100644 --- a/quickshell/popouts/PopoutSurface.qml +++ b/quickshell/popouts/PopoutSurface.qml @@ -3,8 +3,8 @@ import "root:/config" import "root:/components" // The slab every popout sits on. Pure preset — it declares no children of its -// own, so P5Panel's default content property stays usable by callers. -P5Panel { +// own, so Panel's default content property stays usable by callers. +Panel { property color tone: Theme.primary property bool textured: false @@ -14,7 +14,7 @@ P5Panel { readonly property bool attached: parent?.frameAttached ?? false fill: attached ? "transparent" : Theme.mantle - // Zero, not a transparent fill: P5Panel re-applies this opacity to the + // Zero, not a transparent fill: Panel re-applies this opacity to the // fill colour, which turned "transparent" into 97% black. fillOpacity: attached ? 0 : 0.97 // The frame is structure: a neutral hairline. A free-standing panel takes diff --git a/quickshell/popouts/TrayMenu.qml b/quickshell/popouts/TrayMenu.qml index f34a912..ce63402 100644 --- a/quickshell/popouts/TrayMenu.qml +++ b/quickshell/popouts/TrayMenu.qml @@ -10,7 +10,7 @@ import "root:/components" // implementation, but that draws a stock widget popup — square corners, system // palette, no lean — hanging off the corner of a shell that has none of those // things. This walks the menu with QsMenuOpener instead and draws it as a -// P5Panel, so a right click on a tray icon produces the same object language as +// Panel, so a right click on a tray icon produces the same object language as // everything else on the rail. // // Dismissal is a Hyprland focus grab: click anywhere outside and the compositor