Commit 1564b7c9 authored by David Jarvie's avatar David Jarvie
Browse files

Merge branch 'release/20.04'

parents 1c76e347 625d7a1d
......@@ -7,9 +7,10 @@ KAlarm Change Log
+ Return to last used tab in Configuration dialogue when it is reopened.
+ Refactor AlarmCalendar to split out resources and display calendars.
=== Version 2.14.2 (KDE Applications 20.04.2) --- 21 May 2020 ===
=== Version 2.14.2 (KDE Applications 20.04.2) --- 22 May 2020 ===
+ Make multiple KAlarm invocations work (Qt >5.12, Frameworks >5.60) [KDE Bug 417108]
+ Fix failure to set no-autostart for non-KDE desktops, if a writable autostart file exists.
* Fix failure to execute command alarms in a terminal window.
=== Version 2.14.1 (KDE Applications 20.04.1) --- 11 May 2020 ===
+ Correctly interpret resource IDs in command line and DBus calls.
......
......@@ -982,10 +982,13 @@ bool EditCommandAlarmDlg::type_validate(bool trial)
}
else if (mCmdOutputGroup->checkedButton() == mCmdExecInTerm)
{
if (KAMessageBox::warningContinueCancel(this, xi18nc("@info", "<para>No terminal is selected for command alarms.</para>"
"<para>Please set it in the <application>KAlarm</application> Configuration dialog.</para>"))
!= KMessageBox::Continue)
return false;
if (Preferences::cmdXTermCommand().isEmpty())
{
if (KAMessageBox::warningContinueCancel(this, xi18nc("@info", "<para>No terminal is selected for command alarms.</para>"
"<para>Please set it in the <application>KAlarm</application> Configuration dialog.</para>"))
!= KMessageBox::Continue)
return false;
}
}
return true;
}
......
......@@ -107,6 +107,7 @@ static QString xtermCommands[] = {
QStringLiteral("eterm --pause -T %t -e %C"), // some systems use eterm...
QStringLiteral("Eterm --pause -T %t -e %C"), // while some use Eterm
QStringLiteral("rxvt -title %t -e ${SHELL:-sh} -c %w"),
QStringLiteral("xfce4-terminal -T %t -H -e %c"),
QString() // end of list indicator - don't change!
};
......
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