Hello community, here is the log from the commit of package eventviews for openSUSE:Factory checked in at 2016-07-21 07:42:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/eventviews (Old) and /work/SRC/openSUSE:Factory/.eventviews.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "eventviews" Changes: -------- --- /work/SRC/openSUSE:Factory/eventviews/eventviews.changes 2016-06-20 10:56:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.eventviews.new/eventviews.changes 2016-07-21 07:42:55.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Jul 7 23:24:51 UTC 2016 - [email protected] + +- Update to KDE Applications 16.04.3 + * KDE Applications 16.04.3 + * https://www.kde.org/announcements/announce-applications-16.04.3.php + + +------------------------------------------------------------------- Old: ---- eventviews-16.04.2.tar.xz New: ---- eventviews-16.04.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ eventviews.spec ++++++ --- /var/tmp/diff_new_pack.ZIZeKO/_old 2016-07-21 07:42:56.000000000 +0200 +++ /var/tmp/diff_new_pack.ZIZeKO/_new 2016-07-21 07:42:56.000000000 +0200 @@ -17,7 +17,7 @@ Name: eventviews -Version: 16.04.2 +Version: 16.04.3 Release: 0 Summary: Base package of kdepim License: GPL-2.0+ and LGPL-2.1+ ++++++ eventviews-16.04.2.tar.xz -> eventviews-16.04.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eventviews-16.04.2/CMakeLists.txt new/eventviews-16.04.3/CMakeLists.txt --- old/eventviews-16.04.2/CMakeLists.txt 2016-05-11 07:04:25.000000000 +0200 +++ new/eventviews-16.04.3/CMakeLists.txt 2016-06-15 12:13:41.000000000 +0200 @@ -19,7 +19,7 @@ include(ECMQtDeclareLoggingCategory) include(ECMAddTests) -set(EVENTVIEW_LIB_VERSION "5.2.2") +set(EVENTVIEW_LIB_VERSION "5.2.3") set(KF5_VERSION "5.19.0") set(CALENDARUTILS_LIB_VERSION "5.2.0") set(KDEPIMLIBS_LIB_VERSION "5.2.0") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eventviews-16.04.2/src/agenda/timelabels.cpp new/eventviews-16.04.3/src/agenda/timelabels.cpp --- old/eventviews-16.04.2/src/agenda/timelabels.cpp 2016-05-11 07:04:25.000000000 +0200 +++ new/eventviews-16.04.3/src/agenda/timelabels.cpp 2016-06-15 12:13:41.000000000 +0200 @@ -35,7 +35,6 @@ #include <QMenu> #include <QPainter> #include <QPointer> -#include <KLocale> using namespace EventViews; @@ -114,17 +113,25 @@ return sh; } +static bool use12Clock() +{ + const QString str = QLocale().timeFormat(); + // 'A' or 'a' means am/pm is shown (and then 'h' uses 12-hour format) + // but 'H' forces a 24-hour format anyway, even with am/pm shown. + return str.contains(QLatin1Char('a'), Qt::CaseInsensitive) && !str.contains(QLatin1Char('H')); +} + /** updates widget's internal state */ void TimeLabels::updateConfig() { setFont(mTimeLabelsZone->preferences()->agendaTimeLabelsFont()); QString test = QStringLiteral("20"); - if (KLocale::global()->use12Clock()) { + if (use12Clock()) { test = QStringLiteral("12"); } mMiniWidth = fontMetrics().width(test); - if (KLocale::global()->use12Clock()) { + if (use12Clock()) { test = QStringLiteral("pm"); } else { test = QStringLiteral("00"); @@ -199,10 +206,10 @@ QFont hourFont = mTimeLabelsZone->preferences()->agendaTimeLabelsFont(); p.setFont(font()); - //TODO: rewrite this using KLocale's time formats. "am/pm" doesn't make sense + //TODO: rewrite this using QTime's time formats. "am/pm" doesn't make sense // in some locale's QString suffix; - if (!KLocale::global()->use12Clock()) { + if (!use12Clock()) { suffix = QStringLiteral("00"); } else { suffix = QStringLiteral("am"); @@ -254,7 +261,7 @@ hour.setNum(cell + 24); } // handle 24h and am/pm time formats - if (KLocale::global()->use12Clock()) { + if (use12Clock()) { if (cell == 12) { suffix = QStringLiteral("pm"); }
