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: read font settings directly from the kdeglobals config

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-11-22 20:12:44 +02:00
parent 56b3159f80
commit 243f64bdfd
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
kcontrol/krdb/krdb.cpp
View file

@ -127,13 +127,14 @@ static void applyQtColors( QSettings& settings, QPalette& newPal )
static void applyQtSettings( KSharedConfigPtr kglobalcfg, QSettings& settings )
{
#warning FIXME: KGlobalSettings race, settings may not be reloaded yet
/* export font settings */
settings.setValue("Qt/font", KGlobalSettings::generalFont().toString());
KConfigGroup fontgrp( kglobalcfg, "General" );
QString font = fontgrp.readEntry("font", QString());
settings.setValue("Qt/font", font);
/* export effects settings */
KConfigGroup kglobalgrp( kglobalcfg, "KDE-Global GUI Settings" );
int graphicEffects = kglobalgrp.readEntry("GraphicEffectsLevel", int(KGlobalSettings::graphicEffectsLevelDefault()));
KConfigGroup guigrp( kglobalcfg, "KDE-Global GUI Settings" );
int graphicEffects = guigrp.readEntry("GraphicEffectsLevel", int(KGlobalSettings::graphicEffectsLevelDefault()));
KGlobalSettings::GraphicEffects graphicEffectsFlags = KGlobalSettings::GraphicEffects(graphicEffects);
bool effectsEnabled = (graphicEffectsFlags != KGlobalSettings::NoEffects);
bool complexEffects = (graphicEffectsFlags & KGlobalSettings::ComplexAnimationEffects);
@ -314,6 +315,7 @@ void runRdb( uint flags )
KGlobal::dirs()->addResourceType("appdefaults", "data", "kdisplay/app-defaults/");
KGlobal::locale()->insertCatalog("krdb");
#warning FIXME: KGlobalSettings race, palette settings may not be reloaded yet
QString preproc;
QColor backCol = newPal.color( QPalette::Active, QPalette::Background );
addColorDef(preproc, "FOREGROUND" , newPal.color( QPalette::Active, QPalette::Foreground ) );