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

generic: adjust to Katie changes

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2019-12-23 21:56:13 +00:00
parent fa976538d8
commit c66a01659f
3 changed files with 22 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
kcontrol/krdb/krdb.cpp
View file

@ -118,9 +118,9 @@ static void applyQtColors( KSharedConfigPtr kglobalcfg, QSettings& settings, QPa
discg << newPal.color(QPalette::Disabled, discg << newPal.color(QPalette::Disabled,
(QPalette::ColorRole) i).name(); (QPalette::ColorRole) i).name();
settings.setValue("/qt/Palette/active", actcg); settings.setValue("Qt/Palette/active", actcg);
settings.setValue("/qt/Palette/inactive", inactcg); settings.setValue("Qt/Palette/inactive", inactcg);
settings.setValue("/qt/Palette/disabled", discg); settings.setValue("Qt/Palette/disabled", discg);
// export kwin's colors to qtrc for kstyle to use // export kwin's colors to qtrc for kstyle to use
KConfigGroup wmCfgGroup(kglobalcfg, "WM"); KConfigGroup wmCfgGroup(kglobalcfg, "WM");
@ -128,39 +128,39 @@ static void applyQtColors( KSharedConfigPtr kglobalcfg, QSettings& settings, QPa
// active colors // active colors
QColor clr = newPal.color( QPalette::Active, QPalette::Background ); QColor clr = newPal.color( QPalette::Active, QPalette::Background );
clr = wmCfgGroup.readEntry("activeBackground", clr); clr = wmCfgGroup.readEntry("activeBackground", clr);
settings.setValue("/qt/KWinPalette/activeBackground", clr.name()); settings.setValue("Qt/KWinPalette/activeBackground", clr.name());
if (QPixmap::defaultDepth() > 8) if (QPixmap::defaultDepth() > 8)
clr = clr.dark(110); clr = clr.dark(110);
clr = wmCfgGroup.readEntry("activeBlend", clr); clr = wmCfgGroup.readEntry("activeBlend", clr);
settings.setValue("/qt/KWinPalette/activeBlend", clr.name()); settings.setValue("Qt/KWinPalette/activeBlend", clr.name());
clr = newPal.color( QPalette::Active, QPalette::HighlightedText ); clr = newPal.color( QPalette::Active, QPalette::HighlightedText );
clr = wmCfgGroup.readEntry("activeForeground", clr); clr = wmCfgGroup.readEntry("activeForeground", clr);
settings.setValue("/qt/KWinPalette/activeForeground", clr.name()); settings.setValue("Qt/KWinPalette/activeForeground", clr.name());
clr = newPal.color( QPalette::Active,QPalette::Background ); clr = newPal.color( QPalette::Active,QPalette::Background );
clr = wmCfgGroup.readEntry("frame", clr); clr = wmCfgGroup.readEntry("frame", clr);
settings.setValue("/qt/KWinPalette/frame", clr.name()); settings.setValue("Qt/KWinPalette/frame", clr.name());
clr = wmCfgGroup.readEntry("activeTitleBtnBg", clr); clr = wmCfgGroup.readEntry("activeTitleBtnBg", clr);
settings.setValue("/qt/KWinPalette/activeTitleBtnBg", clr.name()); settings.setValue("Qt/KWinPalette/activeTitleBtnBg", clr.name());
// inactive colors // inactive colors
clr = newPal.color(QPalette::Inactive, QPalette::Background); clr = newPal.color(QPalette::Inactive, QPalette::Background);
clr = wmCfgGroup.readEntry("inactiveBackground", clr); clr = wmCfgGroup.readEntry("inactiveBackground", clr);
settings.setValue("/qt/KWinPalette/inactiveBackground", clr.name()); settings.setValue("Qt/KWinPalette/inactiveBackground", clr.name());
if (QPixmap::defaultDepth() > 8) if (QPixmap::defaultDepth() > 8)
clr = clr.dark(110); clr = clr.dark(110);
clr = wmCfgGroup.readEntry("inactiveBlend", clr); clr = wmCfgGroup.readEntry("inactiveBlend", clr);
settings.setValue("/qt/KWinPalette/inactiveBlend", clr.name()); settings.setValue("Qt/KWinPalette/inactiveBlend", clr.name());
clr = newPal.color(QPalette::Inactive, QPalette::Background).dark(); clr = newPal.color(QPalette::Inactive, QPalette::Background).dark();
clr = wmCfgGroup.readEntry("inactiveForeground", clr); clr = wmCfgGroup.readEntry("inactiveForeground", clr);
settings.setValue("/qt/KWinPalette/inactiveForeground", clr.name()); settings.setValue("Qt/KWinPalette/inactiveForeground", clr.name());
clr = newPal.color(QPalette::Inactive, QPalette::Background); clr = newPal.color(QPalette::Inactive, QPalette::Background);
clr = wmCfgGroup.readEntry("inactiveFrame", clr); clr = wmCfgGroup.readEntry("inactiveFrame", clr);
settings.setValue("/qt/KWinPalette/inactiveFrame", clr.name()); settings.setValue("Qt/KWinPalette/inactiveFrame", clr.name());
clr = wmCfgGroup.readEntry("inactiveTitleBtnBg", clr); clr = wmCfgGroup.readEntry("inactiveTitleBtnBg", clr);
settings.setValue("/qt/KWinPalette/inactiveTitleBtnBg", clr.name()); settings.setValue("Qt/KWinPalette/inactiveTitleBtnBg", clr.name());
KConfigGroup kdeCfgGroup(kglobalcfg, "KDE"); KConfigGroup kdeCfgGroup(kglobalcfg, "KDE");
settings.setValue("/qt/KDE/contrast", kdeCfgGroup.readEntry("contrast", 7)); settings.setValue("Qt/KDE/contrast", kdeCfgGroup.readEntry("contrast", 7));
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
@ -168,7 +168,7 @@ static void applyQtColors( KSharedConfigPtr kglobalcfg, QSettings& settings, QPa
static void applyQtSettings( KSharedConfigPtr kglobalcfg, QSettings& settings ) static void applyQtSettings( KSharedConfigPtr kglobalcfg, QSettings& settings )
{ {
/* export font settings */ /* export font settings */
settings.setValue("/qt/font", KGlobalSettings::generalFont().toString()); settings.setValue("Qt/font", KGlobalSettings::generalFont().toString());
/* export effects settings */ /* export effects settings */
KConfigGroup kdeCfgGroup(kglobalcfg, "General"); KConfigGroup kdeCfgGroup(kglobalcfg, "General");
@ -190,7 +190,7 @@ static void applyQtSettings( KSharedConfigPtr kglobalcfg, QSettings& settings )
else else
guieffects << QString("none"); guieffects << QString("none");
settings.setValue("/qt/GUIEffects", guieffects); settings.setValue("Qt/GUIEffects", guieffects);
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
@ -549,7 +549,11 @@ void runRdb( uint flags )
/* Qt exports */ /* Qt exports */
if ( exportQtColors || exportQtSettings ) if ( exportQtColors || exportQtSettings )
{ {
#ifndef QT_KATIE
QSettings* settings = new QSettings(QLatin1String("Trolltech")); QSettings* settings = new QSettings(QLatin1String("Trolltech"));
#else
QSettings* settings = new QSettings(QLatin1String("Katie"), QSettings::NativeFormat);
#endif
if ( exportQtColors ) if ( exportQtColors )
applyQtColors( kglobalcfg, *settings, newPal ); // For kcmcolors applyQtColors( kglobalcfg, *settings, newPal ); // For kcmcolors

2
ktouchpadenabler/settings.kcfgc
View file

@ -1,5 +1,5 @@
ClassName=Settings ClassName=Settings
Namespace=ktouchpadenabler
File=ktouchpadenabler.kcfg File=ktouchpadenabler.kcfg
Mutators=true Mutators=true
NameSpace=ktouchpadenabler
Singleton=true Singleton=true

2
kwin/settings.kcfgc
View file

@ -3,5 +3,5 @@ NameSpace=KWin
ClassName=Settings ClassName=Settings
# options.h is needed for FocusPolicy # options.h is needed for FocusPolicy
# placement.h is needed for Placement::Policy # placement.h is needed for Placement::Policy
IncludeFiles=\"options.h\", \"placement.h\" IncludeFiles=options.h,placement.h
UseEnumTypes=true UseEnumTypes=true