lainns-mirror/noctalia-shell
1
0
Fork 0
mirror of https://github.com/noctalia-dev/noctalia-shell.git synced 2026-05-11 17:08:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:noctalia-dev/noctalia-shell

Browse Source
This commit is contained in:
Lemmy
2026-01-07 08:42:20 -05:00
parent ea52f5dfb1 b3cfdee9d0
commit c3c0de19d6
17 changed files with 511 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Translations/de.json
+1
View File
@@ -387,6 +387,7 @@
"logout": "Abmelden",
"look": "Schau",
"media": "Medien",
"media-player": "Medienwiedergabe",
"memory": "Gedächtnis",
"monitors": "Monitore",
"network": "Netzwerk",
Assets/Translations/en.json
+1
View File
@@ -387,6 +387,7 @@
"logout": "Logout",
"look": "Look",
"media": "Media",
"media-player": "Media Player",
"memory": "Memory",
"monitors": "Monitors",
"network": "Network",
Assets/Translations/es.json
+1
View File
@@ -387,6 +387,7 @@
"logout": "Cerrar sesión",
"look": "Mira",
"media": "Medios",
"media-player": "Reproductor multimedia",
"memory": "Memoria",
"monitors": "Monitores",
"network": "Red",
Assets/Translations/fr.json
+1
View File
@@ -387,6 +387,7 @@
"logout": "Déconnexion",
"look": "Regarde.",
"media": "Médias",
"media-player": "Lecteur multimédia",
"memory": "Mémoire",
"monitors": "Écrans",
"network": "Réseau",
Assets/Translations/hu.json
+1
View File
@@ -387,6 +387,7 @@
"logout": "Kijelentkezés",
"look": "Nézz!",
"media": "Média",
"media-player": "Médialejátszó",
"memory": "Memória",
"monitors": "Monitorok",
"network": "Hálózat",
Assets/Translations/ja.json
+1
View File
@@ -387,6 +387,7 @@
"logout": "ログアウト",
"look": "見る (miru)",
"media": "メディア",
"media-player": "メディアプレーヤー",
"memory": "記憶",
"monitors": "モニタ",
"network": "ネットワーク",
Assets/Translations/ku.json
+1
View File
@@ -387,6 +387,7 @@
"logout": "Derketina ji sîstemê",
"look": "Binêre",
"media": "Medya",
"media-player": "Lîstikvanê Medyayê",
"memory": "Bîr",
"monitors": "Çavdêr",
"network": "Torağ",
Assets/Translations/nl.json
+1
View File
@@ -387,6 +387,7 @@
"logout": "Uitloggen",
"look": "Kijk",
"media": "Media",
"media-player": "Mediaspeler",
"memory": "Geheugen",
"monitors": "Monitoren",
"network": "Netwerk",
Assets/Translations/pl.json
+1
View File
@@ -387,6 +387,7 @@
"logout": "Wyloguj się",
"look": "Spójrz.",
"media": "Media",
"media-player": "Odtwarzacz multimedialny",
"memory": "Pamięć",
"monitors": "Monitory",
"network": "Sieć",
Assets/Translations/pt.json
+1
View File
@@ -387,6 +387,7 @@
"logout": "Sair",
"look": "Olhe",
"media": "Mídia",
"media-player": "Reprodutor de mídia",
"memory": "Memória",
"monitors": "Monitores",
"network": "Rede",
Assets/Translations/ru.json
+1
View File
@@ -387,6 +387,7 @@
"logout": "Выйти",
"look": "Смотри.",
"media": "СМИ",
"media-player": "Медиаплеер",
"memory": "Память",
"monitors": "Мониторы",
"network": "Сеть",
Assets/Translations/tr.json
+1
View File
@@ -387,6 +387,7 @@
"logout": "Çıkış Yap",
"look": "Bak.",
"media": "Medya",
"media-player": "Medya Oynatıcı",
"memory": "Hafıza",
"monitors": "Monitörler",
"network": "Ağ",
Assets/Translations/uk-UA.json
+1
View File
@@ -387,6 +387,7 @@
"logout": "Вийти",
"look": "Подивись",
"media": "Медіа",
"media-player": "Медіапрогравач",
"memory": "Пам'ять",
"monitors": "Монітори",
"network": "Мережа",
Assets/Translations/zh-CN.json
+1
View File
@@ -387,6 +387,7 @@
"logout": "退出登录",
"look": "看",
"media": "媒体",
"media-player": "媒体播放器",
"memory": "记忆",
"monitors": "显示器",
"network": "网络",
Modules/Bar/Widgets/MediaMini.qml
+4 -4
View File
@@ -86,7 +86,7 @@ Item {
readonly property string tooltipText: {
var text = title;
var controls = [];
// Right click now opens options, including player selection
controls.push("Left click to open player.");
controls.push("Right click for options.");
if (MediaService.canGoPrevious)
controls.push("Middle click for previous.");
@@ -401,12 +401,12 @@ Item {
MouseArea {
anchors.fill: parent
hoverEnabled: true
cursorShape: hasPlayer ? Qt.PointingHandCursor : Qt.ArrowCursor
cursorShape: Qt.PointingHandCursor
acceptedButtons: Qt.LeftButton | Qt.RightButton | Qt.MiddleButton
onClicked: mouse => {
if (mouse.button === Qt.LeftButton && hasPlayer && MediaService.canPlay) {
MediaService.playPause();
if (mouse.button === Qt.LeftButton) {
PanelService.getPanel("mediaPlayerPanel", screen)?.toggle(container);
} else if (mouse.button === Qt.RightButton) {
TooltipService.hide();
var popupWindow = PanelService.getPopupMenuWindow(screen);
Modules/MainScreen/MainScreen.qml
+7
View File
@@ -18,6 +18,7 @@ import qs.Modules.Panels.Changelog
import qs.Modules.Panels.Clock
import qs.Modules.Panels.ControlCenter
import qs.Modules.Panels.Launcher
import qs.Modules.Panels.Media
import qs.Modules.Panels.Network
import qs.Modules.Panels.NotificationHistory
import qs.Modules.Panels.Plugins
@@ -195,6 +196,12 @@ PanelWindow {
screen: root.screen
}
MediaPlayerPanel {
id: mediaPlayerPanel
objectName: "mediaPlayerPanel-" + (root.screen?.name || "unknown")
screen: root.screen
}
BatteryPanel {
id: batteryPanel
objectName: "batteryPanel-" + (root.screen?.name || "unknown")
Modules/Panels/Media/MediaPlayerPanel.qml
+486
View File
@@ -0,0 +1,486 @@
import QtQuick
import QtQuick.Controls
import QtQuick.Effects
import QtQuick.Layouts
import Quickshell
import qs.Commons
import qs.Modules.MainScreen
import qs.Services.Media
import qs.Services.UI
import qs.Widgets
import qs.Widgets.AudioSpectrum
SmartPanel {
id: root
preferredWidth: Math.round(400 * Style.uiScaleRatio)
preferredHeight: Math.round((root.showAlbumArt ? 520 : 260) * Style.uiScaleRatio)
readonly property var mediaMiniSettings: {
try {
var widgets = Settings.data.bar.widgets;
var sections = ["left", "center", "right"];
for (var i = 0; i < sections.length; i++) {
var list = widgets[sections[i]];
if (list) {
for (var j = 0; j < list.length; j++) {
if (list[j].id === "MediaMini") {
return list[j];
}
}
}
}
} catch (e) {}
return {};
}
readonly property string visualizerType: (mediaMiniSettings && mediaMiniSettings.visualizerType !== undefined) ? mediaMiniSettings.visualizerType : "linear"
readonly property bool showArtistFirst: !!(mediaMiniSettings && mediaMiniSettings.showArtistFirst !== undefined ? mediaMiniSettings.showArtistFirst : true)
readonly property bool showAlbumArt: !!(mediaMiniSettings && mediaMiniSettings.showAlbumArt !== undefined ? mediaMiniSettings.showAlbumArt : true)
readonly property bool showVisualizer: !!(mediaMiniSettings && mediaMiniSettings.showVisualizer !== undefined ? mediaMiniSettings.showVisualizer : true)
readonly property bool needsCava: root.showVisualizer && root.visualizerType !== "" && root.visualizerType !== "none" && root.isPanelOpen
onNeedsCavaChanged: {
if (root.needsCava) {
CavaService.registerComponent("mediaplayerpanel");
} else {
CavaService.unregisterComponent("mediaplayerpanel");
}
}
Component.onCompleted: {
if (root.needsCava) {
CavaService.registerComponent("mediaplayerpanel");
}
}
Component.onDestruction: {
CavaService.unregisterComponent("mediaplayerpanel");
}
panelContent: Item {
id: playerContent
anchors.fill: parent
Loader {
id: visualizerLoaderCompact
anchors.fill: parent
anchors.margins: Style.marginL
z: 0
active: !!(root.needsCava && !root.showAlbumArt)
sourceComponent: visualizerSource
}
property Component visualizerSource: {
switch (root.visualizerType) {
case "linear":
return linearComponent;
case "mirrored":
return mirroredComponent;
case "wave":
return waveComponent;
default:
return null;
}
}
// Main Column
ColumnLayout {
id: mainLayout
anchors.fill: parent
anchors.margins: Style.marginL
spacing: Style.marginL
z: 1
RowLayout {
Layout.fillWidth: true
spacing: Style.marginS
NIcon {
icon: "music"
pointSize: Style.fontSizeL
color: Color.mPrimary
}
NText {
text: I18n.tr("common.media-player")
font.weight: Style.fontWeightBold
pointSize: Style.fontSizeL
color: Color.mOnSurface
Layout.fillWidth: true
}
Rectangle {
radius: Style.radiusS
color: playerSelectorMouse.containsMouse ? Color.mHover : "transparent"
implicitWidth: playerRow.implicitWidth + Style.marginM
implicitHeight: Style.baseWidgetSize * 0.8
visible: MediaService.getAvailablePlayers().length > 1
RowLayout {
id: playerRow
anchors.centerIn: parent
spacing: Style.marginXS
NText {
text: MediaService.currentPlayer ? MediaService.currentPlayer.identity : "Select Player"
pointSize: Style.fontSizeXS
color: Color.mOnSurfaceVariant
}
NIcon {
icon: "chevron-down"
pointSize: Style.fontSizeXS
color: Color.mOnSurfaceVariant
}
}
MouseArea {
id: playerSelectorMouse
anchors.fill: parent
hoverEnabled: true
cursorShape: Qt.PointingHandCursor
onClicked: playerContextMenu.open()
}
Popup {
id: playerContextMenu
x: 0
y: parent.height
width: 160
padding: Style.marginS
background: Rectangle {
color: Color.mSurfaceVariant
border.color: Color.mOutline
border.width: Style.borderS
radius: Style.iRadiusM
}
contentItem: ColumnLayout {
spacing: 0
Repeater {
model: MediaService.getAvailablePlayers()
delegate: Rectangle {
Layout.fillWidth: true
Layout.preferredHeight: 30
color: "transparent"
Rectangle {
anchors.fill: parent
color: itemMouse.containsMouse ? Color.mHover : "transparent"
radius: Style.iRadiusS
}
RowLayout {
anchors.fill: parent
anchors.margins: Style.marginS
spacing: Style.marginS
NIcon {
visible: MediaService.currentPlayer && MediaService.currentPlayer.identity === modelData.identity
icon: "check"
color: Color.mPrimary
pointSize: Style.fontSizeS
}
NText {
text: modelData.identity
pointSize: Style.fontSizeS
color: itemMouse.containsMouse ? Color.mOnHover : Color.mOnSurface
Layout.fillWidth: true
elide: Text.ElideRight
}
}
MouseArea {
id: itemMouse
anchors.fill: parent
hoverEnabled: true
cursorShape: Qt.PointingHandCursor
onClicked: {
MediaService.currentPlayer = modelData;
playerContextMenu.close();
}
}
}
}
}
}
}
}
// Album Art
Item {
id: albumArtItem
Layout.fillWidth: true
Layout.fillHeight: true
Layout.minimumHeight: 200
visible: root.showAlbumArt
Item {
anchors.fill: parent
layer.enabled: true
layer.effect: MultiEffect {
maskEnabled: true
maskSource: ShaderEffectSource {
sourceItem: maskRect
hideSource: true
}
}
Rectangle {
id: maskRect
anchors.fill: parent
radius: Style.radiusL
color: "white"
visible: false
}
Rectangle {
anchors.fill: parent
color: Color.mSurfaceVariant
}
Image {
id: albumArt
anchors.fill: parent
source: MediaService.trackArtUrl
fillMode: Image.PreserveAspectCrop
asynchronous: true
visible: root.showAlbumArt && source != ""
}
// Fallback Icon
NIcon {
anchors.centerIn: parent
icon: "disc"
pointSize: Style.fontSizeXXXL * 2
color: Color.mOnSurfaceVariant
visible: root.showAlbumArt && albumArt.status !== Image.Ready
}
Loader {
anchors.fill: parent
anchors.margins: Style.marginS
z: 2
active: !!(root.needsCava && root.showAlbumArt)
sourceComponent: visualizerSource
}
}
}
Component {
id: linearComponent
NLinearSpectrum {
values: CavaService.values
fillColor: Color.mPrimary
opacity: 0.8
anchors.bottom: parent.bottom
height: parent.height * 0.4
width: parent.width
}
}
Component {
id: mirroredComponent
NMirroredSpectrum {
values: CavaService.values
fillColor: Color.mPrimary
opacity: 0.8
anchors.centerIn: parent
anchors.top: parent.top
anchors.bottom: parent.bottom
width: parent.width
}
}
Component {
id: waveComponent
NWaveSpectrum {
values: CavaService.values
fillColor: Color.mPrimary
opacity: 0.8
anchors.centerIn: parent
anchors.top: parent.top
anchors.bottom: parent.bottom
width: parent.width
}
}
ColumnLayout {
id: controlsLayout
Layout.fillWidth: true
spacing: Style.marginS
// Track Info
ColumnLayout {
Layout.fillWidth: true
spacing: 0
NText {
text: {
if (root.showArtistFirst) {
return MediaService.trackArtist || (MediaService.trackAlbum || "Unknown Artist");
} else {
return MediaService.trackTitle || "No Media";
}
}
pointSize: Style.fontSizeXL
font.weight: Style.fontWeightBold
color: Color.mOnSurface
Layout.fillWidth: true
horizontalAlignment: Text.AlignHCenter
elide: Text.ElideRight
wrapMode: Text.Wrap
maximumLineCount: 2
}
NText {
text: {
if (root.showArtistFirst) {
return MediaService.trackTitle || "No Media";
} else {
return MediaService.trackArtist || (MediaService.trackAlbum || "Unknown Artist");
}
}
pointSize: Style.fontSizeM
color: Color.mOnSurfaceVariant
Layout.fillWidth: true
horizontalAlignment: Text.AlignHCenter
elide: Text.ElideRight
}
}
// Progress Bar
Item {
id: progressWrapper
visible: (MediaService.currentPlayer && MediaService.trackLength > 0)
Layout.fillWidth: true
height: Style.baseWidgetSize * 0.5
property real localSeekRatio: -1
property real lastSentSeekRatio: -1
property real seekEpsilon: 0.01
property real progressRatio: {
if (!MediaService.currentPlayer || MediaService.trackLength <= 0)
return 0;
const r = MediaService.currentPosition / MediaService.trackLength;
if (isNaN(r) || !isFinite(r))
return 0;
return Math.max(0, Math.min(1, r));
}
Timer {
id: seekDebounce
interval: 75
repeat: false
onTriggered: {
if (MediaService.isSeeking && progressWrapper.localSeekRatio >= 0) {
const next = Math.max(0, Math.min(1, progressWrapper.localSeekRatio));
if (progressWrapper.lastSentSeekRatio < 0 || Math.abs(next - progressWrapper.lastSentSeekRatio) >= progressWrapper.seekEpsilon) {
MediaService.seekByRatio(next);
progressWrapper.lastSentSeekRatio = next;
}
}
}
}
NSlider {
id: progressSlider
anchors.fill: parent
from: 0
to: 1
stepSize: 0
snapAlways: false
enabled: MediaService.trackLength > 0 && MediaService.canSeek
heightRatio: 0.4
value: (!MediaService.isSeeking) ? progressWrapper.progressRatio : (progressWrapper.localSeekRatio >= 0 ? progressWrapper.localSeekRatio : 0)
onMoved: {
progressWrapper.localSeekRatio = value;
seekDebounce.restart();
}
onPressedChanged: {
if (pressed) {
MediaService.isSeeking = true;
progressWrapper.localSeekRatio = value;
MediaService.seekByRatio(value);
progressWrapper.lastSentSeekRatio = value;
} else {
seekDebounce.stop();
MediaService.seekByRatio(value);
MediaService.isSeeking = false;
progressWrapper.localSeekRatio = -1;
progressWrapper.lastSentSeekRatio = -1;
}
}
}
NText {
anchors.left: parent.left
anchors.top: parent.bottom
text: MediaService.positionString || "0:00"
pointSize: Style.fontSizeXS
color: Color.mOnSurfaceVariant
visible: parent.visible
}
NText {
anchors.right: parent.right
anchors.top: parent.bottom
text: MediaService.lengthString || "0:00"
pointSize: Style.fontSizeXS
color: Color.mOnSurfaceVariant
visible: parent.visible
}
}
Item {
Layout.preferredHeight: Style.marginS
}
RowLayout {
Layout.alignment: Qt.AlignHCenter
spacing: Style.marginXL
NIconButton {
icon: "media-prev"
baseSize: Style.baseWidgetSize * 1.2
onClicked: MediaService.previous()
}
// Play/Pause
Rectangle {
implicitWidth: Style.baseWidgetSize * 1.8
implicitHeight: Style.baseWidgetSize * 1.8
radius: Style.radiusL
color: Color.mPrimary
NIcon {
anchors.centerIn: parent
icon: MediaService.isPlaying ? "media-pause" : "media-play"
pointSize: Style.fontSizeXXL
color: Color.mOnPrimary
}
MouseArea {
anchors.fill: parent
cursorShape: Qt.PointingHandCursor
hoverEnabled: true
onEntered: parent.color = Color.mPrimary
onClicked: MediaService.playPause()
}
}
NIconButton {
icon: "media-next"
baseSize: Style.baseWidgetSize * 1.2
onClicked: MediaService.next()
}
}
}
}
}
}