ajout plasma-workspace modifié pour ne plus avoir de dependance avec phonon
This commit is contained in:
jeremy
17
kde-plasma/plasma-workspace/files/10-agent-shutdown.sh
Normal file
17
kde-plasma/plasma-workspace/files/10-agent-shutdown.sh
Normal file
@@ -0,0 +1,17 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# This file is executed at Plasma shutdown.
|
||||
# Uncomment the following lines to kill the agents
|
||||
# that were started at session startup.
|
||||
|
||||
# <gnupg-2.1.x
|
||||
#if [ -n "${GPG_AGENT_INFO}" ]; then
|
||||
# kill $(echo ${GPG_AGENT_INFO} | cut -d':' -f 2) >/dev/null 2>&1
|
||||
#fi
|
||||
|
||||
# >=gnupg-2.1.x
|
||||
#gpgconf --kill gpg-agent >/dev/null 2>&1
|
||||
|
||||
#if [ -n "${SSH_AGENT_PID}" ]; then
|
||||
# eval "$(ssh-agent -s -k)"
|
||||
#fi
|
||||
58
kde-plasma/plasma-workspace/files/10-agent-startup.sh
Normal file
58
kde-plasma/plasma-workspace/files/10-agent-startup.sh
Normal file
@@ -0,0 +1,58 @@
|
||||
# Agents startup file
|
||||
#
|
||||
# This file is sourced at Plasma startup, so that
|
||||
# the environment variables set here are available
|
||||
# throughout the session.
|
||||
#
|
||||
# Uncomment the following lines to start gpg-agent
|
||||
# and/or ssh-agent at Plasma startup.
|
||||
# If you do so, do not forget to uncomment the respective
|
||||
# lines in PLASMADIR/shutdown/agent-shutdown.sh to
|
||||
# properly kill the agents when the session ends.
|
||||
#
|
||||
# If using gpg-agent for ssh instead of ssh-agent, a GUI pinentry program
|
||||
# must be selected either with eselect pinentry or adding an entry to
|
||||
# $HOME/.gnupg/gpg-agent.conf such as "pinentry-program /usr/bin/pinentry-qt".
|
||||
#
|
||||
# If using gnupg-2.1 or later with gpg-agent for ssh instead of ssh-agent,
|
||||
# $HOME/.gnupg/gpg-agent.conf must be edited to include "enable-ssh-support".
|
||||
# See bug #547544 for details of why.
|
||||
#
|
||||
# pinentry-curses or pinentry-tty will not work because the agent started here
|
||||
# is in a different tty than where it is used, so the agent does not know where
|
||||
# to request the passphrase and fails.
|
||||
|
||||
#GPG_AGENT=true
|
||||
#SSH_AGENT=true
|
||||
#SSH_AGENT=gpg # use gpg-agent for ssh instead of ssh-agent
|
||||
|
||||
if [ "${GPG_AGENT}" = true ]; then
|
||||
if [ -x /usr/bin/gpgconf ]; then
|
||||
gpgconf --launch gpg-agent >/dev/null 2>&1
|
||||
if [ $? = 2 ]; then
|
||||
eval "$(/usr/bin/gpg-agent --enable-ssh-support --daemon)"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "${SSH_AGENT}" = true ]; then
|
||||
if [ -x /usr/bin/ssh-agent ]; then
|
||||
eval "$(/usr/bin/ssh-agent -s)"
|
||||
fi
|
||||
elif [ "${SSH_AGENT}" = gpg ] && [ "${GPG_AGENT}" = true ]; then
|
||||
if [ -e /run/user/$(id -ru)/gnupg/S.gpg-agent.ssh ]; then
|
||||
export SSH_AUTH_SOCK=/run/user/$(id -ru)/gnupg/S.gpg-agent.ssh
|
||||
elif [ -e "${HOME}/.gnupg/S.gpg-agent.ssh" ]; then
|
||||
export SSH_AUTH_SOCK=${HOME}/.gnupg/S.gpg-agent.ssh
|
||||
fi
|
||||
fi
|
||||
|
||||
# Uncomment the following lines to start rxvt-unicode which has the ability to
|
||||
# run multiple terminals in one single process, thus starting up faster and
|
||||
# saving resources.
|
||||
# The --opendisplay ensures that the daemon quits when the X server terminates,
|
||||
# therefore we don't need matching lines in agent-shutdown.sh.
|
||||
|
||||
#if [ -x /usr/bin/urxvtd ]; then
|
||||
# /usr/bin/urxvtd --opendisplay --fork --quiet
|
||||
#fi
|
||||
@@ -0,0 +1,39 @@
|
||||
From 9a294b8a91170ed2bd5c75a65c81fee7c58839d2 Mon Sep 17 00:00:00 2001
|
||||
From: Fushan Wen <qydwhotmail@gmail.com>
|
||||
Date: Fri, 9 Aug 2024 00:57:00 +0000
|
||||
Subject: [PATCH] applets/mediacontroller: use Play/Pause to control players
|
||||
|
||||
Some players don't report updated CanPlay or CanPause properties to
|
||||
MPRIS, which is a problem for PlayPause() as it requires the player can
|
||||
play and pause at the same time. Use Play/Pause to work around it.
|
||||
|
||||
CCBUG: 490569
|
||||
|
||||
|
||||
(cherry picked from commit c5edc144665a0d814a908ae6a120a288f7965d7d)
|
||||
|
||||
Co-authored-by: Fushan Wen <qydwhotmail@gmail.com>
|
||||
---
|
||||
applets/mediacontroller/package/contents/ui/main.qml | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/applets/mediacontroller/package/contents/ui/main.qml b/applets/mediacontroller/package/contents/ui/main.qml
|
||||
index 885c972ae71..fa09d2a86c4 100644
|
||||
--- a/applets/mediacontroller/package/contents/ui/main.qml
|
||||
+++ b/applets/mediacontroller/package/contents/ui/main.qml
|
||||
@@ -174,7 +174,11 @@ PlasmoidItem {
|
||||
mpris2Model.currentPlayer.Pause();
|
||||
}
|
||||
function togglePlaying() {
|
||||
- mpris2Model.currentPlayer.PlayPause();
|
||||
+ if (root.isPlaying) {
|
||||
+ mpris2Model.currentPlayer.Pause();
|
||||
+ } else {
|
||||
+ mpris2Model.currentPlayer.Play();
|
||||
+ }
|
||||
}
|
||||
function stop() {
|
||||
mpris2Model.currentPlayer.Stop();
|
||||
--
|
||||
GitLab
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
From 1ff8f37f6a8fb47697364d56460989abbd764bbf Mon Sep 17 00:00:00 2001
|
||||
From: Fushan Wen <qydwhotmail@gmail.com>
|
||||
Date: Fri, 9 Aug 2024 00:57:31 +0000
|
||||
Subject: [PATCH] libkmpris: refresh player when track list changes
|
||||
|
||||
For some players when the current track list changes, it doesn't emit
|
||||
all changed properties for org.mpris.MediaPlayer2.Player. This adds a
|
||||
check for the track list so when the track list changes, the player
|
||||
information is refreshed.
|
||||
|
||||
BUG: 490569
|
||||
FIXED-IN: 6.1.5
|
||||
|
||||
|
||||
(cherry picked from commit 627f5418409f2e362fb83f6fdb6f427221460a0c)
|
||||
|
||||
Co-authored-by: Fushan Wen <qydwhotmail@gmail.com>
|
||||
---
|
||||
libkmpris/playercontainer.cpp | 8 ++------
|
||||
1 file changed, 2 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/libkmpris/playercontainer.cpp b/libkmpris/playercontainer.cpp
|
||||
index f48103d507d..c8d37efae5e 100644
|
||||
--- a/libkmpris/playercontainer.cpp
|
||||
+++ b/libkmpris/playercontainer.cpp
|
||||
@@ -711,15 +711,11 @@ void PlayerContainer::onGetPropsFinished(QDBusPendingCallWatcher *watcher)
|
||||
|
||||
void PlayerContainer::onPropertiesChanged(const QString &interfaceName, const QVariantMap &changedProperties, const QStringList &invalidatedProperties)
|
||||
{
|
||||
- if (interfaceName != QLatin1String("org.mpris.MediaPlayer2.Player") && interfaceName != QLatin1String("org.mpris.MediaPlayer2")) {
|
||||
- // org.mpris.MediaPlayer2.TrackList is ignored for now
|
||||
- return;
|
||||
- }
|
||||
- if (!invalidatedProperties.empty()) {
|
||||
+ if (!invalidatedProperties.empty() || interfaceName == u"org.mpris.MediaPlayer2.TrackList") {
|
||||
disconnect(m_propsIface, &OrgFreedesktopDBusPropertiesInterface::PropertiesChanged, this, &PlayerContainer::onPropertiesChanged);
|
||||
disconnect(m_playerIface, &OrgMprisMediaPlayer2PlayerInterface::Seeked, this, &PlayerContainer::onSeeked);
|
||||
refresh();
|
||||
- } else {
|
||||
+ } else if (interfaceName == u"org.mpris.MediaPlayer2.Player" || interfaceName == u"org.mpris.MediaPlayer2") [[likely]] {
|
||||
updateFromMap(changedProperties);
|
||||
}
|
||||
}
|
||||
--
|
||||
GitLab
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
From ab80bee1724804650147a1c9485ee67ae4f42f83 Mon Sep 17 00:00:00 2001
|
||||
From: Marco Martin <notmart@gmail.com>
|
||||
Date: Mon, 12 Aug 2024 18:56:04 +0000
|
||||
Subject: [PATCH] Fix svg images
|
||||
|
||||
Image delegate needs to be loaded also for ScalableImage
|
||||
|
||||
BUG:491369
|
||||
|
||||
|
||||
(cherry picked from commit 1c6e817a476e76970437faa7fef1dbdc5d3be082)
|
||||
|
||||
1c6e817a Fix svg images
|
||||
|
||||
Co-authored-by: Marco Martin <notmart@gmail.com>
|
||||
---
|
||||
wallpapers/image/imagepackage/contents/ui/ImageStackView.qml | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/wallpapers/image/imagepackage/contents/ui/ImageStackView.qml b/wallpapers/image/imagepackage/contents/ui/ImageStackView.qml
|
||||
index 70545d8814e..bbf64138a4b 100644
|
||||
--- a/wallpapers/image/imagepackage/contents/ui/ImageStackView.qml
|
||||
+++ b/wallpapers/image/imagepackage/contents/ui/ImageStackView.qml
|
||||
@@ -43,7 +43,8 @@ QQC2.StackView {
|
||||
|
||||
function createBackgroundComponent() {
|
||||
switch (mediaProxy.backgroundType) {
|
||||
- case Wallpaper.BackgroundType.Image: {
|
||||
+ case Wallpaper.BackgroundType.Image:
|
||||
+ case Wallpaper.BackgroundType.VectorImage: {
|
||||
if (!staticImageComponent) {
|
||||
staticImageComponent = Qt.createComponent("mediacomponent/StaticImageComponent.qml");
|
||||
}
|
||||
--
|
||||
GitLab
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
From 84d0555e4484cde0cfd41c63047b69381e511767 Mon Sep 17 00:00:00 2001
|
||||
From: Yifan Zhu <fanzhuyifan@gmail.com>
|
||||
Date: Wed, 7 Aug 2024 17:12:02 +0000
|
||||
Subject: [PATCH] shell/panelview: restart unhide timer on drag leave
|
||||
|
||||
Otherwise the autohide and dodge windows panels don't rehide when
|
||||
leaving them during drag and drop.
|
||||
|
||||
CCBUG: 450579
|
||||
|
||||
|
||||
(cherry picked from commit 72e963100eb630771a9f2b7ce57375a7ddc0f59f)
|
||||
|
||||
Co-authored-by: Yifan Zhu <fanzhuyifan@gmail.com>
|
||||
---
|
||||
shell/panelview.cpp | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/shell/panelview.cpp b/shell/panelview.cpp
|
||||
index 095315a8c85..5a88764cf3c 100644
|
||||
--- a/shell/panelview.cpp
|
||||
+++ b/shell/panelview.cpp
|
||||
@@ -1194,8 +1194,11 @@ bool PanelView::event(QEvent *e)
|
||||
}
|
||||
break;
|
||||
}
|
||||
- // DragLeave just works
|
||||
case QEvent::DragLeave:
|
||||
+ m_containsMouse = false;
|
||||
+ if (edgeActivated()) {
|
||||
+ m_unhideTimer.start();
|
||||
+ }
|
||||
break;
|
||||
case QEvent::DragMove: {
|
||||
QDragMoveEvent *de = static_cast<QDragMoveEvent *>(e);
|
||||
--
|
||||
GitLab
|
||||
|
||||
Reference in New Issue
Block a user