Hello community, here is the log from the commit of package grantleetheme for openSUSE:Factory checked in at 2019-08-16 15:35:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grantleetheme (Old) and /work/SRC/openSUSE:Factory/.grantleetheme.new.22127 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grantleetheme" Fri Aug 16 15:35:09 2019 rev:41 rq:723587 version:19.08.0 Changes: -------- --- /work/SRC/openSUSE:Factory/grantleetheme/grantleetheme.changes 2019-07-26 12:34:34.090119069 +0200 +++ /work/SRC/openSUSE:Factory/.grantleetheme.new.22127/grantleetheme.changes 2019-08-16 15:35:11.001881884 +0200 @@ -1,0 +2,34 @@ +Fri Aug 9 08:30:12 UTC 2019 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 19.08.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-19.08.0.php +- No code change since 19.07.90 + +------------------------------------------------------------------- +Tue Aug 06 16:50:47 UTC 2019 - lbeltr...@kde.org + +- Update to 19.07.90 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-19.08-rc.php +- No code changes since 19.07.80 + +------------------------------------------------------------------- +Tue Jul 23 11:58:55 UTC 2019 - lbeltr...@kde.org + +- Update to 19.07.80 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-19.08-beta.php +- Changes since 19.04.3: + * When we use framework 5.59.0 we can use new logging file directory + * Use QVector here + * It was fixed in 5.13.0beta2 + * Move PimCommon::GenericGrantleeFormatter here + * metainfo.yaml: Fix cmakename, is own top-level entry + * It compiles fine without foreach + * Grantleetheme should always prefer files that are located in DataLocation. + +------------------------------------------------------------------- Old: ---- grantleetheme-19.04.3.tar.xz New: ---- applications.keyring grantleetheme-19.08.0.tar.xz grantleetheme-19.08.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grantleetheme.spec ++++++ --- /var/tmp/diff_new_pack.DPbm93/_old 2019-08-16 15:35:11.553881724 +0200 +++ /var/tmp/diff_new_pack.DPbm93/_new 2019-08-16 15:35:11.557881722 +0200 @@ -21,13 +21,17 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: grantleetheme -Version: 19.04.3 +Version: 19.08.0 Release: 0 Summary: Grantlee theme support License: GPL-2.0-only Group: System/Libraries -URL: http://www.kde.org -Source0: %{name}-%{version}.tar.xz +URL: https://www.kde.org +Source: https://download.kde.org/stable/applications/%{version}/src/%{name}-%{version}.tar.xz +%if %{with lang} +Source1: https://download.kde.org/stable/applications/%{version}/src/%{name}-%{version}.tar.xz.sig +Source2: applications.keyring +%endif BuildRequires: extra-cmake-modules >= 5.19.0 BuildRequires: grantlee5-devel BuildRequires: kf5-filesystem ++++++ grantleetheme-19.04.3.tar.xz -> grantleetheme-19.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.04.3/CMakeLists.txt new/grantleetheme-19.08.0/CMakeLists.txt --- old/grantleetheme-19.04.3/CMakeLists.txt 2019-07-09 02:26:12.000000000 +0200 +++ new/grantleetheme-19.08.0/CMakeLists.txt 2019-08-09 02:56:47.000000000 +0200 @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_MIN_VERSION "5.56.0") -set(PIM_VERSION "5.11.3") +set(KF5_MIN_VERSION "5.60.0") +set(PIM_VERSION "5.12.0") project(GrantleeTheme VERSION ${PIM_VERSION}) @@ -30,7 +30,7 @@ set(GRANTLEETHEME_LIB_VERSION ${PIM_VERSION}) -set(QT_REQUIRED_VERSION "5.10.0") +set(QT_REQUIRED_VERSION "5.11.0") set(GRANTLEE_VERSION "5.1") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Network) @@ -48,12 +48,8 @@ ########### Targets ########### -# workaround for https://bugreports.qt.io/browse/QTBUG-74665 (bug in qt5.13 reevaluate it) -if (${Qt5Widgets_VERSION} STRGREATER "5.13") - MESSAGE(STATUS "Qt version: ${Qt5Widgets_VERSION} DISABLE compile without deprecated methods. bug QTBUG-74665") -else() - add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000) -endif() +add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000) +add_definitions(-DQT_NO_FOREACH) ########### CMake Config Files ########### @@ -86,7 +82,7 @@ add_subdirectory(autotest) endif() -install( FILES grantleetheme.renamecategories grantleetheme.categories DESTINATION ${KDE_INSTALL_CONFDIR} ) +install(FILES grantleetheme.renamecategories grantleetheme.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.04.3/metainfo.yaml new/grantleetheme-19.08.0/metainfo.yaml --- old/grantleetheme-19.04.3/metainfo.yaml 2019-06-07 07:02:36.000000000 +0200 +++ new/grantleetheme-19.08.0/metainfo.yaml 2019-08-03 11:43:57.000000000 +0200 @@ -10,7 +10,7 @@ libraries: - qmake: GrantleeTheme cmake: "KF5::GrantleeTheme" - cmakename: KF5GrantleeTheme +cmakename: KF5GrantleeTheme public_lib: true group: kdepim diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.04.3/po/ar/libgrantleetheme.po new/grantleetheme-19.08.0/po/ar/libgrantleetheme.po --- old/grantleetheme-19.04.3/po/ar/libgrantleetheme.po 2019-07-09 02:26:10.000000000 +0200 +++ new/grantleetheme-19.08.0/po/ar/libgrantleetheme.po 2019-08-09 02:56:46.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-05-20 03:14+0200\n" "PO-Revision-Date: ٢٠١٦-٠٩-١٦ ٢٠:٣٠+0300\n" "Last-Translator: Safa Alfulaij <safa1996alful...@gmail.com>\n" "Language-Team: Arabic <d...@arabeyes.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.04.3/po/bg/libgrantleetheme.po new/grantleetheme-19.08.0/po/bg/libgrantleetheme.po --- old/grantleetheme-19.04.3/po/bg/libgrantleetheme.po 2019-07-09 02:26:10.000000000 +0200 +++ new/grantleetheme-19.08.0/po/bg/libgrantleetheme.po 2019-08-09 02:56:46.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-05-20 07:42+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 <ya...@lindeas.com>\n" "Language-Team: Bulgarian <d...@ludost.net>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.04.3/po/bs/libgrantleetheme.po new/grantleetheme-19.08.0/po/bs/libgrantleetheme.po --- old/grantleetheme-19.04.3/po/bs/libgrantleetheme.po 2019-07-09 02:26:10.000000000 +0200 +++ new/grantleetheme-19.08.0/po/bs/libgrantleetheme.po 2019-08-09 02:56:46.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: grantle\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-05-20 07:42+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 <b...@li.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.04.3/po/ca/libgrantleetheme.po new/grantleetheme-19.08.0/po/ca/libgrantleetheme.po --- old/grantleetheme-19.04.3/po/ca/libgrantleetheme.po 2019-07-09 02:26:10.000000000 +0200 +++ new/grantleetheme-19.08.0/po/ca/libgrantleetheme.po 2019-08-09 02:56:46.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: libgrantleetheme\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-05-20 07:42+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 <antonibel...@yahoo.com>\n" "Language-Team: Catalan <kde-i18n...@kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.04.3/po/ca@valencia/libgrantleetheme.po new/grantleetheme-19.08.0/po/ca@valencia/libgrantleetheme.po --- old/grantleetheme-19.04.3/po/ca@valencia/libgrantleetheme.po 2019-07-09 02:26:10.000000000 +0200 +++ new/grantleetheme-19.08.0/po/ca@valencia/libgrantleetheme.po 2019-08-09 02:56:46.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: libgrantleetheme\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-05-20 07:42+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 <antonibel...@yahoo.com>\n" "Language-Team: Catalan <kde-i18n...@kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.04.3/po/cs/libgrantleetheme.po new/grantleetheme-19.08.0/po/cs/libgrantleetheme.po --- old/grantleetheme-19.04.3/po/cs/libgrantleetheme.po 2019-07-09 02:26:10.000000000 +0200 +++ new/grantleetheme-19.08.0/po/cs/libgrantleetheme.po 2019-08-09 02:56:46.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-05-20 07:42+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 <v...@pelcak.org>\n" "Language-Team: Czech <kde-i18n-...@kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.04.3/po/da/libgrantleetheme.po new/grantleetheme-19.08.0/po/da/libgrantleetheme.po --- old/grantleetheme-19.04.3/po/da/libgrantleetheme.po 2019-07-09 02:26:10.000000000 +0200 +++ new/grantleetheme-19.08.0/po/da/libgrantleetheme.po 2019-08-09 02:56:46.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-05-20 07:42+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 <mschlan...@opensuse.org>\n" "Language-Team: Danish <kde-i18n-...@kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.04.3/po/de/libgrantleetheme.po new/grantleetheme-19.08.0/po/de/libgrantleetheme.po --- old/grantleetheme-19.04.3/po/de/libgrantleetheme.po 2019-07-09 02:26:10.000000000 +0200 +++ new/grantleetheme-19.08.0/po/de/libgrantleetheme.po 2019-08-09 02:56:46.000000000 +0200 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-05-20 07:42+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 <lu...@hube-lueck.de>\n" "Language-Team: German <kde-i18n...@kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.04.3/po/el/libgrantleetheme.po new/grantleetheme-19.08.0/po/el/libgrantleetheme.po --- old/grantleetheme-19.04.3/po/el/libgrantleetheme.po 2019-07-09 02:26:10.000000000 +0200 +++ new/grantleetheme-19.08.0/po/el/libgrantleetheme.po 2019-08-09 02:56:47.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-05-20 07:42+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 <dimk...@gmail.com>\n" "Language-Team: Greek <kde-i18n...@kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.04.3/po/en_GB/libgrantleetheme.po new/grantleetheme-19.08.0/po/en_GB/libgrantleetheme.po --- old/grantleetheme-19.04.3/po/en_GB/libgrantleetheme.po 2019-07-09 02:26:10.000000000 +0200 +++ new/grantleetheme-19.08.0/po/en_GB/libgrantleetheme.po 2019-08-09 02:56:47.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-05-20 07:42+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 <steve.allew...@gmail.com>\n" "Language-Team: English <kde-i18n-...@kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.04.3/po/es/libgrantleetheme.po new/grantleetheme-19.08.0/po/es/libgrantleetheme.po --- old/grantleetheme-19.04.3/po/es/libgrantleetheme.po 2019-07-09 02:26:11.000000000 +0200 +++ new/grantleetheme-19.08.0/po/es/libgrantleetheme.po 2019-08-09 02:56:47.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-05-20 07:42+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 <fjvi...@gmail.com>\n" "Language-Team: Spanish <l10n-kde...@kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.04.3/po/et/libgrantleetheme.po new/grantleetheme-19.08.0/po/et/libgrantleetheme.po --- old/grantleetheme-19.04.3/po/et/libgrantleetheme.po 2019-07-09 02:26:11.000000000 +0200 +++ new/grantleetheme-19.08.0/po/et/libgrantleetheme.po 2019-08-09 02:56:47.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-05-20 07:42+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 <qiila...@gmail.com>\n" "Language-Team: Estonian <kde...@linux.ee>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.04.3/po/fi/libgrantleetheme.po new/grantleetheme-19.08.0/po/fi/libgrantleetheme.po --- old/grantleetheme-19.04.3/po/fi/libgrantleetheme.po 2019-07-09 02:26:11.000000000 +0200 +++ new/grantleetheme-19.08.0/po/fi/libgrantleetheme.po 2019-08-09 02:56:47.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-05-20 07:42+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 <transla...@legisign.org>\n" "Language-Team: Finnish <kde-i18n-...@kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.04.3/po/fr/libgrantleetheme.po new/grantleetheme-19.08.0/po/fr/libgrantleetheme.po --- old/grantleetheme-19.04.3/po/fr/libgrantleetheme.po 2019-07-09 02:26:11.000000000 +0200 +++ new/grantleetheme-19.08.0/po/fr/libgrantleetheme.po 2019-08-09 02:56:47.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-05-20 07:42+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 <vpi...@kde.org>\n" "Language-Team: French <kde-francoph...@kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.04.3/po/gl/libgrantleetheme.po new/grantleetheme-19.08.0/po/gl/libgrantleetheme.po --- old/grantleetheme-19.04.3/po/gl/libgrantleetheme.po 2019-07-09 02:26:11.000000000 +0200 +++ new/grantleetheme-19.08.0/po/gl/libgrantleetheme.po 2019-08-09 02:56:47.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-05-20 07:42+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 <adr...@chaves.io>\n" "Language-Team: Galician <kde-i18n-...@kde.org>\n" @@ -17,10 +17,6 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 2.0\n" -"X-Environment: kde\n" -"X-Accelerator-Marker: &\n" -"X-Text-Markup: kde4\n" #: grantleetheme.cpp:99 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.04.3/po/hu/libgrantleetheme.po new/grantleetheme-19.08.0/po/hu/libgrantleetheme.po --- old/grantleetheme-19.04.3/po/hu/libgrantleetheme.po 2019-07-09 02:26:11.000000000 +0200 +++ new/grantleetheme-19.08.0/po/hu/libgrantleetheme.po 2019-08-09 02:56:47.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-05-20 07:42+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 <urbal...@gmail.com>\n" "Language-Team: Hungarian <kde-l10n...@kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.04.3/po/ia/libgrantleetheme.po new/grantleetheme-19.08.0/po/ia/libgrantleetheme.po --- old/grantleetheme-19.04.3/po/ia/libgrantleetheme.po 2019-07-09 02:26:11.000000000 +0200 +++ new/grantleetheme-19.08.0/po/ia/libgrantleetheme.po 2019-08-09 02:56:47.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-05-20 07:42+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 <g.s...@tiscali.it>\n" "Language-Team: Interlingua <kde-l10n...@kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.04.3/po/it/libgrantleetheme.po new/grantleetheme-19.08.0/po/it/libgrantleetheme.po --- old/grantleetheme-19.04.3/po/it/libgrantleetheme.po 2019-07-09 02:26:11.000000000 +0200 +++ new/grantleetheme-19.08.0/po/it/libgrantleetheme.po 2019-08-09 02:56:47.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: libgrantleetheme\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-05-20 07:42+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 <luigi.tosc...@tiscali.it>\n" "Language-Team: Italian <kde-i18n...@kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.04.3/po/ja/libgrantleetheme.po new/grantleetheme-19.08.0/po/ja/libgrantleetheme.po --- old/grantleetheme-19.04.3/po/ja/libgrantleetheme.po 2019-07-09 02:26:11.000000000 +0200 +++ new/grantleetheme-19.08.0/po/ja/libgrantleetheme.po 2019-08-09 02:56:47.000000000 +0200 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: libgrantleetheme\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-05-20 07:42+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 <kde...@kde.org>\n" "Language-Team: Japanese <kde...@kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.04.3/po/kk/libgrantleetheme.po new/grantleetheme-19.08.0/po/kk/libgrantleetheme.po --- old/grantleetheme-19.04.3/po/kk/libgrantleetheme.po 2019-07-09 02:26:11.000000000 +0200 +++ new/grantleetheme-19.08.0/po/kk/libgrantleetheme.po 2019-08-09 02:56:47.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-05-20 07:42+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 <sai...@computer.org>\n" "Language-Team: Kazakh <kde-i18n-...@kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.04.3/po/ko/libgrantleetheme.po new/grantleetheme-19.08.0/po/ko/libgrantleetheme.po --- old/grantleetheme-19.04.3/po/ko/libgrantleetheme.po 2019-07-09 02:26:11.000000000 +0200 +++ new/grantleetheme-19.08.0/po/ko/libgrantleetheme.po 2019-08-09 02:56:47.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-05-20 07:42+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 <k...@peremen.name>\n" "Language-Team: Korean <kde...@kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.04.3/po/lt/libgrantleetheme.po new/grantleetheme-19.08.0/po/lt/libgrantleetheme.po --- old/grantleetheme-19.04.3/po/lt/libgrantleetheme.po 2019-07-09 02:26:11.000000000 +0200 +++ new/grantleetheme-19.08.0/po/lt/libgrantleetheme.po 2019-08-09 02:56:47.000000000 +0200 @@ -7,10 +7,10 @@ msgstr "" "Project-Id-Version: l 10n\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-05-20 07:42+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: none\n" +"Language-Team: lt\n" "Language: lt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.04.3/po/nb/libgrantleetheme.po new/grantleetheme-19.08.0/po/nb/libgrantleetheme.po --- old/grantleetheme-19.04.3/po/nb/libgrantleetheme.po 2019-07-09 02:26:11.000000000 +0200 +++ new/grantleetheme-19.08.0/po/nb/libgrantleetheme.po 2019-08-09 02:56:47.000000000 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-05-20 07:42+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 <bjor...@skogkatt.homelinux.org>\n" "Language-Team: Norwegian Bokmål <i18n...@lister.ping.uio.no>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.04.3/po/nds/libgrantleetheme.po new/grantleetheme-19.08.0/po/nds/libgrantleetheme.po --- old/grantleetheme-19.04.3/po/nds/libgrantleetheme.po 2019-07-09 02:26:11.000000000 +0200 +++ new/grantleetheme-19.08.0/po/nds/libgrantleetheme.po 2019-08-09 02:56:47.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-05-20 07:42+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 <s_dibb...@web.de>\n" "Language-Team: Low Saxon <kde-i18n-...@kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.04.3/po/nl/libgrantleetheme.po new/grantleetheme-19.08.0/po/nl/libgrantleetheme.po --- old/grantleetheme-19.04.3/po/nl/libgrantleetheme.po 2019-07-09 02:26:11.000000000 +0200 +++ new/grantleetheme-19.08.0/po/nl/libgrantleetheme.po 2019-08-09 02:56:47.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-05-20 07:42+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 <freekdekru...@kde.nl>\n" "Language-Team: Dutch <kde-i18n...@kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.04.3/po/pl/libgrantleetheme.po new/grantleetheme-19.08.0/po/pl/libgrantleetheme.po --- old/grantleetheme-19.04.3/po/pl/libgrantleetheme.po 2019-07-09 02:26:11.000000000 +0200 +++ new/grantleetheme-19.08.0/po/pl/libgrantleetheme.po 2019-08-09 02:56:47.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-05-20 07:42+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 <lukasz.wojnilow...@gmail.com>\n" "Language-Team: Polish <kde-i18n-...@kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.04.3/po/pt/libgrantleetheme.po new/grantleetheme-19.08.0/po/pt/libgrantleetheme.po --- old/grantleetheme-19.04.3/po/pt/libgrantleetheme.po 2019-07-09 02:26:11.000000000 +0200 +++ new/grantleetheme-19.08.0/po/pt/libgrantleetheme.po 2019-08-09 02:56:47.000000000 +0200 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: libgrantleetheme\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-05-20 07:42+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 <zepi...@gmail.com>\n" "Language-Team: Portuguese <kde-i18n...@kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.04.3/po/pt_BR/libgrantleetheme.po new/grantleetheme-19.08.0/po/pt_BR/libgrantleetheme.po --- old/grantleetheme-19.04.3/po/pt_BR/libgrantleetheme.po 2019-07-09 02:26:11.000000000 +0200 +++ new/grantleetheme-19.08.0/po/pt_BR/libgrantleetheme.po 2019-08-09 02:56:47.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: libgrantleetheme\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-05-20 07:42+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 <alvare...@kde.org>\n" "Language-Team: Brazilian Portuguese <kde-i18n-pt...@kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.04.3/po/ro/libgrantleetheme.po new/grantleetheme-19.08.0/po/ro/libgrantleetheme.po --- old/grantleetheme-19.04.3/po/ro/libgrantleetheme.po 2019-07-09 02:26:11.000000000 +0200 +++ new/grantleetheme-19.08.0/po/ro/libgrantleetheme.po 2019-08-09 02:56:47.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-05-20 07:42+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 <ser...@ase.md>\n" "Language-Team: Romanian <kde-i18n...@kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.04.3/po/ru/libgrantleetheme.po new/grantleetheme-19.08.0/po/ru/libgrantleetheme.po --- old/grantleetheme-19.04.3/po/ru/libgrantleetheme.po 2019-07-09 02:26:11.000000000 +0200 +++ new/grantleetheme-19.08.0/po/ru/libgrantleetheme.po 2019-08-09 02:56:47.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-05-20 07:42+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 <kekc...@gmail.com>\n" "Language-Team: Russian <kde-russ...@lists.kde.ru>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.04.3/po/sk/libgrantleetheme.po new/grantleetheme-19.08.0/po/sk/libgrantleetheme.po --- old/grantleetheme-19.04.3/po/sk/libgrantleetheme.po 2019-07-09 02:26:11.000000000 +0200 +++ new/grantleetheme-19.08.0/po/sk/libgrantleetheme.po 2019-08-09 02:56:47.000000000 +0200 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: libgrantleetheme\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-05-20 07:42+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 <wizzar...@gmail.com>\n" "Language-Team: Slovak <kde...@linux.sk>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.04.3/po/sl/libgrantleetheme.po new/grantleetheme-19.08.0/po/sl/libgrantleetheme.po --- old/grantleetheme-19.04.3/po/sl/libgrantleetheme.po 2019-07-09 02:26:11.000000000 +0200 +++ new/grantleetheme-19.08.0/po/sl/libgrantleetheme.po 2019-08-09 02:56:47.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-05-20 07:42+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 <andr...@ubuntu.si>\n" "Language-Team: Slovenian <lugos-...@lugos.si>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.04.3/po/sv/libgrantleetheme.po new/grantleetheme-19.08.0/po/sv/libgrantleetheme.po --- old/grantleetheme-19.04.3/po/sv/libgrantleetheme.po 2019-07-09 02:26:12.000000000 +0200 +++ new/grantleetheme-19.08.0/po/sv/libgrantleetheme.po 2019-08-09 02:56:47.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-05-20 07:42+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 <stefan.asserh...@bredband.net>\n" "Language-Team: Swedish <kde-i18n-...@kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.04.3/po/tr/libgrantleetheme.po new/grantleetheme-19.08.0/po/tr/libgrantleetheme.po --- old/grantleetheme-19.04.3/po/tr/libgrantleetheme.po 2019-07-09 02:26:12.000000000 +0200 +++ new/grantleetheme-19.08.0/po/tr/libgrantleetheme.po 2019-08-09 02:56:47.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: kdepim-kde4\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-05-20 07:42+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 <kaanozdin...@gmail.com>\n" "Language-Team: Turkish <kde-l10n...@kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.04.3/po/ug/libgrantleetheme.po new/grantleetheme-19.08.0/po/ug/libgrantleetheme.po --- old/grantleetheme-19.04.3/po/ug/libgrantleetheme.po 2019-07-09 02:26:12.000000000 +0200 +++ new/grantleetheme-19.08.0/po/ug/libgrantleetheme.po 2019-08-09 02:56:47.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: libgrantleetheme\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-05-20 07:42+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 <ghey...@gmail.com>\n" "Language-Team: Uyghur <kde-i18n-...@kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.04.3/po/uk/libgrantleetheme.po new/grantleetheme-19.08.0/po/uk/libgrantleetheme.po --- old/grantleetheme-19.04.3/po/uk/libgrantleetheme.po 2019-07-09 02:26:12.000000000 +0200 +++ new/grantleetheme-19.08.0/po/uk/libgrantleetheme.po 2019-08-09 02:56:47.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: libgrantleetheme\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-05-20 07:42+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 <yurc...@ukr.net>\n" "Language-Team: Ukrainian <kde-i18n...@kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.04.3/po/zh_CN/libgrantleetheme.po new/grantleetheme-19.08.0/po/zh_CN/libgrantleetheme.po --- old/grantleetheme-19.04.3/po/zh_CN/libgrantleetheme.po 2019-07-09 02:26:12.000000000 +0200 +++ new/grantleetheme-19.08.0/po/zh_CN/libgrantleetheme.po 2019-08-09 02:56:47.000000000 +0200 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-05-20 07:42+0200\n" -"PO-Revision-Date: 2019-06-02 13:16\n" +"POT-Creation-Date: 2019-05-20 03:14+0200\n" +"PO-Revision-Date: 2019-07-18 15:10\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.04.3/po/zh_TW/libgrantleetheme.po new/grantleetheme-19.08.0/po/zh_TW/libgrantleetheme.po --- old/grantleetheme-19.04.3/po/zh_TW/libgrantleetheme.po 2019-07-09 02:26:12.000000000 +0200 +++ new/grantleetheme-19.08.0/po/zh_TW/libgrantleetheme.po 2019-08-09 02:56:47.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-05-20 07:42+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 <pan93...@gmail.com>\n" "Language-Team: Chinese <zh-l...@linux.org.tw>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.04.3/src/CMakeLists.txt new/grantleetheme-19.08.0/src/CMakeLists.txt --- old/grantleetheme-19.04.3/src/CMakeLists.txt 2019-06-07 07:02:36.000000000 +0200 +++ new/grantleetheme-19.08.0/src/CMakeLists.txt 2019-08-03 11:43:57.000000000 +0200 @@ -3,6 +3,7 @@ add_subdirectory(plugin) set(libgrantleetheme_SRCS + genericformatter.cpp grantleetheme.cpp grantleethememanager.cpp grantleethemeengine.cpp @@ -43,6 +44,7 @@ ecm_generate_headers(GrantleeTheme_CamelCase_HEADERS HEADER_NAMES + GenericFormatter GrantleeThemeManager GrantleeTheme GrantleeThemeEngine @@ -74,5 +76,3 @@ install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.04.3/src/genericformatter.cpp new/grantleetheme-19.08.0/src/genericformatter.cpp --- old/grantleetheme-19.04.3/src/genericformatter.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/grantleetheme-19.08.0/src/genericformatter.cpp 2019-08-03 11:43:57.000000000 +0200 @@ -0,0 +1,109 @@ +/* + Copyright (c) 2016-2019 Montel Laurent <mon...@kde.org> + + This program 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; either version 2 of the License, or + (at your option) any later version. + + This program 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. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +*/ + +#include "genericformatter.h" +#include "grantleethemeengine.h" +#include "grantleeki18nlocalizer.h" + +using namespace GrantleeTheme; + +class GrantleeTheme::GenericFormatterPrivate +{ +public: + GenericFormatterPrivate() + : mEngine(new Engine) + { + } + + QString mThemePath; + QString mDefaultMainFile; + std::unique_ptr<Engine> mEngine; + QString mErrorMessage; + QSharedPointer<Grantlee::FileSystemTemplateLoader> mTemplateLoader; + Grantlee::Template mTemplate; +}; + + +GenericFormatter::GenericFormatter(const QString &defaultHtmlMain, const QString &themePath) + : d(new GenericFormatterPrivate) +{ + d->mThemePath = themePath; + d->mDefaultMainFile = defaultHtmlMain; + setTemplatePath(d->mThemePath); +} + +GenericFormatter::GenericFormatter() + : d(new GenericFormatterPrivate) +{ +} + +GenericFormatter::~GenericFormatter() = default; + +void GenericFormatter::setDefaultHtmlMainFile(const QString &name) +{ + if (d->mDefaultMainFile != name) { + d->mDefaultMainFile = name; + reloadTemplate(); + } +} + +void GenericFormatter::setTemplatePath(const QString &path) +{ + if (!d->mTemplateLoader) { + d->mTemplateLoader.reset(new Grantlee::FileSystemTemplateLoader); + } + d->mTemplateLoader->setTemplateDirs(QStringList() << path); + d->mEngine->addTemplateLoader(d->mTemplateLoader); + + reloadTemplate(); +} + +void GenericFormatter::setApplicationDomain(const QByteArray &domain) +{ + d->mEngine->localizer()->setApplicationDomain(domain); +} + +QString GenericFormatter::errorMessage() const +{ + return d->mErrorMessage; +} + +QString GenericFormatter::render(const QVariantHash &mapping) const +{ + Grantlee::Context context(mapping); + context.setLocalizer(d->mEngine->localizer()); + + const QString contentHtml = d->mTemplate->render(&context); + return contentHtml; +} + +void GenericFormatter::setTemplateContent(const QString &content) +{ + d->mTemplate = d->mEngine->newTemplate(content, QStringLiteral("content")); + if (d->mTemplate->error()) { + d->mErrorMessage = d->mTemplate->errorString() + QLatin1String("<br>"); + } +} + +void GenericFormatter::reloadTemplate() +{ + d->mTemplate = d->mEngine->loadByName(d->mDefaultMainFile); + if (d->mTemplate->error()) { + d->mErrorMessage += d->mTemplate->errorString() + QLatin1String("<br>"); + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.04.3/src/genericformatter.h new/grantleetheme-19.08.0/src/genericformatter.h --- old/grantleetheme-19.04.3/src/genericformatter.h 1970-01-01 01:00:00.000000000 +0100 +++ new/grantleetheme-19.08.0/src/genericformatter.h 2019-08-03 11:43:57.000000000 +0200 @@ -0,0 +1,62 @@ +/* + Copyright (c) 2016-2019 Montel Laurent <mon...@kde.org> + + This program 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; either version 2 of the License, or + (at your option) any later version. + + This program 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. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +*/ + +#ifndef GRANTLEETHEME_GENERICFORMATTER_H +#define GRANTLEETHEME_GENERICFORMATTER_H + +#include "grantleetheme_export.h" + +#include <memory> + +#include <QVariant> + +class QString; + +namespace GrantleeTheme { + +class GenericFormatterPrivate; + +/** Convenience class for using a Grantlee theme. */ +class GRANTLEETHEME_EXPORT GenericFormatter +{ +public: + GenericFormatter(); + explicit GenericFormatter(const QString &defaultHtmlMain, const QString &themePath); + ~GenericFormatter(); + + void setDefaultHtmlMainFile(const QString &name); + void setTemplatePath(const QString &path); + + /** Translation domain for the Grantlee localizer. */ + void setApplicationDomain(const QByteArray &domain); + + QString render(const QVariantHash &mapping) const; + QString errorMessage() const; + + /** Set template content from a string rather than a file. */ + void setTemplateContent(const QString &content); + + void reloadTemplate(); + +private: + std::unique_ptr<GenericFormatterPrivate> const d; +}; + +} + +#endif // GRANTLEETHEME_GENERICFORMATTER_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-19.04.3/src/grantleethememanager.cpp new/grantleetheme-19.08.0/src/grantleethememanager.cpp --- old/grantleetheme-19.04.3/src/grantleethememanager.cpp 2019-06-07 07:02:36.000000000 +0200 +++ new/grantleetheme-19.08.0/src/grantleethememanager.cpp 2019-08-03 11:43:57.000000000 +0200 @@ -260,13 +260,8 @@ { if (!themesRelativePath.isEmpty()) { themesDirectories = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, themesRelativePath, QStandardPaths::LocateDirectory); - if (themesDirectories.count() < 2) { - //Make sure to add local directory - const QString localDirectory = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1Char('/') + themesRelativePath; - if (!themesDirectories.contains(localDirectory)) { - themesDirectories.append(localDirectory); - } - } + const QString localDirectory = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1Char('/') + themesRelativePath; + themesDirectories.append(localDirectory); } } @@ -275,7 +270,7 @@ QString downloadConfigFileName; QStringList themesDirectories; QMap<QString, GrantleeTheme::Theme> themes; - QList<KToggleAction *> themesActionList; + QVector<KToggleAction *> themesActionList; KDirWatch *watch = nullptr; QActionGroup *actionGroup = nullptr; KActionMenu *menu = nullptr;
