From d73bcdb00e00cd00afc82dafcb6da744aaa80728 Mon Sep 17 00:00:00 2001 From: Abdel-Rahman Abdel-Rahman Date: Wed, 29 Apr 2020 05:45:25 +0200 Subject: [PATCH 1/4] Unmute audio when volume changes BUG: 408705 --- plugins/systemvolume/systemvolumeplugin-pulse.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/plugins/systemvolume/systemvolumeplugin-pulse.cpp b/plugins/systemvolume/systemvolumeplugin-pulse.cpp index da4fb0a62..5c20638ed 100644 --- a/plugins/systemvolume/systemvolumeplugin-pulse.cpp +++ b/plugins/systemvolume/systemvolumeplugin-pulse.cpp @@ -55,12 +55,15 @@ bool SystemvolumePlugin::receivePacket(const NetworkPacket& np) QString name = np.get(QStringLiteral("name")); - if (sinksMap.contains(name)) { + PulseAudioQt::Sink *sink = sinksMap.value(name); + if (sink) { if (np.has(QStringLiteral("volume"))) { - sinksMap[name]->setVolume(np.get(QStringLiteral("volume"))); + int volume = np.get(QStringLiteral("volume")); + sink->setVolume(volume); + sink->setMuted(false); } if (np.has(QStringLiteral("muted"))) { - sinksMap[name]->setMuted(np.get(QStringLiteral("muted"))); + sink->setMuted(np.get(QStringLiteral("muted"))); } } } From c3375506dbae9b30ae2419066e887ebae4077625 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 10 May 2020 09:13:23 +0200 Subject: [PATCH 2/4] GIT_SILENT made messages (after extraction) --- data/org.kde.kdeconnect.kcm.appdata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/data/org.kde.kdeconnect.kcm.appdata.xml b/data/org.kde.kdeconnect.kcm.appdata.xml index 55f263eb2..32d5a45bc 100644 --- a/data/org.kde.kdeconnect.kcm.appdata.xml +++ b/data/org.kde.kdeconnect.kcm.appdata.xml @@ -105,6 +105,7 @@

KDE-anslut tillhandahåller diverse funktioner för att integrera telefon och dator. Det låter dig skicka filer till den andra apparaten, styr dess medieuppspelning, skickar fjärrinmatning, visar dess underrättelser, med mera. Det är tillgängligt för (mobil) Linux, Android, FreeBSD, Windows och MacOS.

За допомогою KDE Connect ви зможете скористатися інтеграцією вашого телефону і комп'ютера. У цьому комплексі програм реалізовано можливості надсилання файлів на інший пристрій, керування відтворенням мультимедійних даних, введення даних, перегляд сповіщень та багато інших можливостей. Комплекс програм може працювати на (мобільних) платформах Linux, Android, FreeBSD, Windows та macOS.

xxKDE Connect provides various features to integrate your phone and your computer. It allows you to send files to the other device, control its media playback, send remote input, view its notifications and may things more. It is available for (mobile) Linux, Android, FreeBSD, Windows and macOS.xx

+

KDE Connect 提供了各种用于整合您手机和计算机的功能。它使您可以将文件发送到另一台设备，控制它的媒体播放，发送远程输入，查看它的通知，以及做许多其他事情。它在 (移动) Linux，Android，FreeBSD，Windows，和 macOS 上均可用。

KDE 連線提供各種整合手機及電腦的功能，能夠傳送檔案至其他裝置、控制媒體播放、傳送遠端輸入、檢視裝置通知還有更多功能。支援 (手機) Linux、Android、FreeBSD、Windows 和 macOS。

https://community.kde.org/KDEConnect From dc9da25fc9b71370633d05f482003911b24b9436 Mon Sep 17 00:00:00 2001 From: Nicolas Fella Date: Thu, 14 May 2020 15:26:03 +0200 Subject: [PATCH 3/4] Remove windows CI in stable too --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 042f6e1a6..5f817c3b2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,4 +2,3 @@ include: - https://invent.kde.org/sysadmin/ci-tooling/raw/master/invent/ci-before.yml - https://invent.kde.org/sysadmin/ci-tooling/raw/master/invent/ci-extragear-linux.yml - https://invent.kde.org/sysadmin/ci-tooling/raw/master/invent/ci-extragear-freebsd.yml - - https://invent.kde.org/sysadmin/ci-tooling/raw/master/invent/ci-extragear-windows.yml From 4df8dfc882ea3d5acc4ff0c97090fdaffd5ce3f6 Mon Sep 17 00:00:00 2001 From: Nicolas Fella Date: Thu, 14 May 2020 15:06:49 +0200 Subject: [PATCH 4/4] Fix findthisdevice sound URL --- plugins/findthisdevice/findthisdeviceplugin.cpp | 2 +- plugins/findthisdevice/findthisdeviceplugin.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/findthisdevice/findthisdeviceplugin.cpp b/plugins/findthisdevice/findthisdeviceplugin.cpp index eeddb4ec2..5d0df2ae0 100644 --- a/plugins/findthisdevice/findthisdeviceplugin.cpp +++ b/plugins/findthisdevice/findthisdeviceplugin.cpp @@ -47,7 +47,7 @@ bool FindThisDevicePlugin::receivePacket(const NetworkPacket& np) { Q_UNUSED(np); const QString soundFile = config()->get(QStringLiteral("ringtone"), defaultSound()); - const QUrl soundURL = QUrl(soundFile); + const QUrl soundURL = QUrl::fromLocalFile(soundFile); if (soundURL.isEmpty()) { qCWarning(KDECONNECT_PLUGIN_FINDTHISDEVICE) << "Not playing sound, no valid ring tone specified."; return true; diff --git a/plugins/findthisdevice/findthisdeviceplugin.h b/plugins/findthisdevice/findthisdeviceplugin.h index 072715cf9..8b957c259 100644 --- a/plugins/findthisdevice/findthisdeviceplugin.h +++ b/plugins/findthisdevice/findthisdeviceplugin.h @@ -81,7 +81,7 @@ inline QString defaultSound() soundURL = QUrl::fromUserInput(QStringLiteral("Oxygen-Im-Phone-Ring.ogg"), dirPath, QUrl::AssumeLocalFile); - if ((soundURL.isLocalFile() && QFile::exists(soundURL.toLocalFile())) || soundURL.isValid()) { + if ((soundURL.isLocalFile() && soundURL.isValid() && QFile::exists(soundURL.toLocalFile()))) { break; } } @@ -89,7 +89,7 @@ inline QString defaultSound() if (soundURL.isEmpty()) { qCWarning(KDECONNECT_PLUGIN_FINDTHISDEVICE) << "Could not find default ring tone."; } - return soundURL.toString(); + return soundURL.toLocalFile(); } #endif //FINDTHISDEVICEPLUGIN_H