plasma-framework/src/declarativeimports/plasmacomponents/qmenuitem.cpp
Kai Uwe Broulik 21f954d94d [PlasmaComponents Menu] Don't crash on null action
You can assign a QAction as "action", this way you can just pass it e.g. plasmoid.action("configure").
However, when assigning a null action as can happen with kiosk restrictions, it would crash
as it assigns m_action the nullptr but never checks for that.

This patch ensures we always have a QAction, creating a new empty one, if neccessary.
Also deletes our own action if an external one is assigned

Differential Revision: https://phabricator.kde.org/D6608
2017-07-11 12:23:39 +02:00

148 lines
4.0 KiB
C++

/***************************************************************************
* Copyright 2011 Viranch Mehta <viranch.mehta@gmail.com> *
* Copyright 2013 Sebastian Kügler <sebas@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 *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA . *
***************************************************************************/
#include "qmenuitem.h"
QMenuItem::QMenuItem(QQuickItem *parent)
: QQuickItem(parent),
m_action(0),
m_section(false)
{
setAction(new QAction(this));
}
QAction *QMenuItem::action() const
{
return m_action;
}
void QMenuItem::setAction(QAction *a)
{
if (m_action != a) {
if (m_action) {
disconnect(m_action, 0, this, 0);
if (m_action->parent() == this) {
delete m_action;
m_action = nullptr;
}
}
if (a) {
m_action = a;
} else {
// don't end up with no action, create an invisible one instead
m_action = new QAction(this);
m_action->setVisible(false);
}
setVisible(m_action->isVisible());
setEnabled(m_action->isEnabled());
connect(m_action, &QAction::changed, this, &QMenuItem::textChanged);
connect(m_action, &QAction::changed, this, &QMenuItem::checkableChanged);
connect(m_action, SIGNAL(toggled(bool)), this, SIGNAL(toggled(bool)));
connect(m_action, &QAction::triggered, this, &QMenuItem::clicked);
connect(this, &QQuickItem::visibleChanged, this, &QMenuItem::updateAction);
connect(this, &QQuickItem::enabledChanged, this, &QMenuItem::updateAction);
emit actionChanged();
}
}
QVariant QMenuItem::icon() const
{
return m_icon;
}
void QMenuItem::setIcon(const QVariant &i)
{
m_icon = i;
if (i.canConvert<QIcon>()) {
m_action->setIcon(i.value<QIcon>());
} else if (i.canConvert<QString>()) {
m_action->setIcon(QIcon::fromTheme(i.toString()));
}
emit iconChanged();
}
bool QMenuItem::separator() const
{
return m_action->isSeparator();
}
void QMenuItem::setSeparator(bool s)
{
m_action->setSeparator(s);
}
bool QMenuItem::section() const
{
return m_section;
}
void QMenuItem::setSection(bool s)
{
m_section = s;
}
QString QMenuItem::text() const
{
return m_action->text();
}
void QMenuItem::setText(const QString &t)
{
if (m_action->text() != t) {
m_action->setText(t);
// signal comes from m_action
}
}
bool QMenuItem::checkable() const
{
return m_action->isCheckable();
}
void QMenuItem::setCheckable(bool checkable)
{
m_action->setCheckable(checkable);
}
bool QMenuItem::checked() const
{
return m_action->isChecked();
}
void QMenuItem::setChecked(bool checked)
{
m_action->setChecked(checked);
}
void QMenuItem::updateAction()
{
m_action->setVisible(isVisible());
m_action->setEnabled(isEnabled());
}