diffstat for plasma-integration-5.13.5 plasma-integration-5.16.0 CMakeLists.txt | 9 autotests/CMakeLists.txt | 7 autotests/kfiledialog_unittest.cpp | 1 autotests/kfiledialogqml_unittest.cpp | 1 debian/changelog | 385 +++++++++++++++++ debian/control | 29 - debian/patches/Drop-the-patch-version-for-breeze.patch | 26 - debian/patches/series | 1 po/ar/plasmaintegration5.po | 4 po/ast/plasmaintegration5.po | 143 ------ po/ca/plasmaintegration5.po | 4 po/ca@valencia/plasmaintegration5.po | 4 po/cs/plasmaintegration5.po | 4 po/da/plasmaintegration5.po | 6 po/de/plasmaintegration5.po | 4 po/el/plasmaintegration5.po | 4 po/en_GB/plasmaintegration5.po | 6 po/es/plasmaintegration5.po | 4 po/et/plasmaintegration5.po | 4 po/eu/plasmaintegration5.po | 4 po/fi/plasmaintegration5.po | 4 po/fr/plasmaintegration5.po | 4 po/gl/plasmaintegration5.po | 14 po/he/plasmaintegration5.po | 4 po/hu/plasmaintegration5.po | 4 po/ia/plasmaintegration5.po | 4 po/id/plasmaintegration5.po | 145 ++++++ po/it/plasmaintegration5.po | 4 po/ja/plasmaintegration5.po | 4 po/ko/plasmaintegration5.po | 6 po/lt/plasmaintegration5.po | 144 ++++++ po/nb/plasmaintegration5.po | 4 po/nl/plasmaintegration5.po | 4 po/nn/plasmaintegration5.po | 4 po/pa/plasmaintegration5.po | 4 po/pl/plasmaintegration5.po | 4 po/pt/plasmaintegration5.po | 4 po/pt_BR/plasmaintegration5.po | 4 po/ru/plasmaintegration5.po | 4 po/sk/plasmaintegration5.po | 4 po/sl/plasmaintegration5.po | 4 po/sr/plasmaintegration5.po | 2 po/sr@ijekavian/plasmaintegration5.po | 2 po/sr@ijekavianlatin/plasmaintegration5.po | 2 po/sr@latin/plasmaintegration5.po | 2 po/sv/plasmaintegration5.po | 4 po/tr/plasmaintegration5.po | 4 po/uk/plasmaintegration5.po | 6 po/zh_CN/plasmaintegration5.po | 8 po/zh_TW/plasmaintegration5.po | 4 src/platformtheme/CMakeLists.txt | 7 src/platformtheme/kdeplatformfiledialoghelper.cpp | 4 src/platformtheme/kdeplatformsystemtrayicon.cpp | 8 src/platformtheme/kdirselectdialog.cpp | 2 src/platformtheme/kfontsettingsdata.cpp | 59 ++ src/platformtheme/kfontsettingsdata.h | 5 src/platformtheme/khintssettings.cpp | 154 +++++- src/platformtheme/khintssettings.h | 8 src/platformtheme/kwaylandintegration.cpp | 38 - src/platformtheme/kwaylandintegration.h | 1 src/platformtheme/org.kde.StatusNotifierWatcher.xml | 42 + src/platformtheme/x11integration.cpp | 10 62 files changed, 1045 insertions(+), 354 deletions(-) diff -Nru plasma-integration-5.13.5/CMakeLists.txt plasma-integration-5.16.0/CMakeLists.txt --- plasma-integration-5.13.5/CMakeLists.txt 2018-09-04 10:18:40.000000000 +0000 +++ plasma-integration-5.16.0/CMakeLists.txt 2019-06-06 13:08:06.000000000 +0000 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.0) project(PlasmaIntegration) -set(PROJECT_VERSION "5.13.5") +set(PROJECT_VERSION "5.16.0") set(PROJECT_VERSION_MAJOR 5) -set(QT_MIN_VERSION "5.9.0") -set(KF5_MIN_VERSION "5.42.0") +set(QT_MIN_VERSION "5.12.0") +set(KF5_MIN_VERSION "5.58.0") find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) @@ -17,6 +17,7 @@ include(GenerateExportHeader) find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Widgets DBus X11Extras QuickControls2) +find_package(Qt5Gui ${QT_MIN_VERSION} CONFIG REQUIRED Private) find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Config ConfigWidgets I18n IconThemes KIO Notifications Wayland @@ -31,7 +32,7 @@ PURPOSE "Required to pass style properties to native Windows on X11 Platform" ) -find_package(Breeze ${PROJECT_VERSION} CONFIG) +find_package(Breeze 5 CONFIG) set_package_properties(Breeze PROPERTIES TYPE REQUIRED PURPOSE "For setting the default QStyle name") diff -Nru plasma-integration-5.13.5/autotests/CMakeLists.txt plasma-integration-5.16.0/autotests/CMakeLists.txt --- plasma-integration-5.13.5/autotests/CMakeLists.txt 2018-09-04 10:18:40.000000000 +0000 +++ plasma-integration-5.16.0/autotests/CMakeLists.txt 2019-06-06 13:08:06.000000000 +0000 @@ -13,8 +13,6 @@ message(STATUS "Qt5Qml not found, QML autotests will not be built.") endif() -include_directories( ${Qt5Gui_PRIVATE_INCLUDE_DIRS} ${Qt5PlatformSupport_PRIVATE_INCLUDE_DIRS} ${CMAKE_BINARY_DIR}/src/platformtheme ) - set(CONFIGFILE "${CMAKE_CURRENT_SOURCE_DIR}/kdeplatformtheme_kdeglobals") set(CHANGED_CONFIGFILE "${CMAKE_CURRENT_SOURCE_DIR}/kdeplatformtheme_changed_kdeglobals") configure_file(kdeplatformtheme_config.h.in ${CMAKE_CURRENT_BINARY_DIR}/kdeplatformtheme_config.h) @@ -29,7 +27,8 @@ add_test(NAME frameworkintegration-${_testname} COMMAND ${_testname}) ecm_mark_as_test(${_testname}) ecm_mark_nongui_executable(${_testname}) - target_link_libraries(${_testname} Qt5::Test Qt5::DBus Qt5::X11Extras Qt5::QuickControls2 ${QT5PLATFORMSUPPORT_LIBS} KF5::ConfigWidgets KF5::ConfigCore KF5::IconThemes KF5::KIOFileWidgets KF5::I18n KF5::Notifications KF5::WindowSystem KF5::WaylandClient XCB::XCB) + target_include_directories(${_testname} PRIVATE ${CMAKE_BINARY_DIR}/src/platformtheme) + target_link_libraries(${_testname} Qt5::GuiPrivate Qt5::Test Qt5::DBus Qt5::X11Extras Qt5::QuickControls2 ${QT5PLATFORMSUPPORT_LIBS} KF5::ConfigWidgets KF5::ConfigCore KF5::IconThemes KF5::KIOFileWidgets KF5::I18n KF5::Notifications KF5::WindowSystem KF5::WaylandClient XCB::XCB) endmacro() set(platformThemeSRCS @@ -46,6 +45,8 @@ ../src/platformtheme/x11integration.cpp ) +qt5_add_dbus_interface(platformThemeSRCS ../src/platformtheme/org.kde.StatusNotifierWatcher.xml statusnotifierwatcher_interface) + frameworkintegration_tests( kdeplatformtheme_unittest ${platformThemeSRCS} diff -Nru plasma-integration-5.13.5/autotests/kfiledialog_unittest.cpp plasma-integration-5.16.0/autotests/kfiledialog_unittest.cpp --- plasma-integration-5.13.5/autotests/kfiledialog_unittest.cpp 2018-09-04 10:18:40.000000000 +0000 +++ plasma-integration-5.16.0/autotests/kfiledialog_unittest.cpp 2019-06-06 13:08:06.000000000 +0000 @@ -38,7 +38,6 @@ private Q_SLOTS: void initTestCase() { - qputenv("KDE_FORK_SLAVES", "yes"); } void init() diff -Nru plasma-integration-5.13.5/autotests/kfiledialogqml_unittest.cpp plasma-integration-5.16.0/autotests/kfiledialogqml_unittest.cpp --- plasma-integration-5.13.5/autotests/kfiledialogqml_unittest.cpp 2018-09-04 10:18:40.000000000 +0000 +++ plasma-integration-5.16.0/autotests/kfiledialogqml_unittest.cpp 2019-06-06 13:08:06.000000000 +0000 @@ -31,7 +31,6 @@ private Q_SLOTS: void initTestCase() { - qputenv("KDE_FORK_SLAVES", "yes"); m_engine = new QQmlEngine; } diff -Nru plasma-integration-5.13.5/debian/changelog plasma-integration-5.16.0/debian/changelog --- plasma-integration-5.13.5/debian/changelog 2018-09-06 18:40:41.000000000 +0000 +++ plasma-integration-5.16.0/debian/changelog 2019-06-11 10:36:55.000000000 +0000 @@ -1,3 +1,104 @@ +plasma-integration (5.16.0-0ubuntu1) eoan; urgency=medium + + * New upstream release (5.16.0) + + -- Rik Mills Tue, 11 Jun 2019 11:36:55 +0100 + +plasma-integration (5.15.90-0ubuntu1) eoan; urgency=medium + + * New upstream (beta) release (5.15.90) + + -- Rik Mills Sat, 18 May 2019 08:50:03 +0100 + +plasma-integration (5.15.5-0ubuntu1) eoan; urgency=medium + + * New upstream release (5.15.5) + + -- Rik Mills Fri, 10 May 2019 13:48:53 +0100 + +plasma-integration (5.15.4-0ubuntu1) disco; urgency=medium + + * New upstream bugfix release (5.15.4) + + -- Rik Mills Thu, 04 Apr 2019 17:10:34 +0100 + +plasma-integration (5.15.3-0ubuntu2) disco; urgency=medium + + * No change rebuild against qtbase-abi-5-12-2. + + -- Rik Mills Wed, 27 Mar 2019 14:19:57 +0000 + +plasma-integration (5.15.3-0ubuntu1) disco; urgency=medium + + * New upstream release (5.15.3) + + -- Rik Mills Wed, 13 Mar 2019 09:09:58 +0000 + +plasma-integration (5.15.2-0ubuntu1) disco; urgency=medium + + * New upstream release (5.15.2) + + -- Rik Mills Tue, 26 Feb 2019 19:15:01 +0000 + +plasma-integration (5.15.1-0ubuntu1) disco; urgency=medium + + * New upstream release (5.15.1) + + -- Rik Mills Tue, 19 Feb 2019 21:34:28 +0000 + +plasma-integration (5.15.0-0ubuntu1) disco; urgency=medium + + * New upstream release (5.15.0) + + -- Rik Mills Tue, 12 Feb 2019 09:54:04 +0000 + +plasma-integration (5.14.90-0ubuntu1) disco; urgency=medium + + * New upstream (beta) release (5.14.90) + + -- Rik Mills Sat, 19 Jan 2019 08:25:18 +0000 + +plasma-integration (5.14.5-0ubuntu1) disco; urgency=medium + + * New upstream release (5.14.5) + + -- Rik Mills Tue, 08 Jan 2019 23:48:51 +0000 + +plasma-integration (5.14.4-0ubuntu2) disco; urgency=medium + + * No-change rebuild against qtbase-abi-5-11-3. + + -- Rik Mills Tue, 01 Jan 2019 21:32:31 +0000 + +plasma-integration (5.14.4-0ubuntu1) disco; urgency=medium + + * d/patches: Remove Drop-the-patch-version-for-breeze.patch + Upstream change does this, and goes further to allowing building + with lower major version of breeze. + * New upstream release (5.13.90) + * New upstream release (5.14.0) + * New upstream release (5.14.1) + * New upstream release (5.14.2) + * New upstream release (5.14.3) + * New upstream release (5.14.4) + + -- Rik Mills Tue, 27 Nov 2018 23:15:55 +0000 + +plasma-integration (5.13.5-1ubuntu2) disco; urgency=medium + + * No-change rebuild against qtbase-abi-5-11-2. + + -- Rik Mills Fri, 09 Nov 2018 18:07:32 +0000 + +plasma-integration (5.13.5-1ubuntu1) cosmic; urgency=medium + + * New upstream release (5.13.5) + * Merge from Debian unstable. Remaining changes: + - debian/control: Kubuntu packaging Vcs fields. + - debian/control: Don't use Debian group breaks. + + -- Rik Mills Fri, 07 Sep 2018 16:35:33 +0100 + plasma-integration (5.13.5-1) unstable; urgency=medium * New revision @@ -9,6 +110,16 @@ -- Maximiliano Curia Thu, 06 Sep 2018 20:40:41 +0200 +plasma-integration (5.13.4-1ubuntu1) cosmic; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - debian/control: Kubuntu packaging Vcs fields. + - debian/control: Don't use Debian group breaks. + - debian/control: Recommends fonts-hack instead of transitional + fonts-hack-ttf. + + -- Rik Mills Tue, 28 Aug 2018 15:44:06 +0100 + plasma-integration (5.13.4-1) unstable; urgency=medium * New upstream release (5.13.4). @@ -18,6 +129,21 @@ -- Maximiliano Curia Sun, 19 Aug 2018 23:18:16 +0200 +plasma-integration (5.13.4-0ubuntu1) cosmic; urgency=medium + + * New upstream release (5.13.4) + + -- Rik Mills Fri, 03 Aug 2018 16:42:43 +0100 + +plasma-integration (5.13.3-0ubuntu1) cosmic; urgency=medium + + * New upstream release (5.13.0) + * New upstream release (5.13.1) + * New upstream release (5.13.2) + * New upstream release (5.13.3) + + -- Rik Mills Sat, 28 Jul 2018 17:26:37 +0100 + plasma-integration (5.13.1-1) unstable; urgency=medium * New upstream release (5.13.1). @@ -28,6 +154,18 @@ -- Maximiliano Curia Tue, 26 Jun 2018 13:43:18 +0200 +plasma-integration (5.12.6-0ubuntu2) cosmic; urgency=medium + + * No-change rebuild against qtbase-abi-5-11-0. + + -- Simon Quigley Sat, 30 Jun 2018 23:56:31 -0500 + +plasma-integration (5.12.6-0ubuntu1) cosmic; urgency=medium + + * New upstream release (5.12.6) + + -- Rik Mills Thu, 28 Jun 2018 15:31:49 +0100 + plasma-integration (5.12.5-1) unstable; urgency=medium * New upstream release (5.12.2). @@ -40,6 +178,44 @@ -- Maximiliano Curia Wed, 09 May 2018 13:24:07 +0200 +plasma-integration (5.12.5-0ubuntu1) cosmic; urgency=medium + + * New upstream release (5.12.5) + + -- Rik Mills Tue, 08 May 2018 19:24:47 +0100 + +plasma-integration (5.12.4-0ubuntu2) bionic; urgency=medium + + * No-change rebuild against qtbase-abi-5-9-5. + + -- Simon Quigley Sat, 14 Apr 2018 22:00:30 -0500 + +plasma-integration (5.12.4-0ubuntu1) bionic; urgency=medium + + * New upstream release (5.12.4) + * Sync changes from https://phabricator.kde.org/D10680 + 'Reduce the dependency burden of plasma-integration' + + -- Rik Mills Tue, 27 Mar 2018 20:54:38 +0100 + +plasma-integration (5.12.3-0ubuntu1) bionic; urgency=medium + + * New upstream release (5.12.3) + + -- Rik Mills Fri, 09 Mar 2018 13:49:54 +0000 + +plasma-integration (5.12.2-0ubuntu2) bionic; urgency=medium + + * No-change rebuild against qtbase-abi-5-9-4. + + -- Simon Quigley Tue, 27 Feb 2018 09:49:45 -0600 + +plasma-integration (5.12.2-0ubuntu1) bionic; urgency=medium + + * New upstream release (5.12.2) + + -- Rik Mills Tue, 20 Feb 2018 22:43:29 +0000 + plasma-integration (5.12.1-1) sid; urgency=medium * Use the salsa canonical urls @@ -49,6 +225,12 @@ -- Maximiliano Curia Tue, 20 Feb 2018 22:09:01 +0100 +plasma-integration (5.12.1-0ubuntu1) bionic; urgency=medium + + * New upstream release (5.12.1) + + -- Rik Mills Wed, 14 Feb 2018 12:13:31 +0000 + plasma-integration (5.12.0-2) sid; urgency=medium * New revision @@ -73,6 +255,19 @@ -- Maximiliano Curia Thu, 08 Feb 2018 15:21:01 +0100 +plasma-integration (5.12.0-0ubuntu1) bionic; urgency=medium + + * New upstream release (5.11.95) + * New upstream release (5.12.0) + + -- Rik Mills Tue, 06 Feb 2018 11:50:58 +0000 + +plasma-integration (5.11.5-0ubuntu1) bionic; urgency=medium + + * New upstream release (5.11.5) + + -- Rik Mills Wed, 03 Jan 2018 17:39:42 +0000 + plasma-integration (5.11.4-1) experimental; urgency=medium * New upstream release (5.11.4). @@ -84,6 +279,23 @@ -- Maximiliano Curia Wed, 03 Jan 2018 16:49:13 -0300 +plasma-integration (5.11.4-0ubuntu1) bionic; urgency=low + + * New upstream release (5.11.4) + + -- Simon Quigley Tue, 28 Nov 2017 21:16:09 -0600 + +plasma-integration (5.11.3-0ubuntu1) bionic; urgency=medium + + * New upstream release (5.10.95) + * Add explicit build depend on QuickControls2 + * New upstream release (5.11.0) + * New upstream release (5.11.1) + * New upstream release (5.11.2) + * New upstream release (5.11.3) + + -- Rik Mills Sat, 25 Nov 2017 17:59:06 +0000 + plasma-integration (5.10.5-2) sid; urgency=medium * New revision @@ -113,6 +325,80 @@ -- Maximiliano Curia Mon, 28 Aug 2017 15:29:28 +0200 +plasma-integration (5.10.5-0ubuntu1) artful; urgency=low + + * New upstream release (5.10.5) + + -- Simon Quigley Wed, 23 Aug 2017 14:39:42 +0100 + +plasma-integration (5.10.4-0ubuntu1) artful; urgency=low + + * New upstream release (5.10.4) + + -- Rik Mills Wed, 19 Jul 2017 14:37:38 +0100 + +plasma-integration (5.10.3-0ubuntu1) artful; urgency=low + + * New upstream release (5.10.3) + + -- Rik Mills Sat, 01 Jul 2017 10:16:12 +0100 + +plasma-integration (5.10.2-0ubuntu1) artful; urgency=low + + * New upstream release (5.10.2) + + -- Rik Mills Thu, 15 Jun 2017 18:12:27 +0100 + +plasma-integration (5.10.1-0ubuntu1) artful; urgency=low + + * New upstream release (5.10.1) + + -- Rik Mills Tue, 06 Jun 2017 19:09:15 +0100 + +plasma-integration (5.10.0-0ubuntu1) artful; urgency=low + + * New upstream release (5.9.95) + * New upstream release (5.10.0) + + -- Rik Mills Tue, 30 May 2017 09:49:29 +0100 + +plasma-integration (5.9.5-0ubuntu1) artful; urgency=low + + * New upstream release (5.9.5) + * Bump manually build depend on breeze to 4:5.9.5~ + + -- José Manuel Santamaría Lema Sun, 30 Apr 2017 11:31:35 +0100 + +plasma-integration (5.9.4-0ubuntu1) zesty; urgency=low + + * New upstream bugfix release (5.9.4) + + -- Rik Mills Thu, 23 Mar 2017 19:57:47 +0000 + +plasma-integration (5.9.3-0ubuntu1) zesty; urgency=low + + * New upstream bugfix release (5.9.3) + + -- Rik Mills Thu, 02 Mar 2017 09:51:42 +0000 + +plasma-integration (5.9.2-0ubuntu1) zesty; urgency=low + + * New upstream bugfix release (5.9.2) + + -- Rik Mills Mon, 20 Feb 2017 11:04:52 +0000 + +plasma-integration (5.9.1-0ubuntu1) zesty; urgency=low + + * New upstream release (5.9.1) + + -- Rik Mills Tue, 14 Feb 2017 23:19:49 +0000 + +plasma-integration (5.9.0-0ubuntu1) zesty; urgency=low + + * New upstream release (5.9.0) + + -- Rik Mills Sat, 04 Feb 2017 00:55:06 +0000 + plasma-integration (5.8.6-1) unstable; urgency=medium * New upstream release (5.8.6) @@ -134,6 +420,12 @@ -- Maximiliano Curia Fri, 30 Dec 2016 18:46:21 +0100 +plasma-integration (5.8.5-0ubuntu1) zesty; urgency=low + + * New upstream release (5.8.5) + + -- Rik Mills Thu, 29 Dec 2016 16:44:57 +0000 + plasma-integration (5.8.4-1) unstable; urgency=medium [ Automatic packaging ] @@ -144,6 +436,29 @@ -- Maximiliano Curia Wed, 23 Nov 2016 18:37:50 +0100 +plasma-integration (5.8.4-0ubuntu2) UNRELEASED; urgency=medium + + * Adding optional build deps + + -- Clive Johnston Mon, 12 Dec 2016 22:23:23 +0000 + +plasma-integration (5.8.4-0ubuntu1) zesty; urgency=medium + + [ José Manuel Santamaría Lema ] + * Update Vcs-Git fields to use https:// instead of git:// + * Remove undesired debian Breaks after merge + + [ Simon Quigley ] + * New upstream release (5.8.3) + + [ José Manuel Santamaría Lema ] + * Merge with debian, dropping the -dbg package in the process + + [ Rik Mills ] + * New upstream release (5.8.4) + + -- Rik Mills Mon, 05 Dec 2016 19:54:22 +0000 + plasma-integration (5.8.2-1) unstable; urgency=medium [ Automatic packaging ] @@ -181,6 +496,12 @@ -- Neon CI Fri, 30 Sep 2016 11:29:15 +0000 +plasma-integration (5.7.5-0ubuntu1) yakkety; urgency=medium + + * New upstream release (5.7.5) + + -- Rik Mills Tue, 20 Sep 2016 20:29:18 -0500 + plasma-integration (5.7.5-0neon) xenial; urgency=medium * New release @@ -198,6 +519,24 @@ -- Maximiliano Curia Sat, 27 Aug 2016 17:26:33 +0200 +plasma-integration (5.7.4-0ubuntu1) UNRELEASED; urgency=medium + + [ Clive Johnston ] + * Installing new files + + [ Philip Muškovac ] + * Add a conflict to appmenu-qt5 as an upstream recommended workaround + to appmenu-qt5 breaking the plasma QPA plugin in plasma sessions by + installing an environment script that overrides the used QPA plugin + disregarding the target environment. + (see #1307619) + + [ Rik Mills ] + * fonts-hack-ttf instead of oxygen + * New upstream release (5.7.4) + + -- Rik Mills Sun, 11 Sep 2016 23:49:43 +0000 + plasma-integration (5.7.4-0neon) xenial; urgency=medium * New release @@ -210,6 +549,19 @@ -- Neon CI Tue, 02 Aug 2016 12:04:34 +0000 +plasma-integration (5.7.2-0ubuntu2) yakkety; urgency=medium + + * No-change rebuild against new QPlatformTheme ABI (LP: #1620870). + + -- Dmitry Shachnev Thu, 08 Sep 2016 11:13:21 +0300 + +plasma-integration (5.7.2-0ubuntu1) yakkety; urgency=medium + + * New upstream release (5.7.1) + * New upstream release (5.7.2) + + -- Clive Johnston Thu, 28 Jul 2016 12:07:56 +0000 + plasma-integration (5.7.2-0neon) xenial; urgency=medium * New release @@ -244,6 +596,12 @@ -- Maximiliano Curia Wed, 22 Jun 2016 16:23:55 +0200 +plasma-integration (5.6.5-0ubuntu1) yakkety; urgency=medium + + * New upstream release (5.6.5) + + -- Clive Johnston Fri, 15 Jul 2016 21:08:25 +0100 + plasma-integration (5.6.5-0neon) xenial; urgency=medium * New release @@ -265,6 +623,33 @@ * New upstream release (5.6.4). -- Maximiliano Curia Wed, 25 May 2016 12:09:16 +0200 +plasma-integration (5.6.4-0ubuntu2) UNRELEASED; urgency=medium + + * Add new required build dependency on breeze-dev + + -- Rik Mills Sat, 11 Jun 2016 19:53:40 +0100 + +plasma-integration (5.6.4-0ubuntu1) yakkety; urgency=medium + + [ Jonathan Riddell ] + * Initial release. + + [ Bhushan Shah ] + * Fix plasma-integration.install for other platforms + + [ Clive Johnston ] + * New upstream release + * Cherry picked install file from KDE Neon + * Adding min version to kwayland-dev + + [ Philip Muškovac ] + * Update the Vcs URLs now that the repositories are hosted on + Launchpad + + [ Clive Johnston ] + * New upstream release (5.6.4) + + -- Clive Johnston Wed, 18 May 2016 13:25:36 -0700 plasma-integration (5.6.4-0neon) xenial; urgency=medium * New release diff -Nru plasma-integration-5.13.5/debian/control plasma-integration-5.16.0/debian/control --- plasma-integration-5.13.5/debian/control 2018-09-06 18:40:41.000000000 +0000 +++ plasma-integration-5.16.0/debian/control 2019-06-11 10:36:55.000000000 +0000 @@ -3,19 +3,19 @@ Priority: optional Maintainer: Debian/Kubuntu Qt/KDE Maintainers Uploaders: Maximiliano Curia -Build-Depends: breeze-dev (>= 4:5.13~), +Build-Depends: breeze-dev (>= 4:5.16.0~), cmake (>= 3.0~), debhelper (>= 11~), - extra-cmake-modules (>= 5.42.0~), - libkf5config-dev (>= 5.42.0~), - libkf5configwidgets-dev (>= 5.42.0~), - libkf5i18n-dev (>= 5.42.0~), - libkf5iconthemes-dev (>= 5.42.0~), - libkf5kio-dev (>= 5.42.0~), - libkf5notifications-dev (>= 5.42.0~), - libkf5wayland-dev (>= 4:5.42.0~), - libkf5widgetsaddons-dev (>= 5.42.0~), - libkf5windowsystem-dev (>= 5.42.0~), + extra-cmake-modules (>= 5.58.0~), + libkf5config-dev (>= 5.58.0~), + libkf5configwidgets-dev (>= 5.58.0~), + libkf5i18n-dev (>= 5.58.0~), + libkf5iconthemes-dev (>= 5.58.0~), + libkf5kio-dev (>= 5.58.0~), + libkf5notifications-dev (>= 5.58.0~), + libkf5wayland-dev (>= 4:5.58.0~), + libkf5widgetsaddons-dev (>= 5.58.0~), + libkf5windowsystem-dev (>= 5.58.0~), libqt5x11extras5-dev (>= 5.9.0~), libxcursor-dev, pkg-config, @@ -26,12 +26,12 @@ qtquickcontrols2-5-dev (>= 5.9.0~), Standards-Version: 4.1.4 Homepage: https://projects.kde.org/projects/kde/workspace/plasma-integration -Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/plasma-integration -Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/plasma-integration.git +Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/plasma-integration +Vcs-Git: https://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/plasma-integration Package: plasma-integration Architecture: any -Depends: breeze (>= 4:5.13), +Depends: breeze (>= 4:5.14), qml-module-org-kde-qqc2desktopstyle, ${misc:Depends}, ${shlibs:Depends}, @@ -40,4 +40,3 @@ Description: Qt Platform Theme integration plugins for KDE Plasma A plugin to provide Qt Platform Theme integration for the Plasma workspace. -Breaks: plasma-desktop (<< 4:5.13), plasma-workspace (<< 4:5.13) diff -Nru plasma-integration-5.13.5/debian/patches/Drop-the-patch-version-for-breeze.patch plasma-integration-5.16.0/debian/patches/Drop-the-patch-version-for-breeze.patch --- plasma-integration-5.13.5/debian/patches/Drop-the-patch-version-for-breeze.patch 2018-09-06 18:40:41.000000000 +0000 +++ plasma-integration-5.16.0/debian/patches/Drop-the-patch-version-for-breeze.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ -From: Maximiliano Curia -Date: Fri, 23 Feb 2018 16:02:12 +0100 -Subject: Drop the patch version for breeze - -Breeze doesn't even receive changes on every point release, and really lts -components shouldn't introduce incompatible changes in the same -major.minor, so dropping this unnecessary requirement. ---- - CMakeLists.txt | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1941521..cc352f9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -31,7 +31,9 @@ set_package_properties(XCB PROPERTIES - PURPOSE "Required to pass style properties to native Windows on X11 Platform" - ) - --find_package(Breeze ${PROJECT_VERSION} CONFIG) -+string(REGEX MATCHALL "[0-9]+" PROJECT_VERSION_COMPONENTS ${PROJECT_VERSION}) -+list(GET PROJECT_VERSION_COMPONENTS 1 PROJECT_VERSION_MINOR) -+find_package(Breeze ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} CONFIG) - set_package_properties(Breeze PROPERTIES - TYPE REQUIRED - PURPOSE "For setting the default QStyle name") diff -Nru plasma-integration-5.13.5/debian/patches/series plasma-integration-5.16.0/debian/patches/series --- plasma-integration-5.13.5/debian/patches/series 2018-09-06 18:40:41.000000000 +0000 +++ plasma-integration-5.16.0/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -Drop-the-patch-version-for-breeze.patch diff -Nru plasma-integration-5.13.5/po/ar/plasmaintegration5.po plasma-integration-5.16.0/po/ar/plasmaintegration5.po --- plasma-integration-5.13.5/po/ar/plasmaintegration5.po 2018-09-04 10:18:48.000000000 +0000 +++ plasma-integration-5.16.0/po/ar/plasmaintegration5.po 2019-06-06 13:08:15.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-08-21 06:39+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-05-20 07:46+0200\n" "PO-Revision-Date: ٢٠١٦-٠٢-٠٨ ٠٨:١٩+0300\n" "Last-Translator: Safa Alfulaij \n" "Language-Team: Arabic \n" diff -Nru plasma-integration-5.13.5/po/ast/plasmaintegration5.po plasma-integration-5.16.0/po/ast/plasmaintegration5.po --- plasma-integration-5.13.5/po/ast/plasmaintegration5.po 2018-09-04 10:18:48.000000000 +0000 +++ plasma-integration-5.16.0/po/ast/plasmaintegration5.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,143 +0,0 @@ -# Copyright (C) YEAR This_file_is_part_of_KDE -# This file is distributed under the same license as the PACKAGE package. -# -# enolp , 2016. -msgid "" -msgstr "" -"Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-08-21 06:39+0200\n" -"PO-Revision-Date: 2016-12-19 03:55+0100\n" -"Last-Translator: enolp \n" -"Language-Team: Asturian \n" -"Language: ast\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 2.0\n" - -#: platformtheme/kdeplatformfiledialoghelper.cpp:287 -#, kde-format -msgctxt "@title:window" -msgid "Open File" -msgstr "" - -#: platformtheme/kdeplatformfiledialoghelper.cpp:287 -#, kde-format -msgctxt "@title:window" -msgid "Save File" -msgstr "" - -#: platformtheme/kdeplatformtheme.cpp:286 -#, kde-format -msgctxt "@action:button" -msgid "Save All" -msgstr "" - -#: platformtheme/kdeplatformtheme.cpp:292 -#, kde-format -msgctxt "@action:button" -msgid "Yes to All" -msgstr "" - -#: platformtheme/kdeplatformtheme.cpp:296 -#, kde-format -msgctxt "@action:button" -msgid "No to All" -msgstr "Non a too" - -#: platformtheme/kdeplatformtheme.cpp:299 -#, kde-format -msgctxt "@action:button" -msgid "Abort" -msgstr "" - -#: platformtheme/kdeplatformtheme.cpp:301 -#, kde-format -msgctxt "@action:button" -msgid "Retry" -msgstr "" - -#: platformtheme/kdeplatformtheme.cpp:303 -#, kde-format -msgctxt "@action:button" -msgid "Ignore" -msgstr "" - -#: platformtheme/kdirselectdialog.cpp:132 -#, kde-format -msgctxt "folder name" -msgid "New Folder" -msgstr "" - -#: platformtheme/kdirselectdialog.cpp:137 -#, kde-format -msgctxt "@title:window" -msgid "New Folder" -msgstr "" - -#: platformtheme/kdirselectdialog.cpp:138 -#, kde-format -msgctxt "@label:textbox" -msgid "" -"Create new folder in:\n" -"%1" -msgstr "" - -#: platformtheme/kdirselectdialog.cpp:168 -#, kde-format -msgid "A file or folder named %1 already exists." -msgstr "" - -#: platformtheme/kdirselectdialog.cpp:171 -#, kde-format -msgid "You do not have permission to create that folder." -msgstr "" - -#: platformtheme/kdirselectdialog.cpp:284 -#, kde-format -msgctxt "@title:window" -msgid "Select Folder" -msgstr "" - -#: platformtheme/kdirselectdialog.cpp:293 -#, kde-format -msgctxt "@action:button" -msgid "New Folder..." -msgstr "" - -#: platformtheme/kdirselectdialog.cpp:339 -#, kde-format -msgctxt "@action:inmenu" -msgid "New Folder..." -msgstr "" - -#: platformtheme/kdirselectdialog.cpp:346 -#, kde-format -msgctxt "@action:inmenu" -msgid "Move to Trash" -msgstr "" - -#: platformtheme/kdirselectdialog.cpp:353 -#, kde-format -msgctxt "@action:inmenu" -msgid "Delete" -msgstr "" - -#: platformtheme/kdirselectdialog.cpp:362 -#, kde-format -msgctxt "@option:check" -msgid "Show Hidden Folders" -msgstr "" - -#: platformtheme/kdirselectdialog.cpp:369 -#, kde-format -msgctxt "@action:inmenu" -msgid "Properties" -msgstr "" - -#: platformtheme/kfiletreeview.cpp:193 -#, kde-format -msgid "Show Hidden Folders" -msgstr "" \ No newline at end of file diff -Nru plasma-integration-5.13.5/po/ca/plasmaintegration5.po plasma-integration-5.16.0/po/ca/plasmaintegration5.po --- plasma-integration-5.13.5/po/ca/plasmaintegration5.po 2018-09-04 10:18:49.000000000 +0000 +++ plasma-integration-5.16.0/po/ca/plasmaintegration5.po 2019-06-06 13:08:17.000000000 +0000 @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: plasmaintegration5\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-08-21 06:39+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-05-20 07:46+0200\n" "PO-Revision-Date: 2017-12-17 23:21+0100\n" "Last-Translator: Josep Ma. Ferrer \n" "Language-Team: Catalan \n" diff -Nru plasma-integration-5.13.5/po/ca@valencia/plasmaintegration5.po plasma-integration-5.16.0/po/ca@valencia/plasmaintegration5.po --- plasma-integration-5.13.5/po/ca@valencia/plasmaintegration5.po 2018-09-04 10:18:49.000000000 +0000 +++ plasma-integration-5.16.0/po/ca@valencia/plasmaintegration5.po 2019-06-06 13:08:17.000000000 +0000 @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: plasmaintegration5\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-08-21 06:39+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-05-20 07:46+0200\n" "PO-Revision-Date: 2017-12-17 23:21+0100\n" "Last-Translator: Josep Ma. Ferrer \n" "Language-Team: Catalan \n" diff -Nru plasma-integration-5.13.5/po/cs/plasmaintegration5.po plasma-integration-5.16.0/po/cs/plasmaintegration5.po --- plasma-integration-5.13.5/po/cs/plasmaintegration5.po 2018-09-04 10:18:49.000000000 +0000 +++ plasma-integration-5.16.0/po/cs/plasmaintegration5.po 2019-06-06 13:08:17.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-08-21 06:39+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-05-20 07:46+0200\n" "PO-Revision-Date: 2014-12-05 13:22+0100\n" "Last-Translator: Vít Pelčák \n" "Language-Team: Czech \n" diff -Nru plasma-integration-5.13.5/po/da/plasmaintegration5.po plasma-integration-5.16.0/po/da/plasmaintegration5.po --- plasma-integration-5.13.5/po/da/plasmaintegration5.po 2018-09-04 10:18:50.000000000 +0000 +++ plasma-integration-5.16.0/po/da/plasmaintegration5.po 2019-06-06 13:08:17.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-08-21 06:39+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-05-20 07:46+0200\n" "PO-Revision-Date: 2016-06-18 14:51+0100\n" "Last-Translator: Martin Schlander \n" "Language-Team: Danish \n" @@ -119,7 +119,7 @@ #, kde-format msgctxt "@action:inmenu" msgid "Move to Trash" -msgstr "Flyt til affald" +msgstr "Flyt til papirkurv" #: platformtheme/kdirselectdialog.cpp:353 #, kde-format diff -Nru plasma-integration-5.13.5/po/de/plasmaintegration5.po plasma-integration-5.16.0/po/de/plasmaintegration5.po --- plasma-integration-5.13.5/po/de/plasmaintegration5.po 2018-09-04 10:18:50.000000000 +0000 +++ plasma-integration-5.16.0/po/de/plasmaintegration5.po 2019-06-06 13:08:17.000000000 +0000 @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-08-21 06:39+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-05-20 07:46+0200\n" "PO-Revision-Date: 2016-04-10 19:54+0100\n" "Last-Translator: Frederik Schwarzer \n" "Language-Team: German \n" diff -Nru plasma-integration-5.13.5/po/el/plasmaintegration5.po plasma-integration-5.16.0/po/el/plasmaintegration5.po --- plasma-integration-5.13.5/po/el/plasmaintegration5.po 2018-09-04 10:18:50.000000000 +0000 +++ plasma-integration-5.16.0/po/el/plasmaintegration5.po 2019-06-06 13:08:17.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-08-21 06:39+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-05-20 07:46+0200\n" "PO-Revision-Date: 2016-07-29 20:02+0200\n" "Last-Translator: Dimitris Kardarakos \n" "Language-Team: Greek \n" diff -Nru plasma-integration-5.13.5/po/en_GB/plasmaintegration5.po plasma-integration-5.16.0/po/en_GB/plasmaintegration5.po --- plasma-integration-5.13.5/po/en_GB/plasmaintegration5.po 2018-09-04 10:18:51.000000000 +0000 +++ plasma-integration-5.16.0/po/en_GB/plasmaintegration5.po 2019-06-06 13:08:18.000000000 +0000 @@ -5,11 +5,11 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-08-21 06:39+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-05-20 07:46+0200\n" "PO-Revision-Date: 2016-09-18 15:46+0000\n" "Last-Translator: Steve Allewell \n" -"Language-Team: British English \n" +"Language-Team: English \n" "Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff -Nru plasma-integration-5.13.5/po/es/plasmaintegration5.po plasma-integration-5.16.0/po/es/plasmaintegration5.po --- plasma-integration-5.13.5/po/es/plasmaintegration5.po 2018-09-04 10:18:51.000000000 +0000 +++ plasma-integration-5.16.0/po/es/plasmaintegration5.po 2019-06-06 13:08:18.000000000 +0000 @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: frameworkintegration5\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-08-21 06:39+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-05-20 07:46+0200\n" "PO-Revision-Date: 2016-04-09 13:34+0200\n" "Last-Translator: Eloy Cuadra \n" "Language-Team: Spanish \n" diff -Nru plasma-integration-5.13.5/po/et/plasmaintegration5.po plasma-integration-5.16.0/po/et/plasmaintegration5.po --- plasma-integration-5.13.5/po/et/plasmaintegration5.po 2018-09-04 10:18:51.000000000 +0000 +++ plasma-integration-5.16.0/po/et/plasmaintegration5.po 2019-06-06 13:08:18.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-08-21 06:39+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-05-20 07:46+0200\n" "PO-Revision-Date: 2016-08-18 19:28+0300\n" "Last-Translator: Marek Laane \n" "Language-Team: Estonian \n" diff -Nru plasma-integration-5.13.5/po/eu/plasmaintegration5.po plasma-integration-5.16.0/po/eu/plasmaintegration5.po --- plasma-integration-5.13.5/po/eu/plasmaintegration5.po 2018-09-04 10:18:51.000000000 +0000 +++ plasma-integration-5.16.0/po/eu/plasmaintegration5.po 2019-06-06 13:08:19.000000000 +0000 @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: plasmaintegrtion5\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-08-21 06:39+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-05-20 07:46+0200\n" "PO-Revision-Date: 2018-02-24 22:54+0100\n" "Last-Translator: Iñigo Salvador Azurmendi \n" "Language-Team: Basque \n" diff -Nru plasma-integration-5.13.5/po/fi/plasmaintegration5.po plasma-integration-5.16.0/po/fi/plasmaintegration5.po --- plasma-integration-5.13.5/po/fi/plasmaintegration5.po 2018-09-04 10:18:52.000000000 +0000 +++ plasma-integration-5.16.0/po/fi/plasmaintegration5.po 2019-06-06 13:08:19.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-08-21 06:39+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-05-20 07:46+0200\n" "PO-Revision-Date: 2016-04-30 23:40+0200\n" "Last-Translator: Lasse Liehu \n" "Language-Team: Finnish \n" diff -Nru plasma-integration-5.13.5/po/fr/plasmaintegration5.po plasma-integration-5.16.0/po/fr/plasmaintegration5.po --- plasma-integration-5.13.5/po/fr/plasmaintegration5.po 2018-09-04 10:18:52.000000000 +0000 +++ plasma-integration-5.16.0/po/fr/plasmaintegration5.po 2019-06-06 13:08:19.000000000 +0000 @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-08-21 06:39+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-05-20 07:46+0200\n" "PO-Revision-Date: 2016-11-23 18:17+0100\n" "Last-Translator: Vincent Pinon \n" "Language-Team: French \n" diff -Nru plasma-integration-5.13.5/po/gl/plasmaintegration5.po plasma-integration-5.16.0/po/gl/plasmaintegration5.po --- plasma-integration-5.13.5/po/gl/plasmaintegration5.po 2018-09-04 10:18:53.000000000 +0000 +++ plasma-integration-5.16.0/po/gl/plasmaintegration5.po 2019-06-06 13:08:19.000000000 +0000 @@ -2,21 +2,21 @@ # This file is distributed under the same license as the PACKAGE package. # # Adrián Chaves Fernández (Gallaecio) , 2016. +# Adrián Chaves (Gallaecio) , 2019. msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-08-21 06:39+0200\n" -"PO-Revision-Date: 2016-04-21 07:00+0100\n" -"Last-Translator: Adrián Chaves Fernández (Gallaecio) \n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-05-20 07:46+0200\n" +"PO-Revision-Date: 2019-02-14 19:23+0100\n" +"Last-Translator: Adrián Chaves (Gallaecio) \n" "Language-Team: Galician \n" "Language: gl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 18.12.1\n" #: platformtheme/kdeplatformfiledialoghelper.cpp:287 #, kde-format @@ -52,7 +52,7 @@ #, kde-format msgctxt "@action:button" msgid "Abort" -msgstr "Cancelar" +msgstr "Interromper" #: platformtheme/kdeplatformtheme.cpp:301 #, kde-format diff -Nru plasma-integration-5.13.5/po/he/plasmaintegration5.po plasma-integration-5.16.0/po/he/plasmaintegration5.po --- plasma-integration-5.13.5/po/he/plasmaintegration5.po 2018-09-04 10:18:53.000000000 +0000 +++ plasma-integration-5.16.0/po/he/plasmaintegration5.po 2019-06-06 13:08:20.000000000 +0000 @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: plasmaintegration5\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-08-21 06:39+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-05-20 07:46+0200\n" "PO-Revision-Date: 2017-05-22 05:11-0400\n" "Last-Translator: Elkana Bardugo \n" "Language-Team: Hebrew\n" diff -Nru plasma-integration-5.13.5/po/hu/plasmaintegration5.po plasma-integration-5.16.0/po/hu/plasmaintegration5.po --- plasma-integration-5.13.5/po/hu/plasmaintegration5.po 2018-09-04 10:18:53.000000000 +0000 +++ plasma-integration-5.16.0/po/hu/plasmaintegration5.po 2019-06-06 13:08:20.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-08-21 06:39+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-05-20 07:46+0200\n" "PO-Revision-Date: 2017-02-24 22:49+0100\n" "Last-Translator: Kiszel Kristóf \n" "Language-Team: Hungarian \n" diff -Nru plasma-integration-5.13.5/po/ia/plasmaintegration5.po plasma-integration-5.16.0/po/ia/plasmaintegration5.po --- plasma-integration-5.13.5/po/ia/plasmaintegration5.po 2018-09-04 10:18:54.000000000 +0000 +++ plasma-integration-5.16.0/po/ia/plasmaintegration5.po 2019-06-06 13:08:20.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-08-21 06:39+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-05-20 07:46+0200\n" "PO-Revision-Date: 2017-02-02 22:57+0100\n" "Last-Translator: giovanni \n" "Language-Team: Interlingua \n" diff -Nru plasma-integration-5.13.5/po/id/plasmaintegration5.po plasma-integration-5.16.0/po/id/plasmaintegration5.po --- plasma-integration-5.13.5/po/id/plasmaintegration5.po 1970-01-01 00:00:00.000000000 +0000 +++ plasma-integration-5.16.0/po/id/plasmaintegration5.po 2019-06-06 13:08:20.000000000 +0000 @@ -0,0 +1,145 @@ +# Copyright (C) YEAR This file is copyright: +# This file is distributed under the same license as the plasma-integration package. +# Wantoyo , 2018. +# +msgid "" +msgstr "" +"Project-Id-Version: plasma-integration\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-05-20 07:46+0200\n" +"PO-Revision-Date: 2018-10-06 19:21+0700\n" +"Last-Translator: Wantoyo \n" +"Language-Team: Indonesian \n" +"Language: id\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Lokalize 2.0\n" + +#: platformtheme/kdeplatformfiledialoghelper.cpp:287 +#, kde-format +msgctxt "@title:window" +msgid "Open File" +msgstr "Buka File" + +#: platformtheme/kdeplatformfiledialoghelper.cpp:287 +#, kde-format +msgctxt "@title:window" +msgid "Save File" +msgstr "Simpan File" + +#: platformtheme/kdeplatformtheme.cpp:286 +#, kde-format +msgctxt "@action:button" +msgid "Save All" +msgstr "Simpan Semua" + +#: platformtheme/kdeplatformtheme.cpp:292 +#, kde-format +msgctxt "@action:button" +msgid "Yes to All" +msgstr "Ya Semuanya" + +#: platformtheme/kdeplatformtheme.cpp:296 +#, kde-format +msgctxt "@action:button" +msgid "No to All" +msgstr "Tidak Semuanya" + +#: platformtheme/kdeplatformtheme.cpp:299 +#, kde-format +msgctxt "@action:button" +msgid "Abort" +msgstr "Gugurkan" + +#: platformtheme/kdeplatformtheme.cpp:301 +#, kde-format +msgctxt "@action:button" +msgid "Retry" +msgstr "Coba lagi" + +#: platformtheme/kdeplatformtheme.cpp:303 +#, kde-format +msgctxt "@action:button" +msgid "Ignore" +msgstr "Abaikan" + +#: platformtheme/kdirselectdialog.cpp:132 +#, kde-format +msgctxt "folder name" +msgid "New Folder" +msgstr "Folder Baru" + +#: platformtheme/kdirselectdialog.cpp:137 +#, kde-format +msgctxt "@title:window" +msgid "New Folder" +msgstr "Folder Baru" + +#: platformtheme/kdirselectdialog.cpp:138 +#, kde-format +msgctxt "@label:textbox" +msgid "" +"Create new folder in:\n" +"%1" +msgstr "" +"Ciptakan folder baru di:\n" +"%1" + +#: platformtheme/kdirselectdialog.cpp:168 +#, kde-format +msgid "A file or folder named %1 already exists." +msgstr "Sebuah file atau folder bernama %1 sudah ada." + +#: platformtheme/kdirselectdialog.cpp:171 +#, kde-format +msgid "You do not have permission to create that folder." +msgstr "Kamu tidak memiliki perizinan untuk menciptakan folder tersebut." + +#: platformtheme/kdirselectdialog.cpp:284 +#, kde-format +msgctxt "@title:window" +msgid "Select Folder" +msgstr "Pilih Folder" + +#: platformtheme/kdirselectdialog.cpp:293 +#, kde-format +msgctxt "@action:button" +msgid "New Folder..." +msgstr "Folder Baru..." + +#: platformtheme/kdirselectdialog.cpp:339 +#, kde-format +msgctxt "@action:inmenu" +msgid "New Folder..." +msgstr "Folder Baru..." + +#: platformtheme/kdirselectdialog.cpp:346 +#, kde-format +msgctxt "@action:inmenu" +msgid "Move to Trash" +msgstr "Pindah ke Sesampahan" + +#: platformtheme/kdirselectdialog.cpp:353 +#, kde-format +msgctxt "@action:inmenu" +msgid "Delete" +msgstr "Hapus" + +#: platformtheme/kdirselectdialog.cpp:362 +#, kde-format +msgctxt "@option:check" +msgid "Show Hidden Folders" +msgstr "Tampilkan Folder Tersembunyi" + +#: platformtheme/kdirselectdialog.cpp:369 +#, kde-format +msgctxt "@action:inmenu" +msgid "Properties" +msgstr "Properti" + +#: platformtheme/kfiletreeview.cpp:193 +#, kde-format +msgid "Show Hidden Folders" +msgstr "Tampilkan Folder Tersembunyi" \ No newline at end of file diff -Nru plasma-integration-5.13.5/po/it/plasmaintegration5.po plasma-integration-5.16.0/po/it/plasmaintegration5.po --- plasma-integration-5.13.5/po/it/plasmaintegration5.po 2018-09-04 10:18:54.000000000 +0000 +++ plasma-integration-5.16.0/po/it/plasmaintegration5.po 2019-06-06 13:08:21.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: frameworkintegration5\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-08-21 06:39+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-05-20 07:46+0200\n" "PO-Revision-Date: 2016-04-11 21:00+0200\n" "Last-Translator: Vincenzo Reale \n" "Language-Team: Italian \n" diff -Nru plasma-integration-5.13.5/po/ja/plasmaintegration5.po plasma-integration-5.16.0/po/ja/plasmaintegration5.po --- plasma-integration-5.13.5/po/ja/plasmaintegration5.po 2018-09-04 10:18:55.000000000 +0000 +++ plasma-integration-5.16.0/po/ja/plasmaintegration5.po 2019-06-06 13:08:21.000000000 +0000 @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: frameworkintegration5\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-08-21 06:39+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-05-20 07:46+0200\n" "PO-Revision-Date: 2014-05-01 01:02-0700\n" "Last-Translator: Japanese KDE translation team \n" "Language-Team: Japanese \n" diff -Nru plasma-integration-5.13.5/po/ko/plasmaintegration5.po plasma-integration-5.16.0/po/ko/plasmaintegration5.po --- plasma-integration-5.13.5/po/ko/plasmaintegration5.po 2018-09-04 10:18:56.000000000 +0000 +++ plasma-integration-5.16.0/po/ko/plasmaintegration5.po 2019-06-06 13:08:22.000000000 +0000 @@ -5,11 +5,11 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-08-21 06:39+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-05-20 07:46+0200\n" "PO-Revision-Date: 2016-10-20 22:52+0100\n" "Last-Translator: Shinjo Park \n" -"Language-Team: Korean \n" +"Language-Team: Korean \n" "Language: ko\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff -Nru plasma-integration-5.13.5/po/lt/plasmaintegration5.po plasma-integration-5.16.0/po/lt/plasmaintegration5.po --- plasma-integration-5.13.5/po/lt/plasmaintegration5.po 1970-01-01 00:00:00.000000000 +0000 +++ plasma-integration-5.16.0/po/lt/plasmaintegration5.po 2019-06-06 13:08:22.000000000 +0000 @@ -0,0 +1,144 @@ +# Lithuanian translations for plasma-integration package. +# Copyright (C) 2019 This file is copyright: +# This file is distributed under the same license as the plasma-integration package. +# Automatically generated, 2019. +# +msgid "" +msgstr "" +"Project-Id-Version: plasma-integration\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-05-20 07:46+0200\n" +"PO-Revision-Date: 2018-08-21 03:49+0200\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n%10>=2 && (n%100<10 || n" +"%100>=20) ? 1 : n%10==0 || (n%100>10 && n%100<20) ? 2 : 3);\n" + +#: platformtheme/kdeplatformfiledialoghelper.cpp:287 +#, kde-format +msgctxt "@title:window" +msgid "Open File" +msgstr "" + +#: platformtheme/kdeplatformfiledialoghelper.cpp:287 +#, kde-format +msgctxt "@title:window" +msgid "Save File" +msgstr "" + +#: platformtheme/kdeplatformtheme.cpp:286 +#, kde-format +msgctxt "@action:button" +msgid "Save All" +msgstr "" + +#: platformtheme/kdeplatformtheme.cpp:292 +#, kde-format +msgctxt "@action:button" +msgid "Yes to All" +msgstr "" + +#: platformtheme/kdeplatformtheme.cpp:296 +#, kde-format +msgctxt "@action:button" +msgid "No to All" +msgstr "" + +#: platformtheme/kdeplatformtheme.cpp:299 +#, kde-format +msgctxt "@action:button" +msgid "Abort" +msgstr "" + +#: platformtheme/kdeplatformtheme.cpp:301 +#, kde-format +msgctxt "@action:button" +msgid "Retry" +msgstr "" + +#: platformtheme/kdeplatformtheme.cpp:303 +#, kde-format +msgctxt "@action:button" +msgid "Ignore" +msgstr "" + +#: platformtheme/kdirselectdialog.cpp:132 +#, kde-format +msgctxt "folder name" +msgid "New Folder" +msgstr "" + +#: platformtheme/kdirselectdialog.cpp:137 +#, kde-format +msgctxt "@title:window" +msgid "New Folder" +msgstr "" + +#: platformtheme/kdirselectdialog.cpp:138 +#, kde-format +msgctxt "@label:textbox" +msgid "" +"Create new folder in:\n" +"%1" +msgstr "" + +#: platformtheme/kdirselectdialog.cpp:168 +#, kde-format +msgid "A file or folder named %1 already exists." +msgstr "" + +#: platformtheme/kdirselectdialog.cpp:171 +#, kde-format +msgid "You do not have permission to create that folder." +msgstr "" + +#: platformtheme/kdirselectdialog.cpp:284 +#, kde-format +msgctxt "@title:window" +msgid "Select Folder" +msgstr "" + +#: platformtheme/kdirselectdialog.cpp:293 +#, kde-format +msgctxt "@action:button" +msgid "New Folder..." +msgstr "" + +#: platformtheme/kdirselectdialog.cpp:339 +#, kde-format +msgctxt "@action:inmenu" +msgid "New Folder..." +msgstr "" + +#: platformtheme/kdirselectdialog.cpp:346 +#, kde-format +msgctxt "@action:inmenu" +msgid "Move to Trash" +msgstr "" + +#: platformtheme/kdirselectdialog.cpp:353 +#, kde-format +msgctxt "@action:inmenu" +msgid "Delete" +msgstr "" + +#: platformtheme/kdirselectdialog.cpp:362 +#, kde-format +msgctxt "@option:check" +msgid "Show Hidden Folders" +msgstr "" + +#: platformtheme/kdirselectdialog.cpp:369 +#, kde-format +msgctxt "@action:inmenu" +msgid "Properties" +msgstr "" + +#: platformtheme/kfiletreeview.cpp:193 +#, kde-format +msgid "Show Hidden Folders" +msgstr "" \ No newline at end of file diff -Nru plasma-integration-5.13.5/po/nb/plasmaintegration5.po plasma-integration-5.16.0/po/nb/plasmaintegration5.po --- plasma-integration-5.13.5/po/nb/plasmaintegration5.po 2018-09-04 10:18:57.000000000 +0000 +++ plasma-integration-5.16.0/po/nb/plasmaintegration5.po 2019-06-06 13:08:23.000000000 +0000 @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-08-21 06:39+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-05-20 07:46+0200\n" "PO-Revision-Date: 2015-02-24 20:41+0100\n" "Last-Translator: Bjørn Steensrud \n" "Language-Team: Norwegian Bokmål \n" diff -Nru plasma-integration-5.13.5/po/nl/plasmaintegration5.po plasma-integration-5.16.0/po/nl/plasmaintegration5.po --- plasma-integration-5.13.5/po/nl/plasmaintegration5.po 2018-09-04 10:18:57.000000000 +0000 +++ plasma-integration-5.16.0/po/nl/plasmaintegration5.po 2019-06-06 13:08:24.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-08-21 06:39+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-05-20 07:46+0200\n" "PO-Revision-Date: 2016-04-09 17:04+0200\n" "Last-Translator: Freek de Kruijf \n" "Language-Team: Dutch \n" diff -Nru plasma-integration-5.13.5/po/nn/plasmaintegration5.po plasma-integration-5.16.0/po/nn/plasmaintegration5.po --- plasma-integration-5.13.5/po/nn/plasmaintegration5.po 2018-09-04 10:18:58.000000000 +0000 +++ plasma-integration-5.16.0/po/nn/plasmaintegration5.po 2019-06-06 13:08:24.000000000 +0000 @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-08-21 06:39+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-05-20 07:46+0200\n" "PO-Revision-Date: 2016-04-24 21:22+0100\n" "Last-Translator: Karl Ove Hufthammer \n" "Language-Team: Norwegian Nynorsk \n" diff -Nru plasma-integration-5.13.5/po/pa/plasmaintegration5.po plasma-integration-5.16.0/po/pa/plasmaintegration5.po --- plasma-integration-5.13.5/po/pa/plasmaintegration5.po 2018-09-04 10:18:58.000000000 +0000 +++ plasma-integration-5.16.0/po/pa/plasmaintegration5.po 2019-06-06 13:08:24.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-08-21 06:39+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-05-20 07:46+0200\n" "PO-Revision-Date: 2016-06-09 17:13-0600\n" "Last-Translator: A S Alam \n" "Language-Team: Punjabi \n" diff -Nru plasma-integration-5.13.5/po/pl/plasmaintegration5.po plasma-integration-5.16.0/po/pl/plasmaintegration5.po --- plasma-integration-5.13.5/po/pl/plasmaintegration5.po 2018-09-04 10:18:59.000000000 +0000 +++ plasma-integration-5.16.0/po/pl/plasmaintegration5.po 2019-06-06 13:08:24.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-08-21 06:39+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-05-20 07:46+0200\n" "PO-Revision-Date: 2016-04-16 06:28+0100\n" "Last-Translator: Łukasz Wojniłowicz \n" "Language-Team: Polish \n" diff -Nru plasma-integration-5.13.5/po/pt/plasmaintegration5.po plasma-integration-5.16.0/po/pt/plasmaintegration5.po --- plasma-integration-5.13.5/po/pt/plasmaintegration5.po 2018-09-04 10:18:59.000000000 +0000 +++ plasma-integration-5.16.0/po/pt/plasmaintegration5.po 2019-06-06 13:08:24.000000000 +0000 @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: plasmaintegration5\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-08-21 06:39+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-05-20 07:46+0200\n" "PO-Revision-Date: 2016-01-12 11:24+0000\n" "Last-Translator: José Nuno Coelho Pires \n" "Language-Team: Portuguese \n" diff -Nru plasma-integration-5.13.5/po/pt_BR/plasmaintegration5.po plasma-integration-5.16.0/po/pt_BR/plasmaintegration5.po --- plasma-integration-5.13.5/po/pt_BR/plasmaintegration5.po 2018-09-04 10:18:59.000000000 +0000 +++ plasma-integration-5.16.0/po/pt_BR/plasmaintegration5.po 2019-06-06 13:08:24.000000000 +0000 @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: plasmaintegration5\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-08-21 06:39+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-05-20 07:46+0200\n" "PO-Revision-Date: 2016-04-09 10:40-0300\n" "Last-Translator: André Marcelo Alvarenga \n" "Language-Team: Brazilian Portuguese \n" diff -Nru plasma-integration-5.13.5/po/ru/plasmaintegration5.po plasma-integration-5.16.0/po/ru/plasmaintegration5.po --- plasma-integration-5.13.5/po/ru/plasmaintegration5.po 2018-09-04 10:19:00.000000000 +0000 +++ plasma-integration-5.16.0/po/ru/plasmaintegration5.po 2019-06-06 13:08:25.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-08-21 06:39+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-05-20 07:46+0200\n" "PO-Revision-Date: 2016-09-29 04:54+0300\n" "Last-Translator: Alexander Potashev \n" "Language-Team: Russian \n" diff -Nru plasma-integration-5.13.5/po/sk/plasmaintegration5.po plasma-integration-5.16.0/po/sk/plasmaintegration5.po --- plasma-integration-5.13.5/po/sk/plasmaintegration5.po 2018-09-04 10:19:00.000000000 +0000 +++ plasma-integration-5.16.0/po/sk/plasmaintegration5.po 2019-06-06 13:08:25.000000000 +0000 @@ -3,8 +3,8 @@ msgid "" msgstr "" "Project-Id-Version: frameworkintegration5\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-08-21 06:39+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-05-20 07:46+0200\n" "PO-Revision-Date: 2016-04-09 13:33+0100\n" "Last-Translator: Roman Paholik \n" "Language-Team: Slovak \n" diff -Nru plasma-integration-5.13.5/po/sl/plasmaintegration5.po plasma-integration-5.16.0/po/sl/plasmaintegration5.po --- plasma-integration-5.13.5/po/sl/plasmaintegration5.po 2018-09-04 10:19:00.000000000 +0000 +++ plasma-integration-5.16.0/po/sl/plasmaintegration5.po 2019-06-06 13:08:25.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-08-21 06:39+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-05-20 07:46+0200\n" "PO-Revision-Date: 2016-05-15 10:32+0200\n" "Last-Translator: Andrej Mernik \n" "Language-Team: Slovenian \n" diff -Nru plasma-integration-5.13.5/po/sr/plasmaintegration5.po plasma-integration-5.16.0/po/sr/plasmaintegration5.po --- plasma-integration-5.13.5/po/sr/plasmaintegration5.po 2018-09-04 10:19:00.000000000 +0000 +++ plasma-integration-5.16.0/po/sr/plasmaintegration5.po 2019-06-06 13:08:25.000000000 +0000 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: plasmaintegration5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-08-21 06:39+0200\n" +"POT-Creation-Date: 2018-08-21 03:49+0200\n" "PO-Revision-Date: 2017-09-28 17:58+0200\n" "Last-Translator: Chusslove Illich \n" "Language-Team: Serbian \n" diff -Nru plasma-integration-5.13.5/po/sr@ijekavian/plasmaintegration5.po plasma-integration-5.16.0/po/sr@ijekavian/plasmaintegration5.po --- plasma-integration-5.13.5/po/sr@ijekavian/plasmaintegration5.po 2018-09-04 10:19:00.000000000 +0000 +++ plasma-integration-5.16.0/po/sr@ijekavian/plasmaintegration5.po 2019-06-06 13:08:25.000000000 +0000 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: plasmaintegration5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-08-21 06:39+0200\n" +"POT-Creation-Date: 2018-08-21 03:49+0200\n" "PO-Revision-Date: 2017-09-28 17:58+0200\n" "Last-Translator: Chusslove Illich \n" "Language-Team: Serbian \n" diff -Nru plasma-integration-5.13.5/po/sr@ijekavianlatin/plasmaintegration5.po plasma-integration-5.16.0/po/sr@ijekavianlatin/plasmaintegration5.po --- plasma-integration-5.13.5/po/sr@ijekavianlatin/plasmaintegration5.po 2018-09-04 10:19:00.000000000 +0000 +++ plasma-integration-5.16.0/po/sr@ijekavianlatin/plasmaintegration5.po 2019-06-06 13:08:26.000000000 +0000 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: plasmaintegration5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-08-21 06:39+0200\n" +"POT-Creation-Date: 2018-08-21 03:49+0200\n" "PO-Revision-Date: 2017-09-28 17:58+0200\n" "Last-Translator: Chusslove Illich \n" "Language-Team: Serbian \n" diff -Nru plasma-integration-5.13.5/po/sr@latin/plasmaintegration5.po plasma-integration-5.16.0/po/sr@latin/plasmaintegration5.po --- plasma-integration-5.13.5/po/sr@latin/plasmaintegration5.po 2018-09-04 10:19:01.000000000 +0000 +++ plasma-integration-5.16.0/po/sr@latin/plasmaintegration5.po 2019-06-06 13:08:26.000000000 +0000 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: plasmaintegration5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-08-21 06:39+0200\n" +"POT-Creation-Date: 2018-08-21 03:49+0200\n" "PO-Revision-Date: 2017-09-28 17:58+0200\n" "Last-Translator: Chusslove Illich \n" "Language-Team: Serbian \n" diff -Nru plasma-integration-5.13.5/po/sv/plasmaintegration5.po plasma-integration-5.16.0/po/sv/plasmaintegration5.po --- plasma-integration-5.13.5/po/sv/plasmaintegration5.po 2018-09-04 10:19:01.000000000 +0000 +++ plasma-integration-5.16.0/po/sv/plasmaintegration5.po 2019-06-06 13:08:26.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-08-21 06:39+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-05-20 07:46+0200\n" "PO-Revision-Date: 2016-04-10 08:12+0100\n" "Last-Translator: Stefan Asserhäll \n" "Language-Team: Swedish \n" diff -Nru plasma-integration-5.13.5/po/tr/plasmaintegration5.po plasma-integration-5.16.0/po/tr/plasmaintegration5.po --- plasma-integration-5.13.5/po/tr/plasmaintegration5.po 2018-09-04 10:19:02.000000000 +0000 +++ plasma-integration-5.16.0/po/tr/plasmaintegration5.po 2019-06-06 13:08:27.000000000 +0000 @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: plasmaintegration5\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-08-21 06:39+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-05-20 07:46+0200\n" "PO-Revision-Date: 2017-10-23 11:16+0000\n" "Last-Translator: Kaan \n" "Language-Team: Turkish \n" diff -Nru plasma-integration-5.13.5/po/uk/plasmaintegration5.po plasma-integration-5.16.0/po/uk/plasmaintegration5.po --- plasma-integration-5.13.5/po/uk/plasmaintegration5.po 2018-09-04 10:19:02.000000000 +0000 +++ plasma-integration-5.16.0/po/uk/plasmaintegration5.po 2019-06-06 13:08:27.000000000 +0000 @@ -1,5 +1,5 @@ # Translation of plasmaintegration5.po to Ukrainian -# Copyright (C) 2014-2016 This_file_is_part_of_KDE +# Copyright (C) 2018 This_file_is_part_of_KDE # This file is distributed under the license LGPL version 2.1 or # version 3 or later versions approved by the membership of KDE e.V. # @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: plasmaintegration5\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-08-21 06:39+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-05-20 07:46+0200\n" "PO-Revision-Date: 2016-04-09 18:05+0300\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" diff -Nru plasma-integration-5.13.5/po/zh_CN/plasmaintegration5.po plasma-integration-5.16.0/po/zh_CN/plasmaintegration5.po --- plasma-integration-5.13.5/po/zh_CN/plasmaintegration5.po 2018-09-04 10:19:03.000000000 +0000 +++ plasma-integration-5.16.0/po/zh_CN/plasmaintegration5.po 2019-06-06 13:08:27.000000000 +0000 @@ -5,10 +5,10 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-08-21 06:39+0200\n" -"PO-Revision-Date: 2018-08-30 13:14\n" -"Last-Translator: guoyunhebrave \n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-05-20 07:46+0200\n" +"PO-Revision-Date: 2019-06-02 13:14\n" +"Last-Translator: Guo Yunhe (guoyunhe)\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" diff -Nru plasma-integration-5.13.5/po/zh_TW/plasmaintegration5.po plasma-integration-5.16.0/po/zh_TW/plasmaintegration5.po --- plasma-integration-5.13.5/po/zh_TW/plasmaintegration5.po 2018-09-04 10:19:03.000000000 +0000 +++ plasma-integration-5.16.0/po/zh_TW/plasmaintegration5.po 2019-06-06 13:08:27.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: plasmaintegration5\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-08-21 06:39+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-05-20 07:46+0200\n" "PO-Revision-Date: 2016-09-23 10:55+0800\n" "Last-Translator: Jeff Huang \n" "Language-Team: Chinese \n" diff -Nru plasma-integration-5.13.5/src/platformtheme/CMakeLists.txt plasma-integration-5.16.0/src/platformtheme/CMakeLists.txt --- plasma-integration-5.13.5/src/platformtheme/CMakeLists.txt 2018-09-04 10:18:40.000000000 +0000 +++ plasma-integration-5.16.0/src/platformtheme/CMakeLists.txt 2019-06-06 13:08:06.000000000 +0000 @@ -17,9 +17,6 @@ remove_definitions(-DQT_NO_SIGNALS_SLOTS_KEYWORDS) -include_directories(${Qt5Core_PRIVATE_INCLUDE_DIRS}) -include_directories(${Qt5Gui_PRIVATE_INCLUDE_DIRS}) - set(platformtheme_SRCS qdbusmenubar.cpp # fork of Qt's qdbusmenubar with some added setters for our convenience kdeplatformtheme.cpp @@ -35,10 +32,13 @@ main.cpp ) +qt5_add_dbus_interface(platformtheme_SRCS org.kde.StatusNotifierWatcher.xml statusnotifierwatcher_interface) + add_library(KDEPlasmaPlatformTheme MODULE ${platformtheme_SRCS}) target_link_libraries(KDEPlasmaPlatformTheme PRIVATE + Qt5::GuiPrivate Qt5::DBus Qt5::X11Extras Qt5::QuickControls2 @@ -61,6 +61,7 @@ target_link_libraries(KDEPlasmaPlatformTheme PRIVATE Qt5::X11Extras ${X11_Xcursor_LIB} ${XCB_XCB_LIBRARY}) endif() +set_target_properties(KDEPlasmaPlatformTheme PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/platformthemes/") install(TARGETS KDEPlasmaPlatformTheme DESTINATION ${KDE_INSTALL_QTPLUGINDIR}/platformthemes) install(FILES fonts_global_toolbar.upd fonts_global.upd fonts_akregator.upd fonts_kate.upd DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR}) diff -Nru plasma-integration-5.13.5/src/platformtheme/kdeplatformfiledialoghelper.cpp plasma-integration-5.16.0/src/platformtheme/kdeplatformfiledialoghelper.cpp --- plasma-integration-5.13.5/src/platformtheme/kdeplatformfiledialoghelper.cpp 2018-09-04 10:18:40.000000000 +0000 +++ plasma-integration-5.16.0/src/platformtheme/kdeplatformfiledialoghelper.cpp 2019-06-06 13:08:06.000000000 +0000 @@ -334,9 +334,7 @@ dialog->m_fileWidget->setConfirmOverwrite(true); } -#if KIO_VERSION >= QT_VERSION_CHECK(5, 43, 0) dialog->m_fileWidget->setSupportedSchemes(options()->supportedSchemes()); -#endif } } @@ -417,7 +415,7 @@ void KDEPlatformFileDialogHelper::selectFile(const QUrl &filename) { // This is called once by QFileDialogPrivate::init -> QFileDialog::selectUrl -> QFileDialogPrivate::selectFile_sys - // and then again by selectFile in the QFileDialog constructor, with a wrong value for remote URLs, until the Qt 5.12.0 fix. + // and then again by selectFile in the QFileDialog constructor, with a wrong value for remote URLs, until the Qt 5.11.2 fix. #if QT_VERSION < QT_VERSION_CHECK(5, 12, 0) if (m_fileSelected && !m_dialogInitialized) return; diff -Nru plasma-integration-5.13.5/src/platformtheme/kdeplatformsystemtrayicon.cpp plasma-integration-5.16.0/src/platformtheme/kdeplatformsystemtrayicon.cpp --- plasma-integration-5.13.5/src/platformtheme/kdeplatformsystemtrayicon.cpp 2018-09-04 10:18:40.000000000 +0000 +++ plasma-integration-5.16.0/src/platformtheme/kdeplatformsystemtrayicon.cpp 2019-06-06 13:08:06.000000000 +0000 @@ -26,6 +26,8 @@ #include #include +#include "statusnotifierwatcher_interface.h" + SystemTrayMenu::SystemTrayMenu() : QPlatformMenu() , m_tag(0) @@ -361,9 +363,11 @@ bool KDEPlatformSystemTrayIcon::isSystemTrayAvailable() const { - QDBusInterface systrayHost(QStringLiteral("org.kde.StatusNotifierWatcher"), QStringLiteral("/StatusNotifierWatcher"), QStringLiteral("org.kde.StatusNotifierWatcher")); + org::kde::StatusNotifierWatcher systrayHost(QStringLiteral("org.kde.StatusNotifierWatcher"), + QStringLiteral("/StatusNotifierWatcher"), + QDBusConnection::sessionBus()); if (systrayHost.isValid()) { - return systrayHost.property("IsStatusNotifierHostRegistered").toBool(); + return systrayHost.isStatusNotifierHostRegistered(); } return false; diff -Nru plasma-integration-5.13.5/src/platformtheme/kdirselectdialog.cpp plasma-integration-5.16.0/src/platformtheme/kdirselectdialog.cpp --- plasma-integration-5.13.5/src/platformtheme/kdirselectdialog.cpp 2018-09-04 10:18:40.000000000 +0000 +++ plasma-integration-5.16.0/src/platformtheme/kdirselectdialog.cpp 2019-06-06 13:08:06.000000000 +0000 @@ -301,7 +301,7 @@ topLayout->addWidget(m_buttons); QHBoxLayout *hlay = new QHBoxLayout(page); - hlay->setMargin(0); + hlay->setContentsMargins(0, 0, 0, 0); QVBoxLayout *mainLayout = new QVBoxLayout(); d->m_actions = new KActionCollection(this); d->m_actions->addAssociatedWidget(this); diff -Nru plasma-integration-5.13.5/src/platformtheme/kfontsettingsdata.cpp plasma-integration-5.16.0/src/platformtheme/kfontsettingsdata.cpp --- plasma-integration-5.13.5/src/platformtheme/kfontsettingsdata.cpp 2018-09-04 10:18:40.000000000 +0000 +++ plasma-integration-5.16.0/src/platformtheme/kfontsettingsdata.cpp 2019-06-06 13:08:06.000000000 +0000 @@ -25,14 +25,21 @@ #include #include #include +#include #include #include #include +static inline bool checkUsePortalSupport() +{ + return !QStandardPaths::locate(QStandardPaths::RuntimeLocation, QStringLiteral("flatpak-info")).isEmpty() || qEnvironmentVariableIsSet("SNAP"); +} + KFontSettingsData::KFontSettingsData() - : QObject(nullptr), - mKdeGlobals(KSharedConfig::openConfig()) + : QObject(nullptr) + , mUsePortal(checkUsePortalSupport()) + , mKdeGlobals(KSharedConfig::openConfig()) { QMetaObject::invokeMethod(this, "delayedDBusConnects", Qt::QueuedConnection); @@ -70,15 +77,17 @@ const KFontData &fontData = DefaultFontData[fontType]; cachedFont = new QFont(QLatin1String(fontData.FontName), fontData.Size, fontData.Weight); cachedFont->setStyleHint(fontData.StyleHint); - cachedFont->setStyleName(QLatin1String(fontData.StyleName)); - const KConfigGroup configGroup(mKdeGlobals, fontData.ConfigGroupKey); - QString fontInfo = configGroup.readEntry(fontData.ConfigKey, QString()); + const QString fontInfo = readConfigValue(QLatin1String(fontData.ConfigGroupKey), QLatin1String(fontData.ConfigKey)); //If we have serialized information for this font, restore it //NOTE: We are not using KConfig directly because we can't call QFont::QFont from here if (!fontInfo.isEmpty()) { cachedFont->fromString(fontInfo); + } else { + // set the canonical stylename here, where it cannot override + // user-specific font attributes if those do not include a stylename. + cachedFont->setStyleName(QLatin1String(fontData.StyleName)); } mFonts[fontType] = cachedFont; @@ -108,4 +117,44 @@ { QDBusConnection::sessionBus().connect(QString(), QStringLiteral("/KDEPlatformTheme"), QStringLiteral("org.kde.KDEPlatformTheme"), QStringLiteral("refreshFonts"), this, SLOT(dropFontSettingsCache())); + + if (mUsePortal) { + QDBusConnection::sessionBus().connect(QString(), QStringLiteral("/org/freedesktop/portal/desktop"), QStringLiteral("org.freedesktop.portal.Settings"), + QStringLiteral("SettingChanged"), this, SLOT(slotPortalSettingChanged(QString,QString,QDBusVariant))); + } +} + +void KFontSettingsData::slotPortalSettingChanged(const QString &group, const QString &key, const QDBusVariant &value) +{ + Q_UNUSED(value); + + if (group == QLatin1String("org.kde.kdeglobals.General") && key == QLatin1String("font")) { + dropFontSettingsCache(); + } +} + +QString KFontSettingsData::readConfigValue(const QString &group, const QString &key, const QString &defaultValue) const +{ + if (mUsePortal) { + const QString settingName = QStringLiteral("org.kde.kdeglobals.%1").arg(group); + QDBusMessage message = QDBusMessage::createMethodCall(QStringLiteral("org.freedesktop.portal.Desktop"), + QStringLiteral("/org/freedesktop/portal/desktop"), + QStringLiteral("org.freedesktop.portal.Settings"), + QStringLiteral("Read")); + message << settingName << key; + + // FIXME: async? + QDBusReply reply = QDBusConnection::sessionBus().call(message); + if (reply.isValid()) { + QDBusVariant result = qvariant_cast(reply.value()); + const QString resultStr = result.variant().toString(); + + if (!resultStr.isEmpty()) { + return resultStr; + } + } + } + + const KConfigGroup configGroup(mKdeGlobals, group); + return configGroup.readEntry(key, defaultValue); } diff -Nru plasma-integration-5.13.5/src/platformtheme/kfontsettingsdata.h plasma-integration-5.16.0/src/platformtheme/kfontsettingsdata.h --- plasma-integration-5.13.5/src/platformtheme/kfontsettingsdata.h 2018-09-04 10:18:40.000000000 +0000 +++ plasma-integration-5.16.0/src/platformtheme/kfontsettingsdata.h 2019-06-06 13:08:06.000000000 +0000 @@ -21,6 +21,7 @@ #ifndef KFONTSETTINGSDATA_H #define KFONTSETTINGSDATA_H +#include #include #include #include @@ -60,11 +61,15 @@ private Q_SLOTS: void delayedDBusConnects(); + void slotPortalSettingChanged(const QString &group, const QString &key, const QDBusVariant &value); public: // access, is not const due to caching QFont *font(FontTypes fontType); private: + QString readConfigValue(const QString &group, const QString &key, const QString &defaultValue = QString()) const; + + bool mUsePortal; QFont *mFonts[FontTypesCount]; KSharedConfigPtr mKdeGlobals; }; diff -Nru plasma-integration-5.13.5/src/platformtheme/khintssettings.cpp plasma-integration-5.16.0/src/platformtheme/khintssettings.cpp --- plasma-integration-5.13.5/src/platformtheme/khintssettings.cpp 2018-09-04 10:18:40.000000000 +0000 +++ plasma-integration-5.16.0/src/platformtheme/khintssettings.cpp 2019-06-06 13:08:06.000000000 +0000 @@ -35,7 +35,9 @@ #include #include #include +#include +#include #include #include @@ -56,35 +58,63 @@ static const QString defaultLookAndFeelPackage = QStringLiteral("org.kde.breeze.desktop"); +const QDBusArgument &operator>>(const QDBusArgument &argument, QMap &map) +{ + argument.beginMap(); + map.clear(); + + while (!argument.atEnd()) { + QString key; + QVariantMap value; + argument.beginMapEntry(); + argument >> key >> value; + argument.endMapEntry(); + map.insert(key, value); + } + + argument.endMap(); + return argument; +} + +static inline bool checkUsePortalSupport() +{ + return !QStandardPaths::locate(QStandardPaths::RuntimeLocation, QStringLiteral("flatpak-info")).isEmpty() || qEnvironmentVariableIsSet("SNAP"); +} + KHintsSettings::KHintsSettings(KSharedConfig::Ptr kdeglobals) : QObject(nullptr) , mKdeGlobals(kdeglobals) + , mUsePortal(checkUsePortalSupport()) { if (!mKdeGlobals) { mKdeGlobals = KSharedConfig::openConfig(); } KConfigGroup cg(mKdeGlobals, "KDE"); + if (mUsePortal) { + updatePortalSetting(); + } + // try to extract the proper defaults file from a lookandfeel package - const QString looknfeel = cg.readEntry("LookAndFeelPackage", defaultLookAndFeelPackage); - mDefaultLnfConfig = KSharedConfig::openConfig(QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("plasma/look-and-feel/") + looknfeel + QStringLiteral("/contents/defaults"))); + const QString looknfeel = readConfigValue(cg, QStringLiteral("LookAndFeelPackage"), defaultLookAndFeelPackage).toString(); + mDefaultLnfConfig = KSharedConfig::openConfig(QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("plasma/look-and-feel/") + defaultLookAndFeelPackage + QStringLiteral("/contents/defaults"))); if (looknfeel != defaultLookAndFeelPackage) { - mLnfConfig = KSharedConfig::openConfig(QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("plasma/look-and-feel/") + defaultLookAndFeelPackage + QStringLiteral("/contents/defaults"))); + mLnfConfig = KSharedConfig::openConfig(QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("plasma/look-and-feel/") + looknfeel + QStringLiteral("/contents/defaults"))); } - const auto cursorBlinkRate = cg.readEntry("CursorBlinkRate", 1000); + const auto cursorBlinkRate = readConfigValue(cg, QStringLiteral("CursorBlinkRate"), 1000).toInt(); m_hints[QPlatformTheme::CursorFlashTime] = cursorBlinkRate > 0 ? qBound(200, cursorBlinkRate, 2000) : 0; // 0 => no blinking - m_hints[QPlatformTheme::MouseDoubleClickInterval] = cg.readEntry("DoubleClickInterval", 400); - m_hints[QPlatformTheme::StartDragDistance] = cg.readEntry("StartDragDist", 10); - m_hints[QPlatformTheme::StartDragTime] = cg.readEntry("StartDragTime", 500); + m_hints[QPlatformTheme::MouseDoubleClickInterval] = readConfigValue(cg, QStringLiteral("DoubleClickInterval"), 400); + m_hints[QPlatformTheme::StartDragDistance] = readConfigValue(cg, QStringLiteral("StartDragDist"), 10); + m_hints[QPlatformTheme::StartDragTime] = readConfigValue(cg, QStringLiteral("StartDragTime"), 500); KConfigGroup cgToolbar(mKdeGlobals, "Toolbar style"); m_hints[QPlatformTheme::ToolButtonStyle] = toolButtonStyle(cgToolbar); KConfigGroup cgToolbarIcon(mKdeGlobals, "MainToolbarIcons"); - m_hints[QPlatformTheme::ToolBarIconSize] = cgToolbarIcon.readEntry("Size", 22); + m_hints[QPlatformTheme::ToolBarIconSize] = readConfigValue(cgToolbarIcon, QStringLiteral("Size"), 22); - m_hints[QPlatformTheme::ItemViewActivateItemOnSingleClick] = cg.readEntry("SingleClick", true); + m_hints[QPlatformTheme::ItemViewActivateItemOnSingleClick] = readConfigValue(cg, QStringLiteral("SingleClick"), true); m_hints[QPlatformTheme::SystemIconThemeName] = readConfigValue(QStringLiteral("Icons"), QStringLiteral("Theme"), QStringLiteral("breeze")); @@ -97,7 +127,7 @@ QStringLiteral("fusion"), QStringLiteral("windows") }; - const QString configuredStyle = cg.readEntry("widgetStyle", QString()); + const QString configuredStyle = readConfigValue(cg, QStringLiteral("widgetStyle"), QString()).toString(); if (!configuredStyle.isEmpty()) { styleNames.removeOne(configuredStyle); styleNames.prepend(configuredStyle); @@ -110,22 +140,20 @@ m_hints[QPlatformTheme::StyleNames] = styleNames; m_hints[QPlatformTheme::DialogButtonBoxLayout] = QDialogButtonBox::KdeLayout; - m_hints[QPlatformTheme::DialogButtonBoxButtonsHaveIcons] = cg.readEntry("ShowIconsOnPushButtons", true); + m_hints[QPlatformTheme::DialogButtonBoxButtonsHaveIcons] = readConfigValue(cg, QStringLiteral("ShowIconsOnPushButtons"), true); m_hints[QPlatformTheme::UseFullScreenForPopupMenu] = true; m_hints[QPlatformTheme::KeyboardScheme] = QPlatformTheme::KdeKeyboardScheme; - m_hints[QPlatformTheme::UiEffects] = cg.readEntry("GraphicEffectsLevel", 0) != 0 ? QPlatformTheme::GeneralUiEffect : 0; + m_hints[QPlatformTheme::UiEffects] = readConfigValue(cg, QStringLiteral("GraphicEffectsLevel"), 0) != 0 ? QPlatformTheme::GeneralUiEffect : 0; m_hints[QPlatformTheme::IconPixmapSizes] = QVariant::fromValue(QList() << 512 << 256 << 128 << 64 << 32 << 22 << 16 << 8); - m_hints[QPlatformTheme::WheelScrollLines] = cg.readEntry("WheelScrollLines", 3); + m_hints[QPlatformTheme::WheelScrollLines] = readConfigValue(cg, QStringLiteral("WheelScrollLines"), 3); if (qobject_cast(QCoreApplication::instance())) { - QApplication::setWheelScrollLines(cg.readEntry("WheelScrollLines", 3)); + QApplication::setWheelScrollLines(readConfigValue(cg, QStringLiteral("WheelScrollLines"), 3).toInt()); } updateShowIconsInMenuItems(cg); -#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) m_hints[QPlatformTheme::ShowShortcutsInContextMenus] = true; -#endif QMetaObject::invokeMethod(this, "delayedDBusConnects", Qt::QueuedConnection); QMetaObject::invokeMethod(this, "setupIconLoader", Qt::QueuedConnection); @@ -141,7 +169,7 @@ QVariant KHintsSettings::readConfigValue(const QString &group, const QString &key, const QVariant &defaultValue) { KConfigGroup userCg(mKdeGlobals, group); - QVariant value = userCg.readEntry(key, QString()); + QVariant value = readConfigValue(userCg, key, QString()); if (!value.isNull()) { return value; @@ -162,12 +190,28 @@ KConfigGroup lnfCg(mDefaultLnfConfig, "kdeglobals"); lnfCg = KConfigGroup(&lnfCg, group); if (lnfCg.isValid()) { - return lnfCg.readEntry(key, defaultValue); + return lnfCg.readEntry(key, defaultValue); } return defaultValue; } +QVariant KHintsSettings::readConfigValue(const KConfigGroup &cg, const QString &key, const QVariant &defaultValue) const +{ + if (mUsePortal) { + const QString settingName = QStringLiteral("org.kde.kdeglobals.%1").arg(cg.name()); + auto groupIt = mKdeGlobalsPortal.constFind(settingName); + if (groupIt != mKdeGlobalsPortal.constEnd()) { + auto valueIt = groupIt.value().constFind(key); + if (valueIt != groupIt.value().constEnd()) { + return valueIt.value(); + } + } + } + + return cg.readEntry(key, defaultValue); +} + QStringList KHintsSettings::xdgIconThemePaths() const { QStringList paths; @@ -189,6 +233,10 @@ QStringLiteral("styleChanged"), this, SLOT(toolbarStyleChanged())); QDBusConnection::sessionBus().connect(QString(), QStringLiteral("/KGlobalSettings"), QStringLiteral("org.kde.KGlobalSettings"), QStringLiteral("notifyChange"), this, SLOT(slotNotifyChange(int,int))); + if (mUsePortal) { + QDBusConnection::sessionBus().connect(QString(), QStringLiteral("/org/freedesktop/portal/desktop"), QStringLiteral("org.freedesktop.portal.Settings"), + QStringLiteral("SettingChanged"), this, SLOT(slotPortalSettingChanged(QString,QString,QDBusVariant))); + } } void KHintsSettings::setupIconLoader() @@ -265,13 +313,13 @@ return; } - const QString theme = cg.readEntry("widgetStyle", QString()); + const QString theme = readConfigValue(cg, QStringLiteral("widgetStyle"), QString()).toString(); if (theme.isEmpty()) { return; } QStringList styleNames; - styleNames << cg.readEntry("widgetStyle", QString()) + styleNames << theme << QStringLiteral(BREEZE_STYLE_NAME) << QStringLiteral("oxygen") << QStringLiteral("fusion") @@ -291,12 +339,32 @@ } } +void KHintsSettings::slotPortalSettingChanged(const QString &group, const QString &key, const QDBusVariant &value) +{ + if (group == QLatin1String("org.kde.kdeglobals.General") && key == QLatin1String("ColorScheme")) { + // For colors obtain complete configuration again + updatePortalSetting(); + slotNotifyChange(PaletteChanged, 0); + } else if (group == QLatin1String("org.kde.kdeglobals.KDE") && key == QLatin1String("widgetStyle")) { + mKdeGlobalsPortal[group][key] = value.variant().toString(); + slotNotifyChange(StyleChanged, 0); + } else if (group == QLatin1String("org.kde.kdeglobals.Icons") && key == QLatin1String("Theme")) { + mKdeGlobalsPortal[group][key] = value.variant().toString(); + // Change icons for each group + for (int i = 0; i <= 5; ++i) { + iconChanged(i); + } + } else if (group == QLatin1String("org.kde.kdeglobals.Toolbar style") && key == QLatin1String("ToolButtonStyle")) { + mKdeGlobalsPortal[group][key] = value.variant().toString(); + toolbarStyleChanged(); + } +} + void KHintsSettings::iconChanged(int group) { KIconLoader::Group iconGroup = (KIconLoader::Group) group; if (iconGroup != KIconLoader::MainToolbar) { m_hints[QPlatformTheme::SystemIconThemeName] = readConfigValue(QStringLiteral("Icons"), QStringLiteral("Theme"), QStringLiteral("breeze")); - return; } @@ -349,13 +417,13 @@ void KHintsSettings::updateShowIconsInMenuItems(KConfigGroup &cg) { - bool showIcons = cg.readEntry("ShowIconsInMenuItems", true); + bool showIcons = readConfigValue(cg, QStringLiteral("ShowIconsInMenuItems"), true).toBool(); QCoreApplication::setAttribute(Qt::AA_DontShowIconsInMenus, !showIcons); } -Qt::ToolButtonStyle KHintsSettings::toolButtonStyle(const KConfigGroup &cg) const +Qt::ToolButtonStyle KHintsSettings::toolButtonStyle(const KConfigGroup &cg) { - const QString buttonStyle = cg.readEntry("ToolButtonStyle", "TextBesideIcon").toLower(); + const QString buttonStyle = readConfigValue(cg, QStringLiteral("ToolButtonStyle"), QStringLiteral("TextBesideIcon")).toString().toLower(); return buttonStyle == QLatin1String("textbesideicon") ? Qt::ToolButtonTextBesideIcon : buttonStyle == QLatin1String("icontextright") ? Qt::ToolButtonTextBesideIcon : buttonStyle == QLatin1String("textundericon") ? Qt::ToolButtonTextUnderIcon @@ -369,12 +437,26 @@ qDeleteAll(m_palettes); m_palettes.clear(); - if (mKdeGlobals->hasGroup("Colors:View")) { + if (mUsePortal && mKdeGlobalsPortal.contains(QStringLiteral("org.kde.kdeglobals.Colors:View"))) { + // Construct a temporary KConfig file containing color setting so we can create a KColorScheme from it + QTemporaryFile file; + file.open(); + + KSharedConfigPtr tempConfig = KSharedConfig::openConfig(file.fileName(), KConfig::SimpleConfig); + for (auto groupIt = mKdeGlobalsPortal.constBegin(); groupIt != mKdeGlobalsPortal.constEnd(); ++groupIt) { + if (groupIt.key().startsWith(QStringLiteral("org.kde.kdeglobals.Colors:"))) { + KConfigGroup tempGroup(tempConfig, groupIt.key().right(groupIt.key().length() - QStringLiteral("org.kde.kdeglobals.").length())); + for (auto valueIt = groupIt.value().constBegin(); valueIt != groupIt.value().constEnd(); ++valueIt) { + tempGroup.writeEntry(valueIt.key(), valueIt.value()); + } + } + } + m_palettes[QPlatformTheme::SystemPalette] = new QPalette(KColorScheme::createApplicationPalette(tempConfig)); + } else if (mKdeGlobals->hasGroup("Colors:View")) { m_palettes[QPlatformTheme::SystemPalette] = new QPalette(KColorScheme::createApplicationPalette(mKdeGlobals)); } else { - KConfigGroup cg(mKdeGlobals, "KDE"); - const QString looknfeel = cg.readEntry("LookAndFeelPackage", defaultLookAndFeelPackage); + const QString looknfeel = readConfigValue(cg, QStringLiteral("LookAndFeelPackage"), defaultLookAndFeelPackage).toString(); QString path = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("plasma/look-and-feel/") + looknfeel + QStringLiteral("/contents/colors")); if (!path.isEmpty()) { m_palettes[QPlatformTheme::SystemPalette] = new QPalette(KColorScheme::createApplicationPalette(KSharedConfig::openConfig(path))); @@ -419,3 +501,21 @@ } #endif } + +void KHintsSettings::updatePortalSetting() +{ + mKdeGlobalsPortal.clear(); + + QDBusMessage message = QDBusMessage::createMethodCall(QStringLiteral("org.freedesktop.portal.Desktop"), + QStringLiteral("/org/freedesktop/portal/desktop"), + QStringLiteral("org.freedesktop.portal.Settings"), + QStringLiteral("ReadAll")); + message << QStringList{QStringLiteral("org.kde.kdeglobals.*")}; + + // FIXME: async? + QDBusMessage resultMessage = QDBusConnection::sessionBus().call(message); + if (resultMessage.type() == QDBusMessage::ReplyMessage) { + QDBusArgument dbusArgument = resultMessage.arguments().at(0).value(); + dbusArgument >> mKdeGlobalsPortal; + } +} diff -Nru plasma-integration-5.13.5/src/platformtheme/khintssettings.h plasma-integration-5.16.0/src/platformtheme/khintssettings.h --- plasma-integration-5.13.5/src/platformtheme/khintssettings.h 2018-09-04 10:18:40.000000000 +0000 +++ plasma-integration-5.16.0/src/platformtheme/khintssettings.h 2019-06-06 13:08:06.000000000 +0000 @@ -21,6 +21,7 @@ #ifndef KHINTS_SETTINGS_H #define KHINTS_SETTINGS_H +#include #include #include @@ -70,21 +71,26 @@ void setupIconLoader(); void toolbarStyleChanged(); void slotNotifyChange(int type, int arg); + void slotPortalSettingChanged(const QString &group, const QString &key, const QDBusVariant &value); private: QVariant readConfigValue(const QString &group, const QString &key, const QVariant &defaultValue); + QVariant readConfigValue(const KConfigGroup &cg, const QString &key, const QVariant &defaultValue) const; void loadPalettes(); void iconChanged(int group); void updateQtSettings(KConfigGroup &cg); void updateShowIconsInMenuItems(KConfigGroup &cg); - Qt::ToolButtonStyle toolButtonStyle(const KConfigGroup &cg) const; + Qt::ToolButtonStyle toolButtonStyle(const KConfigGroup &cg); void updateCursorTheme(); + void updatePortalSetting(); QHash m_palettes; QHash m_hints; KSharedConfigPtr mKdeGlobals; KSharedConfigPtr mDefaultLnfConfig; KSharedConfigPtr mLnfConfig; + QMap mKdeGlobalsPortal; + bool mUsePortal; }; #endif //KHINTS_SETTINGS_H diff -Nru plasma-integration-5.13.5/src/platformtheme/kwaylandintegration.cpp plasma-integration-5.16.0/src/platformtheme/kwaylandintegration.cpp --- plasma-integration-5.13.5/src/platformtheme/kwaylandintegration.cpp 2018-09-04 10:18:40.000000000 +0000 +++ plasma-integration-5.16.0/src/platformtheme/kwaylandintegration.cpp 2019-06-06 13:08:06.000000000 +0000 @@ -20,6 +20,8 @@ #include "kwaylandintegration.h" #include +#include +#include #include #include @@ -38,7 +40,6 @@ KWaylandIntegration::KWaylandIntegration() : QObject() - , m_decoration(nullptr) { } @@ -54,13 +55,7 @@ m_registry->create(connection); QObject::connect(m_registry, &Registry::interfacesAnnounced, this, [this] { - const auto interface = m_registry->interface(Registry::Interface::ServerSideDecorationManager); - if (interface.name != 0) { - m_decoration = m_registry->createServerSideDecorationManager(interface.name, interface.version, this); - qputenv("QT_WAYLAND_DISABLE_WINDOWDECORATION", "1"); - QCoreApplication::instance()->installEventFilter(this); - - } + QCoreApplication::instance()->installEventFilter(this); const auto menuInterface = m_registry->interface(Registry::Interface::AppMenu); if (menuInterface.name != 0) { m_appMenuManager = m_registry->createAppMenuManager(menuInterface.name, menuInterface.version, this); @@ -74,9 +69,7 @@ bool KWaylandIntegration::eventFilter(QObject *watched, QEvent *event) { - if (!m_decoration) { - return false; - } else if (event->type() == QEvent::Expose) { + if (event->type() == QEvent::Expose) { auto ee = static_cast(event); if (ee->region().isNull()) { return false; @@ -85,7 +78,7 @@ if (!w || w->parent() || !w->isVisible()) { return false; } - if(w->property("org.kde.plasma.integration.waylandserverdecoration").isNull()) { + if (w->property("org.kde.plasma.integration.shellSurfaceCreated").isNull()) { shellSurfaceCreated(w); } } else if (event->type() == QEvent::Hide) { @@ -119,22 +112,8 @@ if (!s) { return; } - auto deco = m_decoration->create(s, w); - connect(deco, &ServerSideDecoration::modeChanged, w, - [deco, w] { - const auto flags = w->flags(); - const auto ourMode = (flags.testFlag(Qt::FramelessWindowHint) || flags.testFlag(Qt::Popup) || flags.testFlag(Qt::ToolTip)) ? ServerSideDecoration::Mode::None : ServerSideDecoration::Mode::Server; - if (deco->mode() != ourMode) { - deco->requestMode(ourMode); - } - } - ); - const auto flags = w->flags(); - const auto ourMode = (flags.testFlag(Qt::FramelessWindowHint) || flags.testFlag(Qt::Popup) || flags.testFlag(Qt::ToolTip)) ? ServerSideDecoration::Mode::None : ServerSideDecoration::Mode::Server; - if (deco->defaultMode() != ourMode) { - deco->requestMode(ourMode); - } - w->setProperty("org.kde.plasma.integration.waylandserverdecoration", QVariant::fromValue(deco)); + + w->setProperty("org.kde.plasma.integration.shellSurfaceCreated", true); if (m_appMenuManager) { auto menu = m_appMenuManager->create(s, w); @@ -145,8 +124,7 @@ void KWaylandIntegration::shellSurfaceDestroyed(QWindow *w) { - delete w->property("org.kde.plasma.integration.waylandserverdecoration").value(); - w->setProperty("org.kde.plasma.integration.waylandserverdecoration", QVariant()); + w->setProperty("org.kde.plasma.integration.shellSurfaceCreated", QVariant()); delete w->property("org.kde.plasma.integration.appmenu").value(); w->setProperty("org.kde.plasma.integration.appmenu", QVariant()); diff -Nru plasma-integration-5.13.5/src/platformtheme/kwaylandintegration.h plasma-integration-5.16.0/src/platformtheme/kwaylandintegration.h --- plasma-integration-5.13.5/src/platformtheme/kwaylandintegration.h 2018-09-04 10:18:40.000000000 +0000 +++ plasma-integration-5.16.0/src/platformtheme/kwaylandintegration.h 2019-06-06 13:08:06.000000000 +0000 @@ -54,7 +54,6 @@ void shellSurfaceDestroyed(QWindow *w); void installColorScheme(QWindow *w); - KWayland::Client::ServerSideDecorationManager *m_decoration = nullptr; KWayland::Client::AppMenuManager *m_appMenuManager = nullptr; KWayland::Client::ServerSideDecorationPaletteManager *m_paletteManager = nullptr; KWayland::Client::Registry* m_registry = nullptr; diff -Nru plasma-integration-5.13.5/src/platformtheme/org.kde.StatusNotifierWatcher.xml plasma-integration-5.16.0/src/platformtheme/org.kde.StatusNotifierWatcher.xml --- plasma-integration-5.13.5/src/platformtheme/org.kde.StatusNotifierWatcher.xml 1970-01-01 00:00:00.000000000 +0000 +++ plasma-integration-5.16.0/src/platformtheme/org.kde.StatusNotifierWatcher.xml 2019-06-06 13:08:06.000000000 +0000 @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru plasma-integration-5.13.5/src/platformtheme/x11integration.cpp plasma-integration-5.16.0/src/platformtheme/x11integration.cpp --- plasma-integration-5.13.5/src/platformtheme/x11integration.cpp 2018-09-04 10:18:40.000000000 +0000 +++ plasma-integration-5.16.0/src/platformtheme/x11integration.cpp 2019-06-06 13:08:06.000000000 +0000 @@ -116,11 +116,17 @@ return; } - if (QGuiApplication::desktopFileName().isEmpty()) { + QString desktopFileName = QGuiApplication::desktopFileName(); + if (desktopFileName.isEmpty()) { return; } + // handle apps which set the desktopFileName property with filename suffix, + // due to unclear API dox (https://bugreports.qt.io/browse/QTBUG-75521) + if (desktopFileName.endsWith(QLatin1String(".desktop"))) { + desktopFileName.chop(8); + } NETWinInfo info(QX11Info::connection(), w->winId(), QX11Info::appRootWindow(), NET::Properties(), NET::Properties2()); - info.setDesktopFileName(QGuiApplication::desktopFileName().toUtf8().constData()); + info.setDesktopFileName(desktopFileName.toUtf8().constData()); } void X11Integration::setWindowProperty(QWindow *window, const QByteArray &name, const QByteArray &value)