Hello community, here is the log from the commit of package grantleetheme for openSUSE:Factory checked in at 2019-12-13 12:01:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grantleetheme (Old) and /work/SRC/openSUSE:Factory/.grantleetheme.new.4691 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grantleetheme" Fri Dec 13 12:01:57 2019 rev:45 rq:756164 version:19.12.0 Changes: -------- --- /work/SRC/openSUSE:Factory/grantleetheme/grantleetheme.changes 2019-11-12 11:34:34.658036118 +0100 +++ /work/SRC/openSUSE:Factory/.grantleetheme.new.4691/grantleetheme.changes 2019-12-13 12:02:21.821447758 +0100 @@ -1,0 +2,32 @@ +Tue Dec 10 06:38:11 UTC 2019 - Luca Beltrame <[email protected]> + +- Update to 19.12.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/releases/19.12.0 +- No code change since 19.11.90 + +------------------------------------------------------------------- +Sat Nov 30 09:11:32 UTC 2019 - Luca Beltrame <[email protected]> + +- Update to 19.11.90 + * New feature release + * For more details please see: + * https://kde.org/announcements/releases/19.12-rc +- No code change since 19.11.80 + +------------------------------------------------------------------- +Sun Nov 24 13:29:04 UTC 2019 - Luca Beltrame <[email protected]> + +- Update to 19.11.80 + * New feature release +- Changes since 19.08.3: + * Add colorSetAlpha filter, so explicitly set the alpha value of a color + * Add support for KColorScheme + * Don't use qt 5.12 enum + * Increase version + * Add color and palette APIs for Grantlee + * Add dummy API docs, so these classes show up on api.kde.org + * Not necessary to assign paths if we don't add new path + +------------------------------------------------------------------- Old: ---- grantleetheme-19.08.3.tar.xz grantleetheme-19.08.3.tar.xz.sig New: ---- grantleetheme-19.12.0.tar.xz grantleetheme-19.12.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grantleetheme.spec ++++++ --- /var/tmp/diff_new_pack.VliDx2/_old 2019-12-13 12:02:22.397447540 +0100 +++ /var/tmp/diff_new_pack.VliDx2/_new 2019-12-13 12:02:22.397447540 +0100 @@ -1,7 +1,7 @@ # # spec file for package grantleetheme # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,32 +16,32 @@ # -%define kf5_version 5.26.0 +%define kf5_version 5.60.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: grantleetheme -Version: 19.08.3 +Version: 19.12.0 Release: 0 Summary: Grantlee theme support License: GPL-2.0-only Group: System/Libraries URL: https://www.kde.org -Source: https://download.kde.org/stable/applications/%{version}/src/%{name}-%{version}.tar.xz +Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz %if %{with lang} -Source1: https://download.kde.org/stable/applications/%{version}/src/%{name}-%{version}.tar.xz.sig +Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig Source2: applications.keyring %endif BuildRequires: extra-cmake-modules >= 5.19.0 -BuildRequires: grantlee5-devel BuildRequires: kf5-filesystem -BuildRequires: ki18n-devel -BuildRequires: kiconthemes-devel -BuildRequires: knewstuff-devel -BuildRequires: pkgconfig -BuildRequires: pkgconfig(Qt5Network) >= 5.4.0 -BuildRequires: pkgconfig(Qt5Test) >= 5.4.0 -BuildRequires: pkgconfig(Qt5Widgets) >= 5.4.0 +BuildRequires: cmake(Grantlee5) +BuildRequires: cmake(KF5GuiAddons) +BuildRequires: cmake(KF5I18n) +BuildRequires: cmake(KF5IconThemes) +BuildRequires: cmake(KF5NewStuff) +BuildRequires: cmake(Qt5Network) >= 5.4.0 +BuildRequires: cmake(Qt5Test) >= 5.4.0 +BuildRequires: cmake(Qt5Widgets) >= 5.4.0 %if %{with lang} Recommends: %{name}-lang %endif ++++++ applications.keyring ++++++ Binary files /var/tmp/diff_new_pack.VliDx2/_old and /var/tmp/diff_new_pack.VliDx2/_new differ ++++++ grantleetheme-19.08.3.tar.xz -> grantleetheme-19.12.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/CMakeLists.txt new/grantleetheme-19.12.0/CMakeLists.txt --- old/grantleetheme-19.08.3/CMakeLists.txt 2019-11-05 05:18:17.000000000 +0100 +++ new/grantleetheme-19.12.0/CMakeLists.txt 2019-12-06 02:57:28.000000000 +0100 @@ -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.0") project(GrantleeTheme VERSION ${PIM_VERSION}) @@ -36,6 +36,7 @@ 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 @@ ########### 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/autotest/CMakeLists.txt new/grantleetheme-19.12.0/autotest/CMakeLists.txt --- old/grantleetheme-19.08.3/autotest/CMakeLists.txt 2019-10-11 07:07:34.000000000 +0200 +++ new/grantleetheme-19.12.0/autotest/CMakeLists.txt 2019-11-30 09:47:46.000000000 +0100 @@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/autotest/data/themes/color/color.html new/grantleetheme-19.12.0/autotest/data/themes/color/color.html --- old/grantleetheme-19.08.3/autotest/data/themes/color/color.html 1970-01-01 01:00:00.000000000 +0100 +++ new/grantleetheme-19.12.0/autotest/data/themes/color/color.html 2019-11-30 09:47:46.000000000 +0100 @@ -0,0 +1,33 @@ +<html> +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 }} + +</html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/autotest/data/themes/color/color.testdesktop new/grantleetheme-19.12.0/autotest/data/themes/color/color.testdesktop --- old/grantleetheme-19.08.3/autotest/data/themes/color/color.testdesktop 1970-01-01 01:00:00.000000000 +0100 +++ new/grantleetheme-19.12.0/autotest/data/themes/color/color.testdesktop 2019-11-30 09:47:46.000000000 +0100 @@ -0,0 +1,4 @@ +[Desktop Entry] +Name=Color Unit Test +Description=Color Unit Test +FileName=color.html diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/autotest/data/themes/color/color_expected.html new/grantleetheme-19.12.0/autotest/data/themes/color/color_expected.html --- old/grantleetheme-19.08.3/autotest/data/themes/color/color_expected.html 1970-01-01 01:00:00.000000000 +0100 +++ new/grantleetheme-19.12.0/autotest/data/themes/color/color_expected.html 2019-11-30 09:47:46.000000000 +0100 @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF8"?> +<html> +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 + +</html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/autotest/grantleethemetest.cpp new/grantleetheme-19.12.0/autotest/grantleethemetest.cpp --- old/grantleetheme-19.08.3/autotest/grantleethemetest.cpp 2019-10-11 07:07:34.000000000 +0200 +++ new/grantleetheme-19.12.0/autotest/grantleethemetest.cpp 2019-11-30 09:47:46.000000000 +0100 @@ -21,9 +21,11 @@ #include <qtest.h> #include <QDir> +#include <QPalette> #include <QProcess> #include <QStandardPaths> +#include <KColorScheme> #include <KConfigGroup> #include <KSharedConfig> @@ -173,6 +175,7 @@ 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 @@ 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/po/ar/libgrantleetheme.po new/grantleetheme-19.12.0/po/ar/libgrantleetheme.po --- old/grantleetheme-19.08.3/po/ar/libgrantleetheme.po 2019-11-05 05:18:16.000000000 +0100 +++ new/grantleetheme-19.12.0/po/ar/libgrantleetheme.po 2019-12-06 02:57:26.000000000 +0100 @@ -6,7 +6,7 @@ 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 <[email protected]>\n" "Language-Team: Arabic <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/po/bg/libgrantleetheme.po new/grantleetheme-19.12.0/po/bg/libgrantleetheme.po --- old/grantleetheme-19.08.3/po/bg/libgrantleetheme.po 2019-11-05 05:18:16.000000000 +0100 +++ new/grantleetheme-19.12.0/po/bg/libgrantleetheme.po 2019-12-06 02:57:26.000000000 +0100 @@ -6,7 +6,7 @@ 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 <[email protected]>\n" "Language-Team: Bulgarian <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/po/bs/libgrantleetheme.po new/grantleetheme-19.12.0/po/bs/libgrantleetheme.po --- old/grantleetheme-19.08.3/po/bs/libgrantleetheme.po 2019-11-05 05:18:16.000000000 +0100 +++ new/grantleetheme-19.12.0/po/bs/libgrantleetheme.po 2019-12-06 02:57:26.000000000 +0100 @@ -7,7 +7,7 @@ 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ć <Unknown>\n" "Language-Team: bosanski <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/po/ca/libgrantleetheme.po new/grantleetheme-19.12.0/po/ca/libgrantleetheme.po --- old/grantleetheme-19.08.3/po/ca/libgrantleetheme.po 2019-11-05 05:18:16.000000000 +0100 +++ new/grantleetheme-19.12.0/po/ca/libgrantleetheme.po 2019-12-06 02:57:26.000000000 +0100 @@ -8,7 +8,7 @@ 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 <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/po/ca@valencia/libgrantleetheme.po new/grantleetheme-19.12.0/po/ca@valencia/libgrantleetheme.po --- old/grantleetheme-19.08.3/po/ca@valencia/libgrantleetheme.po 2019-11-05 05:18:16.000000000 +0100 +++ new/grantleetheme-19.12.0/po/ca@valencia/libgrantleetheme.po 2019-12-06 02:57:26.000000000 +0100 @@ -8,7 +8,7 @@ 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 <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/po/cs/libgrantleetheme.po new/grantleetheme-19.12.0/po/cs/libgrantleetheme.po --- old/grantleetheme-19.08.3/po/cs/libgrantleetheme.po 2019-11-05 05:18:16.000000000 +0100 +++ new/grantleetheme-19.12.0/po/cs/libgrantleetheme.po 2019-12-06 02:57:26.000000000 +0100 @@ -6,7 +6,7 @@ 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 <[email protected]>\n" "Language-Team: Czech <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/po/da/libgrantleetheme.po new/grantleetheme-19.12.0/po/da/libgrantleetheme.po --- old/grantleetheme-19.08.3/po/da/libgrantleetheme.po 2019-11-05 05:18:16.000000000 +0100 +++ new/grantleetheme-19.12.0/po/da/libgrantleetheme.po 2019-12-06 02:57:26.000000000 +0100 @@ -6,7 +6,7 @@ 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 <[email protected]>\n" "Language-Team: Danish <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/po/de/libgrantleetheme.po new/grantleetheme-19.12.0/po/de/libgrantleetheme.po --- old/grantleetheme-19.08.3/po/de/libgrantleetheme.po 2019-11-05 05:18:16.000000000 +0100 +++ new/grantleetheme-19.12.0/po/de/libgrantleetheme.po 2019-12-06 02:57:26.000000000 +0100 @@ -4,7 +4,7 @@ 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 <[email protected]>\n" "Language-Team: German <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/po/el/libgrantleetheme.po new/grantleetheme-19.12.0/po/el/libgrantleetheme.po --- old/grantleetheme-19.08.3/po/el/libgrantleetheme.po 2019-11-05 05:18:16.000000000 +0100 +++ new/grantleetheme-19.12.0/po/el/libgrantleetheme.po 2019-12-06 02:57:26.000000000 +0100 @@ -6,7 +6,7 @@ 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 <[email protected]>\n" "Language-Team: Greek <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/po/en_GB/libgrantleetheme.po new/grantleetheme-19.12.0/po/en_GB/libgrantleetheme.po --- old/grantleetheme-19.08.3/po/en_GB/libgrantleetheme.po 2019-11-05 05:18:16.000000000 +0100 +++ new/grantleetheme-19.12.0/po/en_GB/libgrantleetheme.po 2019-12-06 02:57:26.000000000 +0100 @@ -6,7 +6,7 @@ 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 <[email protected]>\n" "Language-Team: English <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/po/es/libgrantleetheme.po new/grantleetheme-19.12.0/po/es/libgrantleetheme.po --- old/grantleetheme-19.08.3/po/es/libgrantleetheme.po 2019-11-05 05:18:16.000000000 +0100 +++ new/grantleetheme-19.12.0/po/es/libgrantleetheme.po 2019-12-06 02:57:26.000000000 +0100 @@ -6,7 +6,7 @@ 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 <[email protected]>\n" "Language-Team: Spanish <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/po/et/libgrantleetheme.po new/grantleetheme-19.12.0/po/et/libgrantleetheme.po --- old/grantleetheme-19.08.3/po/et/libgrantleetheme.po 2019-11-05 05:18:16.000000000 +0100 +++ new/grantleetheme-19.12.0/po/et/libgrantleetheme.po 2019-12-06 02:57:26.000000000 +0100 @@ -6,7 +6,7 @@ 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 <[email protected]>\n" "Language-Team: Estonian <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/po/fi/libgrantleetheme.po new/grantleetheme-19.12.0/po/fi/libgrantleetheme.po --- old/grantleetheme-19.08.3/po/fi/libgrantleetheme.po 2019-11-05 05:18:17.000000000 +0100 +++ new/grantleetheme-19.12.0/po/fi/libgrantleetheme.po 2019-12-06 02:57:26.000000000 +0100 @@ -7,7 +7,7 @@ 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 <[email protected]>\n" "Language-Team: Finnish <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/po/fr/libgrantleetheme.po new/grantleetheme-19.12.0/po/fr/libgrantleetheme.po --- old/grantleetheme-19.08.3/po/fr/libgrantleetheme.po 2019-11-05 05:18:17.000000000 +0100 +++ new/grantleetheme-19.12.0/po/fr/libgrantleetheme.po 2019-12-06 02:57:26.000000000 +0100 @@ -8,7 +8,7 @@ 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 <[email protected]>\n" "Language-Team: French <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/po/gl/libgrantleetheme.po new/grantleetheme-19.12.0/po/gl/libgrantleetheme.po --- old/grantleetheme-19.08.3/po/gl/libgrantleetheme.po 2019-11-05 05:18:17.000000000 +0100 +++ new/grantleetheme-19.12.0/po/gl/libgrantleetheme.po 2019-12-06 02:57:26.000000000 +0100 @@ -8,7 +8,7 @@ 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 <[email protected]>\n" "Language-Team: Galician <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/po/hu/libgrantleetheme.po new/grantleetheme-19.12.0/po/hu/libgrantleetheme.po --- old/grantleetheme-19.08.3/po/hu/libgrantleetheme.po 2019-11-05 05:18:17.000000000 +0100 +++ new/grantleetheme-19.12.0/po/hu/libgrantleetheme.po 2019-12-06 02:57:26.000000000 +0100 @@ -6,7 +6,7 @@ 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 <[email protected]>\n" "Language-Team: Hungarian <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/po/ia/libgrantleetheme.po new/grantleetheme-19.12.0/po/ia/libgrantleetheme.po --- old/grantleetheme-19.08.3/po/ia/libgrantleetheme.po 2019-11-05 05:18:17.000000000 +0100 +++ new/grantleetheme-19.12.0/po/ia/libgrantleetheme.po 2019-12-06 02:57:26.000000000 +0100 @@ -6,7 +6,7 @@ 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-22 12:31+0200\n" "Last-Translator: G.Sora <[email protected]>\n" "Language-Team: Interlingua <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/po/it/libgrantleetheme.po new/grantleetheme-19.12.0/po/it/libgrantleetheme.po --- old/grantleetheme-19.08.3/po/it/libgrantleetheme.po 2019-11-05 05:18:17.000000000 +0100 +++ new/grantleetheme-19.12.0/po/it/libgrantleetheme.po 2019-12-06 02:57:26.000000000 +0100 @@ -6,7 +6,7 @@ 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 <[email protected]>\n" "Language-Team: Italian <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/po/ja/libgrantleetheme.po new/grantleetheme-19.12.0/po/ja/libgrantleetheme.po --- old/grantleetheme-19.08.3/po/ja/libgrantleetheme.po 2019-11-05 05:18:17.000000000 +0100 +++ new/grantleetheme-19.12.0/po/ja/libgrantleetheme.po 2019-12-06 02:57:26.000000000 +0100 @@ -2,7 +2,7 @@ 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 <[email protected]>\n" "Language-Team: Japanese <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/po/kk/libgrantleetheme.po new/grantleetheme-19.12.0/po/kk/libgrantleetheme.po --- old/grantleetheme-19.08.3/po/kk/libgrantleetheme.po 2019-11-05 05:18:17.000000000 +0100 +++ new/grantleetheme-19.12.0/po/kk/libgrantleetheme.po 2019-12-06 02:57:26.000000000 +0100 @@ -6,7 +6,7 @@ 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 <[email protected]>\n" "Language-Team: Kazakh <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/po/ko/libgrantleetheme.po new/grantleetheme-19.12.0/po/ko/libgrantleetheme.po --- old/grantleetheme-19.08.3/po/ko/libgrantleetheme.po 2019-11-05 05:18:17.000000000 +0100 +++ new/grantleetheme-19.12.0/po/ko/libgrantleetheme.po 2019-12-06 02:57:26.000000000 +0100 @@ -6,7 +6,7 @@ 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 <[email protected]>\n" "Language-Team: Korean <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/po/lt/libgrantleetheme.po new/grantleetheme-19.12.0/po/lt/libgrantleetheme.po --- old/grantleetheme-19.08.3/po/lt/libgrantleetheme.po 2019-11-05 05:18:17.000000000 +0100 +++ new/grantleetheme-19.12.0/po/lt/libgrantleetheme.po 2019-12-06 02:57:27.000000000 +0100 @@ -7,7 +7,7 @@ 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/po/nb/libgrantleetheme.po new/grantleetheme-19.12.0/po/nb/libgrantleetheme.po --- old/grantleetheme-19.08.3/po/nb/libgrantleetheme.po 2019-11-05 05:18:17.000000000 +0100 +++ new/grantleetheme-19.12.0/po/nb/libgrantleetheme.po 2019-12-06 02:57:27.000000000 +0100 @@ -5,7 +5,7 @@ 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 <[email protected]>\n" "Language-Team: Norwegian Bokmål <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/po/nds/libgrantleetheme.po new/grantleetheme-19.12.0/po/nds/libgrantleetheme.po --- old/grantleetheme-19.08.3/po/nds/libgrantleetheme.po 2019-11-05 05:18:17.000000000 +0100 +++ new/grantleetheme-19.12.0/po/nds/libgrantleetheme.po 2019-12-06 02:57:27.000000000 +0100 @@ -6,7 +6,7 @@ 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 <[email protected]>\n" "Language-Team: Low Saxon <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/po/nl/libgrantleetheme.po new/grantleetheme-19.12.0/po/nl/libgrantleetheme.po --- old/grantleetheme-19.08.3/po/nl/libgrantleetheme.po 2019-11-05 05:18:17.000000000 +0100 +++ new/grantleetheme-19.12.0/po/nl/libgrantleetheme.po 2019-12-06 02:57:27.000000000 +0100 @@ -6,7 +6,7 @@ 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 <[email protected]>\n" "Language-Team: Dutch <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/po/pl/libgrantleetheme.po new/grantleetheme-19.12.0/po/pl/libgrantleetheme.po --- old/grantleetheme-19.08.3/po/pl/libgrantleetheme.po 2019-11-05 05:18:17.000000000 +0100 +++ new/grantleetheme-19.12.0/po/pl/libgrantleetheme.po 2019-12-06 02:57:27.000000000 +0100 @@ -6,7 +6,7 @@ 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 <[email protected]>\n" "Language-Team: Polish <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/po/pt/libgrantleetheme.po new/grantleetheme-19.12.0/po/pt/libgrantleetheme.po --- old/grantleetheme-19.08.3/po/pt/libgrantleetheme.po 2019-11-05 05:18:17.000000000 +0100 +++ new/grantleetheme-19.12.0/po/pt/libgrantleetheme.po 2019-12-06 02:57:27.000000000 +0100 @@ -2,7 +2,7 @@ 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 <[email protected]>\n" "Language-Team: Portuguese <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/po/pt_BR/libgrantleetheme.po new/grantleetheme-19.12.0/po/pt_BR/libgrantleetheme.po --- old/grantleetheme-19.08.3/po/pt_BR/libgrantleetheme.po 2019-11-05 05:18:17.000000000 +0100 +++ new/grantleetheme-19.12.0/po/pt_BR/libgrantleetheme.po 2019-12-06 02:57:27.000000000 +0100 @@ -7,7 +7,7 @@ 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 <[email protected]>\n" "Language-Team: Brazilian Portuguese <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/po/ro/libgrantleetheme.po new/grantleetheme-19.12.0/po/ro/libgrantleetheme.po --- old/grantleetheme-19.08.3/po/ro/libgrantleetheme.po 2019-11-05 05:18:17.000000000 +0100 +++ new/grantleetheme-19.12.0/po/ro/libgrantleetheme.po 2019-12-06 02:57:27.000000000 +0100 @@ -6,7 +6,7 @@ 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 <[email protected]>\n" "Language-Team: Romanian <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/po/ru/libgrantleetheme.po new/grantleetheme-19.12.0/po/ru/libgrantleetheme.po --- old/grantleetheme-19.08.3/po/ru/libgrantleetheme.po 2019-11-05 05:18:17.000000000 +0100 +++ new/grantleetheme-19.12.0/po/ru/libgrantleetheme.po 2019-12-06 02:57:27.000000000 +0100 @@ -8,7 +8,7 @@ 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 <[email protected]>\n" "Language-Team: Russian <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/po/sk/libgrantleetheme.po new/grantleetheme-19.12.0/po/sk/libgrantleetheme.po --- old/grantleetheme-19.08.3/po/sk/libgrantleetheme.po 2019-11-05 05:18:17.000000000 +0100 +++ new/grantleetheme-19.12.0/po/sk/libgrantleetheme.po 2019-12-06 02:57:27.000000000 +0100 @@ -4,7 +4,7 @@ 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 <[email protected]>\n" "Language-Team: Slovak <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/po/sl/libgrantleetheme.po new/grantleetheme-19.12.0/po/sl/libgrantleetheme.po --- old/grantleetheme-19.08.3/po/sl/libgrantleetheme.po 2019-11-05 05:18:17.000000000 +0100 +++ new/grantleetheme-19.12.0/po/sl/libgrantleetheme.po 2019-12-06 02:57:27.000000000 +0100 @@ -6,7 +6,7 @@ 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 <[email protected]>\n" "Language-Team: Slovenian <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/po/sv/libgrantleetheme.po new/grantleetheme-19.12.0/po/sv/libgrantleetheme.po --- old/grantleetheme-19.08.3/po/sv/libgrantleetheme.po 2019-11-05 05:18:17.000000000 +0100 +++ new/grantleetheme-19.12.0/po/sv/libgrantleetheme.po 2019-12-06 02:57:27.000000000 +0100 @@ -6,7 +6,7 @@ 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 <[email protected]>\n" "Language-Team: Swedish <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/po/tr/libgrantleetheme.po new/grantleetheme-19.12.0/po/tr/libgrantleetheme.po --- old/grantleetheme-19.08.3/po/tr/libgrantleetheme.po 2019-11-05 05:18:17.000000000 +0100 +++ new/grantleetheme-19.12.0/po/tr/libgrantleetheme.po 2019-12-06 02:57:27.000000000 +0100 @@ -8,7 +8,7 @@ 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 <[email protected]>\n" "Language-Team: Turkish <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/po/ug/libgrantleetheme.po new/grantleetheme-19.12.0/po/ug/libgrantleetheme.po --- old/grantleetheme-19.08.3/po/ug/libgrantleetheme.po 2019-11-05 05:18:17.000000000 +0100 +++ new/grantleetheme-19.12.0/po/ug/libgrantleetheme.po 2019-12-06 02:57:27.000000000 +0100 @@ -7,7 +7,7 @@ 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 <[email protected]>\n" "Language-Team: Uyghur <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/po/uk/libgrantleetheme.po new/grantleetheme-19.12.0/po/uk/libgrantleetheme.po --- old/grantleetheme-19.08.3/po/uk/libgrantleetheme.po 2019-11-05 05:18:17.000000000 +0100 +++ new/grantleetheme-19.12.0/po/uk/libgrantleetheme.po 2019-12-06 02:57:27.000000000 +0100 @@ -8,7 +8,7 @@ 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 <[email protected]>\n" "Language-Team: Ukrainian <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/po/zh_CN/libgrantleetheme.po new/grantleetheme-19.12.0/po/zh_CN/libgrantleetheme.po --- old/grantleetheme-19.08.3/po/zh_CN/libgrantleetheme.po 2019-11-05 05:18:17.000000000 +0100 +++ new/grantleetheme-19.12.0/po/zh_CN/libgrantleetheme.po 2019-12-06 02:57:28.000000000 +0100 @@ -6,8 +6,8 @@ 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" +"POT-Creation-Date: 2019-05-20 03:14+0200\n" +"PO-Revision-Date: 2019-11-19 23:11\n" "Last-Translator: Guo Yunhe (guoyunhe)\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/po/zh_TW/libgrantleetheme.po new/grantleetheme-19.12.0/po/zh_TW/libgrantleetheme.po --- old/grantleetheme-19.08.3/po/zh_TW/libgrantleetheme.po 2019-11-05 05:18:17.000000000 +0100 +++ new/grantleetheme-19.12.0/po/zh_TW/libgrantleetheme.po 2019-12-06 02:57:28.000000000 +0100 @@ -7,7 +7,7 @@ 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 <[email protected]>\n" "Language-Team: Chinese <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/src/grantleeki18nlocalizer.h new/grantleetheme-19.12.0/src/grantleeki18nlocalizer.h --- old/grantleetheme-19.08.3/src/grantleeki18nlocalizer.h 2019-10-11 07:07:34.000000000 +0200 +++ new/grantleetheme-19.12.0/src/grantleeki18nlocalizer.h 2019-11-30 09:47:46.000000000 +0100 @@ -28,6 +28,9 @@ class KLocalizedString; namespace GrantleeTheme { +/** + * @brief The GrantleeKi18nLocalizer class + */ class GRANTLEETHEME_EXPORT GrantleeKi18nLocalizer : public Grantlee::QtLocalizer { public: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/src/grantleetheme.cpp new/grantleetheme-19.12.0/src/grantleetheme.cpp --- old/grantleetheme-19.08.3/src/grantleetheme.cpp 2019-10-11 07:07:34.000000000 +0200 +++ new/grantleetheme-19.12.0/src/grantleetheme.cpp 2019-11-30 09:47:46.000000000 +0100 @@ -233,6 +233,6 @@ QStringList paths = ThemePrivate::sEngine->pluginPaths(); if (!paths.contains(path)) { paths.prepend(path); + ThemePrivate::sEngine->setPluginPaths(paths); } - ThemePrivate::sEngine->setPluginPaths(paths); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/src/grantleetheme.h new/grantleetheme-19.12.0/src/grantleetheme.h --- old/grantleetheme-19.08.3/src/grantleetheme.h 2019-10-11 07:07:34.000000000 +0200 +++ new/grantleetheme-19.12.0/src/grantleetheme.h 2019-11-30 09:47:46.000000000 +0100 @@ -30,7 +30,9 @@ namespace GrantleeTheme { class ThemeManager; class ThemePrivate; - +/** + * @brief The Theme class + */ class GRANTLEETHEME_EXPORT Theme { public: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/src/grantleethemeengine.h new/grantleetheme-19.12.0/src/grantleethemeengine.h --- old/grantleetheme-19.08.3/src/grantleethemeengine.h 2019-10-11 07:07:34.000000000 +0200 +++ new/grantleetheme-19.12.0/src/grantleethemeengine.h 2019-11-30 09:47:46.000000000 +0100 @@ -27,6 +27,9 @@ namespace GrantleeTheme { class GrantleeKi18nLocalizer; class EnginePrivate; +/** + * @brief The Engine class + */ class GRANTLEETHEME_EXPORT Engine : public Grantlee::Engine { Q_OBJECT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/src/grantleethememanager.h new/grantleetheme-19.12.0/src/grantleethememanager.h --- old/grantleetheme-19.08.3/src/grantleethememanager.h 2019-10-11 07:07:34.000000000 +0200 +++ new/grantleetheme-19.12.0/src/grantleethememanager.h 2019-11-30 09:47:46.000000000 +0100 @@ -29,6 +29,10 @@ class KActionMenu; namespace GrantleeTheme { +/** + * @brief The ThemeManager class + * @author Laurent montel <[email protected]> + */ class GRANTLEETHEME_EXPORT ThemeManager : public QObject { Q_OBJECT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/src/plugin/CMakeLists.txt new/grantleetheme-19.12.0/src/plugin/CMakeLists.txt --- old/grantleetheme-19.08.3/src/plugin/CMakeLists.txt 2019-10-11 07:07:34.000000000 +0200 +++ new/grantleetheme-19.12.0/src/plugin/CMakeLists.txt 2019-11-30 09:47:46.000000000 +0100 @@ -2,7 +2,10 @@ 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 @@ target_link_libraries(kde_grantlee_plugin Grantlee5::Templates KF5::IconThemes + KF5::GuiAddons + KF5::ConfigWidgets ) install(TARGETS kde_grantlee_plugin diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/src/plugin/color.cpp new/grantleetheme-19.12.0/src/plugin/color.cpp --- old/grantleetheme-19.08.3/src/plugin/color.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/grantleetheme-19.12.0/src/plugin/color.cpp 2019-11-30 09:47:46.000000000 +0100 @@ -0,0 +1,176 @@ +/* + * Copyright (C) 2019 Volker Krause <[email protected]> + * + * 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 <grantlee/exception.h> +#include <grantlee/metatype.h> +#include <grantlee/parser.h> +#include <grantlee/variable.h> + +#include <KColorUtils> +#include <QColor> +#include <QDebug> + +static QColor inputToColor(const QVariant &v) +{ + if (v.canConvert<Grantlee::SafeString>()) { + return QColor(v.value<Grantlee::SafeString>().get()); + } + return v.value<QColor>(); +} + +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<QColor>(); +} + +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<QColor>(); +} + +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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/src/plugin/color.h new/grantleetheme-19.12.0/src/plugin/color.h --- old/grantleetheme-19.08.3/src/plugin/color.h 1970-01-01 01:00:00.000000000 +0100 +++ new/grantleetheme-19.12.0/src/plugin/color.h 2019-11-30 09:47:46.000000000 +0100 @@ -0,0 +1,140 @@ +/* + * Copyright (C) 2019 Volker Krause <[email protected]> + * + * 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 <grantlee/filter.h> +#include <grantlee/node.h> + +/** + * @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:<factor> }} + * @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:<factor> }} + * @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:<alpha-value-from-0-to-255> }} + * @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 <ratio> %} + * @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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/src/plugin/colorscheme.cpp new/grantleetheme-19.12.0/src/plugin/colorscheme.cpp --- old/grantleetheme-19.08.3/src/plugin/colorscheme.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/grantleetheme-19.12.0/src/plugin/colorscheme.cpp 2019-11-30 09:47:46.000000000 +0100 @@ -0,0 +1,60 @@ +/* + * Copyright (C) 2019 Volker Krause <[email protected]> + * + * 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 <grantlee/metatype.h> + +#include <KColorScheme> + +#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<KColorScheme>(); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/src/plugin/colorscheme.h new/grantleetheme-19.12.0/src/plugin/colorscheme.h --- old/grantleetheme-19.08.3/src/plugin/colorscheme.h 1970-01-01 01:00:00.000000000 +0100 +++ new/grantleetheme-19.12.0/src/plugin/colorscheme.h 2019-11-30 09:47:46.000000000 +0100 @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2019 Volker Krause <[email protected]> + * + * 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/src/plugin/kdegrantleeplugin.cpp new/grantleetheme-19.12.0/src/plugin/kdegrantleeplugin.cpp --- old/grantleetheme-19.08.3/src/plugin/kdegrantleeplugin.cpp 2019-10-11 07:07:34.000000000 +0200 +++ new/grantleetheme-19.12.0/src/plugin/kdegrantleeplugin.cpp 2019-11-30 09:47:46.000000000 +0100 @@ -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 @@ Q_UNUSED(name); QHash<QString, Grantlee::AbstractNodeFactory *> nodeFactories; + nodeFactories[QStringLiteral("colorMix")] = new ColorMixTag(); nodeFactories[QStringLiteral("icon")] = new IconTag(); return nodeFactories; @@ -42,5 +49,12 @@ QHash<QString, Grantlee::Filter *> KDEGrantleePlugin::filters(const QString &name) { - return Grantlee::TagLibraryInterface::filters(name); + Q_UNUSED(name) + QHash<QString, Grantlee::Filter *> 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/src/plugin/palette.cpp new/grantleetheme-19.12.0/src/plugin/palette.cpp --- old/grantleetheme-19.08.3/src/plugin/palette.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/grantleetheme-19.12.0/src/plugin/palette.cpp 2019-11-30 09:47:46.000000000 +0100 @@ -0,0 +1,81 @@ +/* + * Copyright (C) 2019 Volker Krause <[email protected]> + * + * 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 <grantlee/metatype.h> + +#include <QPalette> + +#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<QPalette>(); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/src/plugin/palette.h new/grantleetheme-19.12.0/src/plugin/palette.h --- old/grantleetheme-19.08.3/src/plugin/palette.h 1970-01-01 01:00:00.000000000 +0100 +++ new/grantleetheme-19.12.0/src/plugin/palette.h 2019-11-30 09:47:46.000000000 +0100 @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2019 Volker Krause <[email protected]> + * + * 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.08.3/src/qtresourcetemplateloader.h new/grantleetheme-19.12.0/src/qtresourcetemplateloader.h --- old/grantleetheme-19.08.3/src/qtresourcetemplateloader.h 2019-10-11 07:07:34.000000000 +0200 +++ new/grantleetheme-19.12.0/src/qtresourcetemplateloader.h 2019-11-30 09:47:46.000000000 +0100 @@ -22,6 +22,10 @@ #include "grantlee/templateloader.h" #include "grantleetheme_export.h" namespace GrantleeTheme { +/** + * @brief The QtResourceTemplateLoader class + * @author Laurent montel <[email protected]> + */ class GRANTLEETHEME_EXPORT QtResourceTemplateLoader : public Grantlee::FileSystemTemplateLoader { public:
