From 09d4266442a69c5c6e7250e6b4a6f0443db95208 Mon Sep 17 00:00:00 2001 From: Rivo Laks Date: Mon, 27 Aug 2007 12:53:56 +0000 Subject: [PATCH] Disable OpenGL options group when XRender mode has been chosen svn path=/trunk/KDE/kdebase/workspace/; revision=705202 --- kcmkwin/kwincompositing/advanced.cpp | 7 +++++++ kcmkwin/kwincompositing/advanced.h | 1 + kcmkwin/kwincompositing/advanced.ui | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/kcmkwin/kwincompositing/advanced.cpp b/kcmkwin/kwincompositing/advanced.cpp index 0e297db874..78cca94125 100644 --- a/kcmkwin/kwincompositing/advanced.cpp +++ b/kcmkwin/kwincompositing/advanced.cpp @@ -28,6 +28,8 @@ KWinAdvancedCompositingOptions::KWinAdvancedCompositingOptions(QWidget* parent, ui.setupUi(mainWidget); setMainWidget(mainWidget); + connect(ui.compositingType, SIGNAL(currentIndexChanged(int)), this, SLOT(compositingModeChanged())); + connect(ui.compositingType, SIGNAL(currentIndexChanged(int)), this, SLOT(changed())); connect(ui.glMode, SIGNAL(currentIndexChanged(int)), this, SLOT(changed())); connect(ui.glTextureFilter, SIGNAL(currentIndexChanged(int)), this, SLOT(changed())); @@ -51,6 +53,11 @@ void KWinAdvancedCompositingOptions::changed() enableButtonApply(true); } +void KWinAdvancedCompositingOptions::compositingModeChanged() +{ + ui.glGroup->setEnabled(ui.compositingType->currentIndex() == 0); +} + void KWinAdvancedCompositingOptions::load() { KConfigGroup config(mKWinConfig, "Compositing"); diff --git a/kcmkwin/kwincompositing/advanced.h b/kcmkwin/kwincompositing/advanced.h index c2996ea54e..5775b5ac3d 100644 --- a/kcmkwin/kwincompositing/advanced.h +++ b/kcmkwin/kwincompositing/advanced.h @@ -32,6 +32,7 @@ class KWinAdvancedCompositingOptions : public KDialog public slots: void changed(); void save(); + void compositingModeChanged(); signals: void configSaved(); diff --git a/kcmkwin/kwincompositing/advanced.ui b/kcmkwin/kwincompositing/advanced.ui index 7eaaed8374..b72fb10b28 100644 --- a/kcmkwin/kwincompositing/advanced.ui +++ b/kcmkwin/kwincompositing/advanced.ui @@ -36,7 +36,7 @@ - + OpenGL options