Hello community, here is the log from the commit of package kalarm for openSUSE:Factory checked in at 2017-02-14 00:46:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kalarm (Old) and /work/SRC/openSUSE:Factory/.kalarm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kalarm" Changes: -------- --- /work/SRC/openSUSE:Factory/kalarm/kalarm.changes 2017-01-18 21:46:37.667667959 +0100 +++ /work/SRC/openSUSE:Factory/.kalarm.new/kalarm.changes 2017-02-14 00:47:00.793992991 +0100 @@ -1,0 +2,8 @@ +Thu Feb 9 06:44:35 UTC 2017 - [email protected] + +- Update to KDE Applications 16.12.2 + * KDE Applications 16.12.2 + * https://www.kde.org/announcements/announce-applications-16.12.2.php + + +------------------------------------------------------------------- Old: ---- kalarm-16.12.1.tar.xz New: ---- kalarm-16.12.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kalarm.spec ++++++ --- /var/tmp/diff_new_pack.d0HhLq/_old 2017-02-14 00:47:01.353913947 +0100 +++ /var/tmp/diff_new_pack.d0HhLq/_new 2017-02-14 00:47:01.357913383 +0100 @@ -17,10 +17,10 @@ Name: kalarm -Version: 16.12.1 +Version: 16.12.2 Release: 0 %define kf5_version 5.26.0 -# Latest stable Applications (e.g. 16.08 in KA, but 16.12.1 in KUA) +# Latest stable Applications (e.g. 16.08 in KA, but 16.12.2 in KUA) %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Summary: Personal Alarm Scheduler License: GPL-2.0 ++++++ kalarm-16.12.1.tar.xz -> kalarm-16.12.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalarm-16.12.1/CMakeLists.txt new/kalarm-16.12.2/CMakeLists.txt --- old/kalarm-16.12.1/CMakeLists.txt 2017-01-02 02:08:37.000000000 +0100 +++ new/kalarm-16.12.2/CMakeLists.txt 2017-02-05 20:37:07.000000000 +0100 @@ -32,7 +32,7 @@ endif() -set(KDEPIM_VERSION_NUMBER "5.4.1") +set(KDEPIM_VERSION_NUMBER "5.4.2") set(KDEPIM_VERSION "${KDEPIM_VERSION_NUMBER}${KDEPIM_DEV_VERSION}") set(AKONADI_MIMELIB_VERSION "5.4.0") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalarm-16.12.1/Changelog new/kalarm-16.12.2/Changelog --- old/kalarm-16.12.1/Changelog 2017-01-02 02:08:37.000000000 +0100 +++ new/kalarm-16.12.2/Changelog 2017-02-05 20:37:07.000000000 +0100 @@ -1,5 +1,10 @@ KAlarm Change Log +=== Version 2.11.13 --- 29 January 2017 === ++ Fix system tray icon used for "some alarms disabled" ++ Improved system tray icons (requires Plasma 5.9) [KDE Bug 362631] ++ Don't show misleading "Failed to update alarm" if command alarm fails [KDE Bug 375615] + === Version 2.11.12 (KDE Applications 16.12.1) --- 1 January 2017 === + Fix Export Alarms file save error [KDE Bug 374337] + Fix arrow/page up/down keys not working in date edit control diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalarm-16.12.1/src/akonadimodel.cpp new/kalarm-16.12.2/src/akonadimodel.cpp --- old/kalarm-16.12.1/src/akonadimodel.cpp 2017-01-02 02:08:37.000000000 +0100 +++ new/kalarm-16.12.2/src/akonadimodel.cpp 2017-02-05 20:37:07.000000000 +0100 @@ -1507,7 +1507,9 @@ const Item current = itemById(itemId); // fetch the up-to-date item checkQueuedItemModifyJob(current); } - KAMessageBox::error(MainWindow::mainMainWindow(), xi18nc("@info", "%1<nl/>(%2)", errMsg, j->errorString())); + // Don't show error details by default, since it's from Akonadi and likely + // to be too technical for general users. + KAMessageBox::detailedError(MainWindow::mainMainWindow(), errMsg, j->errorString()); } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalarm-16.12.1/src/kalarm.h new/kalarm-16.12.2/src/kalarm.h --- old/kalarm-16.12.1/src/kalarm.h 2017-01-02 02:08:37.000000000 +0100 +++ new/kalarm-16.12.2/src/kalarm.h 2017-02-05 20:37:07.000000000 +0100 @@ -24,7 +24,7 @@ #undef QT3_SUPPORT #define VERSION_SUFFIX "-5" -#define KALARM_VERSION "2.11.12" VERSION_SUFFIX +#define KALARM_VERSION "2.11.13" VERSION_SUFFIX #define KALARM_NAME "KAlarm" #define KALARM_DBUS_SERVICE "org.kde.kalarm" // D-Bus service name of KAlarm application diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalarm-16.12.1/src/kalarmapp.cpp new/kalarm-16.12.2/src/kalarmapp.cpp --- old/kalarm-16.12.1/src/kalarmapp.cpp 2017-01-02 02:08:37.000000000 +0100 +++ new/kalarm-16.12.2/src/kalarmapp.cpp 2017-02-05 20:37:07.000000000 +0100 @@ -75,9 +75,6 @@ static const int AKONADI_TIMEOUT = 30; // timeout (seconds) for Akonadi collections to be populated -static void setEventCommandError(const KAEvent&, KAEvent::CmdErrType); -static void clearEventCommandError(const KAEvent&, KAEvent::CmdErrType); - /****************************************************************************** * Find the maximum number of seconds late which a late-cancel alarm is allowed * to be. This is calculated as the late cancel interval, plus a few seconds @@ -1770,6 +1767,12 @@ event.removeExpiredAlarm(alarmType); if (!event.alarmCount()) { + // If it's a command alarm being executed, mark it as deleted + ProcData* pd = findCommandProcess(event.id()); + if (pd) + pd->eventDeleted = true; + + // Delete it KAlarm::deleteEvent(event, false); return true; } @@ -2366,9 +2369,15 @@ MessageWin::stopAudio(); } - -void setEventCommandError(const KAEvent& event, KAEvent::CmdErrType err) +/****************************************************************************** +* Set the command error for the specified alarm. +*/ +void KAlarmApp::setEventCommandError(const KAEvent& event, KAEvent::CmdErrType err) const { + ProcData* pd = findCommandProcess(event.id()); + if (pd && pd->eventDeleted) + return; // the alarm has been deleted, so can't set error status + if (err == KAEvent::CMD_ERROR_POST && event.commandError() == KAEvent::CMD_ERROR_PRE) err = KAEvent::CMD_ERROR_PRE_POST; event.setCommandError(err); @@ -2378,8 +2387,15 @@ AkonadiModel::instance()->updateCommandError(event); } -void clearEventCommandError(const KAEvent& event, KAEvent::CmdErrType err) +/****************************************************************************** +* Clear the command error for the specified alarm. +*/ +void KAlarmApp::clearEventCommandError(const KAEvent& event, KAEvent::CmdErrType err) const { + ProcData* pd = findCommandProcess(event.id()); + if (pd && pd->eventDeleted) + return; // the alarm has been deleted, so can't set error status + KAEvent::CmdErrType newerr = static_cast<KAEvent::CmdErrType>(event.commandError() & ~err); event.setCommandError(newerr); KAEvent* ev = AlarmCalendar::resources()->event(EventId(event)); @@ -2391,13 +2407,28 @@ AkonadiModel::instance()->updateCommandError(event); } +/****************************************************************************** +* Find the currently executing command process for an event ID, if any. +*/ +KAlarmApp::ProcData* KAlarmApp::findCommandProcess(const QString& eventId) const +{ + for (int i = 0, end = mCommandProcesses.count(); i < end; ++i) + { + ProcData* pd = mCommandProcesses[i]; + if (pd->event->id() == eventId) + return pd; + } + return Q_NULLPTR; +} + KAlarmApp::ProcData::ProcData(ShellProcess* p, KAEvent* e, KAAlarm* a, int f) : process(p), event(e), alarm(a), messageBoxParent(Q_NULLPTR), - flags(f) + flags(f), + eventDeleted(false) { } KAlarmApp::ProcData::~ProcData() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalarm-16.12.1/src/kalarmapp.h new/kalarm-16.12.2/src/kalarmapp.h --- old/kalarm-16.12.1/src/kalarmapp.h 2017-01-02 02:08:37.000000000 +0100 +++ new/kalarm-16.12.2/src/kalarmapp.h 2017-02-05 20:37:07.000000000 +0100 @@ -154,6 +154,7 @@ QPointer<QWidget> messageBoxParent; QStringList tempFiles; int flags; + bool eventDeleted; }; struct ActionQEntry { @@ -186,6 +187,9 @@ void commandErrorMsg(const ShellProcess*, const KAEvent&, const KAAlarm*, int flags = 0); void purge(int daysToKeep); QStringList scheduledAlarmList(); + void setEventCommandError(const KAEvent&, KAEvent::CmdErrType) const; + void clearEventCommandError(const KAEvent&, KAEvent::CmdErrType) const; + ProcData* findCommandProcess(const QString& eventId) const; static KAlarmApp* mInstance; // the one and only KAlarmApp instance static int mActiveCount; // number of active instances without main windows diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalarm-16.12.1/src/org.kde.kalarm.appdata.xml new/kalarm-16.12.2/src/org.kde.kalarm.appdata.xml --- old/kalarm-16.12.1/src/org.kde.kalarm.appdata.xml 2017-01-02 02:08:37.000000000 +0100 +++ new/kalarm-16.12.2/src/org.kde.kalarm.appdata.xml 2017-02-05 20:37:07.000000000 +0100 @@ -286,7 +286,7 @@ <li xml:lang="et">Mitme häirekalendri toetus, mis lubab näiteks jagada häireid süle- ja lauaarvuti vahel</li> <li xml:lang="fi">Tuki useammille hälytyskalentereille, minkä ansiosta voit esimerkiksi jakaa hälytyksiä kannettavan ja pöytätietokoneen välillä.</li> <li xml:lang="fr">Prise en charge de plusieurs calendriers d'alarmes, ce qui vous permet par exemple de partager des alarmes entre un ordinateur portable et un ordinateur de bureau.</li> - <li xml:lang="gl">Compatíbel con varios calendarios de alarma, o que por exemplo lle permite compartir alarmas entre o seu computador portátil e mailo computador de escritorio.</li> + <li xml:lang="gl">Compatíbel con varios calendarios de alarma, o que por exemplo lle permite compartir alarmas entre o seu computador portátil e o computador de escritorio.</li> <li xml:lang="hu">Több naptár használata, lehetővé téve ezzel az emlékeztetők megosztását például a hordozható és az asztali számítógépe között.</li> <li xml:lang="it">Supporto per più calendari di avvisi, permettendoti di condividere gli allarmi tra un portatile ed un computer desktop.</li> <li xml:lang="ko">두 대 이상의 컴퓨터와 동기화할 수 있는 등의 다중 알람 달력 지원</li> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalarm-16.12.1/src/recurrenceedit.cpp new/kalarm-16.12.2/src/recurrenceedit.cpp --- old/kalarm-16.12.1/src/recurrenceedit.cpp 2017-01-02 02:08:37.000000000 +0100 +++ new/kalarm-16.12.2/src/recurrenceedit.cpp 2017-02-05 20:37:07.000000000 +0100 @@ -1575,7 +1575,7 @@ w->setWhatsThis(i18nc("@info:whatsthis", "Select the months of the year in which to repeat the alarm")); // February 29th handling option - QHBoxLayout* f29box = new QHBoxLayout(this); + QHBoxLayout* f29box = new QHBoxLayout; layout()->addLayout(f29box); w = new QWidget(this); // this is to control the QWhatsThis text display area f29box->addWidget(w, 0, Qt::AlignLeft); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalarm-16.12.1/src/traywindow.cpp new/kalarm-16.12.2/src/traywindow.cpp --- old/kalarm-16.12.1/src/traywindow.cpp 2017-01-02 02:08:37.000000000 +0100 +++ new/kalarm-16.12.2/src/traywindow.cpp 2017-02-05 20:37:07.000000000 +0100 @@ -1,7 +1,7 @@ /* * traywindow.cpp - the KDE system tray applet * Program: kalarm - * Copyright © 2002-2016 by David Jarvie <[email protected]> + * Copyright © 2002-2017 by David Jarvie <[email protected]> * * 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 @@ -43,7 +43,6 @@ #include <kstandardguiitem.h> #include <kiconeffect.h> #include <kconfig.h> -#include <KIconLoader> #include <KAboutData> #include <QMenu> @@ -80,9 +79,6 @@ setToolTipIconByName(QStringLiteral("kalarm")); setToolTipTitle(KAboutData::applicationData().displayName()); setIconByName(QStringLiteral("kalarm")); - // Load the disabled icon for use by setIconByPixmap() - // - setIconByName() doesn't work for this one! - mIconDisabled.addPixmap(KIconLoader::global()->loadIcon(QStringLiteral("kalarm-disabled"), KIconLoader::Panel)); setStatus(KStatusNotifierItem::Active); // Set up the context menu mActionEnabled = KAlarm::createAlarmEnableAction(this); @@ -329,10 +325,9 @@ */ void TrayWindow::updateIcon() { - if (theApp()->alarmsEnabled()) - setIconByName(mHaveDisabledAlarms ? QStringLiteral("kalarm-partdisabled") : QStringLiteral("kalarm")); - else - setIconByPixmap(mIconDisabled); + setIconByName(!theApp()->alarmsEnabled() ? QStringLiteral("kalarm-disabled") + : mHaveDisabledAlarms ? QStringLiteral("kalarm-partdisabled") + : QStringLiteral("kalarm")); } /****************************************************************************** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalarm-16.12.1/src/traywindow.h new/kalarm-16.12.2/src/traywindow.h --- old/kalarm-16.12.1/src/traywindow.h 2017-01-02 02:08:37.000000000 +0100 +++ new/kalarm-16.12.2/src/traywindow.h 2017-02-05 20:37:07.000000000 +0100 @@ -67,7 +67,6 @@ void updateIcon(); MainWindow* mAssocMainWindow; // main window associated with this, or null - QIcon mIconDisabled; KToggleAction* mActionEnabled; NewAlarmAction* mActionNew; mutable AlarmListModel* mAlarmsModel; // active alarms sorted in time order
