Commit 11f27d54 authored by David Jarvie's avatar David Jarvie
Browse files

Fix calendar configuration dialog not appearing

parent 59ac9295
......@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.5)
set(KDEPIM_VERSION_NUMBER "5.11.2")
set(PIM_VERSION ${KDEPIM_VERSION_NUMBER})
project(kalarm VERSION "2.12.2")
project(kalarm VERSION "2.12.3")
set(KF5_MIN_VERSION "5.56.0")
......
/*
* akonadiresourcecreator.cpp - interactively create an Akonadi resource
* Program: kalarm
* Copyright © 2011 by David Jarvie <djarvie@kde.org>
* Copyright © 2011,2019 by David Jarvie <djarvie@kde.org>
*
* 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
......@@ -29,6 +29,7 @@
#include <AkonadiCore/agentmanager.h>
#include <kdbusconnectionpool.h>
#include <AkonadiWidgets/agenttypedialog.h>
#include <AkonadiWidgets/AgentConfigurationDialog>
#include <kmessagebox.h>
#include <KLocalizedString>
......@@ -135,7 +136,10 @@ void AkonadiResourceCreator::agentInstanceCreated(KJob* j)
connect(agentControlIface, &org::freedesktop::Akonadi::Agent::Control::configurationDialogAccepted, this, &AkonadiResourceCreator::configurationDialogAccepted);
connect(agentControlIface, &org::freedesktop::Akonadi::Agent::Control::configurationDialogRejected, this, &AkonadiResourceCreator::exitWithError);
}
mAgentInstance.configure(mParent);
QPointer<AgentConfigurationDialog> dlg = new AgentConfigurationDialog(mAgentInstance, mParent);
dlg->exec();
delete dlg;
if (!controlOk)
Q_EMIT finished(this, true); // don't actually know the result in this case
......
/*
* kalarm.h - global header file
* Program: kalarm
* Copyright © 2001-2018 by David Jarvie <djarvie@kde.org>
* Copyright © 2001-2019 by David Jarvie <djarvie@kde.org>
*
* 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
......@@ -22,7 +22,7 @@
#define KALARM_H
#define VERSION_SUFFIX ""
#define KALARM_VERSION "2.12.2" VERSION_SUFFIX
#define KALARM_VERSION "2.12.3" VERSION_SUFFIX
#define KALARM_NAME "KAlarm"
#define KALARM_DBUS_SERVICE "org.kde.kalarm" // D-Bus service name of KAlarm application
......
/*
* main.cpp
* Program: kalarm
* Copyright © 2001-2018 by David Jarvie <djarvie@kde.org>
* Copyright © 2001-2019 by David Jarvie <djarvie@kde.org>
*
* 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
......@@ -54,7 +54,7 @@ int main(int argc, char* argv[])
QStringLiteral(KALARM_VERSION),
i18n("Personal alarm message, command and email scheduler by KDE"),
KAboutLicense::GPL,
ki18n("Copyright 2001-%1, David Jarvie").subs(2018).toString(), QString(),
ki18n("Copyright 2001-%1, David Jarvie").subs(2019).toString(), QString(),
QStringLiteral("http://www.astrojar.org.uk/kalarm"));
aboutData.addAuthor(i18n("David Jarvie"), i18n("Author"), QStringLiteral("djarvie@kde.org"));
aboutData.setOrganizationDomain("kde.org");
......
/*
* resourceselector.cpp - calendar resource selection widget
* Program: kalarm
* Copyright © 2006-2013 by David Jarvie <djarvie@kde.org>
* Copyright © 2006-2019 by David Jarvie <djarvie@kde.org>
* Based on KOrganizer's ResourceView class and KAddressBook's ResourceSelection class,
* Copyright (C) 2003,2004 Cornelius Schumacher <schumacher@kde.org>
* Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
......@@ -38,6 +38,7 @@
#include <AkonadiCore/agenttype.h>
#include <AkonadiCore/entitydisplayattribute.h>
#include <AkonadiWidgets/collectionpropertiesdialog.h>
#include <AkonadiWidgets/AgentConfigurationDialog>
#include <KLocalizedString>
#include <kactioncollection.h>
......@@ -257,7 +258,11 @@ void ResourceSelector::editResource()
{
AgentInstance instance = AgentManager::self()->instance(collection.resource());
if (instance.isValid())
instance.configure(this);
{
QPointer<AgentConfigurationDialog> dlg = new AgentConfigurationDialog(instance, this);
dlg->exec();
delete dlg;
}
}
}
......
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