yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Enable color correction check box for the appropriate compositing types

Browse source 
REVIEW: 111055
This commit is contained in:
Casian Andrei 2013-06-16 23:14:52 +03:00
parent cc66b75609
commit 0c20edb250
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
kcmkwin/kwincompositing/main.cpp
View file

@ -166,7 +166,7 @@ KWinCompositingConfig::KWinCompositingConfig(QWidget *parent, const QVariantList
connect(ui.animationSpeedCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(changed())); connect(ui.animationSpeedCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(changed()));
connect(ui.compositingType, SIGNAL(currentIndexChanged(int)), this, SLOT(changed())); connect(ui.compositingType, SIGNAL(currentIndexChanged(int)), this, SLOT(changed()));
connect(ui.compositingType, SIGNAL(currentIndexChanged(int)), this, SLOT(toogleSmoothScaleUi(int))); connect(ui.compositingType, SIGNAL(currentIndexChanged(int)), this, SLOT(alignGuiToCompositingType(int)));
connect(ui.compositingType, SIGNAL(activated(int)), this, SLOT(suggestGraphicsSystem())); connect(ui.compositingType, SIGNAL(activated(int)), this, SLOT(suggestGraphicsSystem()));
connect(ui.graphicsSystem, SIGNAL(currentIndexChanged(int)), this, SLOT(changed())); connect(ui.graphicsSystem, SIGNAL(currentIndexChanged(int)), this, SLOT(changed()));
connect(ui.windowThumbnails, SIGNAL(activated(int)), this, SLOT(changed())); connect(ui.windowThumbnails, SIGNAL(activated(int)), this, SLOT(changed()));
@ -376,12 +376,16 @@ void KWinCompositingConfig::suggestGraphicsSystem()
ui.graphicsSystem->setCurrentIndex(0); ui.graphicsSystem->setCurrentIndex(0);
} }
void KWinCompositingConfig::toogleSmoothScaleUi(int compositingType) void KWinCompositingConfig::alignGuiToCompositingType(int compositingType)
{ {
ui.glScaleFilter->setVisible(compositingType != XRENDER_INDEX); ui.glScaleFilter->setVisible(compositingType != XRENDER_INDEX);
ui.xrScaleFilter->setVisible(compositingType == XRENDER_INDEX); ui.xrScaleFilter->setVisible(compositingType == XRENDER_INDEX);
ui.scaleMethodLabel->setBuddy(compositingType == XRENDER_INDEX ? ui.xrScaleFilter : ui.glScaleFilter); ui.scaleMethodLabel->setBuddy(compositingType == XRENDER_INDEX ? ui.xrScaleFilter : ui.glScaleFilter);
ui.glGroup->setEnabled(compositingType != XRENDER_INDEX); ui.glGroup->setEnabled(compositingType != XRENDER_INDEX);
ui.glColorCorrection->setEnabled(compositingType == OPENGL20_INDEX ||
compositingType == OPENGL31_INDEX);
} }
void KWinCompositingConfig::toggleEffectShortcutChanged(const QKeySequence &seq) void KWinCompositingConfig::toggleEffectShortcutChanged(const QKeySequence &seq)
@ -451,7 +455,7 @@ void KWinCompositingConfig::loadAdvancedTab()
ui.glSwapStrategy->setCurrentIndex(swapStrategy); ui.glSwapStrategy->setCurrentIndex(swapStrategy);
ui.glColorCorrection->setChecked(config.readEntry("GLColorCorrection", false)); ui.glColorCorrection->setChecked(config.readEntry("GLColorCorrection", false));
toogleSmoothScaleUi(ui.compositingType->currentIndex()); alignGuiToCompositingType(ui.compositingType->currentIndex());
} }
void KWinCompositingConfig::updateStatusUI(bool compositingIsPossible) void KWinCompositingConfig::updateStatusUI(bool compositingIsPossible)

2
kcmkwin/kwincompositing/main.h
View file

@ -81,7 +81,7 @@ private slots:
void glSwapStrategyChanged(int idx); void glSwapStrategyChanged(int idx);
void rearmGlSupport(); void rearmGlSupport();
void suggestGraphicsSystem(); void suggestGraphicsSystem();
void toogleSmoothScaleUi(int compositingType); void alignGuiToCompositingType(int compositingType);
void toggleEffectShortcutChanged(const QKeySequence &seq); void toggleEffectShortcutChanged(const QKeySequence &seq);
void updateStatusUI(bool compositingIsPossible); void updateStatusUI(bool compositingIsPossible);
void showDetailedEffectLoadingInformation(); void showDetailedEffectLoadingInformation();