Commit 36f1cc49 authored by David Jarvie's avatar David Jarvie
Browse files

Merge commit '616bca0e193771b2ff8621b008c407e447af5c64'

parents 188a3f6c 218da0ce
KAlarm Change Log
=== Version 2.11.3 --- 3 November 2015 ===
=== Version 2.11.3 --- 4 November 2015 ===
- Re-enable use of sendmail for email alarms.
- Fix conversion error in sub-repetition interval from command line.
=== Version 2.11.2 (KDE Applications 15.08.2) --- 24 September 2015 ===
- Enable typing into New Alarm dialogue while alarm is displayed (Unity desktop) [KDE Bug 352889]
......
......@@ -630,7 +630,7 @@ void EditAlarmDlg::setTime(const DateTime& start)
{
mTimeWidget->setDateTime(start);
}
void EditAlarmDlg::setRecurrence(const KARecurrence& recur, int subRepeatInterval, int subRepeatCount)
void EditAlarmDlg::setRecurrence(const KARecurrence& recur, const KCalCore::Duration& subRepeatInterval, int subRepeatCount)
{
KAEvent event;
event.setTime(mTimeWidget->getDateTime(Q_NULLPTR, false, false));
......
......@@ -76,7 +76,7 @@ class EditAlarmDlg : public QDialog
// N.B. setTime() must be called first to set the date-only characteristic,
// followed by setRecurrence() if applicable.
void setTime(const DateTime&); // must be called first to set date-only value
void setRecurrence(const KARecurrence&, int subRepeatInterval, int subRepeatCount);
void setRecurrence(const KARecurrence&, const KCalCore::Duration& subRepeatInterval, int subRepeatCount);
void setRepeatAtLogin();
virtual void setAction(KAEvent::SubAction, const AlarmText& = AlarmText()) = 0;
void setLateCancel(int minutes);
......
......@@ -400,7 +400,7 @@ int KAlarmApp::newInstance()
if (options.alarmTime().isValid())
editDlg->setTime(options.alarmTime());
if (options.recurrence())
editDlg->setRecurrence(*options.recurrence(), options.subRepeatInterval(), options.subRepeatCount()); // FIXME: subRepeatInterval bool->int implicit cast is not what we want
editDlg->setRecurrence(*options.recurrence(), options.subRepeatInterval(), options.subRepeatCount());
else if (options.flags() & KAEvent::REPEAT_AT_LOGIN)
editDlg->setRepeatAtLogin();
editDlg->setAction(options.editAction(), AlarmText(options.text()));
......
......@@ -128,10 +128,11 @@ Duration TimeSelector::period() const
*/
void TimeSelector::setPeriod(const Duration& period, bool dateOnly, TimePeriod::Units defaultUnits)
{
mSelect->setChecked(!period.isNull());
mPeriod->setEnabled(!period.isNull());
bool havePeriod = !period.isNull();
mSelect->setChecked(havePeriod);
mPeriod->setEnabled(havePeriod);
if (mSignWidget)
mSignWidget->setEnabled(!period.isNull());
mSignWidget->setEnabled(havePeriod);
mPeriod->setPeriod(period, dateOnly, defaultUnits);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment