Commit c1e3859f authored by David Jarvie's avatar David Jarvie
Browse files

Merge commit '11a7088238be279b1ad7c088e42e7159246cf3d0'

parents b1188452 fa0e2cac
......@@ -46,9 +46,9 @@
#include <Libkdepim/MaillistDrag>
#include <kmime/kmime_content.h>
#include <AkonadiWidgets/controlgui.h>
#include <KCalCore/MemoryCalendar>
#include <KCalUtils/kcalutils/icaldrag.h>
#include <AkonadiWidgets/controlgui.h>
using namespace KCalCore;
using namespace KCalUtils;
#include <KLocale>
......@@ -453,7 +453,7 @@ void MainWindow::initActions()
//QT5 action->setGlobalShortcut(dummy); // actions->addAction() must be called first!
connect(action, &QAction::triggered, this, &MainWindow::slotNewAudio);
TemplateMenuAction *templateMenuAction = mActionNew->fromTemplateAlarmAction();
TemplateMenuAction* templateMenuAction = mActionNew->fromTemplateAlarmAction();
actions->addAction(QStringLiteral("newFromTemplate"), templateMenuAction);
connect(templateMenuAction, &TemplateMenuAction::selected, this, &MainWindow::slotNewFromTemplate);
......
/*
* timeselector.cpp - widget to optionally set a time period
* Program: kalarm
* Copyright © 2004,2005,2007,2009-2011 by David Jarvie <djarvie@kde.org>
* Copyright © 2004-2016 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
......@@ -67,8 +67,11 @@ TimeSelector::TimeSelector(const QString& selectText, const QString& selectWhats
ComboBox* TimeSelector::createSignCombo()
{
delete mSignWidget;
mSignWidget = new ComboBox(mPeriod->parentWidget());
QWidget* p = mPeriod->parentWidget();
mSignWidget = new ComboBox(p);
mSignWidget = new ComboBox(p);
mSignWidget->setEnabled(mPeriod->isEnabled());
p->layout()->addWidget(mSignWidget);
return mSignWidget;
}
......
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