From aaed0138ca8feebb9d45b9c4a2dfd5df651ad972 Mon Sep 17 00:00:00 2001 From: David Edmundson Date: Sat, 20 Jun 2020 18:20:04 +0100 Subject: [PATCH 1/5] Fix case of monitored service in startplasma's shutdown Startplasma monitors ksmserver and tears down the session if it goes away, to match previous behaviour and as some lockscreen bypass protection. When we teardown our new binary plasma-shutdown appears, runs scripts and makes the final shutdown call. ksmserver could gracefully quit in the meantime, so startplasma guarded this case and waited till both names exited. However it contains a really stupid typo. BUG: 422870 --- startkde/startplasma.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp index 7d8631f5a..a055d5635 100644 --- a/startkde/startplasma.cpp +++ b/startkde/startplasma.cpp @@ -384,7 +384,7 @@ bool startPlasmaSession(bool wayland) // We want to exit when both ksmserver and plasma-session-shutdown have finished // This also closes if ksmserver crashes unexpectedly, as in those cases plasma-shutdown is not running serviceWatcher.addWatchedService(QStringLiteral("org.kde.ksmserver")); - serviceWatcher.addWatchedService(QStringLiteral("org.kde.shutdown")); + serviceWatcher.addWatchedService(QStringLiteral("org.kde.Shutdown")); serviceWatcher.setWatchMode(QDBusServiceWatcher::WatchForUnregistration); QObject::connect(&startPlasmaSession, QOverload::of(&QProcess::finished), [&rc, &e](int exitCode, QProcess::ExitStatus) { From 3d224cb1d6b799d42a896055f769974ec76bcc4c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 22 Jun 2020 08:59:15 +0200 Subject: [PATCH 2/5] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- applets/systemmonitor/coreusage/metadata.desktop | 2 ++ applets/systemmonitor/cpu/metadata.desktop | 2 ++ applets/systemmonitor/diskactivity/metadata.desktop | 1 + applets/systemmonitor/diskusage/metadata.desktop | 2 ++ applets/systemmonitor/memory/metadata.desktop | 2 ++ applets/systemmonitor/net/metadata.desktop | 2 ++ applets/systemmonitor/systemmonitor/package/metadata.desktop | 2 ++ 7 files changed, 13 insertions(+) diff --git a/applets/systemmonitor/coreusage/metadata.desktop b/applets/systemmonitor/coreusage/metadata.desktop index eb1687924..8271c4e60 100644 --- a/applets/systemmonitor/coreusage/metadata.desktop +++ b/applets/systemmonitor/coreusage/metadata.desktop @@ -17,6 +17,7 @@ Name[sk]=Využitie jednotlivých jadier Name[sv]=Användning av individuella kärnor Name[uk]=Використання окремих ядер Name[x-test]=xxIndividual Core Usagexx +Name[zh_CN]=单个核心使用 Name[zh_TW]=獨立核心用量 Comment=System monitor Widget that shows usage of individual CPU cores Comment[ca]=Estri del monitor del sistema que mostra l'ús dels nuclis individuals de la CPU @@ -36,6 +37,7 @@ Comment[sk]=Miniaplikácia monitorovania systému, ktorá zobrazuje využitie je Comment[sv]=Grafisk systemövervakningskomponent som visar användning av individuella processorkärnor Comment[uk]=Віджет нагляду за системою, який показує використання окремих ядер процесора Comment[x-test]=xxSystem monitor Widget that shows usage of individual CPU coresxx +Comment[zh_CN]=显示单独CPU核心使用情况的系统监视部件 Comment[zh_TW]=顯示獨立 CPU 核心用量的系統監視器元件 Type=Service Icon=ksysguardd diff --git a/applets/systemmonitor/cpu/metadata.desktop b/applets/systemmonitor/cpu/metadata.desktop index a131406e6..31ced19ac 100644 --- a/applets/systemmonitor/cpu/metadata.desktop +++ b/applets/systemmonitor/cpu/metadata.desktop @@ -18,6 +18,7 @@ Name[sk]=Celkové využitie CPU Name[sv]=Total processoranvändning Name[uk]=Загальне використання процесора Name[x-test]=xxTotal CPU Usexx +Name[zh_CN]=总 CPU 使用 Name[zh_TW]=總 CPU 用量 Comment=System monitor Widget that shows the total CPU usage Comment[ca]=Estri del monitor del sistema que mostra l'ús total de la CPU @@ -37,6 +38,7 @@ Comment[sk]=Miniaplikácia monitorovania systému, ktorá zobrazuje celkové vyu Comment[sv]=Grafisk systemövervakningskomponent som visar total processoranvändning Comment[uk]=Віджет нагляду за системою, який показує загальне використання процесора Comment[x-test]=xxSystem monitor Widget that shows the total CPU usagexx +Comment[zh_CN]=显示总CPU使用率的系统监视部件 Comment[zh_TW]=顯示總 CPU 用量的系統監視器元件 Type=Service Icon=cpu diff --git a/applets/systemmonitor/diskactivity/metadata.desktop b/applets/systemmonitor/diskactivity/metadata.desktop index 37c6b9adb..432e832ce 100644 --- a/applets/systemmonitor/diskactivity/metadata.desktop +++ b/applets/systemmonitor/diskactivity/metadata.desktop @@ -19,6 +19,7 @@ Name[sk]=Aktivita pevného disku Name[sv]=Hårddiskaktivitet Name[uk]=Робота із жорстким диском Name[x-test]=xxHard Disk Activityxx +Name[zh_CN]=磁盘活动 Name[zh_TW]=硬碟活動 Comment=An applet that monitors hard disk throughput and input/output Comment[ar]=بُريْمج يراقب استخدام إنتاجيّة القرص الصلب ودَخْله/خَرْجه diff --git a/applets/systemmonitor/diskusage/metadata.desktop b/applets/systemmonitor/diskusage/metadata.desktop index 14d109731..bc9a20859 100644 --- a/applets/systemmonitor/diskusage/metadata.desktop +++ b/applets/systemmonitor/diskusage/metadata.desktop @@ -19,6 +19,7 @@ Name[sk]=Využitie disku Name[sv]=Diskanvändning Name[uk]=Використання диска Name[x-test]=xxDisk Usagexx +Name[zh_CN]=磁盘使用率 Name[zh_TW]=磁碟用量 Comment=System monitor Widget that shows the usage of the root partition Comment[ca]=Estri del monitor del sistema que mostra l'ús de la partició arrel @@ -37,6 +38,7 @@ Comment[sk]=Miniaplikácia monitorovania systému, ktorá zobrazuje využitie ko Comment[sv]=Grafisk systemövervakningskomponent som visar användning av rotpartitionen Comment[uk]=Віджет нагляду за системою, який показує використання кореневого розділу Comment[x-test]=xxSystem monitor Widget that shows the usage of the root partitionxx +Comment[zh_CN]=显示根分区使用情况的系统监视部件 Comment[zh_TW]=顯示 Root 分割區用量的系統監視器元件 Type=Service Icon=cpu diff --git a/applets/systemmonitor/memory/metadata.desktop b/applets/systemmonitor/memory/metadata.desktop index 539dcda8c..5d88a3ff3 100644 --- a/applets/systemmonitor/memory/metadata.desktop +++ b/applets/systemmonitor/memory/metadata.desktop @@ -19,6 +19,7 @@ Name[sk]=Využitie pamäte Name[sv]=Minnesanvändning Name[uk]=Використання пам'яті Name[x-test]=xxMemory Usagexx +Name[zh_CN]=内存使用 Name[zh_TW]=記憶體用量 Comment=System monitor Widget that shows physical memory usage Comment[ca]=Estri del monitor del sistema que mostra l'ús de la memòria física @@ -37,6 +38,7 @@ Comment[sk]=Miniaplikácia monitorovania systému, ktorá zobrazuje využitie fy Comment[sv]=Grafisk systemövervakningskomponent som fysisk minnesanvändning Comment[uk]=Віджет нагляду за системою, який показує використання фізичної пам'яті Comment[x-test]=xxSystem monitor Widget that shows physical memory usagexx +Comment[zh_CN]=显示物理内存使用情况的系统监视部件 Comment[zh_TW]=顯示實體記憶體用量的系統監視器元件 Type=Service Icon=ksysguardd diff --git a/applets/systemmonitor/net/metadata.desktop b/applets/systemmonitor/net/metadata.desktop index ba1c5ca41..5ebbb8e4b 100644 --- a/applets/systemmonitor/net/metadata.desktop +++ b/applets/systemmonitor/net/metadata.desktop @@ -19,6 +19,7 @@ Name[sk]=Rýchlosť siete Name[sv]=Nätverkshastighet Name[uk]=Швидкість мережі Name[x-test]=xxNetwork speedxx +Name[zh_CN]=网络速度 Name[zh_TW]=網路速度 Comment=System monitor Widget that shows the download and upload data rate Comment[ca]=Estri del monitor del sistema que mostra la velocitat de baixada i pujada de les dades @@ -38,6 +39,7 @@ Comment[sk]=Miniaplikácia monitorovania systému, ktorá zobrazuje množstvo s Comment[sv]=Grafisk systemövervakningskomponent som visar nerladdnings- och uppladdningshastighet för data Comment[uk]=Віджет нагляду за системою, який показує швидкість отримання та вивантаження даних Comment[x-test]=xxSystem monitor Widget that shows the download and upload data ratexx +Comment[zh_CN]=显示下载和上传速率的系统监视部件 Comment[zh_TW]=顯示下載與上傳之資料速率的系統監視器元件 Type=Service diff --git a/applets/systemmonitor/systemmonitor/package/metadata.desktop b/applets/systemmonitor/systemmonitor/package/metadata.desktop index 1169d136f..fdd0fc9ff 100644 --- a/applets/systemmonitor/systemmonitor/package/metadata.desktop +++ b/applets/systemmonitor/systemmonitor/package/metadata.desktop @@ -20,6 +20,7 @@ Name[sk]=Senzor monitorovania systému Name[sv]=Systemövervakningssensor Name[uk]=Датчик нагляду за системою Name[x-test]=xxSystem monitor Sensorxx +Name[zh_CN]=系统监视传感器 Name[zh_TW]=系統監視器感測器 Comment=Displays a configurable chart of a system monitor sensor Comment[ca]=Mostra un diagrama configurable d'un sensor del monitor del sistema @@ -39,6 +40,7 @@ Comment[sk]=Zobrazuje konfigurovateľný graf senzoru monitorovania systému Comment[sv]=Visar ett anpassningsbart diagram av en systemövervakningssensor Comment[uk]=Показує придатну до налаштовування діаграму на основі даних датчика нагляду за системою Comment[x-test]=xxDisplays a configurable chart of a system monitor sensorxx +Comment[zh_CN]=显示系统监视器的可配置图表 Comment[zh_TW]=顯示可設定的系統監視器感測器圖表 Icon=ksysguardd From 09e73292aa3e1d07d531d01bcdd086ab6b7801e7 Mon Sep 17 00:00:00 2001 From: Kai Uwe Broulik Date: Fri, 19 Jun 2020 17:53:55 +0200 Subject: [PATCH 3/5] [Notifications] Support description where only a value is set BUG: 423218 FIXED-IN: 5.19.2 --- applets/notifications/package/contents/ui/JobDetails.qml | 3 +-- libnotificationmanager/job_p.cpp | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/applets/notifications/package/contents/ui/JobDetails.qml b/applets/notifications/package/contents/ui/JobDetails.qml index b9b68f6b0..ed1b6174b 100644 --- a/applets/notifications/package/contents/ui/JobDetails.qml +++ b/applets/notifications/package/contents/ui/JobDetails.qml @@ -79,8 +79,7 @@ GridLayout { Component.onCompleted: bindText() function bindText() { text = Qt.binding(function() { - return jobDetails["descriptionLabel" + modelData] && jobDetails["descriptionValue" + modelData] - ? jobDetails["descriptionValue" + modelData] : ""; + return jobDetails["descriptionValue" + modelData] || ""; }); } diff --git a/libnotificationmanager/job_p.cpp b/libnotificationmanager/job_p.cpp index 7015af4e3..62df19a0e 100644 --- a/libnotificationmanager/job_p.cpp +++ b/libnotificationmanager/job_p.cpp @@ -134,8 +134,6 @@ void JobPrivate::updateHasDetails() || m_processedBytes > 0 || m_processedFiles > 0 || m_processedDirectories > 0 - || !m_descriptionLabel1.isEmpty() - || !m_descriptionLabel2.isEmpty() || !m_descriptionValue1.isEmpty() || !m_descriptionValue2.isEmpty() || m_speed > 0; From a89bdb6ab9e283aea4cf0a284a19fcebf4f47182 Mon Sep 17 00:00:00 2001 From: Jonathan Riddell Date: Tue, 23 Jun 2020 11:22:32 +0100 Subject: [PATCH 4/5] Update version number for 5.19.2 GIT_SILENT --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 62f720eeb..bea86dc0c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.0) project(plasma-workspace) -set(PROJECT_VERSION "5.19.1") +set(PROJECT_VERSION "5.19.2") set(PROJECT_VERSION_MAJOR 5) set(QT_MIN_VERSION "5.14.0") From fcf4aabe4209fa5a797953e36546394739f6fa75 Mon Sep 17 00:00:00 2001 From: David Edmundson Date: Tue, 23 Jun 2020 16:17:44 +0100 Subject: [PATCH 5/5] Fix DBus service used in shutdown interface During Plasma 5.18, ksmserver was cleverly split so it hosted the new new interface registering both services names org.kde.ksmserver and org.kde.Shutdown. This way we could do a gradual port, update the libs, and migrate the final code without any breakages. It was a good plan in theory. In 5.19 we did the final actual splitting, unfortunately in libkworkspace on the path where we skip logout confirmation had the wrong name. BUG: 423391 --- libkworkspace/sessionmanagement.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libkworkspace/sessionmanagement.cpp b/libkworkspace/sessionmanagement.cpp index 943b4c4c6..b9d868548 100644 --- a/libkworkspace/sessionmanagement.cpp +++ b/libkworkspace/sessionmanagement.cpp @@ -47,7 +47,7 @@ class ShutdownIface : public OrgKdeShutdownInterface Q_OBJECT public: ShutdownIface() - : OrgKdeShutdownInterface(QStringLiteral("org.kde.ksmserver"), QStringLiteral("/Shutdown"), QDBusConnection::sessionBus()) + : OrgKdeShutdownInterface(QStringLiteral("org.kde.Shutdown"), QStringLiteral("/Shutdown"), QDBusConnection::sessionBus()) { } };