Changeset View
Changeset View
Standalone View
Standalone View
kcms/krdb/krdb.cpp
Show All 28 Lines | |||||
29 | #include <QFontDatabase> | 29 | #include <QFontDatabase> | ||
30 | #include <QSettings> | 30 | #include <QSettings> | ||
31 | #include <QTextCodec> | 31 | #include <QTextCodec> | ||
32 | 32 | | |||
33 | #include <QPixmap> | 33 | #include <QPixmap> | ||
34 | #include <QByteArray> | 34 | #include <QByteArray> | ||
35 | #include <QTextStream> | 35 | #include <QTextStream> | ||
36 | #include <QDateTime> | 36 | #include <QDateTime> | ||
37 | #include <QDebug> | ||||
37 | #include <QDBusConnection> | 38 | #include <QDBusConnection> | ||
38 | #include <klauncher_iface.h> | 39 | #include <QSaveFile> | ||
40 | #include <QTemporaryFile> | ||||
39 | 41 | | |||
davidedmundson: I don't understand why this changes
| |||||
broulik: I don't either but it wouldn't build without. | |||||
40 | #include <KColorUtils> | 42 | #include <KColorUtils> | ||
41 | #include <kcolorscheme.h> | 43 | #include <kcolorscheme.h> | ||
42 | #include <kconfig.h> | 44 | #include <kconfig.h> | ||
43 | #include <kconfiggroup.h> | 45 | #include <kconfiggroup.h> | ||
44 | #include <kprocess.h> | 46 | #include <kprocess.h> | ||
45 | #include <KLocalizedString> | 47 | #include <KLocalizedString> | ||
46 | #include <kdelibs4migration.h> | 48 | #include <kdelibs4migration.h> | ||
47 | #include <KWindowSystem> | 49 | #include <KWindowSystem> | ||
48 | 50 | | |||
51 | #include <updatelaunchenvjob.h> | ||||
52 | | ||||
49 | #include "krdb.h" | 53 | #include "krdb.h" | ||
50 | #if HAVE_X11 | 54 | #if HAVE_X11 | ||
51 | #include <X11/Xlib.h> | 55 | #include <X11/Xlib.h> | ||
52 | #include <QX11Info> | 56 | #include <QX11Info> | ||
53 | #endif | 57 | #endif | ||
54 | inline const char * gtkEnvVar(int version) | 58 | inline const char * gtkEnvVar(int version) | ||
55 | { | 59 | { | ||
56 | return 2==version ? "GTK2_RC_FILES" : "GTK_RC_FILES"; | 60 | return 2==version ? "GTK2_RC_FILES" : "GTK_RC_FILES"; | ||
▲ Show 20 Lines • Show All 46 Lines • ▼ Show 20 Line(s) | 106 | if (!list.contains(systemGtkrc)) | |||
103 | list.prepend(systemGtkrc); | 107 | list.prepend(systemGtkrc); | ||
104 | list.removeAll(QLatin1String("")); | 108 | list.removeAll(QLatin1String("")); | ||
105 | list.removeAll(gtkkde); | 109 | list.removeAll(gtkkde); | ||
106 | list.append(gtkkde); | 110 | list.append(gtkkde); | ||
107 | 111 | | |||
108 | // Pass env. var to kdeinit. | 112 | // Pass env. var to kdeinit. | ||
109 | QString name = gtkEnvVar(version); | 113 | QString name = gtkEnvVar(version); | ||
110 | QString value = list.join(QLatin1Char(':')); | 114 | QString value = list.join(QLatin1Char(':')); | ||
111 | org::kde::KLauncher klauncher(QStringLiteral("org.kde.klauncher5"), QStringLiteral("/KLauncher"), QDBusConnection::sessionBus()); | 115 | UpdateLaunchEnvJob(name, value); | ||
112 | klauncher.setLaunchEnv(name, value); | | |||
113 | } | 116 | } | ||
114 | 117 | | |||
115 | // ----------------------------------------------------------------------------- | 118 | // ----------------------------------------------------------------------------- | ||
116 | 119 | | |||
117 | static void applyQtColors( KSharedConfigPtr kglobalcfg, QSettings& settings, QPalette& newPal ) | 120 | static void applyQtColors( KSharedConfigPtr kglobalcfg, QSettings& settings, QPalette& newPal ) | ||
118 | { | 121 | { | ||
119 | QStringList actcg, inactcg, discg; | 122 | QStringList actcg, inactcg, discg; | ||
120 | /* export kde color settings */ | 123 | /* export kde color settings */ | ||
▲ Show 20 Lines • Show All 865 Lines • Show Last 20 Lines |
I don't understand why this changes