Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-23 18:32:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kcontrol: do not write palette to the Katie config from krdb

Browse source 
palette is to be set by the platform plugin

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2023-08-21 20:37:49 +03:00
parent 9fe1463ad0
commit f298066b23
1 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
kcontrol/krdb/main.cpp
View file

@ -119,8 +119,10 @@ static void applyQtColors(QSettings &settings, QPalette&newPal)
// -----------------------------------------------------------------------------
static void applyQtSettings(KSharedConfigPtr kglobalcfg, QSettings &settings)
static void applyQtSettings(KSharedConfigPtr kglobalcfg)
{
QSettings settings(QLatin1String("Katie"));
/* export font settings */
KConfigGroup fontgrp(kglobalcfg, "General");
QString font = fontgrp.readEntry("font", KGlobalSettings::generalFont().toString());
@ -284,7 +286,6 @@ int main(int argc, char *argv[])
// This key is written by the "colors" module.
bool exportColors = kcmdisplayx11.readEntry("exportKDEColors", true);
bool exportQtColors = true;
bool exportQtSettings = true;
bool exportXftSettings = true;
@ -436,18 +437,8 @@ int main(int argc, char *argv[])
applyGtkStyles(exportColors, 2);
/* Katie exports */
if (exportQtColors || exportQtSettings) {
{
QSettings settings(QLatin1String("Katie"));
if (exportQtColors) {
applyQtColors(settings, newPal); // For kcmcolors
}
if (exportQtSettings) {
applyQtSettings(kglobalcfg, settings); // For kcmstyle
}
}
if (exportQtSettings) {
applyQtSettings(kglobalcfg); // For kcmstyle
QApplication::flush();
// We let KIPC take care of ourselves, as we are in a KDE app with