Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-24 19:02:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kdeui: override application style like palette

Browse source 
this is done so that all application use the style set in the config
regardless if the platform plugin environment variable (QT_PLATFORM_PLUGIN)
is set in the current environment as the application may be a D-Bus service
and as such is not started by kdeinit4 for example

more changes are required to not rely on KDE_FULL_SESSION and perhaps even
more environment variables (kcheckrunning should be used instead) but that
is for another commit

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-05-26 08:49:51 +03:00
parent f53dc16596
commit f910886e6b
1 changed files with 15 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
kdeui/kernel/kglobalsettings.cpp
View file

@ -30,23 +30,24 @@
#include <kstyle.h> #include <kstyle.h>
#include <kapplication.h> #include <kapplication.h>
#include <QtCore/QDir>
#include <QtCore/QStandardPaths>
#include <QtGui/QColor> #include <QtGui/QColor>
#include <QtGui/QCursor> #include <QtGui/QCursor>
#include <QtGui/QDesktopWidget> #include <QtGui/QDesktopWidget>
#include <QtCore/QDir>
#include <QtGui/QFont> #include <QtGui/QFont>
#include <QtGui/QFontDatabase> #include <QtGui/QFontDatabase>
#include <QtGui/QFontInfo> #include <QtGui/QFontInfo>
#include <QtGui/QKeySequence> #include <QtGui/QKeySequence>
#include <QtGui/QPixmap> #include <QtGui/QPixmap>
#include <QtGui/QPixmapCache> #include <QtGui/QPixmapCache>
#include <QApplication>
#include <QtDBus/QtDBus>
#include <QtGui/QStyleFactory>
#include <QtCore/QStandardPaths>
#include "qplatformdefs.h"
#include <QtGui/QToolTip> #include <QtGui/QToolTip>
#include <QtGui/QWhatsThis> #include <QtGui/QWhatsThis>
#include <QtGui/QApplication>
#include <QtGui/QStyleFactory>
#include <QtGui/QGuiPlatformPlugin>
#include <QtDBus/QtDBus>
#include "qplatformdefs.h"
#ifdef Q_WS_X11 #ifdef Q_WS_X11
#include <X11/Xlib.h> #include <X11/Xlib.h>
@ -812,51 +813,20 @@ QString kde_overrideStyle;
void KGlobalSettings::Private::applyGUIStyle() void KGlobalSettings::Private::applyGUIStyle()
{ {
//Platform plugin only loaded on X11 systems if (!kdeFullSession) {
#ifdef Q_WS_X11 return;
if (!kde_overrideStyle.isEmpty()) {
const QLatin1String currentStyleName(qApp->style()->metaObject()->className());
if (0 != kde_overrideStyle.compare(currentStyleName, Qt::CaseInsensitive) &&
0 != (QString(kde_overrideStyle + QLatin1String("Style"))).compare(currentStyleName, Qt::CaseInsensitive)) {
qApp->setStyle(kde_overrideStyle);
}
} else {
emit q->kdisplayStyleChanged();
} }
#else
const QLatin1String currentStyleName(qApp->style()->metaObject()->className());
if (kde_overrideStyle.isEmpty()) { if (kde_overrideStyle.isEmpty()) {
const QString &defaultStyle = KStyle::defaultStyle();
const KConfigGroup pConfig(KGlobal::config(), "General"); const KConfigGroup pConfig(KGlobal::config(), "General");
const QString &styleStr = pConfig.readEntry("widgetStyle", defaultStyle); kde_overrideStyle = pConfig.readEntry("widgetStyle", KStyle::defaultStyle());
if (styleStr.isEmpty() ||
// check whether we already use the correct style to return then
// (workaround for Qt misbehavior to avoid double style initialization)
0 == (QString(styleStr + QLatin1String("Style"))).compare(currentStyleName, Qt::CaseInsensitive) ||
0 == styleStr.compare(currentStyleName, Qt::CaseInsensitive)) {
return;
}
QStyle* sp = QStyleFactory::create( styleStr );
if (sp && currentStyleName == sp->metaObject()->className()) {
delete sp;
return;
}
// If there is no default style available, try falling back any available style
if ( !sp && styleStr != defaultStyle)
sp = QStyleFactory::create( defaultStyle );
if ( !sp )
sp = QStyleFactory::create( QStyleFactory::keys().first() );
qApp->setStyle(sp);
} else if (0 != kde_overrideStyle.compare(currentStyleName, Qt::CaseInsensitive) &&
0 != (QString(kde_overrideStyle + QLatin1String("Style"))).compare(currentStyleName, Qt::CaseInsensitive)) {
qApp->setStyle(kde_overrideStyle);
} }
if (kde_overrideStyle.isEmpty()) {
return;
}
qApp->setStyle(kde_overrideStyle);
emit q->kdisplayStyleChanged(); emit q->kdisplayStyleChanged();
#endif //Q_WS_X11
} }
QPalette KGlobalSettings::createApplicationPalette(const KSharedConfigPtr &config) QPalette KGlobalSettings::createApplicationPalette(const KSharedConfigPtr &config)