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

[kcmkwin/kwincompositing] Drop the OpenGLErrorView from Effects

Browse source 
As we have the split between Effects and Compositor settings nowadays
it's incorrect to have an Compositor related option exposed in the
Effects settings view. Thus the OpenGLErrorView should be removed. As
a nice side-effect that simplifies the main qml file quite a bit by
turning the EffectView from Item into Rectangle.

If it shows that we need the reset GL check in the effects view it would
be better to use a KMessageWidget like in the compositing view.

BUG: 336342
REVIEW: 118790
This commit is contained in:
Martin Gräßlin 2014-06-17 08:30:00 +02:00
parent 3a4bba7542
commit 2088ce0e7e
3 changed files with 6 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
kcmkwin/kwincompositing/qml/EffectView.qml
View file

@ -23,10 +23,11 @@ import QtQuick.Controls 1.0
import QtQuick.Layouts 1.0
import org.kde.kwin.kwincompositing 1.0
Item {
Rectangle {
signal changed
implicitWidth: col.implicitWidth
implicitHeight: col.implicitHeight
color: engine.backgroundViewColor()
Component {
id: sectionHeading

48
kcmkwin/kwincompositing/qml/OpenGLErrorView.qml
View file

@ -1,48 +0,0 @@
/**************************************************************************
* KWin - the KDE window manager *
* This file is part of the KDE project. *
* *
* Copyright (C) 2013 Antonis Tsiapaliokas <kok3rs@gmail.com> *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
**************************************************************************/
import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Layouts 1.0
Item {
id: openGLErrorView
signal activated
implicitWidth: mainLayout.implicitWidth
implicitHeight: mainLayout.implicitHeight
ColumnLayout {
id: mainLayout
Label {
id: openGLErrorText
text: i18n("OpenGL compositing (the default) has crashed KWin in the past.\n" +
"This was most likely due to a driver bug.\n" +
"If you think that you have meanwhile upgraded to a stable driver,\n" +
"you can reset this protection but be aware that this might result in an immediate crash!\n" +
"Alternatively, you might want to use the XRender backend instead.")
}
Button {
id: openGLButton
text: i18n("Re-enable OpenGL detection")
onClicked: openGLErrorView.activated()
}
}
}

40
kcmkwin/kwincompositing/qml/main.qml
View file

@ -23,41 +23,9 @@ import QtQuick.Controls 1.0
import QtQuick.Layouts 1.0
import org.kde.kwin.kwincompositing 1.0
Rectangle {
id: window
implicitWidth: openGLBrokeState ? glError.implicitWidth : view.implicitWidth
implicitHeight: openGLBrokeState ? glError.implicitHeight : view.implicitHeight
color: engine.backgroundViewColor()
property bool openGLBrokeState: true
signal changed
OpenGLErrorView {
id: glError
visible: window.openGLBrokeState
anchors.fill: parent
onActivated: window.openGLBrokeState = compositing.OpenGLIsBroken();
}
EffectView{
id: view
anchors.fill: parent
visible: !window.openGLBrokeState
onChanged: {
window.changed()
}
}
Compositing {
id: compositing
}
Connections {
target: compositing
onChanged: window.changed()
}
Component.onCompleted: {
openGLBrokeState = compositing.OpenGLIsUnsafe()
compositing.reset();
EffectView{
id: view
onChanged: {
window.changed()
}
}