feat(qbz-qt): phase 2 — app shell with 1:1 Slint visual parity
HeaderBar (42px, sidebar cycle, back/forward, centered search replica, offline badge + flyout, app menu), three-state Sidebar (open 240 / mini 64 / closed 0, 160ms animation, nav rows with exact msgids), NowPlaying bar SMALL (3px three-color seekbar, art+title+time left, transport center, quality/volume/queue-toggle right, exact empty state), Queue panel (300px animated column, Queue/History tabs, exact empty states). Nav history stack + NowPlayingModel with empty-state defaults behind new bridge properties/invokables (transport log-and-noop until playback lands). Icons as pre-baked tinted SVG variants (ColorOverlay is broken on the software path); Inter fonts bundled; full dark theme tokens ported from the Slint foundation files. km
This commit is contained in:
189 files changed
+3206
-135
No files matched your search
@@ -0,0 +1,441 @@
|
||||
// Top header bar — QML port of crates/qbz-ui/ui/shell/HeaderBar.slint.
|
||||
//
|
||||
// Left: the three "sacred" nav buttons (sidebar cycle, back, forward) and
|
||||
// — while the sidebar is fully closed — the compact icon-only section nav
|
||||
// (nav-in-sidebar is ON in this POC, so the full text tabs never mount).
|
||||
// Center: the search field, absolutely centered on the window (VISUAL
|
||||
// replica — the cortinilla/live-search is out of scope; POC-NOTE).
|
||||
// Right: the tri-state offline status badge with its flyout (recovery
|
||||
// "Sign in" wired to QbzBridge.recoveryLogin) and the app menu (user block
|
||||
// + Log Out + Close; the other Slint menu items are POC-NOTE stubs).
|
||||
//
|
||||
// POC-NOTE: the custom window-chrome parts (drag surface, drawn
|
||||
// min/max/close WindowControls) are skipped — the POC keeps NATIVE window
|
||||
// decorations.
|
||||
|
||||
import QtQuick
|
||||
import QtQuick.Controls
|
||||
import com.blitzfc.qbz
|
||||
|
||||
Rectangle {
|
||||
id: root
|
||||
color: theme.surfaceCard
|
||||
|
||||
QbzTheme { id: theme }
|
||||
|
||||
// Slint OfflineState.badge-state: 0 hidden / 1 hard offline / 2 manual /
|
||||
// 3 logged out (wins over the others).
|
||||
readonly property int badgeState: QbzBridge.offlineSession ? 3
|
||||
: QbzBridge.offlineMode === 2 ? 2
|
||||
: QbzBridge.offlineMode === 1 ? 1 : 0
|
||||
|
||||
// Circular history / collapse button (HeaderNavBtn).
|
||||
component HeaderNavBtn: Rectangle {
|
||||
property string name: ""
|
||||
property bool btnEnabled: true
|
||||
signal clicked()
|
||||
|
||||
width: 28
|
||||
height: 28
|
||||
radius: 14
|
||||
opacity: btnEnabled ? 1.0 : 0.4
|
||||
color: (hnArea.containsMouse && btnEnabled) ? theme.surfaceHover : theme.surfaceElevated
|
||||
|
||||
QbzIcon {
|
||||
name: parent.name
|
||||
width: 15
|
||||
height: 15
|
||||
anchors.centerIn: parent
|
||||
tintName: parent.btnEnabled ? "primary" : "muted"
|
||||
}
|
||||
MouseArea {
|
||||
id: hnArea
|
||||
anchors.fill: parent
|
||||
enabled: parent.btnEnabled
|
||||
hoverEnabled: true
|
||||
cursorShape: parent.btnEnabled ? Qt.PointingHandCursor : Qt.ArrowCursor
|
||||
onClicked: parent.clicked()
|
||||
}
|
||||
}
|
||||
|
||||
// Square icon button (HeaderIconButton, 36px) / compact nav (30px).
|
||||
component HeaderIconBtn: Rectangle {
|
||||
property string name: ""
|
||||
property int btnSize: 36
|
||||
property int iconSize: 19
|
||||
property bool active: false
|
||||
signal clicked()
|
||||
|
||||
width: btnSize
|
||||
height: btnSize
|
||||
radius: theme.radiusSm
|
||||
color: active ? theme.surfaceElevated
|
||||
: hiArea.containsMouse ? theme.surfaceHover : "transparent"
|
||||
|
||||
QbzIcon {
|
||||
name: parent.name
|
||||
width: parent.iconSize
|
||||
height: parent.iconSize
|
||||
anchors.centerIn: parent
|
||||
tintName: parent.active ? "accent"
|
||||
: hiArea.containsMouse ? "primary" : "secondary"
|
||||
}
|
||||
MouseArea {
|
||||
id: hiArea
|
||||
anchors.fill: parent
|
||||
hoverEnabled: true
|
||||
cursorShape: Qt.PointingHandCursor
|
||||
onClicked: parent.clicked()
|
||||
}
|
||||
}
|
||||
|
||||
// --- Left controls ---------------------------------------------------
|
||||
Row {
|
||||
id: leftControls
|
||||
x: theme.spacingMd
|
||||
y: (root.height - height) / 2
|
||||
height: 36
|
||||
spacing: 6
|
||||
|
||||
HeaderNavBtn {
|
||||
name: "panel-left"
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
onClicked: QbzBridge.cycleSidebar()
|
||||
}
|
||||
HeaderNavBtn {
|
||||
name: "chevron-left"
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
btnEnabled: QbzBridge.canBack
|
||||
onClicked: QbzBridge.navigateBack()
|
||||
}
|
||||
HeaderNavBtn {
|
||||
name: "chevron-right"
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
btnEnabled: QbzBridge.canForward
|
||||
onClicked: QbzBridge.navigateForward()
|
||||
}
|
||||
|
||||
// Compact section nav — only while the sidebar is fully closed
|
||||
// (Cerrado), so the sections stay reachable. POC-NOTE: these open
|
||||
// dropdown menus in Slint; here they are inert visual replicas.
|
||||
Row {
|
||||
visible: QbzBridge.sidebarState === 2
|
||||
height: parent.height
|
||||
spacing: 2
|
||||
|
||||
Item { width: 6; height: 1 }
|
||||
HeaderIconBtn {
|
||||
name: "compass"
|
||||
btnSize: 30; iconSize: 16
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
visible: !QbzBridge.offline
|
||||
}
|
||||
HeaderIconBtn {
|
||||
name: "music-library-2"
|
||||
btnSize: 30; iconSize: 16
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
visible: !QbzBridge.offline
|
||||
}
|
||||
HeaderIconBtn {
|
||||
name: "hard-drive"
|
||||
btnSize: 30; iconSize: 16
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
}
|
||||
HeaderIconBtn {
|
||||
name: "qbz-symbolic"
|
||||
btnSize: 30; iconSize: 16
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
}
|
||||
// Thin separator + the playlists flyout button.
|
||||
Rectangle {
|
||||
width: 1
|
||||
height: 18
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
color: theme.borderSubtle
|
||||
}
|
||||
HeaderIconBtn {
|
||||
name: "list-music"
|
||||
btnSize: 30; iconSize: 16
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// --- Search (absolutely centered; VISUAL replica only) ---------------
|
||||
// POC-NOTE: the field is inert — the live-search cortinilla is out of
|
||||
// scope; metrics/colors/placeholder match the Slint field.
|
||||
Rectangle {
|
||||
x: (root.width - width) / 2
|
||||
y: (root.height - height) / 2
|
||||
width: root.width < 960 ? 179 : 256
|
||||
height: 32
|
||||
radius: 6
|
||||
border.width: 1
|
||||
border.color: theme.borderSubtle
|
||||
color: theme.surfaceElevated
|
||||
|
||||
QbzIcon {
|
||||
name: "search"
|
||||
width: 14
|
||||
height: 14
|
||||
x: 10
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
tintName: "muted"
|
||||
}
|
||||
Text {
|
||||
anchors.fill: parent
|
||||
text: QbzBridge.tr("Search")
|
||||
color: theme.textMuted
|
||||
font.pixelSize: 13
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
horizontalAlignment: Text.AlignHCenter
|
||||
}
|
||||
}
|
||||
|
||||
// --- Right controls: status badge + app menu --------------------------
|
||||
Row {
|
||||
id: rightControls
|
||||
x: root.width - width - theme.spacingMd + 2
|
||||
y: (root.height - height) / 2
|
||||
height: 36
|
||||
spacing: 4
|
||||
|
||||
// Offline status badge (OfflineStatusBadge) — ghost chrome like
|
||||
// NavTab: transparent, hover -> surface-hover, radius sm.
|
||||
Rectangle {
|
||||
visible: root.badgeState !== 0
|
||||
height: 30
|
||||
width: badgeRow.implicitWidth
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
radius: theme.radiusSm
|
||||
color: badgeArea.containsMouse ? theme.surfaceHover : "transparent"
|
||||
|
||||
readonly property string stateTintName: root.badgeState === 1 ? "warning"
|
||||
: root.badgeState === 2 ? "accent" : "muted"
|
||||
|
||||
Row {
|
||||
id: badgeRow
|
||||
height: parent.height
|
||||
leftPadding: 9
|
||||
rightPadding: 11
|
||||
spacing: 6
|
||||
QbzIcon {
|
||||
name: root.badgeState === 3 ? "user" : "cloud-off"
|
||||
width: 14
|
||||
height: 14
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
tintName: parent.parent.stateTintName
|
||||
}
|
||||
Text {
|
||||
height: parent.height
|
||||
text: root.badgeState === 3 ? QbzBridge.tr("Logged out")
|
||||
: root.badgeState === 2 ? QbzBridge.tr("Offline (manual)")
|
||||
: QbzBridge.tr("Offline (hard)")
|
||||
color: theme.textSecondary
|
||||
font.pixelSize: 11
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
}
|
||||
}
|
||||
MouseArea {
|
||||
id: badgeArea
|
||||
anchors.fill: parent
|
||||
hoverEnabled: true
|
||||
cursorShape: Qt.PointingHandCursor
|
||||
onClicked: badgeFlyout.open()
|
||||
}
|
||||
|
||||
// Status flyout — the former banner texts + actions.
|
||||
Popup {
|
||||
id: badgeFlyout
|
||||
x: parent.width - 320
|
||||
y: parent.height + 6
|
||||
width: 320
|
||||
padding: 14
|
||||
closePolicy: Popup.CloseOnPressOutside
|
||||
|
||||
background: Rectangle {
|
||||
color: theme.surfaceMain
|
||||
radius: theme.radiusSm
|
||||
border.width: 1
|
||||
border.color: theme.borderMuted
|
||||
}
|
||||
contentItem: Column {
|
||||
spacing: 12
|
||||
Row {
|
||||
spacing: 8
|
||||
width: parent.width
|
||||
QbzIcon {
|
||||
name: root.badgeState === 3 ? "user" : "cloud-off"
|
||||
width: 15
|
||||
height: 15
|
||||
tintName: "muted"
|
||||
}
|
||||
Text {
|
||||
width: parent.width - 23
|
||||
text: root.badgeState === 3
|
||||
? (QbzBridge.connectivity === 2
|
||||
? QbzBridge.tr("You're signed out. Sign-in needs a connection.")
|
||||
: QbzBridge.connectivity === 1
|
||||
? QbzBridge.tr("Connection available — sign back in to Qobuz.")
|
||||
: QbzBridge.tr("You're signed out — sign back in to Qobuz."))
|
||||
: root.badgeState === 2
|
||||
? QbzBridge.tr("Offline mode is enabled. Disable it in Settings to use Qobuz.")
|
||||
: QbzBridge.tr("No internet connection — your local library and downloads keep working.")
|
||||
color: theme.textPrimary
|
||||
font.pixelSize: 12
|
||||
wrapMode: Text.WordWrap
|
||||
}
|
||||
}
|
||||
// Sign in — logged-out state only; disabled only when the
|
||||
// link is CONFIRMED down.
|
||||
Item {
|
||||
visible: root.badgeState === 3
|
||||
width: parent.width
|
||||
height: visible ? 32 : 0
|
||||
Rectangle {
|
||||
anchors.right: parent.right
|
||||
width: signInText.implicitWidth + 28
|
||||
height: 32
|
||||
radius: theme.radiusSm
|
||||
border.width: 1
|
||||
border.color: theme.borderSubtle
|
||||
opacity: QbzBridge.connectivity === 2 ? 0.4 : 1.0
|
||||
color: signInArea.containsMouse ? theme.surfaceHover : theme.surfaceElevated
|
||||
Text {
|
||||
id: signInText
|
||||
anchors.centerIn: parent
|
||||
text: QbzBridge.tr("Sign in")
|
||||
color: theme.textSecondary
|
||||
font.pixelSize: 13
|
||||
}
|
||||
MouseArea {
|
||||
id: signInArea
|
||||
anchors.fill: parent
|
||||
enabled: QbzBridge.connectivity !== 2
|
||||
hoverEnabled: true
|
||||
cursorShape: Qt.PointingHandCursor
|
||||
onClicked: {
|
||||
QbzBridge.recoveryLogin()
|
||||
badgeFlyout.close()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
// POC-NOTE: the manual-offline quick toggle (state 2)
|
||||
// needs OfflineModeActions.set-offline — not wired; the
|
||||
// status text above still renders.
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
HeaderIconBtn {
|
||||
name: "menu"
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
onClicked: appMenu.open()
|
||||
}
|
||||
}
|
||||
|
||||
// --- App menu (stub: user block + Log Out + Close) --------------------
|
||||
// POC-NOTE: the Slint menu also carries Settings / Open Music Link /
|
||||
// Keyboard Shortcuts / Documentation / Report an Issue / What's New /
|
||||
// About QBZ — omitted here (no views/dialogs to open yet).
|
||||
Popup {
|
||||
id: appMenu
|
||||
x: root.width - 234 - theme.spacingMd
|
||||
y: theme.headerHeight - 4
|
||||
width: 234
|
||||
padding: 0
|
||||
closePolicy: Popup.CloseOnPressOutside
|
||||
|
||||
background: Rectangle {
|
||||
color: theme.surfaceMain
|
||||
radius: theme.radiusSm
|
||||
border.width: 1
|
||||
border.color: theme.borderMuted
|
||||
}
|
||||
contentItem: Column {
|
||||
width: parent.width
|
||||
topPadding: 6
|
||||
bottomPadding: 6
|
||||
|
||||
// Signed-in user — name and subscription tier.
|
||||
Column {
|
||||
width: parent.width
|
||||
leftPadding: 14
|
||||
rightPadding: 14
|
||||
topPadding: 6
|
||||
bottomPadding: 10
|
||||
spacing: 2
|
||||
Text {
|
||||
text: QbzBridge.sessionUserName === ""
|
||||
? QbzBridge.tr("Guest") : QbzBridge.sessionUserName
|
||||
color: theme.textPrimary
|
||||
font.pixelSize: theme.fontBody
|
||||
font.weight: theme.weightSemibold
|
||||
}
|
||||
Text {
|
||||
text: QbzBridge.sessionSubscription === ""
|
||||
? QbzBridge.tr("Not signed in") : QbzBridge.sessionSubscription
|
||||
color: theme.textMuted
|
||||
font.pixelSize: 12
|
||||
}
|
||||
}
|
||||
Rectangle { width: parent.width; height: 1; color: theme.borderSubtle }
|
||||
Item { width: 1; height: 4 }
|
||||
|
||||
// One menu row (MenuItem).
|
||||
component AppMenuItem: Rectangle {
|
||||
property string name: ""
|
||||
property string label: ""
|
||||
signal clicked()
|
||||
|
||||
width: parent ? parent.width : 0
|
||||
height: 34
|
||||
color: miArea.containsMouse ? theme.surfaceHover : "transparent"
|
||||
Row {
|
||||
anchors.fill: parent
|
||||
anchors.leftMargin: 12
|
||||
anchors.rightMargin: 18
|
||||
spacing: 10
|
||||
QbzIcon {
|
||||
name: parent.parent.name
|
||||
width: 15
|
||||
height: 15
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
tintName: "secondary"
|
||||
}
|
||||
Text {
|
||||
height: parent.height
|
||||
text: parent.parent.label
|
||||
color: theme.textSecondary
|
||||
font.pixelSize: 13
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
}
|
||||
}
|
||||
MouseArea {
|
||||
id: miArea
|
||||
anchors.fill: parent
|
||||
hoverEnabled: true
|
||||
cursorShape: Qt.PointingHandCursor
|
||||
onClicked: parent.clicked()
|
||||
}
|
||||
}
|
||||
|
||||
AppMenuItem {
|
||||
name: "log-out"
|
||||
label: QbzBridge.tr("Log Out")
|
||||
onClicked: {
|
||||
appMenu.close()
|
||||
QbzBridge.logout()
|
||||
}
|
||||
}
|
||||
AppMenuItem {
|
||||
name: "x"
|
||||
label: QbzBridge.tr("Close")
|
||||
// POC-NOTE: the Slint app hides to tray / follows the
|
||||
// platform close behavior; the POC just quits.
|
||||
onClicked: Qt.quit()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user