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

generic: adjust to KGlobalSettings changes

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-11-22 05:05:45 +02:00
parent 617366c72d
commit 35151a7d91
3 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
kcontrol/krdb/krdb.cpp
View file

@ -131,10 +131,10 @@ static void applyQtSettings( QSettings& settings )
settings.setValue("Qt/font", KGlobalSettings::generalFont().toString());
/* export effects settings */
bool effectsEnabled = (KGlobalSettings::graphicEffectsLevel() > KGlobalSettings::NoEffects);
bool fadeMenus = (KGlobalSettings::graphicEffectsLevel() >= KGlobalSettings::ComplexAnimationEffects);
bool fadeTooltips = (KGlobalSettings::graphicEffectsLevel() >= KGlobalSettings::ComplexAnimationEffects);
bool animateCombobox = (KGlobalSettings::graphicEffectsLevel() >= KGlobalSettings::SimpleAnimationEffects);
bool effectsEnabled = (KGlobalSettings::graphicEffectsLevel() != KGlobalSettings::NoEffects);
bool fadeMenus = (KGlobalSettings::graphicEffectsLevel() & KGlobalSettings::ComplexAnimationEffects);
bool fadeTooltips = (KGlobalSettings::graphicEffectsLevel() & KGlobalSettings::ComplexAnimationEffects);
bool animateCombobox = (KGlobalSettings::graphicEffectsLevel() & KGlobalSettings::SimpleAnimationEffects);
QStringList guieffects;
if (effectsEnabled) {
@ -145,9 +145,9 @@ static void applyQtSettings( QSettings& settings )
guieffects << QString("animatecombo");
if (fadeTooltips)
guieffects << QString("fadetooltip");
}
else
} else {
guieffects << QString("none");
}
settings.setValue("Qt/GUIEffects", guieffects);
}

14
kcontrol/style/kcmstyle.cpp
View file

@ -231,11 +231,8 @@ KCMStyle::KCMStyle( QWidget* parent, const QVariantList& )
fineTuningUi.comboGraphicEffectsLevel->setObjectName( "cbGraphicEffectsLevel" );
fineTuningUi.comboGraphicEffectsLevel->setEditable( false );
fineTuningUi.comboGraphicEffectsLevel->addItem(i18n("Low display resolution and Low CPU"), KGlobalSettings::NoEffects);
fineTuningUi.comboGraphicEffectsLevel->addItem(i18n("High display resolution and Low CPU"), KGlobalSettings::GradientEffects);
fineTuningUi.comboGraphicEffectsLevel->addItem(i18n("Low display resolution and High CPU"), KGlobalSettings::SimpleAnimationEffects);
fineTuningUi.comboGraphicEffectsLevel->addItem(i18n("High display resolution and High CPU"), (int) (KGlobalSettings::SimpleAnimationEffects | KGlobalSettings::GradientEffects));
fineTuningUi.comboGraphicEffectsLevel->addItem(i18n("Low display resolution and Very High CPU"), KGlobalSettings::ComplexAnimationEffects);
fineTuningUi.comboGraphicEffectsLevel->addItem(i18n("High display resolution and Very High CPU"), (int) (KGlobalSettings::ComplexAnimationEffects | KGlobalSettings::GradientEffects));
fineTuningUi.comboGraphicEffectsLevel->addItem(i18n("High display resolution and High CPU"), static_cast<int>(KGlobalSettings::SimpleAnimationEffects | KGlobalSettings::ComplexAnimationEffects));
connect(cbStyle, SIGNAL(activated(int)), this, SLOT(setStyleDirty()));
connect(fineTuningUi.cbIconsOnButtons, SIGNAL(toggled(bool)), this, SLOT(setEffectsDirty()));
@ -390,14 +387,15 @@ void KCMStyle::save()
}
// Save effects.
KConfig _config("kdeglobals", KConfig::NoGlobals);
KConfigGroup config(&_config, "KDE");
KConfig _config("kdeglobals", KConfig::NoGlobals);
KConfigGroup config(&_config, "KDE");
// Effects page
config.writeEntry( "ShowIconsOnPushButtons", fineTuningUi.cbIconsOnButtons->isChecked());
config.writeEntry( "ShowIconsInMenuItems", fineTuningUi.cbIconsInMenus->isChecked());
KConfigGroup g( &_config, "KDE-Global GUI Settings" );
g.writeEntry( "GraphicEffectsLevel", fineTuningUi.comboGraphicEffectsLevel->itemData(fineTuningUi.comboGraphicEffectsLevel->currentIndex()));
KConfigGroup generalGroup(&_config, "General");
generalGroup.writeEntry("widgetStyle", currentStyle());
@ -415,8 +413,6 @@ void KCMStyle::save()
if ( m_bEffectsDirty ) {
KGlobalSettings::self()->emitChange(KGlobalSettings::SettingsChanged, KGlobalSettings::SETTINGS_STYLE);
// ##### FIXME - Doesn't apply all settings correctly due to bugs in
// KApplication/KToolbar
KGlobalSettings::self()->emitChange(KGlobalSettings::ToolbarStyleChanged);
#ifdef Q_WS_X11
@ -494,7 +490,7 @@ void KCMStyle::defaults()
fineTuningUi.comboSecondaryToolbarIcons->setCurrentIndex(toolbarButtonIndex("TextBesideIcon"));
fineTuningUi.cbIconsOnButtons->setChecked(true);
fineTuningUi.cbIconsInMenus->setChecked(true);
fineTuningUi.comboGraphicEffectsLevel->setCurrentIndex(fineTuningUi.comboGraphicEffectsLevel->findData(((int) KGlobalSettings::graphicEffectsLevelDefault())));
fineTuningUi.comboGraphicEffectsLevel->setCurrentIndex(fineTuningUi.comboGraphicEffectsLevel->findData(static_cast<int>(KGlobalSettings::graphicEffectsLevelDefault())));
emit changed(true);
}

2
plasma/applets/folderview/animator.cpp
View file

@ -53,7 +53,7 @@ void HoverAnimation::updateCurrentTime(int currentTime)
Animator::Animator(AbstractItemView *view)
: QObject(view)
{
m_effectsOn = (KGlobalSettings::graphicEffectsLevel() >= KGlobalSettings::SimpleAnimationEffects); //do not animate if the graphics effects are set to Low CPU
m_effectsOn = (KGlobalSettings::graphicEffectsLevel() != KGlobalSettings::NoEffects); //do not animate if the graphics effects are set to Low CPU
connect(KGlobalSettings::self(), SIGNAL(settingsChanged(int)), SLOT(graphicsEffectsToggled(int)));
connect(view, SIGNAL(entered(QModelIndex)), SLOT(entered(QModelIndex)));
connect(view, SIGNAL(left(QModelIndex)), SLOT(left(QModelIndex)));