diff --git a/kcmkwin/kwindecoration/CMakeLists.txt b/kcmkwin/kwindecoration/CMakeLists.txt index db384cf65b..da02993ce9 100644 --- a/kcmkwin/kwindecoration/CMakeLists.txt +++ b/kcmkwin/kwindecoration/CMakeLists.txt @@ -30,4 +30,4 @@ install(TARGETS kcm_kwindecoration DESTINATION ${PLUGIN_INSTALL_DIR} ) ########### install files ############### install( FILES kwindecoration.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES qml/main.qml qml/AuroraeDecoration.qml DESTINATION ${DATA_INSTALL_DIR}/kwin/kcm_kwindecoration) +install( FILES qml/main.qml qml/AuroraeDecoration.qml qml/AuroraePreview.qml DESTINATION ${DATA_INSTALL_DIR}/kwin/kcm_kwindecoration) diff --git a/kcmkwin/kwindecoration/qml/AuroraePreview.qml b/kcmkwin/kwindecoration/qml/AuroraePreview.qml new file mode 100644 index 0000000000..369914c000 --- /dev/null +++ b/kcmkwin/kwindecoration/qml/AuroraePreview.qml @@ -0,0 +1,52 @@ +/******************************************************************** +Copyright (C) 2012 Martin Gräßlin + +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 . +*********************************************************************/ +import QtQuick 1.1 +import org.kde.kwin.aurorae 0.1 + +Item { + id: aurorae + AuroraeTheme { + id: auroraeTheme + Component.onCompleted: { + auroraeTheme.loadTheme(auroraeThemeName); + inactiveAurorae.source = auroraeSource; + activeAurorae.source = auroraeSource; + } + } + AuroraeDecoration { + id: inactiveAurorae + active: false + anchors { + fill: parent + leftMargin: 40 - auroraeTheme.paddingLeft + rightMargin: 10 - auroraeTheme.paddingRight + topMargin: 10 - auroraeTheme.paddingTop + bottomMargin: 40 - auroraeTheme.paddingBottom + } + } + AuroraeDecoration { + id: activeAurorae + active: true + anchors { + fill: parent + leftMargin: 10 - auroraeTheme.paddingLeft + rightMargin: 40 - auroraeTheme.paddingRight + topMargin: 40 - auroraeTheme.paddingTop + bottomMargin: 10 - auroraeTheme.paddingBottom + } + } +} diff --git a/kcmkwin/kwindecoration/qml/main.qml b/kcmkwin/kwindecoration/qml/main.qml index 9b6c7c0fb6..e39ec7783c 100644 --- a/kcmkwin/kwindecoration/qml/main.qml +++ b/kcmkwin/kwindecoration/qml/main.qml @@ -16,7 +16,6 @@ along with this program. If not, see . *********************************************************************/ import QtQuick 1.1 import org.kde.qtextracomponents 0.1 as QtExtra -import org.kde.kwin.aurorae 0.1 import org.kde.plasma.components 0.1 as PlasmaComponents Item { @@ -39,40 +38,9 @@ Item { anchors.fill: parent visible: type == 0 } - Item { - id: aurorae - visible: type == 1 + Loader { + source: type == 1 ? "AuroraePreview.qml" : "" anchors.fill: parent - AuroraeTheme { - id: auroraeTheme - Component.onCompleted: { - auroraeTheme.loadTheme(auroraeThemeName); - inactiveAurorae.source = auroraeSource; - activeAurorae.source = auroraeSource; - } - } - AuroraeDecoration { - id: inactiveAurorae - active: false - anchors { - fill: parent - leftMargin: 40 - auroraeTheme.paddingLeft - rightMargin: 10 - auroraeTheme.paddingRight - topMargin: 10 - auroraeTheme.paddingTop - bottomMargin: 40 - auroraeTheme.paddingBottom - } - } - AuroraeDecoration { - id: activeAurorae - active: true - anchors { - fill: parent - leftMargin: 10 - auroraeTheme.paddingLeft - rightMargin: 40 - auroraeTheme.paddingRight - topMargin: 40 - auroraeTheme.paddingTop - bottomMargin: 10 - auroraeTheme.paddingBottom - } - } } MouseArea { hoverEnabled: false