diff --git a/ksmserver/CMakeLists.txt b/ksmserver/CMakeLists.txt index a9e51db89..23af7de3f 100644 --- a/ksmserver/CMakeLists.txt +++ b/ksmserver/CMakeLists.txt @@ -1,94 +1,93 @@ add_definitions(-DTRANSLATION_DOMAIN=\"ksmserver\") include_directories(${PHONON_INCLUDE_DIR}) check_library_exists(ICE _IceTransNoListen "" HAVE__ICETRANSNOLISTEN) configure_file(config-ksmserver.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-ksmserver.h) include_directories(${CMAKE_CURRENT_BINARY_DIR}) add_subdirectory(logout-greeter) add_subdirectory(switchuser-greeter) add_subdirectory(tests) ########### next target ############### set(ksmserver_KDEINIT_SRCS ksmserver_debug.cpp main.cpp server.cpp legacy.cpp startup.cpp autostart.cpp shutdown.cpp client.cpp ) set(kcminit_adaptor ${plasma-workspace_SOURCE_DIR}/startkde/kcminit/main.h) set(kcminit_xml ${CMAKE_CURRENT_BINARY_DIR}/org.kde.KCMinit.xml) qt5_generate_dbus_interface( ${kcminit_adaptor} ${kcminit_xml} ) qt5_add_dbus_interface( ksmserver_KDEINIT_SRCS ${kcminit_xml} kcminit_interface ) # FIXME: This is actually not disabled any more because OrgKDEKlauncherInterface isn't provided # otherwise. # # This is actually now disabled, because OrgKDEKlauncherInterface is also provided # # by kdecore, it is not autogenerated and is not binary compatible with a currently # # generated version, thus at certain circumstances leading to strange crashes. # # This should be fixed for KDE5. # # KLauchner.xml is installed by kdelibs, so it is in KDE4_DBUS_INTERFACES_DIR set(klauncher_xml ${KINIT_DBUS_INTERFACES_DIR}/kf5_org.kde.KLauncher.xml) qt5_add_dbus_interface( ksmserver_KDEINIT_SRCS ${klauncher_xml} klauncher_interface ) qt5_add_dbus_adaptor( ksmserver_KDEINIT_SRCS org.kde.KSMServerInterface.xml server.h KSMServer ) kf5_add_kdeinit_executable( ksmserver ${ksmserver_KDEINIT_SRCS}) set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KSMServerDBusInterface") ecm_configure_package_config_file(KSMServerDBusInterfaceConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/KSMServerDBusInterfaceConfig.cmake PATH_VARS KDE_INSTALL_DBUSINTERFACEDIR INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}) target_link_libraries(kdeinit_ksmserver PW::KScreenLocker PW::KWorkspace KF5::XmlGui KF5::GlobalAccel KF5::KIOCore KF5::KIOWidgets ${X11_LIBRARIES} ${X11_Xrender_LIB} Qt5::X11Extras KF5::Solid Qt5::Quick KF5::Declarative KF5::DBusAddons KF5::Package KF5::KDELibs4Support # Solid/PowerManagement ${PHONON_LIBRARIES} Qt5::Concurrent ) install(TARGETS kdeinit_ksmserver ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) install(TARGETS ksmserver ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/KSMServerDBusInterfaceConfig.cmake DESTINATION ${CMAKECONFIG_INSTALL_DIR}) ########### next target ############### set(kcheckrunning_SRCS kcheckrunning.cpp) add_executable( kcheckrunning ${kcheckrunning_SRCS}) target_link_libraries(kcheckrunning ${X11_LIBRARIES}) target_include_directories(kcheckrunning PRIVATE ${X11_X11_INCLUDE_PATH}) install(TARGETS kcheckrunning ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) ########### install files ############### install( FILES org.kde.KSMServerInterface.xml DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR}) -install( DIRECTORY themes/ DESTINATION ${KDE_INSTALL_DATADIR}/ksmserver/themes ) diff --git a/ksmserver/logout-greeter/main.cpp b/ksmserver/logout-greeter/main.cpp index 4a8aa4a21..c457bb2f3 100644 --- a/ksmserver/logout-greeter/main.cpp +++ b/ksmserver/logout-greeter/main.cpp @@ -1,224 +1,224 @@ /***************************************************************** ksmserver - the KDE session management server Copyright 2016 Martin Graesslin Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ #include #include #include #include #include "../shutdowndlg.h" #include #include #include #include #include #include class Greeter : public QObject { Q_OBJECT public: Greeter(int fd, bool shutdownAllowed, bool choose, KWorkSpace::ShutdownType type); virtual ~Greeter(); void init(); bool eventFilter(QObject *watched, QEvent *event) override; private: void adoptScreen(QScreen *screen); void rejected(); void setupWaylandIntegration(); int m_fd; bool m_shutdownAllowed; bool m_choose; KWorkSpace::ShutdownType m_shutdownType; QVector m_dialogs; KWayland::Client::PlasmaShell *m_waylandPlasmaShell; }; Greeter::Greeter(int fd, bool shutdownAllowed, bool choose, KWorkSpace::ShutdownType type) : QObject() , m_fd(fd) , m_shutdownAllowed(shutdownAllowed) , m_choose(choose) , m_shutdownType(type) , m_waylandPlasmaShell(nullptr) { } Greeter::~Greeter() { qDeleteAll(m_dialogs); } void Greeter::setupWaylandIntegration() { if (!KWindowSystem::isPlatformWayland()) { return; } using namespace KWayland::Client; ConnectionThread *connection = ConnectionThread::fromApplication(this); if (!connection) { return; } Registry *registry = new Registry(this); registry->create(connection); connect(registry, &Registry::plasmaShellAnnounced, this, [this, registry] (quint32 name, quint32 version) { m_waylandPlasmaShell = registry->createPlasmaShell(name, version, this); } ); registry->setup(); connection->roundtrip(); } void Greeter::init() { setupWaylandIntegration(); foreach (QScreen *screen, qApp->screens()) { adoptScreen(screen); } connect(qApp, &QGuiApplication::screenAdded, this, &Greeter::adoptScreen); } void Greeter::adoptScreen(QScreen* screen) { // TODO: last argument is the theme, maybe add command line option for it? - KSMShutdownDlg *w = new KSMShutdownDlg(nullptr, m_shutdownAllowed, m_choose, m_shutdownType, QString(), m_waylandPlasmaShell); + KSMShutdownDlg *w = new KSMShutdownDlg(nullptr, m_shutdownAllowed, m_choose, m_shutdownType, m_waylandPlasmaShell); w->installEventFilter(this); m_dialogs << w; QObject::connect(screen, &QObject::destroyed, w, [w, this] { m_dialogs.removeOne(w); w->deleteLater(); }); connect(w, &KSMShutdownDlg::rejected, this, &Greeter::rejected); connect(w, &KSMShutdownDlg::accepted, this, [w, this] { if (m_fd != -1) { QFile f; if (f.open(m_fd, QFile::WriteOnly, QFile::AutoCloseHandle)) { f.write(QByteArray::number(int(w->shutdownType()))); f.close(); } } QApplication::quit(); } ); w->setScreen(screen); w->setGeometry(screen->geometry()); w->init(); } void Greeter::rejected() { if (m_fd != -1) { close(m_fd); } QApplication::exit(1); } bool Greeter::eventFilter(QObject *watched, QEvent *event) { if (qobject_cast(watched)) { if (event->type() == QEvent::MouseButtonPress) { // check that the position is on no window QMouseEvent *me = static_cast(event); for (auto it = m_dialogs.constBegin(); it != m_dialogs.constEnd(); ++it) { if ((*it)->geometry().contains(me->globalPos())) { return false; } } // click outside, close rejected(); } } return false; } int main(int argc, char *argv[]) { QQuickWindow::setDefaultAlphaBuffer(true); QApplication app(argc, argv); KQuickAddons::QtQuickSettings::init(); QCommandLineParser parser; parser.addHelpOption(); // TODO: should these things be translated? It's internal after all... QCommandLineOption shutdownAllowedOption(QStringLiteral("shutdown-allowed"), QStringLiteral("Whether the user is allowed to shut down the system.")); parser.addOption(shutdownAllowedOption); QCommandLineOption chooseOption(QStringLiteral("choose"), QStringLiteral("Whether the user is offered the choices between logout, shutdown, etc.")); parser.addOption(chooseOption); QCommandLineOption modeOption(QStringLiteral("mode"), QStringLiteral("The initial exit mode to offer to the user."), QStringLiteral("logout|shutdown|reboot"), QStringLiteral("logout")); parser.addOption(modeOption); QCommandLineOption fdOption(QStringLiteral("mode-fd"), QStringLiteral("An optional file descriptor the selected mode is written to on accepted"), QStringLiteral("fd"), QString::number(-1)); parser.addOption(fdOption); parser.process(app); KWorkSpace::ShutdownType type = KWorkSpace::ShutdownTypeDefault; if (parser.isSet(modeOption)) { const QString modeValue = parser.value(modeOption); if (QString::compare(QLatin1String("logout"), modeValue, Qt::CaseInsensitive) == 0) { type = KWorkSpace::ShutdownTypeNone; } else if (QString::compare(QLatin1String("shutdown"), modeValue, Qt::CaseInsensitive) == 0) { type = KWorkSpace::ShutdownTypeHalt; } else if (QString::compare(QLatin1String("reboot"), modeValue, Qt::CaseInsensitive) == 0) { type = KWorkSpace::ShutdownTypeReboot; } else { return 1; } } int fd = -1; if (parser.isSet(fdOption)) { bool ok = false; const int passedFd = parser.value(fdOption).toInt(&ok); if (ok) { fd = dup(passedFd); } } Greeter greeter(fd, parser.isSet(shutdownAllowedOption), parser.isSet(chooseOption), type); greeter.init(); return app.exec(); } #include "main.moc" diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp index 07f0c9d20..9afc36ec3 100644 --- a/ksmserver/shutdowndlg.cpp +++ b/ksmserver/shutdowndlg.cpp @@ -1,324 +1,321 @@ /***************************************************************** ksmserver - the KDE session management server Copyright 2000 Matthias Ettrich Copyright 2007 Urs Wolfer Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ #include "shutdowndlg.h" #include "ksmserver_debug.h" #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include Q_DECLARE_METATYPE(Solid::PowerManagement::SleepState) KSMShutdownDlg::KSMShutdownDlg( QWindow* parent, bool maysd, bool choose, KWorkSpace::ShutdownType sdtype, - const QString& theme, KWayland::Client::PlasmaShell *plasmaShell) + KWayland::Client::PlasmaShell *plasmaShell) : QQuickView(parent), m_result(false), - m_theme(theme), m_waylandPlasmaShell(plasmaShell) // this is a WType_Popup on purpose. Do not change that! Not // having a popup here has severe side effects. { // window stuff setClearBeforeRendering(true); setColor(QColor(Qt::transparent)); setResizeMode(QQuickView::SizeRootObjectToView); // Qt doesn't set this on unmanaged windows //FIXME: or does it? if (KWindowSystem::isPlatformX11()) { XChangeProperty( QX11Info::display(), winId(), XInternAtom( QX11Info::display(), "WM_WINDOW_ROLE", False ), XA_STRING, 8, PropModeReplace, (unsigned char *)"logoutdialog", strlen( "logoutdialog" )); XClassHint classHint; classHint.res_name = const_cast("ksmserver"); classHint.res_class = const_cast("ksmserver"); XSetClassHint(QX11Info::display(), winId(), &classHint); } //QQuickView *windowContainer = QQuickView::createWindowContainer(m_view, this); //windowContainer->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); QQmlContext *context = rootContext(); context->setContextProperty(QStringLiteral("maysd"), maysd); context->setContextProperty(QStringLiteral("choose"), choose); context->setContextProperty(QStringLiteral("sdtype"), sdtype); QQmlPropertyMap *mapShutdownType = new QQmlPropertyMap(this); mapShutdownType->insert(QStringLiteral("ShutdownTypeDefault"), QVariant::fromValue(KWorkSpace::ShutdownTypeDefault)); mapShutdownType->insert(QStringLiteral("ShutdownTypeNone"), QVariant::fromValue(KWorkSpace::ShutdownTypeNone)); mapShutdownType->insert(QStringLiteral("ShutdownTypeReboot"), QVariant::fromValue(KWorkSpace::ShutdownTypeReboot)); mapShutdownType->insert(QStringLiteral("ShutdownTypeHalt"), QVariant::fromValue(KWorkSpace::ShutdownTypeHalt)); mapShutdownType->insert(QStringLiteral("ShutdownTypeLogout"), QVariant::fromValue(KWorkSpace::ShutdownTypeLogout)); context->setContextProperty(QStringLiteral("ShutdownType"), mapShutdownType); QQmlPropertyMap *mapSpdMethods = new QQmlPropertyMap(this); QSet spdMethods = Solid::PowerManagement::supportedSleepStates(); mapSpdMethods->insert(QStringLiteral("StandbyState"), QVariant::fromValue(spdMethods.contains(Solid::PowerManagement::StandbyState))); mapSpdMethods->insert(QStringLiteral("SuspendState"), QVariant::fromValue(spdMethods.contains(Solid::PowerManagement::SuspendState))); mapSpdMethods->insert(QStringLiteral("HibernateState"), QVariant::fromValue(spdMethods.contains(Solid::PowerManagement::HibernateState))); context->setContextProperty(QStringLiteral("spdMethods"), mapSpdMethods); context->setContextProperty(QStringLiteral("canLogout"), KAuthorized::authorize(QStringLiteral("logout"))); QString bootManager = KConfig(QStringLiteral(KDE_CONFDIR "/kdm/kdmrc"), KConfig::SimpleConfig) .group("Shutdown") .readEntry("BootManager", "None"); context->setContextProperty(QStringLiteral("bootManager"), bootManager); QStringList options; int def, cur; if ( KDisplayManager().bootOptions( rebootOptions, def, cur ) ) { if ( cur > -1 ) { def = cur; } } QQmlPropertyMap *rebootOptionsMap = new QQmlPropertyMap(this); rebootOptionsMap->insert(QStringLiteral("options"), QVariant::fromValue(rebootOptions)); rebootOptionsMap->insert(QStringLiteral("default"), QVariant::fromValue(def)); context->setContextProperty(QStringLiteral("rebootOptions"), rebootOptionsMap); // engine stuff KDeclarative::KDeclarative kdeclarative; kdeclarative.setDeclarativeEngine(engine()); kdeclarative.initialize(); kdeclarative.setupBindings(); // windowContainer->installEventFilter(this); } void KSMShutdownDlg::init() { rootContext()->setContextProperty(QStringLiteral("screenGeometry"), screen()->geometry()); QString fileName; - if(m_theme.isEmpty()) { - KPackage::Package package = KPackage::PackageLoader::self()->loadPackage(QStringLiteral("Plasma/LookAndFeel")); - KConfigGroup cg(KSharedConfig::openConfig(QStringLiteral("kdeglobals")), "KDE"); - const QString packageName = cg.readEntry("LookAndFeelPackage", QString()); - if (!packageName.isEmpty()) { - package.setPath(packageName); - } + QString fileUrl; + KPackage::Package package = KPackage::PackageLoader::self()->loadPackage(QStringLiteral("Plasma/LookAndFeel")); + KConfigGroup cg(KSharedConfig::openConfig(QStringLiteral("kdeglobals")), "KDE"); + const QString packageName = cg.readEntry("LookAndFeelPackage", QString()); + if (!packageName.isEmpty()) { + package.setPath(packageName); + } - fileName = package.filePath("logoutmainscript"); - } else - fileName = m_theme; + fileName = package.filePath("logoutmainscript"); if (QFile::exists(fileName)) { //qCDebug(KSMSERVER) << "Using QML theme" << fileName; - setSource(QUrl::fromLocalFile(fileName)); + setSource(package.fileUrl("logoutmainscript")); } else { qCWarning(KSMSERVER) << "Couldn't find a theme for the Shutdown dialog" << fileName; return; } if(!errors().isEmpty()) { qCWarning(KSMSERVER) << errors(); } connect(rootObject(), SIGNAL(logoutRequested()), SLOT(slotLogout())); connect(rootObject(), SIGNAL(haltRequested()), SLOT(slotHalt())); connect(rootObject(), SIGNAL(suspendRequested(int)), SLOT(slotSuspend(int)) ); connect(rootObject(), SIGNAL(rebootRequested()), SLOT(slotReboot())); connect(rootObject(), SIGNAL(rebootRequested2(int)), SLOT(slotReboot(int)) ); connect(rootObject(), SIGNAL(cancelRequested()), SLOT(reject())); connect(rootObject(), SIGNAL(lockScreenRequested()), SLOT(slotLockScreen())); connect(screen(), &QScreen::geometryChanged, this, [this] { setGeometry(screen()->geometry()); }); //decide in backgroundcontrast wether doing things darker or lighter //set backgroundcontrast here, because in QEvent::PlatformSurface //is too early and we don't have the root object yet const QColor backgroundColor = rootObject() ? rootObject()->property("backgroundColor").value() : QColor(); KWindowEffects::enableBackgroundContrast(winId(), true, 0.4, (backgroundColor.value() > 128 ? 1.6 : 0.3), 1.7); QQuickView::showFullScreen(); requestActivate(); KWindowSystem::setState(winId(), NET::SkipTaskbar|NET::SkipPager); setKeyboardGrabEnabled(true); } void KSMShutdownDlg::resizeEvent(QResizeEvent *e) { QQuickView::resizeEvent( e ); if( KWindowSystem::compositingActive()) { //TODO: reenable window mask when we are without composite? // clearMask(); } else { // setMask(m_view->mask()); } } bool KSMShutdownDlg::event(QEvent *e) { if (e->type() == QEvent::PlatformSurface) { switch (static_cast(e)->surfaceEventType()) { case QPlatformSurfaceEvent::SurfaceCreated: setupWaylandIntegration(); KWindowEffects::enableBlurBehind(winId(), true); break; case QPlatformSurfaceEvent::SurfaceAboutToBeDestroyed: delete m_shellSurface; m_shellSurface = nullptr; break; } } return QQuickView::event(e); } void KSMShutdownDlg::setupWaylandIntegration() { if (m_shellSurface) { // already setup return; } using namespace KWayland::Client; if (!m_waylandPlasmaShell) { return; } Surface *s = Surface::fromWindow(this); if (!s) { return; } m_shellSurface = m_waylandPlasmaShell->createSurface(s, this); // TODO: set a proper window type to indicate to KWin that this is the logout dialog // maybe we need a dedicated type for it? m_shellSurface->setPosition(geometry().topLeft()); } void KSMShutdownDlg::slotLogout() { m_shutdownType = KWorkSpace::ShutdownTypeNone; accept(); } void KSMShutdownDlg::slotReboot() { // no boot option selected -> current m_bootOption.clear(); m_shutdownType = KWorkSpace::ShutdownTypeReboot; accept(); } void KSMShutdownDlg::slotReboot(int opt) { if (int(rebootOptions.size()) > opt) m_bootOption = rebootOptions[opt]; m_shutdownType = KWorkSpace::ShutdownTypeReboot; accept(); } void KSMShutdownDlg::slotLockScreen() { m_bootOption.clear(); QDBusMessage call = QDBusMessage::createMethodCall(QStringLiteral("org.kde.screensaver"), QStringLiteral("/ScreenSaver"), QStringLiteral("org.freedesktop.ScreenSaver"), QStringLiteral("Lock")); QDBusConnection::sessionBus().asyncCall(call); reject(); } void KSMShutdownDlg::slotHalt() { m_bootOption.clear(); m_shutdownType = KWorkSpace::ShutdownTypeHalt; accept(); } void KSMShutdownDlg::slotSuspend(int spdMethod) { m_bootOption.clear(); switch (spdMethod) { case Solid::PowerManagement::StandbyState: case Solid::PowerManagement::SuspendState: Solid::PowerManagement::requestSleep(Solid::PowerManagement::SuspendState, 0, 0); break; case Solid::PowerManagement::HibernateState: Solid::PowerManagement::requestSleep(Solid::PowerManagement::HibernateState, 0, 0); break; } reject(); } void KSMShutdownDlg::accept() { emit accepted(); } void KSMShutdownDlg::reject() { emit rejected(); } diff --git a/ksmserver/shutdowndlg.h b/ksmserver/shutdowndlg.h index de8a60c85..bfe55e4a0 100644 --- a/ksmserver/shutdowndlg.h +++ b/ksmserver/shutdowndlg.h @@ -1,99 +1,98 @@ /***************************************************************** ksmserver - the KDE session management server Copyright 2000 Matthias Ettrich Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ #ifndef SHUTDOWNDLG_H #define SHUTDOWNDLG_H #include #include #include class QMenu; class QTimer; class QTimeLine; class QLabel; class LogoutEffect; namespace Plasma { class Svg; class FrameSvg; } namespace KWayland { namespace Client { class PlasmaShell; class PlasmaShellSurface; } } class QQuickView; // The confirmation dialog class KSMShutdownDlg : public QQuickView { Q_OBJECT public: - KSMShutdownDlg( QWindow* parent, bool maysd, bool choose, KWorkSpace::ShutdownType sdtype, const QString& theme, KWayland::Client::PlasmaShell *plasmaShell = nullptr ); + KSMShutdownDlg( QWindow* parent, bool maysd, bool choose, KWorkSpace::ShutdownType sdtype, KWayland::Client::PlasmaShell *plasmaShell = nullptr ); void init(); bool result() const; KWorkSpace::ShutdownType shutdownType() const { return m_shutdownType; } public Q_SLOTS: void accept(); void reject(); void slotLogout(); void slotHalt(); void slotReboot(); void slotReboot(int); void slotSuspend(int); void slotLockScreen(); Q_SIGNALS: void accepted(); void rejected(); protected: void resizeEvent(QResizeEvent *e) Q_DECL_OVERRIDE; bool event(QEvent *e) override; private: void setupWaylandIntegration(); KWorkSpace::ShutdownType m_shutdownType; QString m_bootOption; QStringList rebootOptions; bool m_result : 1; - QString m_theme; KWayland::Client::PlasmaShell *m_waylandPlasmaShell; KWayland::Client::PlasmaShellSurface *m_shellSurface = nullptr; }; #endif diff --git a/ksmserver/themes/contour/ContourButton.qml b/ksmserver/themes/contour/ContourButton.qml deleted file mode 100644 index f7a1e1cc8..000000000 --- a/ksmserver/themes/contour/ContourButton.qml +++ /dev/null @@ -1,124 +0,0 @@ -/* - * Copyright 2011-2012 Lamarque V. Souza - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2 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 Library General Public License for more details - * - * You should have received a copy of the GNU Library 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. - */ - -/**Documented API -Inherits: - PlasmaCore.FrameSvgItem - -Imports: - QtQuick 2.0 - org.kde.plasma.core - org.kde.kquickcontrolsaddons - -Description: - A simple button with label at the bottom and icon at the top which uses the plasma theme. - Plasma theme is the theme which changes via the systemsetting - workspace appearence - - desktop theme. - -Properties: - * string text: - This property holds the text label for the button. - For example, the ok button has text 'ok'. - The default value for this property is an empty string. - - * font font: - This property holds the font used by the button label. - See also Qt documentation for font type. - - * string iconSource: - This property holds the source url for the Button's icon. - The default value is an empty url, which displays no icon. - - * int iconSize: - This property holds the icon size. - The default is use the natural image size. -Signals: - * onClicked: - This handler is called when there is a click. -**/ - -import QtQuick 2.0 -import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.kquickcontrolsaddons 2.0 - -PlasmaCore.FrameSvgItem { - id: button - width: mainColumn.width - height: mainColumn.height - - property alias text: labelElement.text - property alias font: labelElement.font - property string iconSource - property alias iconSize: iconElement.width - - signal clicked() - - PlasmaCore.Theme { - id: theme - } - - Column { - id: mainColumn - - QIconItem { - id: iconElement - icon: QIcon(iconSource) - height: width - - MouseArea { - anchors.fill: parent - onClicked: button.clicked() - onPressed: button.state = "Pressed" - onReleased: button.state = "Normal" - } - } - Text { - id: labelElement - anchors.horizontalCenter: iconElement.horizontalCenter - horizontalAlignment: Text.AlignHCenter - color: theme.textColor - // Use theme.defaultFont in plasma-mobile and - // theme.font in plasma-desktop. - font.family: theme.defaultFont.family - font.bold: theme.defaultFont.bold - font.capitalization: theme.defaultFont.capitalization - font.italic: theme.defaultFont.italic - font.weight: theme.defaultFont.weight - font.underline: theme.defaultFont.underline - font.wordSpacing: theme.defaultFont.wordSpacing - } - } - - states: [ - State { - name: "Normal" - PropertyChanges { target: mainColumn; scale: 1.0} - }, - State { - name: "Pressed" - PropertyChanges { target: mainColumn; scale: 0.9} - } - ] - - transitions: [ - Transition { - NumberAnimation { properties: "scale"; duration: 50 } - } - ] -} diff --git a/ksmserver/themes/contour/main.qml b/ksmserver/themes/contour/main.qml deleted file mode 100644 index e788b80ab..000000000 --- a/ksmserver/themes/contour/main.qml +++ /dev/null @@ -1,151 +0,0 @@ -/* - * Copyright 2011-2012 Lamarque V. Souza - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2 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 Library General Public License for more details - * - * You should have received a copy of the GNU Library 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. - */ - -import QtQuick 2.0 -import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents -import org.kde.kquickcontrolsaddons 2.0 - -PlasmaCore.FrameSvgItem { - id: shutdownUi - property int iconSize: 96 - property int realMarginTop: margins.top - property int realMarginBottom: margins.bottom - property int realMarginLeft: margins.left - property int realMarginRight: realMarginLeft - width: 3*realMarginLeft + dialog.width + 3*realMarginRight - height: 2*realMarginTop + dialog.height + 2*realMarginBottom - property int automaticallyDoSeconds: 5 - - imagePath: "dialogs/shutdowndialog" - - signal logoutRequested() - signal haltRequested() - signal suspendRequested(int spdMethod) - signal rebootRequested() - signal rebootRequested2(int opt) - signal cancelRequested() - signal lockScreenRequested() - - PlasmaCore.Theme { - id: theme - } - - Component.onCompleted: { - if (margins.left == 0) { - realMarginTop = 9 - realMarginBottom = 7 - realMarginLeft = 12 - realMarginRight = 12 - } - - //console.log("contour.qml: maysd("+maysd+") choose ("+choose+") ("+sdtype+")") - //console.log("contour.qml: defualtFont.pointSize == " + theme.defaultFont.pointSize) - } - - Timer { - id: timer - repeat: true - running: true - interval: 1000 - - onTriggered: { - if (automaticallyDoSeconds <= 0) { // timeout is at 0, do selected action - running = false - sleepButton.clicked(null) - } - automaticallyDoLabel.text = i18ndp("ksmserver", "Sleeping in 1 second", - "Sleeping in %1 seconds", automaticallyDoSeconds) - --automaticallyDoSeconds; - } - } - - Column { - id: dialog - spacing: 5 - - anchors { - centerIn: parent - } - - Text { - id: automaticallyDoLabel - text: " " - // pixelSize does not work with PlasmaComponents.Label, so I am using a Text element here. - font.pixelSize: Math.max(12, theme.defaultFont.pointSize) - color: theme.textColor - anchors { - horizontalCenter: parent.horizontalCenter - } - } - - Row { - id: iconRow - spacing: 3*realMarginLeft - - ContourButton { - id: lockScreenButton - iconSource: "system-lock-screen" - iconSize: shutdownUi.iconSize - text: i18nd("ksmserver", "Lock") - font.pixelSize: 1.5*automaticallyDoLabel.font.pixelSize - - onClicked: { - //console.log("contour.qml: lock screen requested") - timer.running = false - lockScreenRequested(); - } - } - - ContourButton { - id: sleepButton - iconSource: "system-suspend" - iconSize: shutdownUi.iconSize - text: i18n("ksmserver", "Sleep") - font.pixelSize: 1.5*automaticallyDoLabel.font.pixelSize - - onClicked: { - //console.log("contour.qml: sleep requested") - timer.running = false - if (spdMethods.SuspendState) { - suspendRequested(2); // Solid::PowerManagement::SuspendState - } else if (spdMethods.StandbyState) { - suspendRequested(1); // Solid::PowerManagement::StandbyState - } else { - console.log("contour.qml: system does not support suspend") - } - } - } - - ContourButton { - id: shutdownButton - iconSource: "system-shutdown" - iconSize: shutdownUi.iconSize - text: i18nd("ksmserver", "Turn off") - font.pixelSize: 1.5*automaticallyDoLabel.font.pixelSize - - onClicked: { - //console.log("contour.qml turn off requested") - timer.running = false - haltRequested() - } - } - } - } -} diff --git a/ksmserver/themes/contour/metadata.desktop b/ksmserver/themes/contour/metadata.desktop deleted file mode 100644 index 2b48a4ffd..000000000 --- a/ksmserver/themes/contour/metadata.desktop +++ /dev/null @@ -1,115 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Contour -Name[bs]=Kontura -Name[ca]=Contour -Name[ca@valencia]=Contour -Name[cs]=Contour -Name[da]=Contour -Name[de]=Contour -Name[el]=Περίγραμμα -Name[en_GB]=Contour -Name[es]=Contour -Name[et]=Kontuur -Name[eu]=Contour -Name[fi]=Contour -Name[fr]=Contour -Name[gl]=Contour -Name[hu]=Körvonal -Name[ia]=Bordo -Name[id]=Kontur -Name[is]=Útjaðar -Name[it]=Contour -Name[ja]=Contour -Name[kk]=Контур -Name[km]=Contour -Name[ko]=Contour -Name[lt]=Kontūras -Name[mr]=कॉनटुर -Name[nb]=Kontur -Name[nds]=Ümreet -Name[nl]=Contour -Name[nn]=Kontur -Name[pa]=ਢਾਂਚਾ -Name[pl]=Kontur -Name[pt]=Contour -Name[pt_BR]=Contour -Name[ro]=Contur -Name[ru]=Контур -Name[sk]=Kontúra -Name[sl]=Obris -Name[sr]=Контура -Name[sr@ijekavian]=Контура -Name[sr@ijekavianlatin]=Kontura -Name[sr@latin]=Kontura -Name[sv]=Kontur -Name[tr]=Contour -Name[ug]=ئىزنا -Name[uk]=Контур -Name[x-test]=xxContourxx -Name[zh_CN]=Contour -Name[zh_TW]=輪廓 -Comment=Plasma Active theme -Comment[ar]=سمة بلازما النشطة -Comment[bs]=Plazma aktivna tema -Comment[ca]=Tema Plasma Active -Comment[ca@valencia]=Tema Plasma Active -Comment[cs]=Motiv Plasma Active -Comment[da]=Tema til Plasma Active -Comment[de]=Plasma-Active-Design -Comment[el]=Ενεργό θέμα Plasma -Comment[en_GB]=Plasma Active theme -Comment[es]=Tema para Plasma Active -Comment[et]=Plasma Active'i teema -Comment[eu]=Plasma Active-ren gaia -Comment[fi]=Plasma Activen teema -Comment[fr]=Thème de Plasma Active -Comment[gl]=Tema de plasma active -Comment[he]=ערכת הנושא של Plasma Active -Comment[hu]=Plazma aktív téma -Comment[ia]=Thema de Plasma Active -Comment[id]=Tema Plasma Aktif -Comment[is]=Plasma Active þema -Comment[it]=Tema di Plasma Active -Comment[ja]=Plasma Active テーマ -Comment[kk]=Plasma Active нақышы -Comment[km]=រូបរាង​សកម្ម​ប្លាស្មា -Comment[ko]=Plasma Active 테마 -Comment[lt]=Aktyvus Plasma apipavidalinimas -Comment[mr]=प्लाज्मा एक्टिव्ह शैली -Comment[nb]=Aktivt Plasma-tema -Comment[nds]=Plasma-Aktiev-Muster -Comment[nl]=Thema Plasma Active -Comment[nn]=Plasma Active-tema -Comment[pa]=ਪਲਾਜ਼ਮਾ ਐਕਟਿਵ ਥੀਮ -Comment[pl]=Wystrój Plazma Active -Comment[pt]=Tema do Plasma Active -Comment[pt_BR]=Tema do Plasma Active -Comment[ro]=Temă Plasma Active -Comment[ru]=Тема Plasma -Comment[sk]=Téma Plasma Active -Comment[sl]=Tema Plasma Active -Comment[sr]=Тема Плазма актива -Comment[sr@ijekavian]=Тема Плазма актива -Comment[sr@ijekavianlatin]=Tema Plasma aktiva -Comment[sr@latin]=Tema Plasma aktiva -Comment[sv]=Plasma aktivt tema -Comment[tr]=Plasma Active teması -Comment[uk]=Тема портативної Плазми -Comment[x-test]=xxPlasma Active themexx -Comment[zh_CN]=Plasma Active 主题 -Comment[zh_TW]=Plasma Active 主題 -Type=Service - - -X-KDE-PluginInfo-Author=Lamarque V. Souza -X-KDE-PluginInfo-Email=Lamarque.Souza.ext@basyskom.com -X-KDE-PluginInfo-Name=contour -X-KDE-PluginInfo-Version=0.9 -X-KDE-PluginInfo-Website= -X-KDE-PluginInfo-Category= -X-KDE-PluginInfo-Depends= -X-KDE-PluginInfo-License=GPL -X-KDE-PluginInfo-EnabledByDefault=true -X-Plasma-API=declarativeappletscript -#X-Plasma-MainScript=main.qml diff --git a/ksmserver/themes/contour/screenshot.png b/ksmserver/themes/contour/screenshot.png deleted file mode 100644 index 7c417365f..000000000 Binary files a/ksmserver/themes/contour/screenshot.png and /dev/null differ diff --git a/ksmserver/themes/default/KSMButton.qml b/ksmserver/themes/default/KSMButton.qml deleted file mode 100644 index 48b659831..000000000 --- a/ksmserver/themes/default/KSMButton.qml +++ /dev/null @@ -1,245 +0,0 @@ -/* - Copyright (C) 2011-2012 Lamarque Souza - - 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. -*/ - -/**Documented API -Inherits: - PlasmaCore.FrameSvgItem - -Imports: - QtQuick 2.0 - org.kde.plasma.core - org.kde.kquickcontrolsaddons - -Description: - A button with label and icon (at the right) which uses the plasma theme. - The button uses hover event to change the background on mouse over, supports tab stop - and context menu. - Plasma theme is the theme which changes via the systemsetting - workspace appearence - - desktop theme. - -Properties: - * string text: - This property holds the text label for the button. - For example,the ok button has text 'ok'. - The default value for this property is an empty string. - - * string iconSource: - This property holds the source url for the Button's icon. - The default value is an empty url, which displays no icon. - - * bool smallButton: - Make the button use a different SVG element as background. - The default is false. - - * bool menu: - Indicates if the button will have a context menu. The menu is created by - the parent. - The default value is false. - - * ContextMenu contextMenu - This property holds the contextMenu element. - The default is a null Item. - - * Item tabStopNext: - This property holds the next Item in a tab stop chain. - - * Item tabStopBack: - This property holds the previous Item in a tab stop chain. - -Signals: - * onClicked: - This handler is called when there is a click. - * onPressed: - This handler is called when there is a press. - * onPressAndHold: - This handler is called when there is a press and hold. -**/ - -import QtQuick 2.0 -import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.kquickcontrolsaddons 2.0 - -PlasmaCore.FrameSvgItem { - id: button - property string text - property string iconSource - property bool smallButton: false - property bool menu: false - property ContextMenu contextMenu - property Item tabStopNext - property Item tabStopBack - property int accelKey: -1 - height: theme.desktopFont.mSize.height + 22 - - signal clicked() - signal pressed() - signal pressAndHold() - -// PlasmaCore.Theme { -// id: theme -// } - - PlasmaCore.SvgItem { - id: background - anchors.fill: parent - - svg: PlasmaCore.Svg { - imagePath: "dialogs/shutdowndialog" - } - elementId: "button-normal" - } - - Text { - id: labelElement - font.pointSize: theme.desktopFont.pointSize - color: theme.textColor - anchors { - verticalCenter: parent.verticalCenter - left: parent.left - leftMargin: theme.mSize(theme.defaultFont).width - } - - onPaintedWidthChanged: { - button.width = Math.max(button.width, theme.mSize(theme.defaultFont).width + labelElement.width + 2*theme.mSize(theme.defaultFont).width + iconElement.width + theme.mSize(theme.defaultFont).width) - } - } - - // visual part of the label accelerator implementation. See main.qml (Keys.onPressed) to see the code - // that actually triggers the action. - onTextChanged: { - var i = button.text.indexOf('&') - - if (i > -1) { - var stringToReplace = button.text.substr(i, 2) - accelKey = stringToReplace.toUpperCase().charCodeAt(1) - labelElement.text = button.text.replace(stringToReplace, ''+stringToReplace[1]+'') - } else { - labelElement.text = button.text - } - } - - QIconItem { - id: menuIconElement - - // if textColor is closer to white than to black use "draw-triangle4", which is also close to white. - // Otherwise use "arrow-down", which is green. I have not found a black triangle icon. - icon: theme.textColor > "#7FFFFF" ? QIcon("draw-triangle4") : QIcon("arrow-down") - - width: 6 - height: width - visible: button.menu - - anchors { - right: iconElement.left - rightMargin: 2 - bottom: parent.bottom - bottomMargin: 2 - } - } - - QIconItem { - id: iconElement - icon: QIcon(iconSource) - width: height - height: parent.height - 8 - - anchors { - verticalCenter: parent.verticalCenter - right: parent.right - rightMargin: 4 - } - - MouseArea { - z: 10 - anchors.fill: parent - onClicked: { - button.focus = true - if (menu) { - button.pressAndHold() - } else { - button.clicked() - } - } - } - } - - Component.onCompleted: { - if (button.focus) { - background.elementId = button.smallButton ? "button-small-hover" : "button-hover" - } else { - background.elementId = button.smallButton ? "button-small-normal" : "button-normal" - } - if (button.smallButton) { - height = theme.desktopFont.mSize.height + 12 - } else { - height = theme.desktopFont.mSize.height + 22 - } - } - - onActiveFocusChanged: { - if (activeFocus) { - background.elementId = button.smallButton ? "button-small-hover" : "button-hover" - //console.log("KSMButton.qml activeFocus "+activeFocus+" "+button.text) - } else { - background.elementId = button.smallButton ? "button-small-normal" : "button-normal" - } - } - - onTabStopNextChanged: { - KeyNavigation.tab = tabStopNext - KeyNavigation.down = tabStopNext - KeyNavigation.right = tabStopNext - } - - onTabStopBackChanged: { - KeyNavigation.backtab = tabStopBack - KeyNavigation.up = tabStopBack - KeyNavigation.left = tabStopBack - } - - Keys.onPressed: { - if (event.key == Qt.Key_Return || - event.key == Qt.Key_Enter) { - mouseArea.clicked(null) - } else if (event.key == Qt.Key_Space) { - button.pressAndHold(); - } - } - - MouseArea { - id: mouseArea - - z: -10 - anchors.fill: parent - hoverEnabled: true - onClicked: { - button.focus = true - button.clicked() - } - onPressed: button.pressed() - onPressAndHold: button.pressAndHold() - onEntered: { - background.elementId = button.smallButton ? "button-small-hover" : "button-hover" - } - onExited: { - if (!button.focus) { - background.elementId = button.smallButton ? "button-small-normal" : "button-normal" - } - } - } -} diff --git a/ksmserver/themes/default/metadata.desktop b/ksmserver/themes/default/metadata.desktop deleted file mode 100644 index 036727196..000000000 --- a/ksmserver/themes/default/metadata.desktop +++ /dev/null @@ -1,158 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Default -Name[af]=Standaard -Name[ar]=الافتراضية -Name[as]=অবিকল্পিত -Name[be]=Прадвызначаны -Name[be@latin]=Zmoŭčany -Name[bg]=По подразбиране -Name[bn]=ডিফল্ট -Name[bn_IN]=ডিফল্ট -Name[br]=Dre ziouer -Name[bs]=Podrazumijevano -Name[ca]=Per defecte -Name[ca@valencia]=Per defecte -Name[cs]=Výchozí -Name[csb]=Domëslno -Name[cy]=Rhagosodedig -Name[da]=Standard -Name[de]=Standard -Name[el]=Προκαθορισμένο -Name[en_GB]=Default -Name[eo]=Defaŭlta -Name[es]=Por omisión -Name[et]=Vaikimisi -Name[eu]=Lehenetsia -Name[fa]=پیش‌فرض -Name[fi]=Oletus -Name[fr]=Par défaut -Name[fy]=Standert -Name[ga]=Réamhshocrú -Name[gl]=Predeterminado -Name[gu]=મૂળભુત -Name[he]=ברירת מחדל -Name[hi]=डिफ़ॉल्ट -Name[hne]=डिफाल्ट -Name[hr]=Zadano -Name[hsb]=Standard -Name[hu]=Alapértelmezett -Name[ia]=Predefinite -Name[id]=Standar -Name[is]=Sjálfgefið -Name[it]=Predefinito -Name[ja]=標準 -Name[ka]=ნაგულისხმევი -Name[kk]=Әдетті -Name[km]=​លំនាំដើម -Name[kn]=ಪೂರ್ವನಿಯೋಜಿತ -Name[ko]=기본값 -Name[ku]=Standard -Name[lt]=Numatytas -Name[mai]=पूर्वनिर्धारित -Name[mk]=Стандардно -Name[ml]=സഹജമായ -Name[mr]=मूलभूत -Name[ms]=Default -Name[nb]=Standard -Name[nds]=Standard -Name[ne]=पूर्वनिर्धारित -Name[nl]=Standaard -Name[nn]=Standard -Name[oc]=Defaut -Name[or]=ପୂର୍ବନିର୍ଦ୍ଧାରିତ -Name[pa]=ਡਿਫਾਲਟ -Name[pl]=Domyślny -Name[pt]=Predefinição -Name[pt_BR]=Padrão -Name[ro]=Implicită -Name[ru]=По умолчанию -Name[se]=Standárda -Name[si]=පෙරනිමිය -Name[sk]=Predvolené -Name[sl]=Privzeto -Name[sr]=Подразумевана -Name[sr@ijekavian]=Подразумијевана -Name[sr@ijekavianlatin]=Podrazumijevana -Name[sr@latin]=Podrazumevana -Name[sv]=Standard -Name[ta]=முன்னிருப்பு -Name[te]=అప్రమెయం -Name[tg]=Стандартӣ -Name[th]=ค่าปริยาย -Name[tr]=Öntanımlı -Name[ug]=كۆڭۈلدىكى -Name[uk]=Типова -Name[uz]=Andoza -Name[uz@cyrillic]=Андоза -Name[vi]=Mặc định -Name[wa]=Prémetou -Name[xh]=Okwendalo -Name[x-test]=xxDefaultxx -Name[zh_CN]=默认 -Name[zh_TW]=預設 -Comment=Default Plasma Desktop theme -Comment[ar]=سمة سطح مكتب بلازما الافتراضية -Comment[bs]=Podrazumijevana Plasma desktopa tema -Comment[ca]=Tema l'escriptori Plasma per defecte -Comment[ca@valencia]=Tema l'escriptori Plasma per defecte -Comment[cs]=Výchozí motiv pracovní plochy Plasma -Comment[da]=Standard Plasma Desktop-tema -Comment[de]=Standard-Plasma-Arbeitsflächendesign -Comment[el]=Προκαθορισμένο θέμα επιφάνειας εργασίας Plasma -Comment[en_GB]=Default Plasma Desktop theme -Comment[es]=Tema por omisión del escritorio Plasma -Comment[et]=Vaikimisi Plasma töölauateema -Comment[eu]=Plasma mahaigainaren gai lehenetsia -Comment[fi]=Plasman oletustyöpöytäteema -Comment[fr]=Thème par défaut du bureau Plasma -Comment[gl]=Tema predeterminado do escritorio Plasma -Comment[he]=ברירת המחדל של ערכת הנושא של שולחן העבודה של Plasma -Comment[hu]=Alapértelmezett plazma asztaltéma -Comment[ia]=Thema predefinite de scriptorio de Plasma -Comment[id]=Tema Desktop Plasma standar -Comment[is]=Sjálfgefið Plasma skjáborðsþema -Comment[it]=Tema standard del desktop di Plasma -Comment[ja]=Plasma デスクトップの標準テーマ -Comment[kk]=Әдетті Plasma үстел нақышы -Comment[km]=រូបរាង​ផ្ទៃតុ​ប្លាស្មា​លំនាំដើម -Comment[ko]=기본 Plasma 데스크톱 테마 -Comment[lt]=Numatytas Plasma darbalaukio apipavidalinimas -Comment[mr]=मूलभूत प्लाज्मा डेस्कटॉप शैली -Comment[nb]=Standard Plasma skrivebordstema -Comment[nds]=Standard-Plasma-Schriefdischmuster -Comment[nl]=Standaard thema van het Plasma bureaublad -Comment[nn]=Standard Plasma skrivebordstema -Comment[pa]=ਡਿਫਾਲਟ ਪਲਾਜ਼ਮਾ ਡੈਸਕਟਾਪ ਥੀਮ -Comment[pl]=Domyślny wystrój Pulpitu Plazmy -Comment[pt]=Tema predefinido do ecrã do Plasma -Comment[pt_BR]=Tema padrão da área de trabalho do Plasma -Comment[ro]=Tema implicită de birou Plasma -Comment[ru]=Тема рабочего стола Plasma по умолчанию -Comment[sk]=Predvolená téma plochy Plasma -Comment[sl]=Privzeta tema Plasma Desktop -Comment[sr]=Подразумевана тема Плазма површи -Comment[sr@ijekavian]=Подразумевана тема Плазма површи -Comment[sr@ijekavianlatin]=Podrazumevana tema Plasma površi -Comment[sr@latin]=Podrazumevana tema Plasma površi -Comment[sv]=Standardskrivbordstema för Plasma -Comment[tr]=Öntanımlı Plasma Masaüstü teması -Comment[uk]=Типова тема стільниці Плазми -Comment[vi]=Sắc thái màn hình làm việc Plasma mặc định -Comment[x-test]=xxDefault Plasma Desktop themexx -Comment[zh_CN]=默认 Plasma 桌面主题 -Comment[zh_TW]=預設 Plasma 桌面主題 -Type=Service - - -X-KDE-PluginInfo-Author=Lamarque V. Souza -X-KDE-PluginInfo-Email=Lamarque.Souza.ext@basyskom.com -X-KDE-PluginInfo-Name=default -X-KDE-PluginInfo-Version=0.9 -X-KDE-PluginInfo-Website= -X-KDE-PluginInfo-Category= -X-KDE-PluginInfo-Depends= -X-KDE-PluginInfo-License=GPL -X-KDE-PluginInfo-EnabledByDefault=true -X-Plasma-API=declarativeappletscript -#X-Plasma-MainScript=main.qml diff --git a/ksmserver/themes/default/screenshot.png b/ksmserver/themes/default/screenshot.png deleted file mode 100644 index 734aa0c38..000000000 Binary files a/ksmserver/themes/default/screenshot.png and /dev/null differ