Commit 0c4f5ffd authored by David Jarvie's avatar David Jarvie
Browse files

Fix inability to edit an existing calendar resource's configuration

parent bef72264
KAlarm Change Log
=== Version 3.0.2 (KDE Applications 20.08.2) --- 25 September 2020 ===
=== Version 3.0.2 (KDE Applications 20.08.2) --- 28 September 2020 ===
+ Fix repeat-at-login alarms not triggering when KAlarm starts.
+ If command generating text for display alarm fails, only display error message,
not the display alarm, and don't redisplay the alarm on every restart.
+ Fix next trigger time shown as "Never" after using Try button for command display alarm, if command fails.
+ Display alarms in time order on startup (fixes regression).
+ Allow alarm list and template list to be sorted by clicking headers.
+ Fix inability to edit an existing calendar resource's configuration.
=== Version 3.0.1 (KDE Applications 20.08.1) --- 24 August 2020 ===
+ Fix inability to create alarms from templates, or load templates in edit dialogue [KDE Bug 425751]
......
......@@ -179,20 +179,23 @@ void SingleFileResourceConfigDialog::setUrlValidation(QString (*func)(const QUrl
void SingleFileResourceConfigDialog::validate()
{
// Validate URL first, in order to display any error message.
const QUrl currentUrl = mUi->pathRequester->url();
if (mUi->pathRequester->text().trimmed().isEmpty() || currentUrl.isEmpty())
{
disableOkButton(QString());
return;
}
if (mUrlValidationFunc)
const QUrl currentUrl = mUi->pathRequester->url(); // empty if not creating
if (mCreating)
{
const QString error = (*mUrlValidationFunc)(currentUrl);
if (!error.isEmpty())
if (mUi->pathRequester->text().trimmed().isEmpty() || currentUrl.isEmpty())
{
disableOkButton(error, true);
disableOkButton(QString());
return;
}
if (mUrlValidationFunc)
{
const QString error = (*mUrlValidationFunc)(currentUrl);
if (!error.isEmpty())
{
disableOkButton(error, true);
return;
}
}
}
if (mUi->displayNameText->text().trimmed().isEmpty()
......
Supports Markdown
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