diff -pruN 19.08.3-1/autotest/CMakeLists.txt 19.12.3-0ubuntu1/autotest/CMakeLists.txt --- 19.08.3-1/autotest/CMakeLists.txt 2019-10-11 05:07:34.000000000 +0000 +++ 19.12.3-0ubuntu1/autotest/CMakeLists.txt 2020-02-07 06:13:55.000000000 +0000 @@ -1,7 +1,7 @@ add_definitions( -DGRANTLEETHEME_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/data" ) ecm_add_test(grantleethemetest.cpp NAME_PREFIX "grantleetheme-" - LINK_LIBRARIES Qt5::Test KF5::GrantleeTheme KF5::ConfigCore + LINK_LIBRARIES Qt5::Test KF5::GrantleeTheme KF5::ConfigCore Qt5::Gui KF5::ConfigWidgets ) ecm_add_test(grantleethememanagertest.cpp NAME_PREFIX "grantleetheme-" diff -pruN 19.08.3-1/autotest/data/themes/color/color_expected.html 19.12.3-0ubuntu1/autotest/data/themes/color/color_expected.html --- 19.08.3-1/autotest/data/themes/color/color_expected.html 1970-01-01 00:00:00.000000000 +0000 +++ 19.12.3-0ubuntu1/autotest/data/themes/color/color_expected.html 2020-02-07 06:13:55.000000000 +0000 @@ -0,0 +1,34 @@ + + +Color name: #ff0000 +RGBA: rgba(255, 0, 0, 1) +Color lighter: #ff7f7f +Color darker: #aa0000 +Color set alpha: rgba(255, 0, 0, 0.164706) + +Active: #ff0000 +Inactive: #00ff00 +Disabled: #0000ff +Default: #00ff00 + +Red: 255 +Name: #ff0000 +RGBA: rgba(255, 0, 0, 1) + +Mix literal/literal: rgba(64, 0, 191, 1) +Mix var/literal: rgba(128, 0, 128, 1) +Mix var/var: rgba(191, 64, 0, 1) + +Color literal: #b0c4de + +Mix filtered: rgba(64, 0, 64, 1) + +## Color scheme +Normal background: #fcfcfc +Link background: #e5eff7 +Normal text: #232627 +Link text: #2980b9 +Hover color: #93cee9 +Focus color: #3daee9 + + diff -pruN 19.08.3-1/autotest/data/themes/color/color.html 19.12.3-0ubuntu1/autotest/data/themes/color/color.html --- 19.08.3-1/autotest/data/themes/color/color.html 1970-01-01 00:00:00.000000000 +0000 +++ 19.12.3-0ubuntu1/autotest/data/themes/color/color.html 2020-02-07 06:13:55.000000000 +0000 @@ -0,0 +1,33 @@ + +Color name: {{ pal.button|colorHexRgb }} +RGBA: {{ pal.button|colorCssRgba }} +Color lighter: {{ pal.button|colorLighter:150|colorHexRgb }} +Color darker: {{ pal.button|colorDarker:150|colorHexRgb }} +Color set alpha: {{ pal.button|colorSetAlpha:42|colorCssRgba }} + +Active: {{ pal.activeBase|colorHexRgb }} +Inactive: {{ pal.inactiveBase|colorHexRgb }} +Disabled: {{ pal.disabledBase|colorHexRgb }} +Default: {{ pal.base|colorHexRgb }} + +Red: {{ pal.button.red }} +Name: {{ pal.button.hexRgb }} +RGBA: {{ pal.button.cssRgba }} + +Mix literal/literal: {% colorMix "#ff0000" "#0000ff" 0.75 %} +Mix var/literal: {% colorMix pal.button "#0000ff" 0.5 %} +Mix var/var: {% colorMix pal.button pal.inactiveBase 0.25 %} + +Color literal: {{ "lightsteelblue"|colorHexRgb }} + +Mix filtered: {% colorMix pal.button "#0000ff" 0.5 as myColor %}{{ myColor|colorDarker:200|colorCssRgba }} + +## Color scheme +Normal background: {{ colorScheme.normalBackground.hexRgb }} +Link background: {{ colorScheme.linkBackground.hexRgb }} +Normal text: {{ colorScheme.normalText.hexRgb }} +Link text: {{ colorScheme.linkText.hexRgb }} +Hover color: {{ colorScheme.hoverColor.hexRgb }} +Focus color: {{ colorScheme.focusColor.hexRgb }} + + diff -pruN 19.08.3-1/autotest/data/themes/color/color.testdesktop 19.12.3-0ubuntu1/autotest/data/themes/color/color.testdesktop --- 19.08.3-1/autotest/data/themes/color/color.testdesktop 1970-01-01 00:00:00.000000000 +0000 +++ 19.12.3-0ubuntu1/autotest/data/themes/color/color.testdesktop 2020-02-07 06:13:55.000000000 +0000 @@ -0,0 +1,4 @@ +[Desktop Entry] +Name=Color Unit Test +Description=Color Unit Test +FileName=color.html diff -pruN 19.08.3-1/autotest/grantleethemetest.cpp 19.12.3-0ubuntu1/autotest/grantleethemetest.cpp --- 19.08.3-1/autotest/grantleethemetest.cpp 2019-10-11 05:07:34.000000000 +0000 +++ 19.12.3-0ubuntu1/autotest/grantleethemetest.cpp 2020-02-07 06:13:55.000000000 +0000 @@ -21,9 +21,11 @@ #include #include +#include #include #include +#include #include #include @@ -173,6 +175,7 @@ void GrantleeThemeTest::testRenderTempla QTest::newRow("valid theme") << QStringLiteral("valid") << true << QStringLiteral("filename.testdesktop") << QStringLiteral("header"); QTest::newRow("invalid theme") << QStringLiteral("invalid") << false << QStringLiteral("filename.testdesktop") << QString(); + QTest::newRow("color") << QStringLiteral("color") << true << QStringLiteral("color.testdesktop") << QStringLiteral("color"); } void GrantleeThemeTest::testRenderTemplate() @@ -191,6 +194,14 @@ void GrantleeThemeTest::testRenderTempla data[QStringLiteral("title")] = QStringLiteral("Something's going on"); data[QStringLiteral("subtext")] = QStringLiteral("Please wait, it will be over soon."); + QPalette pal; + pal.setColor(QPalette::Button, Qt::red); + pal.setColor(QPalette::Active, QPalette::Base, Qt::red); + pal.setColor(QPalette::Inactive, QPalette::Base, Qt::green); + pal.setColor(QPalette::Disabled, QPalette::Base, Qt::blue); + data[QStringLiteral("pal")] = QVariant::fromValue(pal); + data[QStringLiteral("colorScheme")] = QVariant::fromValue(KColorScheme(QPalette::Normal, KColorScheme::View)); + GrantleeTheme::Theme theme(themePath, dirname, filename); QCOMPARE(theme.isValid(), isValid); diff -pruN 19.08.3-1/CMakeLists.txt 19.12.3-0ubuntu1/CMakeLists.txt --- 19.08.3-1/CMakeLists.txt 2019-11-05 04:18:17.000000000 +0000 +++ 19.12.3-0ubuntu1/CMakeLists.txt 2020-03-03 00:38:29.000000000 +0000 @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_MIN_VERSION "5.60.0") -set(PIM_VERSION "5.12.3") +set(KF5_MIN_VERSION "5.63.0") +set(PIM_VERSION "5.13.3") project(GrantleeTheme VERSION ${PIM_VERSION}) @@ -36,6 +36,7 @@ set(QT_REQUIRED_VERSION "5.11.0") set(GRANTLEE_VERSION "5.1") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Network) +find_package(KF5GuiAddons ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5I18n ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5IconThemes ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5NewStuff ${KF5_MIN_VERSION} CONFIG REQUIRED) @@ -50,7 +51,11 @@ ecm_setup_version(PROJECT VARIABLE_PREFI ########### Targets ########### -add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000) +if (EXISTS "${CMAKE_SOURCE_DIR}/.git") + add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050e00) + add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054000) +endif() + add_definitions(-DQT_NO_FOREACH) diff -pruN 19.08.3-1/debian/changelog 19.12.3-0ubuntu1/debian/changelog --- 19.08.3-1/debian/changelog 2019-11-30 21:54:05.000000000 +0000 +++ 19.12.3-0ubuntu1/debian/changelog 2020-04-11 12:57:00.000000000 +0000 @@ -1,199 +1,122 @@ -libkf5grantleetheme (19.08.3-1) unstable; urgency=medium +libkf5grantleetheme (19.12.3-0ubuntu1) focal; urgency=medium - [ Sandro Knauß ] - * New upstream release (19.08.3). + * Move qdebug categories file to new location. + * New upstream release (19.12.3) + * Update symbols from build logs. - -- Sandro Knauß Sat, 30 Nov 2019 22:54:05 +0100 + -- Rik Mills Sat, 11 Apr 2020 13:57:00 +0100 -libkf5grantleetheme (19.08.2-1) experimental; urgency=medium +libkf5grantleetheme (19.04.3-0ubuntu2) focal; urgency=medium - [ Sandro Knauß ] - * Bump Standards-Version to 4.4.1 (No changes needed). - * New upstream release (19.08.2). - * Update build-deps and deps with the info from cmake. - * Update install files for new upstream release. - * Remove breaks against kde-l10n packages. + * No-change rebuild for libgcc-s1 package name change. - -- Sandro Knauß Fri, 08 Nov 2019 10:38:57 +0100 + -- Matthias Klose Mon, 23 Mar 2020 07:18:06 +0100 -libkf5grantleetheme (18.08.3-3) unstable; urgency=medium +libkf5grantleetheme (19.04.3-0ubuntu1) eoan; urgency=medium - * Release to unstable. + * New upstream release (19.04.3) - -- Sandro Knauß Thu, 14 Nov 2019 23:49:01 +0100 + -- Rik Mills Tue, 23 Jul 2019 18:53:47 +0100 -libkf5grantleetheme (18.08.3-2) experimental; urgency=medium +libkf5grantleetheme (18.12.3-0ubuntu2) disco; urgency=medium - [ Sandro Knauß ] - * Bump Standards-Version to 4.4.0 (No changes needed). - * Bump compat level to 12. - * Add myself to Uploaders. - * Delete not needed Breaks/Confilcts. - * Use virtual packages to bundle KDEPIM. + * No-change rebuild for fixed akonadi server. - -- Sandro Knauß Thu, 03 Oct 2019 22:59:40 +0200 + -- Rik Mills Sun, 07 Apr 2019 17:44:33 +0100 -libkf5grantleetheme (18.08.3-1) unstable; urgency=medium +libkf5grantleetheme (18.12.3-0ubuntu1) disco; urgency=medium - * Team upload. + * New upstream release (18.12.3) - [ Sandro Knauß ] - * New upstream release (18.08.3). - * Bump Standards-Version to 4.3.0 (No changes needed). - * Removed acc autopkgtest. - * Removed testsuite autopkgtest. + -- Rik Mills Sat, 16 Mar 2019 15:04:15 +0000 - -- Sandro Knauß Mon, 04 Feb 2019 15:57:05 +0100 +libkf5grantleetheme (18.04.3-0ubuntu2) disco; urgency=medium -libkf5grantleetheme (18.08.1-1) unstable; urgency=medium + * Follow Debian dropping of autotests. - * Team upload. + -- Rik Mills Thu, 07 Feb 2019 08:25:44 +0000 - [ Sandro Knauß ] - * Bump Standards-Version to 4.2.1 (No changes needed). - * Follow stable releases in KDE again. - * New upstream release (18.08.1). +libkf5grantleetheme (18.04.3-0ubuntu1) cosmic; urgency=medium - -- Sandro Knauß Tue, 02 Oct 2018 23:16:59 +0200 + * New upstream release (18.03.80) + * New upstream release (18.04.0) + * New upstream release (18.04.1) + * New upstream release (18.04.3) -libkf5grantleetheme (18.07.90-1) experimental; urgency=medium + -- Rik Mills Tue, 21 Aug 2018 18:52:57 +0100 - * Team upload. - [ Sandro Knauß ] - * Update watch file to match unstable releases, too. - * New upstream release (18.07.90). - * Bump Standards-Version to 4.2.0 (No changes needed). - * Update build-deps and deps with the info from cmake - - -- Sandro Knauß Thu, 16 Aug 2018 11:00:19 +0200 +libkf5grantleetheme (17.12.3-0ubuntu1) bionic; urgency=medium -libkf5grantleetheme (17.12.3-1) unstable; urgency=medium + * New upstream release (17.12.3) - * Team upload. + -- Rik Mills Fri, 16 Mar 2018 13:23:16 +0000 - [ Sandro Knauß ] - * New upstream release (17.12.3). - * use secure copyright format uri. - * Use secure uri in d/watch. +libkf5grantleetheme (17.12.2-0ubuntu1) bionic; urgency=medium - -- Sandro Knauß Sat, 31 Mar 2018 18:27:11 +0200 + * New upstream release (17.11.80) + * New upstream release (17.11.90) + * New upstream release (17.12.0) + * New upstream release (17.12.2) -libkf5grantleetheme (17.12.2-1) experimental; urgency=medium + -- Rik Mills Wed, 28 Feb 2018 09:43:50 +0000 - * Team upload. +libkf5grantleetheme (17.08.3-0ubuntu1) bionic; urgency=medium - [ Sandro Knauß ] - * New upstream release (17.12.2). - * Update build-deps and deps with the info from cmake - * Enable build tests. - * Update Vcs links to salsa. - * Bump debhelper build-dep and compat to 11. + * New upstream release (17.08.3) - -- Sandro Knauß Fri, 09 Mar 2018 15:15:23 +0100 + -- Rik Mills Fri, 01 Dec 2017 15:01:44 +0000 -libkf5grantleetheme (17.08.3-1) unstable; urgency=medium +libkf5grantleetheme (17.04.3-0ubuntu1) artful; urgency=low - * Team upload. + * New upstream release (17.04.1) + * Add libkf5grantleetheme-data installing the translations + * New upstream release (17.04.2) + * New upstream release (17.04.3) - [ Sandro Knauß ] - * New upstream release (17.08.3). - * Add Mulit-Arch hints. - * Bump Standards-Version to 4.1.2 ( No changes needed). - * Use secure version for upstream website. - * Get rid of unnessary break/replaces of kde-l10n-ast. - * Bump debhelper build-dep and compat to 10. - * Set l10npkgs_firstversion_ok to 4:16.04.3-9~ + -- José Manuel Santamaría Lema Mon, 21 Aug 2017 14:32:57 +0100 - -- Sandro Knauß Thu, 21 Dec 2017 17:58:58 +0100 +libkf5grantleetheme (16.12.3-0ubuntu1) artful; urgency=medium -libkf5grantleetheme (17.08.0-1) experimental; urgency=medium + [ Automatic packaging ] + ** SNAPSHOT build @40d535d561608ae6ee60fcefdcb33b0febee7410 ** - * New upstream release (17.08.0) - * Bump Standards-Version to 4.0.1. - * Update upstream metadata * Update build-deps and deps with the info from cmake - * Bump group breaks (17.08) - * Release to experimental - - -- Maximiliano Curia Fri, 01 Sep 2017 22:19:16 +0200 - -libkf5grantleetheme (17.08.0-0neon) xenial; urgency=medium - - * New release - - -- Neon CI Thu, 17 Aug 2017 09:31:53 +0000 - -libkf5grantleetheme (17.04.3-0neon) xenial; urgency=medium - - * New release - - -- Neon CI Wed, 12 Jul 2017 10:18:20 +0000 - -libkf5grantleetheme (17.04.2-0neon) xenial; urgency=medium - - * New release - - -- Neon CI Wed, 07 Jun 2017 12:20:02 +0000 - -libkf5grantleetheme (17.04.1-0neon) xenial; urgency=medium - - * New release - - -- Neon CI Thu, 11 May 2017 18:10:27 +0000 - -libkf5grantleetheme (17.04.0-0neon) xenial; urgency=medium - - * New release - - -- Neon CI Thu, 20 Apr 2017 13:30:54 +0000 - -libkf5grantleetheme (16.12.3-0neon) xenial; urgency=medium - - * New release - - -- Neon CI Wed, 08 Mar 2017 13:46:29 +0000 - -libkf5grantleetheme (16.12.2-0neon) xenial; urgency=medium - - * New release - - -- Neon CI Wed, 08 Feb 2017 16:55:52 +0000 - -libkf5grantleetheme (16.12.1-0neon) xenial; urgency=medium - - * New release - - -- Neon CI Wed, 11 Jan 2017 13:14:52 +0000 - -libkf5grantleetheme (16.12.0-0neon) xenial; urgency=medium - - * New release - - -- Neon CI Wed, 14 Dec 2016 16:25:34 +0000 - -libkf5grantleetheme (16.08.3-0neon) xenial; urgency=medium + * Update symbols files + * Add breaks related to a minor abi change + * UNRELEASED - * New release + [ Clive Johnston ] + * Merged with Debian + * Added new file to install - -- Neon CI Mon, 21 Nov 2016 13:52:36 +0000 + [ Rik Mills ] + * New upstream release (16.12.0) + * New upstream release (16.12.1) -libkf5grantleetheme (16.08.2-0neon) xenial; urgency=medium + [ Darin Miller ] + * New upstream release (16.12.2) - * New release + [ José Manuel Santamaría Lema ] + * Pass '-fno-keep-inline-functions' to gcc in the acc test in order to + avoid possible spurious test failures. + * Add libgrantlee5-dev to libkf5grantleetheme-dev depends, fixing the + acc autopkgtest. + * New upstream release (16.12.3) - -- Neon CI Fri, 14 Oct 2016 13:38:14 +0000 + -- José Manuel Santamaría Lema Mon, 01 May 2017 20:27:36 +0100 -libkf5grantleetheme (16.08.1-0neon) xenial; urgency=medium +libkf5grantleetheme (16.04.3-1ubuntu2) UNRELEASED; urgency=medium - * New release + * Update Vcs-Git fields to use https:// instead of git:// - -- Neon CI Fri, 16 Sep 2016 13:05:35 +0000 + -- José Manuel Santamaría Lema Sat, 29 Oct 2016 17:16:47 +0200 -libkf5grantleetheme (16.08.0-0neon) xenial; urgency=medium +libkf5grantleetheme (16.04.3-1ubuntu1) yakkety; urgency=medium - * New release + * Sync with Debian for initial packaging + * Update VCS fields to point to Launchpad git repo - -- Neon CI Wed, 17 Aug 2016 11:47:36 +0000 + -- José Manuel Santamaría Lema Fri, 30 Sep 2016 06:35:52 +0200 libkf5grantleetheme (16.04.3-1) unstable; urgency=medium diff -pruN 19.08.3-1/debian/compat 19.12.3-0ubuntu1/debian/compat --- 19.08.3-1/debian/compat 1970-01-01 00:00:00.000000000 +0000 +++ 19.12.3-0ubuntu1/debian/compat 2020-04-11 12:57:00.000000000 +0000 @@ -0,0 +1 @@ +9 diff -pruN 19.08.3-1/debian/control 19.12.3-0ubuntu1/debian/control --- 19.08.3-1/debian/control 2019-11-30 21:32:09.000000000 +0000 +++ 19.12.3-0ubuntu1/debian/control 2020-04-11 12:57:00.000000000 +0000 @@ -2,31 +2,39 @@ Source: libkf5grantleetheme Section: libs Priority: optional Maintainer: Debian/Kubuntu Qt/KDE Maintainers -Uploaders: Maximiliano Curia , Sandro Knauß -Build-Depends: cmake (>= 3.5~), - debhelper-compat (= 12), - extra-cmake-modules (>= 5.60.0~), - libgrantlee5-dev (>= 5.1~), - libkf5i18n-dev (>= 5.60.0~), - libkf5iconthemes-dev (>= 5.60.0~), - libkf5newstuff-dev (>= 5.60.0~), +Uploaders: Maximiliano Curia +Build-Depends: cmake (>= 2.8.12~), + debhelper (>= 9), + extra-cmake-modules (>= 5.31.0~), + libgrantlee5-dev (>= 5.0.0~), + libkf5i18n-dev (>= 5.31.0~), + libkf5iconthemes-dev (>= 5.31.0~), + libkf5newstuff-dev (>= 5.31.0~), pkg-kde-tools (>= 0.12), - qtbase5-dev (>= 5.11.0~), - xauth, - xvfb -Standards-Version: 4.4.1 -Homepage: https://pim.kde.org/ -Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/grantleetheme -Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/grantleetheme.git + qtbase5-dev (>= 5.6.1~), +Standards-Version: 3.9.8 +Homepage: http://pim.kde.org/ +Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/grantleetheme +Vcs-Git: https://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/grantleetheme + +Package: libkf5grantleetheme-data +Architecture: all +Depends: ${misc:Depends} +Breaks: ${kde-l10n:all} +Replaces: ${kde-l10n:all} +Description: KDE PIM grantlee theme support - data files + This library provides the grantlee theme support for KDE PIM. + . + This package provides the shared libraries. Package: libkf5grantleetheme-dev -Section: libdevel Architecture: any -Multi-Arch: same -Depends: libkf5grantleetheme5 (= ${binary:Version}), - qtbase5-dev (>= 5.11.0~), +Section: libdevel +Depends: libgrantlee5-dev, + libkf5grantleetheme5 (= ${binary:Version}), + qtbase5-dev (>= 5.6.1~), ${misc:Depends}, - ${shlibs:Depends} + ${shlibs:Depends}, Description: KDE PIM grantlee theme support - devel files This library provides the grantlee theme support for KDE PIM. . @@ -34,7 +42,6 @@ Description: KDE PIM grantlee theme supp Package: libkf5grantleetheme-plugins Architecture: any -Multi-Arch: same Depends: ${misc:Depends}, ${shlibs:Depends} Breaks: libkf5libkdepim5 (<= 4:16.04) Replaces: libkf5libkdepim5 (<= 4:16.04) @@ -45,13 +52,15 @@ Description: KDE PIM grantlee theme supp Package: libkf5grantleetheme5 Architecture: any -Multi-Arch: same -Depends: ${misc:Depends}, ${shlibs:Depends} -Breaks: libkf5libkdepim5 (<= 4:16.04) +Depends: libkf5grantleetheme-data (= ${source:Version}), + ${misc:Depends}, + ${shlibs:Depends}, +Breaks: akregator (<= 4:16.08), + kontact (<= 4:16.08), + libkf5libkdepim5 (<= 4:16.04), + libkf5messageviewer5 (<= 4:16.04), Replaces: libkf5libkdepim5 (<= 4:16.04) -Recommends: libkf5grantleetheme-plugins (= ${binary:Version}) Description: KDE PIM grantlee theme support - library This library provides the grantlee theme support for KDE PIM. . This package provides the shared libraries. -Provides: ${ABI:VirtualPackage} diff -pruN 19.08.3-1/debian/copyright 19.12.3-0ubuntu1/debian/copyright --- 19.08.3-1/debian/copyright 2019-10-16 17:04:28.000000000 +0000 +++ 19.12.3-0ubuntu1/debian/copyright 2020-04-11 12:57:00.000000000 +0000 @@ -1,10 +1,7 @@ -Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Files: * Copyright: 2015, Daniel Vrátil - 1991-1999, Free Software Foundation, Inc - 2016-2018, Laurent Montel - 2013-2015, This_file_is_part_of_KDE 2015, Volker Krause License: LGPL-2.1+ @@ -13,50 +10,14 @@ Files: autotest/grantleethemetest.cpp src/grantleetheme.cpp src/grantleetheme.h src/grantleetheme_p.h - src/grantleethemeengine.cpp - src/grantleethemeengine.h src/grantleethememanager.cpp src/grantleethememanager.h -Copyright: 2016, Daniel Vrátil - 2013-2018, Montel Laurent +Copyright: 2013-2016, Montel Laurent License: GPL-2 -Files: po/ca/* - po/ca@valencia/* - po/uk/* -Copyright: 2013-2017, This_file_is_part_of_KDE -License: LGPL-2.1+3+KDEeV - -Files: autotest/grantleethememanagertest.cpp -Copyright: 2016, David Faure -License: LGPL-2+ - -License: GPL-2 - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the license. - . - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - The complete text of the GNU General Public License version 2 - can be found in `/usr/share/common-licenses/GPL-2'. - -License: LGPL-2+ - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - . - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - . - The complete text of the GNU Lesser General Public License version 2.1 can be - found in `/usr/share/common-licenses/LGPL-2'. +Files: debian/* +Copyright: 2016, Maximiliano Curia +License: LGPL-2.1+ License: LGPL-2.1+ This library is free software; you can redistribute it and/or @@ -72,13 +33,15 @@ License: LGPL-2.1+ The complete text of the GNU Lesser General Public License version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'. -License: LGPL-2.1+3+KDEeV - 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. +License: GPL-2 + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the license. . - The complete text of the GNU Lesser General Public License version 2.1 can be - found in `/usr/share/common-licenses/LGPL-2.1'. + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. . - The complete text of the GNU Lesser General Public License version 3 can be - found in `/usr/share/common-licenses/LGPL-3'. - + The complete text of the GNU General Public License version 2 + can be found in `/usr/share/common-licenses/GPL-2'. diff -pruN 19.08.3-1/debian/libkf5grantleetheme5.install 19.12.3-0ubuntu1/debian/libkf5grantleetheme5.install --- 19.08.3-1/debian/libkf5grantleetheme5.install 2019-11-30 21:32:09.000000000 +0000 +++ 19.12.3-0ubuntu1/debian/libkf5grantleetheme5.install 2020-04-11 12:57:00.000000000 +0000 @@ -1,5 +1,4 @@ usr/lib/*/libKF5GrantleeTheme.so.5 usr/lib/*/libKF5GrantleeTheme.so.5.* -usr/share/locale/ usr/share/qlogging-categories5/grantleetheme.categories usr/share/qlogging-categories5/grantleetheme.renamecategories diff -pruN 19.08.3-1/debian/libkf5grantleetheme5.lintian-overrides 19.12.3-0ubuntu1/debian/libkf5grantleetheme5.lintian-overrides --- 19.08.3-1/debian/libkf5grantleetheme5.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ 19.12.3-0ubuntu1/debian/libkf5grantleetheme5.lintian-overrides 2020-04-11 12:57:00.000000000 +0000 @@ -0,0 +1 @@ +libkf5grantleetheme5: symbols-declares-dependency-on-other-package libkf5grantleetheme-plugins diff -pruN 19.08.3-1/debian/libkf5grantleetheme5.maintscript 19.12.3-0ubuntu1/debian/libkf5grantleetheme5.maintscript --- 19.08.3-1/debian/libkf5grantleetheme5.maintscript 1970-01-01 00:00:00.000000000 +0000 +++ 19.12.3-0ubuntu1/debian/libkf5grantleetheme5.maintscript 2020-04-11 12:57:00.000000000 +0000 @@ -0,0 +1,2 @@ +rm_conffile /etc/xdg/grantleetheme.categories +rm_conffile /etc/xdg/grantleetheme.renamecategories diff -pruN 19.08.3-1/debian/libkf5grantleetheme5.symbols 19.12.3-0ubuntu1/debian/libkf5grantleetheme5.symbols --- 19.08.3-1/debian/libkf5grantleetheme5.symbols 1970-01-01 00:00:00.000000000 +0000 +++ 19.12.3-0ubuntu1/debian/libkf5grantleetheme5.symbols 2020-04-11 12:57:00.000000000 +0000 @@ -0,0 +1,98 @@ +# SymbolsHelper-Confirmed: 19.12.3 amd64 arm64 armhf ppc64el riscv64 s390x +libKF5GrantleeTheme.so.5 libkf5grantleetheme5 #MINVER#, libkf5grantleetheme-plugins + _ZN13GrantleeTheme12ThemeManager11qt_metacallEN11QMetaObject4CallEiPPv@Base 15.12.0 + _ZN13GrantleeTheme12ThemeManager11qt_metacastEPKc@Base 15.12.0 + _ZN13GrantleeTheme12ThemeManager12setThemeMenuEP11KActionMenu@Base 15.12.0 + _ZN13GrantleeTheme12ThemeManager12updateThemesEv@Base 15.12.0 + _ZN13GrantleeTheme12ThemeManager13themesChangedEv@Base 15.12.0 + _ZN13GrantleeTheme12ThemeManager14actionForThemeEv@Base 15.12.0 + _ZN13GrantleeTheme12ThemeManager14pathFromThemesERK7QStringS3_S3_@Base 15.12.0 + _ZN13GrantleeTheme12ThemeManager14setActionGroupEP12QActionGroup@Base 15.12.0 + _ZN13GrantleeTheme12ThemeManager16staticMetaObjectE@Base 15.12.0 + _ZN13GrantleeTheme12ThemeManager19configuredThemeNameERK7QString@Base 15.12.0 + _ZN13GrantleeTheme12ThemeManager21grantleeThemeSelectedEv@Base 15.12.0 + _ZN13GrantleeTheme12ThemeManager29setDownloadNewStuffConfigFileERK7QString@Base 15.12.0 + _ZN13GrantleeTheme12ThemeManager5themeERK7QString@Base 15.12.0 + _ZN13GrantleeTheme12ThemeManager9loadThemeERK7QStringS3_S3_@Base 15.12.0 + _ZN13GrantleeTheme12ThemeManagerC1ERK7QStringS3_P17KActionCollectionS3_P7QObject@Base 15.12.0 + _ZN13GrantleeTheme12ThemeManagerC2ERK7QStringS3_P17KActionCollectionS3_P7QObject@Base 15.12.0 + _ZN13GrantleeTheme12ThemeManagerD0Ev@Base 15.12.0 + _ZN13GrantleeTheme12ThemeManagerD1Ev@Base 15.12.0 + _ZN13GrantleeTheme12ThemeManagerD2Ev@Base 15.12.0 + _ZN13GrantleeTheme16GenericFormatter14reloadTemplateEv@Base 19.12.3 + _ZN13GrantleeTheme16GenericFormatter15setTemplatePathERK7QString@Base 19.12.3 + _ZN13GrantleeTheme16GenericFormatter18setTemplateContentERK7QString@Base 19.12.3 + _ZN13GrantleeTheme16GenericFormatter20setApplicationDomainERK10QByteArray@Base 19.12.3 + _ZN13GrantleeTheme16GenericFormatter22setDefaultHtmlMainFileERK7QString@Base 19.12.3 + _ZN13GrantleeTheme16GenericFormatterC1ERK7QStringS3_@Base 19.12.3 + _ZN13GrantleeTheme16GenericFormatterC1Ev@Base 19.12.3 + _ZN13GrantleeTheme16GenericFormatterC2ERK7QStringS3_@Base 19.12.3 + _ZN13GrantleeTheme16GenericFormatterC2Ev@Base 19.12.3 + _ZN13GrantleeTheme16GenericFormatterD1Ev@Base 19.12.3 + _ZN13GrantleeTheme16GenericFormatterD2Ev@Base 19.12.3 + _ZN13GrantleeTheme22GrantleeKi18nLocalizer20setApplicationDomainERK10QByteArray@Base 16.08.0 + _ZN13GrantleeTheme22GrantleeKi18nLocalizerC1Ev@Base 16.08.0 + _ZN13GrantleeTheme22GrantleeKi18nLocalizerC2Ev@Base 16.08.0 + _ZN13GrantleeTheme22GrantleeKi18nLocalizerD0Ev@Base 16.08.0 + _ZN13GrantleeTheme22GrantleeKi18nLocalizerD1Ev@Base 16.08.0 + _ZN13GrantleeTheme22GrantleeKi18nLocalizerD2Ev@Base 16.08.0 + _ZN13GrantleeTheme24QtResourceTemplateLoaderC1E14QSharedPointerIN8Grantlee17AbstractLocalizerEE@Base 16.08.0 + _ZN13GrantleeTheme24QtResourceTemplateLoaderC2E14QSharedPointerIN8Grantlee17AbstractLocalizerEE@Base 16.08.0 + _ZN13GrantleeTheme5Theme13addPluginPathERK7QString@Base 15.12.0 + _ZN13GrantleeTheme5Theme6renderERK7QStringRK5QHashIS1_8QVariantERK10QByteArray@Base 16.08.0 + _ZN13GrantleeTheme5ThemeC1ERK7QStringS3_S3_@Base 15.12.0 + _ZN13GrantleeTheme5ThemeC1ERKS0_@Base 15.12.0 + _ZN13GrantleeTheme5ThemeC1Ev@Base 15.12.0 + _ZN13GrantleeTheme5ThemeC2ERK7QStringS3_S3_@Base 15.12.0 + _ZN13GrantleeTheme5ThemeC2ERKS0_@Base 15.12.0 + _ZN13GrantleeTheme5ThemeC2Ev@Base 15.12.0 + _ZN13GrantleeTheme5ThemeD1Ev@Base 15.12.0 + _ZN13GrantleeTheme5ThemeD2Ev@Base 15.12.0 + _ZN13GrantleeTheme5ThemeaSERKS0_@Base 15.12.0 + _ZN13GrantleeTheme6Engine11qt_metacallEN11QMetaObject4CallEiPPv@Base 16.08.0 + _ZN13GrantleeTheme6Engine11qt_metacastEPKc@Base 16.08.0 + _ZN13GrantleeTheme6Engine16staticMetaObjectE@Base 16.08.0 + _ZN13GrantleeTheme6EngineC1EP7QObject@Base 16.08.0 + _ZN13GrantleeTheme6EngineC2EP7QObject@Base 16.08.0 + _ZN13GrantleeTheme6EngineD0Ev@Base 16.08.0 + _ZN13GrantleeTheme6EngineD1Ev@Base 16.08.0 + _ZN13GrantleeTheme6EngineD2Ev@Base 16.08.0 + _ZNK13GrantleeTheme12ThemeManager10metaObjectEv@Base 15.12.0 + _ZNK13GrantleeTheme12ThemeManager19configuredThemeNameEv@Base 15.12.0 + _ZNK13GrantleeTheme12ThemeManager21displayExtraVariablesERK7QString@Base 15.12.0 + _ZNK13GrantleeTheme12ThemeManager6themesEv@Base 15.12.0 + _ZNK13GrantleeTheme16GenericFormatter12errorMessageEv@Base 19.12.3 + _ZNK13GrantleeTheme16GenericFormatter6renderERK5QHashI7QString8QVariantE@Base 19.12.3 + _ZNK13GrantleeTheme22GrantleeKi18nLocalizer13currentLocaleEv@Base 16.08.0 + _ZNK13GrantleeTheme22GrantleeKi18nLocalizer14localizeStringERK7QStringRK5QListI8QVariantE@Base 16.08.0 + _ZNK13GrantleeTheme22GrantleeKi18nLocalizer16processArgumentsERK16KLocalizedStringRK5QListI8QVariantE@Base 16.08.0 + _ZNK13GrantleeTheme22GrantleeKi18nLocalizer20localizePluralStringERK7QStringS3_RK5QListI8QVariantE@Base 16.08.0 + _ZNK13GrantleeTheme22GrantleeKi18nLocalizer21localizeContextStringERK7QStringS3_RK5QListI8QVariantE@Base 16.08.0 + _ZNK13GrantleeTheme22GrantleeKi18nLocalizer21localizeMonetaryValueEdRK7QString@Base 16.08.0 + _ZNK13GrantleeTheme22GrantleeKi18nLocalizer27localizePluralContextStringERK7QStringS3_S3_RK5QListI8QVariantE@Base 16.08.0 + _ZNK13GrantleeTheme24QtResourceTemplateLoader10loadByNameERK7QStringPKN8Grantlee6EngineE@Base 16.08.0 + _ZNK13GrantleeTheme24QtResourceTemplateLoader15canLoadTemplateERK7QString@Base 16.08.0 + _ZNK13GrantleeTheme5Theme11authorEmailEv@Base 15.12.0 + _ZNK13GrantleeTheme5Theme11descriptionEv@Base 15.12.0 + _ZNK13GrantleeTheme5Theme12absolutePathEv@Base 15.12.0 + _ZNK13GrantleeTheme5Theme13themeFilenameEv@Base 15.12.0 + _ZNK13GrantleeTheme5Theme21displayExtraVariablesEv@Base 15.12.0 + _ZNK13GrantleeTheme5Theme4nameEv@Base 15.12.0 + _ZNK13GrantleeTheme5Theme6authorEv@Base 15.12.0 + _ZNK13GrantleeTheme5Theme7dirNameEv@Base 15.12.0 + _ZNK13GrantleeTheme5Theme7isValidEv@Base 15.12.0 + _ZNK13GrantleeTheme5ThemeeqERKS0_@Base 15.12.0 + _ZNK13GrantleeTheme6Engine10metaObjectEv@Base 16.08.0 + _ZNK13GrantleeTheme6Engine9localizerEv@Base 16.08.0 + _ZTIN13GrantleeTheme12ThemeManagerE@Base 15.12.0 + _ZTIN13GrantleeTheme22GrantleeKi18nLocalizerE@Base 16.08.0 + _ZTIN13GrantleeTheme24QtResourceTemplateLoaderE@Base 16.08.0 + _ZTIN13GrantleeTheme6EngineE@Base 16.08.0 + _ZTSN13GrantleeTheme12ThemeManagerE@Base 15.12.0 + _ZTSN13GrantleeTheme22GrantleeKi18nLocalizerE@Base 16.08.0 + _ZTSN13GrantleeTheme24QtResourceTemplateLoaderE@Base 16.08.0 + _ZTSN13GrantleeTheme6EngineE@Base 16.08.0 + _ZTVN13GrantleeTheme12ThemeManagerE@Base 15.12.0 + _ZTVN13GrantleeTheme22GrantleeKi18nLocalizerE@Base 16.08.0 + _ZTVN13GrantleeTheme24QtResourceTemplateLoaderE@Base 16.08.0 + _ZTVN13GrantleeTheme6EngineE@Base 16.08.0 diff -pruN 19.08.3-1/debian/libkf5grantleetheme-data.install 19.12.3-0ubuntu1/debian/libkf5grantleetheme-data.install --- 19.08.3-1/debian/libkf5grantleetheme-data.install 1970-01-01 00:00:00.000000000 +0000 +++ 19.12.3-0ubuntu1/debian/libkf5grantleetheme-data.install 2020-04-11 12:57:00.000000000 +0000 @@ -0,0 +1 @@ +usr/share/locale/ diff -pruN 19.08.3-1/debian/libkf5grantleetheme-dev.acc.in 19.12.3-0ubuntu1/debian/libkf5grantleetheme-dev.acc.in --- 19.08.3-1/debian/libkf5grantleetheme-dev.acc.in 1970-01-01 00:00:00.000000000 +0000 +++ 19.12.3-0ubuntu1/debian/libkf5grantleetheme-dev.acc.in 2020-04-11 12:57:00.000000000 +0000 @@ -0,0 +1,24 @@ + + + + + 16.04.0 + + + + /usr/include/KF5/GrantleeTheme/ + /usr/include/KF5/grantleetheme/ + /usr/include/KF5/grantleetheme_version.h + + + + /usr/lib/@@DEB_HOST_MULTIARCH@@/libKF5GrantleeTheme.so + + + + -fPIC + -std=c++11 + -fno-keep-inline-functions + + + \ No newline at end of file diff -pruN 19.08.3-1/debian/rules 19.12.3-0ubuntu1/debian/rules --- 19.08.3-1/debian/rules 2019-11-30 21:32:09.000000000 +0000 +++ 19.12.3-0ubuntu1/debian/rules 2020-04-11 12:57:00.000000000 +0000 @@ -1,18 +1,10 @@ #!/usr/bin/make -f -include /usr/share/dpkg/pkg-info.mk -include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk - -AbiVirtualPackageVersion = $(call dpkg_late_eval,AbiVirtualPackageVersion,echo '${DEB_VERSION_UPSTREAM}' | sed -e 's/\.[0-9]\+$$//') -pkgs_lib = $(filter-out %-%,$(filter lib%,$(shell dh_listpackages))) +l10npkgs_firstversion_ok := 4:17.03.90-0~ -override_dh_makeshlibs: - for pkg in $(pkgs_lib); do \ - name=$$( echo "$${pkg}" | sed -e 's/abi[0-9]\+\s*//'); \ - echo "ABI:VirtualPackage=$${name}-${AbiVirtualPackageVersion}" >> debian/$${pkg}.substvars; \ - $(overridden_command) -p$${pkg} -V "$${pkg} (>= $(DEB_VERSION_EPOCH_UPSTREAM)), $${name}-${AbiVirtualPackageVersion}"; \ - done +include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk +include /usr/share/pkg-kde-tools/qt-kde-team/2/l10n-packages.mk override_dh_auto_test: # Disable dh_auto_test at build time - -xvfb-run -- dh_auto_test --no-parallel + : diff -pruN 19.08.3-1/debian/upstream/metadata 19.12.3-0ubuntu1/debian/upstream/metadata --- 19.08.3-1/debian/upstream/metadata 2017-12-11 20:09:33.000000000 +0000 +++ 19.12.3-0ubuntu1/debian/upstream/metadata 2020-04-11 12:57:00.000000000 +0000 @@ -1,7 +1,7 @@ Name: grantleetheme -Changelog: https://cgit.kde.org/grantleetheme.git/log +Changelog: https://quickgit.kde.org/?p=grantleetheme.git&a=log Contact: kde-devel@kde.org Donation: https://www.kde.org/community/donations/index.php Repository: https://anongit.kde.org/grantleetheme.git -Repository-Browse: https://cgit.kde.org/grantleetheme.git +Repository-Browse: https://quickgit.kde.org/?p=grantleetheme.git Security-Contact: security@kde.org diff -pruN 19.08.3-1/debian/upstream/signing-key.asc 19.12.3-0ubuntu1/debian/upstream/signing-key.asc --- 19.08.3-1/debian/upstream/signing-key.asc 2017-12-11 20:09:33.000000000 +0000 +++ 19.12.3-0ubuntu1/debian/upstream/signing-key.asc 1970-01-01 00:00:00.000000000 +0000 @@ -1,112 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1 - -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 -RJWljvaVa8fj2U2D659nVsq8og== -=5Ltf ------END PGP PUBLIC KEY BLOCK----- diff -pruN 19.08.3-1/debian/watch 19.12.3-0ubuntu1/debian/watch --- 19.08.3-1/debian/watch 2019-10-16 17:05:23.000000000 +0000 +++ 19.12.3-0ubuntu1/debian/watch 2020-04-11 12:57:00.000000000 +0000 @@ -1,2 +1,2 @@ -version=4 -opts=pgpsigurlmangle=s/$/.sig/ https://download.kde.org/stable/applications/([\d.]+)/src/grantleetheme-([\d.]+).tar.xz +version=3 +http://download.kde.org/stable/applications/([\d.]+)/src/grantleetheme-([\d.]+).tar.xz diff -pruN 19.08.3-1/po/ar/libgrantleetheme.po 19.12.3-0ubuntu1/po/ar/libgrantleetheme.po --- 19.08.3-1/po/ar/libgrantleetheme.po 2019-11-05 04:18:16.000000000 +0000 +++ 19.12.3-0ubuntu1/po/ar/libgrantleetheme.po 2020-03-03 00:38:25.000000000 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-08-30 07:48+0200\n" +"POT-Creation-Date: 2019-05-20 03:14+0200\n" "PO-Revision-Date: ٢٠١٦-٠٩-١٦ ٢٠:٣٠+0300\n" "Last-Translator: Safa Alfulaij \n" "Language-Team: Arabic \n" diff -pruN 19.08.3-1/po/bg/libgrantleetheme.po 19.12.3-0ubuntu1/po/bg/libgrantleetheme.po --- 19.08.3-1/po/bg/libgrantleetheme.po 2019-11-05 04:18:16.000000000 +0000 +++ 19.12.3-0ubuntu1/po/bg/libgrantleetheme.po 2020-03-03 00:38:25.000000000 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-08-30 07:48+0200\n" +"POT-Creation-Date: 2019-05-20 03:14+0200\n" "PO-Revision-Date: 2013-08-05 12:13+0300\n" "Last-Translator: Yasen Pramatarov \n" "Language-Team: Bulgarian \n" diff -pruN 19.08.3-1/po/bs/libgrantleetheme.po 19.12.3-0ubuntu1/po/bs/libgrantleetheme.po --- 19.08.3-1/po/bs/libgrantleetheme.po 2019-11-05 04:18:16.000000000 +0000 +++ 19.12.3-0ubuntu1/po/bs/libgrantleetheme.po 2020-03-03 00:38:25.000000000 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: grantle\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-08-30 07:48+0200\n" +"POT-Creation-Date: 2019-05-20 03:14+0200\n" "PO-Revision-Date: 2013-10-19 10:52+0000\n" "Last-Translator: Samir Ribić \n" "Language-Team: bosanski \n" diff -pruN 19.08.3-1/po/ca/libgrantleetheme.po 19.12.3-0ubuntu1/po/ca/libgrantleetheme.po --- 19.08.3-1/po/ca/libgrantleetheme.po 2019-11-05 04:18:16.000000000 +0000 +++ 19.12.3-0ubuntu1/po/ca/libgrantleetheme.po 2020-03-03 00:38:25.000000000 +0000 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: libgrantleetheme\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-08-30 07:48+0200\n" +"POT-Creation-Date: 2019-05-20 03:14+0200\n" "PO-Revision-Date: 2017-04-19 14:22+0100\n" "Last-Translator: Antoni Bella Pérez \n" "Language-Team: Catalan \n" diff -pruN 19.08.3-1/po/ca@valencia/libgrantleetheme.po 19.12.3-0ubuntu1/po/ca@valencia/libgrantleetheme.po --- 19.08.3-1/po/ca@valencia/libgrantleetheme.po 2019-11-05 04:18:16.000000000 +0000 +++ 19.12.3-0ubuntu1/po/ca@valencia/libgrantleetheme.po 2020-03-03 00:38:25.000000000 +0000 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: libgrantleetheme\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-08-30 07:48+0200\n" +"POT-Creation-Date: 2019-05-20 03:14+0200\n" "PO-Revision-Date: 2017-04-19 14:22+0100\n" "Last-Translator: Antoni Bella Pérez \n" "Language-Team: Catalan \n" diff -pruN 19.08.3-1/po/cs/libgrantleetheme.po 19.12.3-0ubuntu1/po/cs/libgrantleetheme.po --- 19.08.3-1/po/cs/libgrantleetheme.po 2019-11-05 04:18:16.000000000 +0000 +++ 19.12.3-0ubuntu1/po/cs/libgrantleetheme.po 2020-03-03 00:38:26.000000000 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-08-30 07:48+0200\n" +"POT-Creation-Date: 2019-05-20 03:14+0200\n" "PO-Revision-Date: 2017-04-25 14:47+0100\n" "Last-Translator: Vít Pelčák \n" "Language-Team: Czech \n" diff -pruN 19.08.3-1/po/da/libgrantleetheme.po 19.12.3-0ubuntu1/po/da/libgrantleetheme.po --- 19.08.3-1/po/da/libgrantleetheme.po 2019-11-05 04:18:16.000000000 +0000 +++ 19.12.3-0ubuntu1/po/da/libgrantleetheme.po 2020-03-03 00:38:26.000000000 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-08-30 07:48+0200\n" +"POT-Creation-Date: 2019-05-20 03:14+0200\n" "PO-Revision-Date: 2016-07-11 21:54+0100\n" "Last-Translator: Martin Schlander \n" "Language-Team: Danish \n" diff -pruN 19.08.3-1/po/de/libgrantleetheme.po 19.12.3-0ubuntu1/po/de/libgrantleetheme.po --- 19.08.3-1/po/de/libgrantleetheme.po 2019-11-05 04:18:16.000000000 +0000 +++ 19.12.3-0ubuntu1/po/de/libgrantleetheme.po 2020-03-03 00:38:26.000000000 +0000 @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-08-30 07:48+0200\n" +"POT-Creation-Date: 2019-05-20 03:14+0200\n" "PO-Revision-Date: 2017-07-17 20:06+0100\n" "Last-Translator: Burkhard Lück \n" "Language-Team: German \n" diff -pruN 19.08.3-1/po/el/libgrantleetheme.po 19.12.3-0ubuntu1/po/el/libgrantleetheme.po --- 19.08.3-1/po/el/libgrantleetheme.po 2019-11-05 04:18:16.000000000 +0000 +++ 19.12.3-0ubuntu1/po/el/libgrantleetheme.po 2020-03-03 00:38:26.000000000 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-08-30 07:48+0200\n" +"POT-Creation-Date: 2019-05-20 03:14+0200\n" "PO-Revision-Date: 2014-11-04 14:28+0200\n" "Last-Translator: Dimitris Kardarakos \n" "Language-Team: Greek \n" diff -pruN 19.08.3-1/po/en_GB/libgrantleetheme.po 19.12.3-0ubuntu1/po/en_GB/libgrantleetheme.po --- 19.08.3-1/po/en_GB/libgrantleetheme.po 2019-11-05 04:18:16.000000000 +0000 +++ 19.12.3-0ubuntu1/po/en_GB/libgrantleetheme.po 2020-03-03 00:38:26.000000000 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-08-30 07:48+0200\n" +"POT-Creation-Date: 2019-05-20 03:14+0200\n" "PO-Revision-Date: 2017-05-21 16:36+0000\n" "Last-Translator: Steve Allewell \n" "Language-Team: English \n" diff -pruN 19.08.3-1/po/es/libgrantleetheme.po 19.12.3-0ubuntu1/po/es/libgrantleetheme.po --- 19.08.3-1/po/es/libgrantleetheme.po 2019-11-05 04:18:16.000000000 +0000 +++ 19.12.3-0ubuntu1/po/es/libgrantleetheme.po 2020-03-03 00:38:26.000000000 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-08-30 07:48+0200\n" +"POT-Creation-Date: 2019-05-20 03:14+0200\n" "PO-Revision-Date: 2017-04-29 23:03+0100\n" "Last-Translator: Javier Vinal \n" "Language-Team: Spanish \n" diff -pruN 19.08.3-1/po/et/libgrantleetheme.po 19.12.3-0ubuntu1/po/et/libgrantleetheme.po --- 19.08.3-1/po/et/libgrantleetheme.po 2019-11-05 04:18:16.000000000 +0000 +++ 19.12.3-0ubuntu1/po/et/libgrantleetheme.po 2020-03-03 00:38:26.000000000 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-08-30 07:48+0200\n" +"POT-Creation-Date: 2019-05-20 03:14+0200\n" "PO-Revision-Date: 2016-07-26 20:43+0300\n" "Last-Translator: Marek Laane \n" "Language-Team: Estonian \n" diff -pruN 19.08.3-1/po/fi/libgrantleetheme.po 19.12.3-0ubuntu1/po/fi/libgrantleetheme.po --- 19.08.3-1/po/fi/libgrantleetheme.po 2019-11-05 04:18:17.000000000 +0000 +++ 19.12.3-0ubuntu1/po/fi/libgrantleetheme.po 2020-03-03 00:38:26.000000000 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-08-30 07:48+0200\n" +"POT-Creation-Date: 2019-05-20 03:14+0200\n" "PO-Revision-Date: 2018-08-15 13:46+0200\n" "Last-Translator: Tommi Nieminen \n" "Language-Team: Finnish \n" diff -pruN 19.08.3-1/po/fr/libgrantleetheme.po 19.12.3-0ubuntu1/po/fr/libgrantleetheme.po --- 19.08.3-1/po/fr/libgrantleetheme.po 2019-11-05 04:18:17.000000000 +0000 +++ 19.12.3-0ubuntu1/po/fr/libgrantleetheme.po 2020-03-03 00:38:27.000000000 +0000 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-08-30 07:48+0200\n" +"POT-Creation-Date: 2019-05-20 03:14+0200\n" "PO-Revision-Date: 2017-06-12 22:27+0100\n" "Last-Translator: Vincent Pinon \n" "Language-Team: French \n" diff -pruN 19.08.3-1/po/gl/libgrantleetheme.po 19.12.3-0ubuntu1/po/gl/libgrantleetheme.po --- 19.08.3-1/po/gl/libgrantleetheme.po 2019-11-05 04:18:17.000000000 +0000 +++ 19.12.3-0ubuntu1/po/gl/libgrantleetheme.po 2020-03-03 00:38:27.000000000 +0000 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-08-30 07:48+0200\n" +"POT-Creation-Date: 2019-05-20 03:14+0200\n" "PO-Revision-Date: 2018-04-22 10:53+0100\n" "Last-Translator: Adrian Chaves \n" "Language-Team: Galician \n" diff -pruN 19.08.3-1/po/hu/libgrantleetheme.po 19.12.3-0ubuntu1/po/hu/libgrantleetheme.po --- 19.08.3-1/po/hu/libgrantleetheme.po 2019-11-05 04:18:17.000000000 +0000 +++ 19.12.3-0ubuntu1/po/hu/libgrantleetheme.po 2020-03-03 00:38:27.000000000 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-08-30 07:48+0200\n" +"POT-Creation-Date: 2019-05-20 03:14+0200\n" "PO-Revision-Date: 2013-07-30 18:19+0200\n" "Last-Translator: Balázs Úr \n" "Language-Team: Hungarian \n" diff -pruN 19.08.3-1/po/ia/libgrantleetheme.po 19.12.3-0ubuntu1/po/ia/libgrantleetheme.po --- 19.08.3-1/po/ia/libgrantleetheme.po 2019-11-05 04:18:17.000000000 +0000 +++ 19.12.3-0ubuntu1/po/ia/libgrantleetheme.po 2020-03-03 00:38:27.000000000 +0000 @@ -1,46 +1,46 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# G.Sora , 2013. +# G.Sora , 2013, 2020. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-08-30 07:48+0200\n" -"PO-Revision-Date: 2013-10-22 12:31+0200\n" -"Last-Translator: G.Sora \n" -"Language-Team: Interlingua \n" +"POT-Creation-Date: 2019-05-20 03:14+0200\n" +"PO-Revision-Date: 2020-02-07 23:31+0100\n" +"Last-Translator: Giovanni Sora \n" +"Language-Team: Interlingua \n" "Language: ia\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 1.5\n" +"X-Generator: Lokalize 2.0\n" #: grantleetheme.cpp:99 #, kde-format msgid "Template" -msgstr "" +msgstr "Patrono" #: grantleetheme.cpp:99 #, kde-format msgid "Error message" -msgstr "" +msgstr "Message de error" #: grantleetheme.cpp:107 #, kde-format msgid "(null template)" -msgstr "" +msgstr "(patrono nulle)" #: grantleetheme.cpp:215 #, kde-format msgid "Template parsing error" -msgstr "" +msgstr "Error de analysator syntactic de patrono" #: grantleetheme.cpp:221 #, kde-format msgid "Template rendering error" -msgstr "" +msgstr "Error de rendering de patrono" #: grantleethememanager.cpp:56 #, kde-format diff -pruN 19.08.3-1/po/it/libgrantleetheme.po 19.12.3-0ubuntu1/po/it/libgrantleetheme.po --- 19.08.3-1/po/it/libgrantleetheme.po 2019-11-05 04:18:17.000000000 +0000 +++ 19.12.3-0ubuntu1/po/it/libgrantleetheme.po 2020-03-03 00:38:27.000000000 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: libgrantleetheme\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-08-30 07:48+0200\n" +"POT-Creation-Date: 2019-05-20 03:14+0200\n" "PO-Revision-Date: 2017-04-22 22:18+0100\n" "Last-Translator: Luigi Toscano \n" "Language-Team: Italian \n" diff -pruN 19.08.3-1/po/ja/libgrantleetheme.po 19.12.3-0ubuntu1/po/ja/libgrantleetheme.po --- 19.08.3-1/po/ja/libgrantleetheme.po 2019-11-05 04:18:17.000000000 +0000 +++ 19.12.3-0ubuntu1/po/ja/libgrantleetheme.po 2020-03-03 00:38:27.000000000 +0000 @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: libgrantleetheme\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-08-30 07:48+0200\n" +"POT-Creation-Date: 2019-05-20 03:14+0200\n" "PO-Revision-Date: 2013-08-19 00:13-0700\n" "Last-Translator: Japanese KDE translation team \n" "Language-Team: Japanese \n" diff -pruN 19.08.3-1/po/kk/libgrantleetheme.po 19.12.3-0ubuntu1/po/kk/libgrantleetheme.po --- 19.08.3-1/po/kk/libgrantleetheme.po 2019-11-05 04:18:17.000000000 +0000 +++ 19.12.3-0ubuntu1/po/kk/libgrantleetheme.po 2020-03-03 00:38:27.000000000 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-08-30 07:48+0200\n" +"POT-Creation-Date: 2019-05-20 03:14+0200\n" "PO-Revision-Date: 2013-09-17 03:57+0600\n" "Last-Translator: Sairan Kikkarin \n" "Language-Team: Kazakh \n" diff -pruN 19.08.3-1/po/ko/libgrantleetheme.po 19.12.3-0ubuntu1/po/ko/libgrantleetheme.po --- 19.08.3-1/po/ko/libgrantleetheme.po 2019-11-05 04:18:17.000000000 +0000 +++ 19.12.3-0ubuntu1/po/ko/libgrantleetheme.po 2020-03-03 00:38:27.000000000 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-08-30 07:48+0200\n" +"POT-Creation-Date: 2019-05-20 03:14+0200\n" "PO-Revision-Date: 2017-12-03 22:14+0100\n" "Last-Translator: Shinjo Park \n" "Language-Team: Korean \n" diff -pruN 19.08.3-1/po/lt/libgrantleetheme.po 19.12.3-0ubuntu1/po/lt/libgrantleetheme.po --- 19.08.3-1/po/lt/libgrantleetheme.po 2019-11-05 04:18:17.000000000 +0000 +++ 19.12.3-0ubuntu1/po/lt/libgrantleetheme.po 2020-03-03 00:38:27.000000000 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: l 10n\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-08-30 07:48+0200\n" +"POT-Creation-Date: 2019-05-20 03:14+0200\n" "PO-Revision-Date: 2013-09-04 01:41+0000\n" "Last-Translator: Automatically generated\n" "Language-Team: lt\n" diff -pruN 19.08.3-1/po/nb/libgrantleetheme.po 19.12.3-0ubuntu1/po/nb/libgrantleetheme.po --- 19.08.3-1/po/nb/libgrantleetheme.po 2019-11-05 04:18:17.000000000 +0000 +++ 19.12.3-0ubuntu1/po/nb/libgrantleetheme.po 2020-03-03 00:38:28.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-08-30 07:48+0200\n" +"POT-Creation-Date: 2019-05-20 03:14+0200\n" "PO-Revision-Date: 2013-10-01 23:22+0200\n" "Last-Translator: Bjørn Steensrud \n" "Language-Team: Norwegian Bokmål \n" diff -pruN 19.08.3-1/po/nds/libgrantleetheme.po 19.12.3-0ubuntu1/po/nds/libgrantleetheme.po --- 19.08.3-1/po/nds/libgrantleetheme.po 2019-11-05 04:18:17.000000000 +0000 +++ 19.12.3-0ubuntu1/po/nds/libgrantleetheme.po 2020-03-03 00:38:28.000000000 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-08-30 07:48+0200\n" +"POT-Creation-Date: 2019-05-20 03:14+0200\n" "PO-Revision-Date: 2014-03-13 00:47+0100\n" "Last-Translator: Sönke Dibbern \n" "Language-Team: Low Saxon \n" diff -pruN 19.08.3-1/po/nl/libgrantleetheme.po 19.12.3-0ubuntu1/po/nl/libgrantleetheme.po --- 19.08.3-1/po/nl/libgrantleetheme.po 2019-11-05 04:18:17.000000000 +0000 +++ 19.12.3-0ubuntu1/po/nl/libgrantleetheme.po 2020-03-03 00:38:28.000000000 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-08-30 07:48+0200\n" +"POT-Creation-Date: 2019-05-20 03:14+0200\n" "PO-Revision-Date: 2017-04-19 10:37+0100\n" "Last-Translator: Freek de Kruijf \n" "Language-Team: Dutch \n" diff -pruN 19.08.3-1/po/pl/libgrantleetheme.po 19.12.3-0ubuntu1/po/pl/libgrantleetheme.po --- 19.08.3-1/po/pl/libgrantleetheme.po 2019-11-05 04:18:17.000000000 +0000 +++ 19.12.3-0ubuntu1/po/pl/libgrantleetheme.po 2020-03-03 00:38:28.000000000 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-08-30 07:48+0200\n" +"POT-Creation-Date: 2019-05-20 03:14+0200\n" "PO-Revision-Date: 2017-04-22 07:26+0100\n" "Last-Translator: Łukasz Wojniłowicz \n" "Language-Team: Polish \n" diff -pruN 19.08.3-1/po/pt/libgrantleetheme.po 19.12.3-0ubuntu1/po/pt/libgrantleetheme.po --- 19.08.3-1/po/pt/libgrantleetheme.po 2019-11-05 04:18:17.000000000 +0000 +++ 19.12.3-0ubuntu1/po/pt/libgrantleetheme.po 2020-03-03 00:38:28.000000000 +0000 @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: libgrantleetheme\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-08-30 07:48+0200\n" +"POT-Creation-Date: 2019-05-20 03:14+0200\n" "PO-Revision-Date: 2017-04-19 10:22+0100\n" "Last-Translator: José Nuno Coelho Pires \n" "Language-Team: Portuguese \n" diff -pruN 19.08.3-1/po/pt_BR/libgrantleetheme.po 19.12.3-0ubuntu1/po/pt_BR/libgrantleetheme.po --- 19.08.3-1/po/pt_BR/libgrantleetheme.po 2019-11-05 04:18:17.000000000 +0000 +++ 19.12.3-0ubuntu1/po/pt_BR/libgrantleetheme.po 2020-03-03 00:38:28.000000000 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: libgrantleetheme\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-08-30 07:48+0200\n" +"POT-Creation-Date: 2019-05-20 03:14+0200\n" "PO-Revision-Date: 2018-08-04 23:26-0300\n" "Last-Translator: André Marcelo Alvarenga \n" "Language-Team: Brazilian Portuguese \n" diff -pruN 19.08.3-1/po/ro/libgrantleetheme.po 19.12.3-0ubuntu1/po/ro/libgrantleetheme.po --- 19.08.3-1/po/ro/libgrantleetheme.po 2019-11-05 04:18:17.000000000 +0000 +++ 19.12.3-0ubuntu1/po/ro/libgrantleetheme.po 2020-03-03 00:38:28.000000000 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-08-30 07:48+0200\n" +"POT-Creation-Date: 2019-05-20 03:14+0200\n" "PO-Revision-Date: 2014-08-18 09:42+0300\n" "Last-Translator: Sergiu Bivol \n" "Language-Team: Romanian \n" diff -pruN 19.08.3-1/po/ru/libgrantleetheme.po 19.12.3-0ubuntu1/po/ru/libgrantleetheme.po --- 19.08.3-1/po/ru/libgrantleetheme.po 2019-11-05 04:18:17.000000000 +0000 +++ 19.12.3-0ubuntu1/po/ru/libgrantleetheme.po 2020-03-03 00:38:28.000000000 +0000 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-08-30 07:48+0200\n" +"POT-Creation-Date: 2019-05-20 03:14+0200\n" "PO-Revision-Date: 2018-10-02 20:54+0300\n" "Last-Translator: Alexander Yavorsky \n" "Language-Team: Russian \n" diff -pruN 19.08.3-1/po/sk/libgrantleetheme.po 19.12.3-0ubuntu1/po/sk/libgrantleetheme.po --- 19.08.3-1/po/sk/libgrantleetheme.po 2019-11-05 04:18:17.000000000 +0000 +++ 19.12.3-0ubuntu1/po/sk/libgrantleetheme.po 2020-03-03 00:38:28.000000000 +0000 @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: libgrantleetheme\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-08-30 07:48+0200\n" +"POT-Creation-Date: 2019-05-20 03:14+0200\n" "PO-Revision-Date: 2017-04-26 21:17+0100\n" "Last-Translator: Roman Paholik \n" "Language-Team: Slovak \n" diff -pruN 19.08.3-1/po/sl/libgrantleetheme.po 19.12.3-0ubuntu1/po/sl/libgrantleetheme.po --- 19.08.3-1/po/sl/libgrantleetheme.po 2019-11-05 04:18:17.000000000 +0000 +++ 19.12.3-0ubuntu1/po/sl/libgrantleetheme.po 2020-03-03 00:38:28.000000000 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-08-30 07:48+0200\n" +"POT-Creation-Date: 2019-05-20 03:14+0200\n" "PO-Revision-Date: 2017-07-16 11:58+0100\n" "Last-Translator: Andrej Mernik \n" "Language-Team: Slovenian \n" diff -pruN 19.08.3-1/po/sv/libgrantleetheme.po 19.12.3-0ubuntu1/po/sv/libgrantleetheme.po --- 19.08.3-1/po/sv/libgrantleetheme.po 2019-11-05 04:18:17.000000000 +0000 +++ 19.12.3-0ubuntu1/po/sv/libgrantleetheme.po 2020-03-03 00:38:28.000000000 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-08-30 07:48+0200\n" +"POT-Creation-Date: 2019-05-20 03:14+0200\n" "PO-Revision-Date: 2017-04-19 19:37+0100\n" "Last-Translator: Stefan Asserhäll \n" "Language-Team: Swedish \n" diff -pruN 19.08.3-1/po/tr/libgrantleetheme.po 19.12.3-0ubuntu1/po/tr/libgrantleetheme.po --- 19.08.3-1/po/tr/libgrantleetheme.po 2019-11-05 04:18:17.000000000 +0000 +++ 19.12.3-0ubuntu1/po/tr/libgrantleetheme.po 2020-03-03 00:38:29.000000000 +0000 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: kdepim-kde4\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-08-30 07:48+0200\n" +"POT-Creation-Date: 2019-05-20 03:14+0200\n" "PO-Revision-Date: 2017-06-05 11:52+0000\n" "Last-Translator: Kaan \n" "Language-Team: Turkish \n" diff -pruN 19.08.3-1/po/ug/libgrantleetheme.po 19.12.3-0ubuntu1/po/ug/libgrantleetheme.po --- 19.08.3-1/po/ug/libgrantleetheme.po 2019-11-05 04:18:17.000000000 +0000 +++ 19.12.3-0ubuntu1/po/ug/libgrantleetheme.po 2020-03-03 00:38:29.000000000 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: libgrantleetheme\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-08-30 07:48+0200\n" +"POT-Creation-Date: 2019-05-20 03:14+0200\n" "PO-Revision-Date: 2013-09-08 07:05+0900\n" "Last-Translator: Gheyret Kenji \n" "Language-Team: Uyghur \n" diff -pruN 19.08.3-1/po/uk/libgrantleetheme.po 19.12.3-0ubuntu1/po/uk/libgrantleetheme.po --- 19.08.3-1/po/uk/libgrantleetheme.po 2019-11-05 04:18:17.000000000 +0000 +++ 19.12.3-0ubuntu1/po/uk/libgrantleetheme.po 2020-03-03 00:38:29.000000000 +0000 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: libgrantleetheme\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-08-30 07:48+0200\n" +"POT-Creation-Date: 2019-05-20 03:14+0200\n" "PO-Revision-Date: 2017-04-19 08:51+0300\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" diff -pruN 19.08.3-1/po/zh_CN/libgrantleetheme.po 19.12.3-0ubuntu1/po/zh_CN/libgrantleetheme.po --- 19.08.3-1/po/zh_CN/libgrantleetheme.po 2019-11-05 04:18:17.000000000 +0000 +++ 19.12.3-0ubuntu1/po/zh_CN/libgrantleetheme.po 2020-03-03 00:38:29.000000000 +0000 @@ -6,16 +6,15 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-08-30 07:48+0200\n" -"PO-Revision-Date: 2019-10-09 10:05\n" -"Last-Translator: Guo Yunhe (guoyunhe)\n" +"POT-Creation-Date: 2019-05-20 03:14+0200\n" +"PO-Revision-Date: 2020-01-20 21:56\n" +"Last-Translator: FULL NAME \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: crowdin.com\n" "X-Crowdin-Project: kdeorg\n" "X-Crowdin-Language: zh-CN\n" "X-Crowdin-File: /kf5-stable/messages/pim/libgrantleetheme.pot\n" diff -pruN 19.08.3-1/po/zh_TW/libgrantleetheme.po 19.12.3-0ubuntu1/po/zh_TW/libgrantleetheme.po --- 19.08.3-1/po/zh_TW/libgrantleetheme.po 2019-11-05 04:18:17.000000000 +0000 +++ 19.12.3-0ubuntu1/po/zh_TW/libgrantleetheme.po 2020-03-03 00:38:29.000000000 +0000 @@ -7,10 +7,10 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-08-30 07:48+0200\n" +"POT-Creation-Date: 2019-05-20 03:14+0200\n" "PO-Revision-Date: 2019-03-22 00:42+0800\n" "Last-Translator: pan93412 \n" -"Language-Team: Chinese \n" +"Language-Team: Chinese \n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff -pruN 19.08.3-1/src/grantleeki18nlocalizer.h 19.12.3-0ubuntu1/src/grantleeki18nlocalizer.h --- 19.08.3-1/src/grantleeki18nlocalizer.h 2019-10-11 05:07:34.000000000 +0000 +++ 19.12.3-0ubuntu1/src/grantleeki18nlocalizer.h 2020-02-07 06:13:55.000000000 +0000 @@ -28,6 +28,9 @@ class KLocalizedString; namespace GrantleeTheme { +/** + * @brief The GrantleeKi18nLocalizer class + */ class GRANTLEETHEME_EXPORT GrantleeKi18nLocalizer : public Grantlee::QtLocalizer { public: diff -pruN 19.08.3-1/src/grantleetheme.cpp 19.12.3-0ubuntu1/src/grantleetheme.cpp --- 19.08.3-1/src/grantleetheme.cpp 2019-10-11 05:07:34.000000000 +0000 +++ 19.12.3-0ubuntu1/src/grantleetheme.cpp 2020-02-07 06:13:55.000000000 +0000 @@ -233,6 +233,6 @@ void Theme::addPluginPath(const QString QStringList paths = ThemePrivate::sEngine->pluginPaths(); if (!paths.contains(path)) { paths.prepend(path); + ThemePrivate::sEngine->setPluginPaths(paths); } - ThemePrivate::sEngine->setPluginPaths(paths); } diff -pruN 19.08.3-1/src/grantleethemeengine.h 19.12.3-0ubuntu1/src/grantleethemeengine.h --- 19.08.3-1/src/grantleethemeengine.h 2019-10-11 05:07:34.000000000 +0000 +++ 19.12.3-0ubuntu1/src/grantleethemeengine.h 2020-02-07 06:13:55.000000000 +0000 @@ -27,6 +27,9 @@ namespace GrantleeTheme { class GrantleeKi18nLocalizer; class EnginePrivate; +/** + * @brief The Engine class + */ class GRANTLEETHEME_EXPORT Engine : public Grantlee::Engine { Q_OBJECT diff -pruN 19.08.3-1/src/grantleetheme.h 19.12.3-0ubuntu1/src/grantleetheme.h --- 19.08.3-1/src/grantleetheme.h 2019-10-11 05:07:34.000000000 +0000 +++ 19.12.3-0ubuntu1/src/grantleetheme.h 2020-02-07 06:13:55.000000000 +0000 @@ -30,7 +30,9 @@ class GrantleeThemeTest; namespace GrantleeTheme { class ThemeManager; class ThemePrivate; - +/** + * @brief The Theme class + */ class GRANTLEETHEME_EXPORT Theme { public: diff -pruN 19.08.3-1/src/grantleethememanager.h 19.12.3-0ubuntu1/src/grantleethememanager.h --- 19.08.3-1/src/grantleethememanager.h 2019-10-11 05:07:34.000000000 +0000 +++ 19.12.3-0ubuntu1/src/grantleethememanager.h 2020-02-07 06:13:55.000000000 +0000 @@ -29,6 +29,10 @@ class KToggleAction; class KActionMenu; namespace GrantleeTheme { +/** + * @brief The ThemeManager class + * @author Laurent montel + */ class GRANTLEETHEME_EXPORT ThemeManager : public QObject { Q_OBJECT diff -pruN 19.08.3-1/src/plugin/CMakeLists.txt 19.12.3-0ubuntu1/src/plugin/CMakeLists.txt --- 19.08.3-1/src/plugin/CMakeLists.txt 2019-10-11 05:07:34.000000000 +0000 +++ 19.12.3-0ubuntu1/src/plugin/CMakeLists.txt 2020-02-07 06:13:55.000000000 +0000 @@ -2,7 +2,10 @@ kde_enable_exceptions() set(grantleeplugin_SRCS kdegrantleeplugin.cpp + color.cpp + colorscheme.cpp icon.cpp + palette.cpp ) add_library(kde_grantlee_plugin MODULE ${grantleeplugin_SRCS}) @@ -10,6 +13,8 @@ kpim_grantlee_adjust_plugin_name(kde_gra target_link_libraries(kde_grantlee_plugin Grantlee5::Templates KF5::IconThemes + KF5::GuiAddons + KF5::ConfigWidgets ) install(TARGETS kde_grantlee_plugin diff -pruN 19.08.3-1/src/plugin/color.cpp 19.12.3-0ubuntu1/src/plugin/color.cpp --- 19.08.3-1/src/plugin/color.cpp 1970-01-01 00:00:00.000000000 +0000 +++ 19.12.3-0ubuntu1/src/plugin/color.cpp 2020-02-07 06:13:55.000000000 +0000 @@ -0,0 +1,176 @@ +/* + * Copyright (C) 2019 Volker Krause + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "color.h" + +#include +#include +#include +#include + +#include +#include +#include + +static QColor inputToColor(const QVariant &v) +{ + if (v.canConvert()) { + return QColor(v.value().get()); + } + return v.value(); +} + +static QString rgbaString(const QColor &c) +{ + return QLatin1String("rgba(") + + QString::number(c.red()) + QLatin1String(", ") + + QString::number(c.green()) + QLatin1String(", ") + + QString::number(c.blue()) + QLatin1String(", ") + + QString::number(c.alphaF()) + QLatin1Char(')'); +} + +#define COLOR_PROP(name) if (property == QLatin1String(#name)) { return object.name(); } + +GRANTLEE_BEGIN_LOOKUP(QColor) + COLOR_PROP(red) + COLOR_PROP(green) + COLOR_PROP(blue) + COLOR_PROP(alpha) + if (property == QLatin1String("hexRgb")) { + return object.name(); + } + if (property == QLatin1String("cssRgba")) { + return rgbaString(object); + } + return {}; +GRANTLEE_END_LOOKUP + +void Color::registerMetaType() +{ + Grantlee::registerMetaType(); +} + +QVariant ColorHexRgbFilter::doFilter(const QVariant &input, const QVariant &arg, bool autoescape) const +{ + Q_UNUSED(arg) + Q_UNUSED(autoescape) + + const auto color = inputToColor(input); + return color.name(); +} + +QVariant ColorCssRgbaFilter::doFilter(const QVariant &input, const QVariant &arg, bool autoescape) const +{ + Q_UNUSED(arg) + Q_UNUSED(autoescape) + + const auto color = inputToColor(input); + return rgbaString(color); +} + +QVariant ColorLighterFilter::doFilter(const QVariant& input, const QVariant& arg, bool autoescape) const +{ + Q_UNUSED(autoescape) + + const auto color = inputToColor(input); + const auto factor = arg.toInt(); + return color.lighter(factor); +} + +QVariant ColorDarkerFilter::doFilter(const QVariant& input, const QVariant& arg, bool autoescape) const +{ + Q_UNUSED(autoescape) + + const auto color = inputToColor(input); + const auto factor = arg.toInt(); + return color.darker(factor); +} + +QVariant ColorSetAlphaFilter::doFilter(const QVariant& input, const QVariant& arg, bool autoescape) const +{ + Q_UNUSED(autoescape) + + auto color = inputToColor(input); + color.setAlpha(arg.toInt()); + return color; +} + +ColorMixTag::ColorMixTag(QObject *parent) + : Grantlee::AbstractNodeFactory(parent) +{ +} + +ColorMixTag::~ColorMixTag() = default; + +Grantlee::Node* ColorMixTag::getNode(const QString &tagContent, Grantlee::Parser *p) const +{ + Q_UNUSED(p); + const auto parts = smartSplit(tagContent); + if (parts.size() != 4 && parts.size() != 6) { + throw Grantlee::Exception(Grantlee::TagSyntaxError, QStringLiteral("colormix tag needs 3 or 5 arguments")); + } + + bool ok = false; + const auto ratio = parts.at(3).toDouble(&ok); + if (!ok) { + throw Grantlee::Exception(Grantlee::TagSyntaxError, QStringLiteral("colormix: invalid ratio")); + } + + QString varName; + if (parts.size() == 6) { + if (parts.at(4) != QLatin1String("as")) { + throw Grantlee::Exception(Grantlee::TagSyntaxError, QStringLiteral("colormix: syntax error")); + } + varName = parts.at(5); + } + + return new ColorMixNode(parts.at(1), parts.at(2), ratio, varName); +} + +ColorMixNode::ColorMixNode(const QString &color1Name, const QString &color2Name, double ratio, const QString &varName, QObject *parent) + : Grantlee::Node(parent) + , m_color1Name(color1Name) + , m_color2Name(color2Name) + , m_varName(varName) + , m_ratio(ratio) +{ +} + +ColorMixNode::~ColorMixNode() = default; + +static QColor resolveColor(const QString &name, Grantlee::Context *c) +{ + if (name.startsWith(QLatin1Char('"')) && name.endsWith(QLatin1Char('"'))) { + return QColor(name.midRef(1, name.size() - 2)); + } + + const auto val = Grantlee::Variable(name).resolve(c); + return val.value(); +} + +void ColorMixNode::render(Grantlee::OutputStream *stream, Grantlee::Context *c) const +{ + const auto col1 = resolveColor(m_color1Name, c); + const auto col2 = resolveColor(m_color2Name, c); + const auto result = KColorUtils::mix(col1, col2, m_ratio); + if (!m_varName.isEmpty()) { + c->insert(m_varName, QVariant::fromValue(result)); + } else { + (*stream) << rgbaString(result); + } +} diff -pruN 19.08.3-1/src/plugin/color.h 19.12.3-0ubuntu1/src/plugin/color.h --- 19.08.3-1/src/plugin/color.h 1970-01-01 00:00:00.000000000 +0000 +++ 19.12.3-0ubuntu1/src/plugin/color.h 2020-02-07 06:13:55.000000000 +0000 @@ -0,0 +1,140 @@ +/* + * Copyright (C) 2019 Volker Krause + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef GRANTLEETHEME_COLOR_H +#define GRANTLEETHEME_COLOR_H + +#include +#include + +/** + * @name colorHexRgb filter + * @brief Provides colorName filter for converting a QColor to a color string. + * + * The syntax is: + * @code + * {{ myColor|colorHexRgb }} + * @endcode + */ +class ColorHexRgbFilter : public Grantlee::Filter +{ +public: + QVariant doFilter(const QVariant &input, const QVariant &arg, bool autoescape) const override; +}; + +/** + * @name colorCssRgba filter + * @brief Provides colorRgba filter for converting a QColor to a rgba() CSS color definition. + * + * The syntax is: + * @code + * {{ myColor|colorCssRgba }} + * @endcode + */ +class ColorCssRgbaFilter : public Grantlee::Filter +{ +public: + QVariant doFilter(const QVariant &input, const QVariant &arg, bool autoescape) const override; +}; + +/** + * @name colorLighter filter + * @brief Provides colorLighter filter for applying QColor::lighter to a color. + * + * The syntax is: + * @code + * {{ myColor|colorLighter: }} + * @endcode + */ +class ColorLighterFilter : public Grantlee::Filter +{ +public: + QVariant doFilter(const QVariant &input, const QVariant &arg, bool autoescape) const override; +}; + +/** + * @name colorDarker filter + * @brief Provides colorDarker filter for applying QColor::darker to a color. + * + * The syntax is: + * @code + * {{ myColor|colorDarker: }} + * @endcode + */ +class ColorDarkerFilter : public Grantlee::Filter +{ +public: + QVariant doFilter(const QVariant &input, const QVariant &arg, bool autoescape) const override; +}; + +/** + * @name colorSetAlpha filter + * @brief Provides colorSetAlpha filter for setting a fixed alpha value on the given color. + * + * The syntax is: + * @code + * {{ myColor|colorSetAlpha: }} + * @endcode + */ +class ColorSetAlphaFilter : public Grantlee::Filter +{ +public: + QVariant doFilter(const QVariant &input, const QVariant &arg, bool autoescape) const override; +}; + +/** + * @name colorMix tag + * @brief Provides {% colorMix %} tag for mixing two colors + * + * The syntax is: + * @code + * {% colorMix "#rrggbb"|var-with-color "#rrggbb"|var-with-color %} + * @endcode + * + * The tag generates a rgba() CSS color definition. + */ +class ColorMixTag : public Grantlee::AbstractNodeFactory +{ + Q_OBJECT +public: + explicit ColorMixTag(QObject *parent = nullptr); + ~ColorMixTag(); + Grantlee::Node *getNode(const QString &tagContent, Grantlee::Parser *p) const override; +}; + +class ColorMixNode : public Grantlee::Node +{ + Q_OBJECT +public: + explicit ColorMixNode(const QString &color1Name, const QString &color2Name, double ratio, const QString &varName, QObject *parent = nullptr); + ~ColorMixNode(); + void render(Grantlee::OutputStream *stream, Grantlee::Context *c) const override; + +private: + QString m_color1Name; + QString m_color2Name; + QString m_varName; + double m_ratio; +}; + +namespace Color +{ + void registerMetaType(); +} + +#endif // GRANTLEETHEME_COLOR_H diff -pruN 19.08.3-1/src/plugin/colorscheme.cpp 19.12.3-0ubuntu1/src/plugin/colorscheme.cpp --- 19.08.3-1/src/plugin/colorscheme.cpp 1970-01-01 00:00:00.000000000 +0000 +++ 19.12.3-0ubuntu1/src/plugin/colorscheme.cpp 2020-02-07 06:13:55.000000000 +0000 @@ -0,0 +1,60 @@ +/* + * Copyright (C) 2019 Volker Krause + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "colorscheme.h" + +#include + +#include + +#define PROP_IMPL(PROP, METHOD) if (QString::compare(property, QLatin1String(#PROP), Qt::CaseInsensitive) == 0) \ + { return object.METHOD(KColorScheme::PROP).color(); } +#define BACKGROUND_PROP(PROP) PROP_IMPL(PROP, background) +#define FOREGROUND_PROP(PROP) PROP_IMPL(PROP, foreground) +#define DECORATION_PROP(PROP) PROP_IMPL(PROP, decoration) + +GRANTLEE_BEGIN_LOOKUP(KColorScheme) + BACKGROUND_PROP(NormalBackground) + BACKGROUND_PROP(AlternateBackground) + BACKGROUND_PROP(ActiveBackground) + BACKGROUND_PROP(LinkBackground) + BACKGROUND_PROP(VisitedBackground) + BACKGROUND_PROP(NegativeBackground) + BACKGROUND_PROP(NeutralBackground) + BACKGROUND_PROP(PositiveBackground) + + FOREGROUND_PROP(NormalText) + FOREGROUND_PROP(InactiveText) + FOREGROUND_PROP(ActiveText) + FOREGROUND_PROP(LinkText) + FOREGROUND_PROP(VisitedText) + FOREGROUND_PROP(NegativeText) + FOREGROUND_PROP(NeutralText) + FOREGROUND_PROP(PositiveText) + + DECORATION_PROP(FocusColor) + DECORATION_PROP(HoverColor) + + return {}; +GRANTLEE_END_LOOKUP + + +void ColorScheme::registerMetaType() +{ + Grantlee::registerMetaType(); +} diff -pruN 19.08.3-1/src/plugin/colorscheme.h 19.12.3-0ubuntu1/src/plugin/colorscheme.h --- 19.08.3-1/src/plugin/colorscheme.h 1970-01-01 00:00:00.000000000 +0000 +++ 19.12.3-0ubuntu1/src/plugin/colorscheme.h 2020-02-07 06:13:55.000000000 +0000 @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2019 Volker Krause + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef GRANTLEETHEME_COLORSCHEME_H +#define GRANTLEETHEME_COLORSCHEME_H + +namespace ColorScheme +{ + void registerMetaType(); +} + +#endif // GRANTLEETHEME_COLORSCHEME_H diff -pruN 19.08.3-1/src/plugin/kdegrantleeplugin.cpp 19.12.3-0ubuntu1/src/plugin/kdegrantleeplugin.cpp --- 19.08.3-1/src/plugin/kdegrantleeplugin.cpp 2019-10-11 05:07:34.000000000 +0000 +++ 19.12.3-0ubuntu1/src/plugin/kdegrantleeplugin.cpp 2020-02-07 06:13:55.000000000 +0000 @@ -18,12 +18,18 @@ */ #include "kdegrantleeplugin.h" +#include "color.h" +#include "colorscheme.h" #include "icon.h" +#include "palette.h" KDEGrantleePlugin::KDEGrantleePlugin(QObject *parent) : QObject(parent) , Grantlee::TagLibraryInterface() { + Color::registerMetaType(); + ColorScheme::registerMetaType(); + Palette::registerMetaType(); } KDEGrantleePlugin::~KDEGrantleePlugin() @@ -35,6 +41,7 @@ QHash nodeFactories; + nodeFactories[QStringLiteral("colorMix")] = new ColorMixTag(); nodeFactories[QStringLiteral("icon")] = new IconTag(); return nodeFactories; @@ -42,5 +49,12 @@ QHash KDEGrantleePlugin::filters(const QString &name) { - return Grantlee::TagLibraryInterface::filters(name); + Q_UNUSED(name) + QHash filters; + filters.insert(QStringLiteral("colorHexRgb"), new ColorHexRgbFilter()); + filters.insert(QStringLiteral("colorCssRgba"), new ColorCssRgbaFilter()); + filters.insert(QStringLiteral("colorLighter"), new ColorLighterFilter()); + filters.insert(QStringLiteral("colorDarker"), new ColorDarkerFilter()); + filters.insert(QStringLiteral("colorSetAlpha"), new ColorSetAlphaFilter()); + return filters; } diff -pruN 19.08.3-1/src/plugin/palette.cpp 19.12.3-0ubuntu1/src/plugin/palette.cpp --- 19.08.3-1/src/plugin/palette.cpp 1970-01-01 00:00:00.000000000 +0000 +++ 19.12.3-0ubuntu1/src/plugin/palette.cpp 2020-02-07 06:13:55.000000000 +0000 @@ -0,0 +1,81 @@ +/* + * Copyright (C) 2019 Volker Krause + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "palette.h" + +#include + +#include + +#define ROLE(R) { #R, QPalette::R } + +static const struct { + const char* name; + QPalette::ColorRole role; +} color_roles[] = { + ROLE(AlternateBase), + ROLE(Base), + ROLE(BrightText), + ROLE(Button), + ROLE(ButtonText), + ROLE(Dark), + ROLE(Highlight), + ROLE(HighlightedText), + ROLE(Light), + ROLE(Link), + ROLE(LinkVisited), + ROLE(Mid), + ROLE(Midlight), +#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0) + ROLE(PlaceholderText), +#endif + ROLE(Shadow), + ROLE(Text), + ROLE(ToolTipBase), + ROLE(ToolTipText), + ROLE(Window), + ROLE(WindowText), +}; + +GRANTLEE_BEGIN_LOOKUP(QPalette) + auto group = QPalette::Inactive; + auto roleName = property; + + if (property.startsWith(QLatin1String("active"))) { + roleName = property.mid(6); + group = QPalette::Active; + } else if (property.startsWith(QLatin1String("disabled"))) { + roleName = property.mid(8); + group = QPalette::Disabled; + } else if (property.startsWith(QLatin1String("inactive"))) { + roleName = property.mid(8); + group = QPalette::Inactive; + } + + for (const auto &role : color_roles) { + if (roleName.compare(QLatin1String(role.name), Qt::CaseInsensitive) == 0) { + return object.color(group, role.role); + } + } + return {}; +GRANTLEE_END_LOOKUP + +void Palette::registerMetaType() +{ + Grantlee::registerMetaType(); +} diff -pruN 19.08.3-1/src/plugin/palette.h 19.12.3-0ubuntu1/src/plugin/palette.h --- 19.08.3-1/src/plugin/palette.h 1970-01-01 00:00:00.000000000 +0000 +++ 19.12.3-0ubuntu1/src/plugin/palette.h 2020-02-07 06:13:55.000000000 +0000 @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2019 Volker Krause + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef GRANTLEETHEME_PALETTE_H +#define GRANTLEETHEME_PALETTE_H + +namespace Palette +{ + void registerMetaType(); +} + +#endif // GRANTLEETHEME_PALETTE_H diff -pruN 19.08.3-1/src/qtresourcetemplateloader.h 19.12.3-0ubuntu1/src/qtresourcetemplateloader.h --- 19.08.3-1/src/qtresourcetemplateloader.h 2019-10-11 05:07:34.000000000 +0000 +++ 19.12.3-0ubuntu1/src/qtresourcetemplateloader.h 2020-02-07 06:13:55.000000000 +0000 @@ -22,6 +22,10 @@ #include "grantlee/templateloader.h" #include "grantleetheme_export.h" namespace GrantleeTheme { +/** + * @brief The QtResourceTemplateLoader class + * @author Laurent montel + */ class GRANTLEETHEME_EXPORT QtResourceTemplateLoader : public Grantlee::FileSystemTemplateLoader { public: