diff --git a/plasma-windowed/CMakeLists.txt b/plasma-windowed/CMakeLists.txt index 867cdc7e9..d19e276d8 100644 --- a/plasma-windowed/CMakeLists.txt +++ b/plasma-windowed/CMakeLists.txt @@ -1,25 +1,26 @@ set(plasmawindowed-app_SRCS plasmawindowedcorona.cpp plasmawindowedview.cpp main.cpp ) add_executable(plasmawindowed ${plasmawindowed-app_SRCS}) target_link_libraries( plasmawindowed Qt5::Widgets Qt5::Quick Qt5::Qml KF5::I18n KF5::IconThemes KF5::XmlGui + KF5::QuickAddons KF5::PlasmaQuick KF5::Plasma KF5::DBusAddons KF5::Notifications ) install(TARGETS plasmawindowed ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) #even if hidden, the desktop file is needed anyways for kdbusservice::unique install(FILES plasma-windowed.desktop DESTINATION ${KDE_INSTALL_APPDIR}) diff --git a/plasma-windowed/main.cpp b/plasma-windowed/main.cpp index abc126e09..0067538a2 100644 --- a/plasma-windowed/main.cpp +++ b/plasma-windowed/main.cpp @@ -1,74 +1,77 @@ /* * Copyright 2014 Bhushan Shah * Copyright 2014 Marco Martin * * 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) version 3 or any later version * accepted by the membership of KDE e.V. (or its successor approved * by the membership of KDE e.V.), which shall act as a proxy * defined in Section 14 of version 3 of the license. * * 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, see */ #include #include #include +#include #include #include #include "plasmawindowedview.h" #include "plasmawindowedcorona.h" static const char version[] = "1.0"; int main(int argc, char **argv) { QQuickWindow::setDefaultAlphaBuffer(true); QApplication app(argc, argv); app.setApplicationVersion(version); app.setOrganizationDomain(QStringLiteral("kde.org")); KDBusService service(KDBusService::Unique); + KQuickAddons::QtQuickSettings::init(); + QCommandLineParser parser; parser.setApplicationDescription(i18n("Plasma Windowed")); parser.addOption(QCommandLineOption(QStringLiteral("statusnotifier"), i18n("Makes the plasmoid stay alive in the Notification Area, even when the window is closed."))); parser.addPositionalArgument(QStringLiteral("applet"), i18n("The applet to open.")); parser.addPositionalArgument(QStringLiteral("args"), i18n("Arguments to pass to the plasmoid."), QStringLiteral("[args...]")); parser.addVersionOption(); parser.addHelpOption(); parser.process(app); if (parser.positionalArguments().isEmpty()) { parser.showHelp(1); } PlasmaWindowedCorona *corona = new PlasmaWindowedCorona(); const QStringList arguments = parser.positionalArguments(); QVariantList args; QStringList::const_iterator constIterator = arguments.constBegin() + 1; for (; constIterator != arguments.constEnd(); ++constIterator) { args << (*constIterator); } corona->setHasStatusNotifier(parser.isSet(QStringLiteral("statusnotifier"))); corona->loadApplet(arguments.first(), args); QObject::connect(&service, &KDBusService::activateRequested, corona, &PlasmaWindowedCorona::activateRequested); const int ret = app.exec(); delete corona; return ret; }