diff --git a/src/kcmoduleqml.cpp b/src/kcmoduleqml.cpp index 89d146f..307c239 100644 --- a/src/kcmoduleqml.cpp +++ b/src/kcmoduleqml.cpp @@ -1,276 +1,296 @@ /* This file is part of the KDE Project Copyright (c) 2014 Marco Martin This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License version 2 as published by the Free Software Foundation. This library 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 Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "kcmoduleqml_p.h" #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include class KCModuleQmlPrivate { public: - KCModuleQmlPrivate(KQuickAddons::ConfigModule *cm) - : quickWindow(nullptr), + KCModuleQmlPrivate(KQuickAddons::ConfigModule *cm, KCModuleQml *q) + : q(q), + quickWindow(nullptr), configModule(cm) { //ensure the engine is present, then ref it engine(); engineRef = s_engine; } ~KCModuleQmlPrivate() { //when the only remaining are out two refs, reset the pointers, causing deletion //when the refcount is 2, we are sure that the only refs are s_engine and our copy //of engineRef if (engineRef.use_count() == 2) { s_engine.reset(); } } static QQmlEngine *engine() { if (!s_engine) { s_engine = std::make_shared(); KDeclarative::KDeclarative::setupEngine(s_engine.get()); } return s_engine.get(); } + void syncLevel() + { + q->setCurrentLevel(pageRow->property("currentIndex").toInt()); + } + + KCModuleQml *q; QQuickWindow *quickWindow; QQuickWidget *quickWidget; QQuickItem *rootPlaceHolder; + QQuickItem *pageRow; KQuickAddons::ConfigModule *configModule; //used to delete the engine std::shared_ptr engineRef; static std::shared_ptr s_engine; }; std::shared_ptr KCModuleQmlPrivate::s_engine = std::shared_ptr(); KCModuleQml::KCModuleQml(KQuickAddons::ConfigModule *configModule, QWidget* parent, const QVariantList& args) : KCModule(parent, args), - d(new KCModuleQmlPrivate(configModule)) + d(new KCModuleQmlPrivate(configModule, this)) { connect(configModule, &KQuickAddons::ConfigModule::quickHelpChanged, this, &KCModuleQml::quickHelpChanged); //HACK:Here is important those two enums keep having the exact same values //but the kdeclarative one can't use the KCModule's enum setButtons((KCModule::Buttons)(int)d->configModule->buttons()); connect(configModule, &KQuickAddons::ConfigModule::buttonsChanged, [=] { setButtons((KCModule::Buttons)(int)d->configModule->buttons()); }); if (d->configModule->needsSave()) { emit changed(true); } connect(configModule, &KQuickAddons::ConfigModule::needsSaveChanged, [=] { emit changed(d->configModule->needsSave()); }); setNeedsAuthorization(d->configModule->needsAuthorization()); connect(configModule, &KQuickAddons::ConfigModule::needsAuthorizationChanged, [=] { setNeedsAuthorization(d->configModule->needsAuthorization()); }); setRootOnlyMessage(d->configModule->rootOnlyMessage()); setUseRootOnlyMessage(d->configModule->useRootOnlyMessage()); connect(configModule, &KQuickAddons::ConfigModule::rootOnlyMessageChanged, [=] { setRootOnlyMessage(d->configModule->rootOnlyMessage()); }); connect(configModule, &KQuickAddons::ConfigModule::useRootOnlyMessageChanged, [=] { setUseRootOnlyMessage(d->configModule->useRootOnlyMessage()); }); if (!d->configModule->authActionName().isEmpty()) { setAuthAction(KAuth::Action(d->configModule->authActionName())); } connect(configModule, &KQuickAddons::ConfigModule::authActionNameChanged, [=] { setAuthAction(d->configModule->authActionName()); }); + setAboutData(d->configModule->aboutData()); setFocusPolicy(Qt::StrongFocus); //Build the UI QVBoxLayout* layout = new QVBoxLayout(this); layout->setContentsMargins(0, 0, 0, 0); d->quickWidget = new QQuickWidget(d->engine(), this); d->quickWidget->setResizeMode(QQuickWidget::SizeRootObjectToView); d->quickWidget->setFocusPolicy(Qt::StrongFocus); d->quickWidget->installEventFilter(this); d->quickWindow = d->quickWidget->quickWindow(); d->quickWindow->setColor(QGuiApplication::palette().window().color()); connect(qApp, &QGuiApplication::paletteChanged, d->quickWindow, [=]() { d->quickWindow->setColor(QGuiApplication::palette().window().color()); }); QQmlComponent *component = new QQmlComponent(d->quickWidget->engine(), this); //this has activeFocusOnTab to notice when the navigation wraps //around, so when we need to go outside and inside //pushPage/popPage are needed as push of StackView can't be directly invoked from c++ //because its parameters are QQmlV4Function which is not public component->setData(QByteArrayLiteral("import QtQuick 2.3\n" "import org.kde.kirigami 2.4 as Kirigami\n" "Kirigami.ApplicationItem{" "function __pushPage(page){" "return pageStack.push(page);" "}\n" "signal levelPushed(string title);" "signal levelRemoved();" "pageStack.onPagePushed:levelPushed(page.title);" "pageStack.onPageRemoved:levelRemoved();" "pageStack.defaultColumnWidth:width;" "pageStack.separatorVisible:false;" "pageStack.globalToolBar.style:Kirigami.ApplicationHeaderStyle.None;" "activeFocusOnTab:true" "}"), QUrl()); d->rootPlaceHolder = qobject_cast(component->create()); d->quickWidget->setContent(QUrl(), component, d->rootPlaceHolder); QQmlEngine::setContextForObject(d->configModule, QQmlEngine::contextForObject(d->rootPlaceHolder)); - connect(d->rootPlaceHolder, SIGNAL(levelPushed(QString)), this, SLOT(pushLevel(QString))); - connect(d->rootPlaceHolder, SIGNAL(levelRemoved()), this, SLOT(popLevel())); + d->pageRow = d->rootPlaceHolder->property("pageStack").value(); + if (d->pageRow) { + QMetaObject::invokeMethod(d->pageRow, "push", Qt::DirectConnection, Q_ARG(QVariant, QVariant::fromValue(d->configModule->mainUi())), Q_ARG(QVariant, QVariant())); - QMetaObject::invokeMethod(d->rootPlaceHolder, "__pushPage", Qt::DirectConnection, Q_ARG(QVariant, QVariant::fromValue(d->configModule->mainUi()))); + //todo: use directly pageRow + connect(d->rootPlaceHolder, SIGNAL(levelPushed(QString)), this, SLOT(pushLevel(QString))); + connect(d->rootPlaceHolder, SIGNAL(levelRemoved()), this, SLOT(popLevel())); + + connect(this, &KCModuleQml::currentLevelChanged, this, + [this](int level) { + d->pageRow->setProperty("currentIndex", level); + } + ); + connect(d->pageRow, SIGNAL(currentIndexChanged()), this, SLOT(syncLevel())); + } layout->addWidget(d->quickWidget); } KCModuleQml::~KCModuleQml() { delete d; } bool KCModuleQml::eventFilter(QObject* watched, QEvent* event) { //FIXME: those are all workarounds around the QQuickWidget brokeness //BUG https://bugreports.qt.io/browse/QTBUG-64561 if (watched == d->quickWidget && event->type() == QEvent::KeyPress) { //allow tab navigation inside the qquickwidget QKeyEvent *ke = static_cast(event); QQuickItem *currentItem = d->quickWindow->activeFocusItem(); if (!currentItem) { return KCModule::eventFilter(watched, event); } if (currentItem->scopedFocusItem()) { currentItem = currentItem->scopedFocusItem(); } if (ke->key() == Qt::Key_Tab) { //nextItemInFocusChain will always return something, in the worst case will still be currentItem QQuickItem *nextItem = currentItem->nextItemInFocusChain(true); //when it arrives at the place holder item, go out of the qqw and //go to the other widgets around systemsettigns if (nextItem == d->rootPlaceHolder) { QWidget *w = d->quickWidget->nextInFocusChain(); while (!(w->focusPolicy() & Qt::TabFocus)) { w = w->nextInFocusChain(); } w->setFocus(Qt::TabFocusReason); } else { nextItem->forceActiveFocus(Qt::TabFocusReason); } return true; } else if (ke->key() == Qt::Key_Backtab || (ke->key() == Qt::Key_Tab && (ke->modifiers() & Qt::ShiftModifier))) { QQuickItem *nextItem = currentItem->nextItemInFocusChain(false); if (nextItem == d->rootPlaceHolder) { QWidget *w = d->quickWidget->previousInFocusChain(); while (!(w->focusPolicy() & Qt::TabFocus)) { w = w->previousInFocusChain(); } w->setFocus(Qt::BacktabFocusReason); } else { nextItem->forceActiveFocus(Qt::BacktabFocusReason); } return true; } } return KCModule::eventFilter(watched, event); } void KCModuleQml::focusInEvent(QFocusEvent *event) { Q_UNUSED(event) if (event->reason() == Qt::TabFocusReason) { d->rootPlaceHolder->nextItemInFocusChain(true)->forceActiveFocus(Qt::TabFocusReason); } else if (event->reason() == Qt::BacktabFocusReason) { d->rootPlaceHolder->nextItemInFocusChain(false)->forceActiveFocus(Qt::BacktabFocusReason); } } QSize KCModuleQml::sizeHint() const { if (!d->configModule->mainUi()) { return QSize(); } return QSize(d->configModule->mainUi()->implicitWidth(), d->configModule->mainUi()->implicitHeight()); } QString KCModuleQml::quickHelp() const { return d->configModule->quickHelp(); } const KAboutData *KCModuleQml::aboutData() const { return d->configModule->aboutData(); } void KCModuleQml::load() { d->configModule->load(); } void KCModuleQml::save() { d->configModule->save(); d->configModule->setNeedsSave(false); } void KCModuleQml::defaults() { d->configModule->defaults(); } #include "moc_kcmoduleqml_p.cpp" diff --git a/src/kcmoduleqml_p.h b/src/kcmoduleqml_p.h index 310fb5f..3afbe94 100644 --- a/src/kcmoduleqml_p.h +++ b/src/kcmoduleqml_p.h @@ -1,56 +1,58 @@ /* Copyright (c) 2014 Marco Martin This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License version 2 as published by the Free Software Foundation. This library 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 Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef KCMODULEQML_H #define KCMODULEQML_H #include class QQuickItem; class KCModuleQmlPrivate; namespace KQuickAddons { class ConfigModule; } class KCModuleQml : public KCModule { Q_OBJECT public: KCModuleQml(KQuickAddons::ConfigModule *configModule, QWidget* parent, const QVariantList& args); ~KCModuleQml(); QString quickHelp() const Q_DECL_OVERRIDE; const KAboutData *aboutData() const Q_DECL_OVERRIDE; public Q_SLOTS: void load() Q_DECL_OVERRIDE; void save() Q_DECL_OVERRIDE; void defaults() Q_DECL_OVERRIDE; protected: void focusInEvent(QFocusEvent *event) Q_DECL_OVERRIDE; QSize sizeHint() const Q_DECL_OVERRIDE; bool eventFilter(QObject* watched, QEvent* event) Q_DECL_OVERRIDE; private: KCModuleQmlPrivate *const d; + + Q_PRIVATE_SLOT(d, void syncLevel()) }; #endif