diff --git a/src/declarativeimports/plasmacomponents/qml/CheckBox.qml b/src/declarativeimports/plasmacomponents/qml/CheckBox.qml index 5e98d1176..4a6fc4e50 100644 --- a/src/declarativeimports/plasmacomponents/qml/CheckBox.qml +++ b/src/declarativeimports/plasmacomponents/qml/CheckBox.qml @@ -18,8 +18,9 @@ */ import QtQuick 2.1 +import QtQuick.Controls 1.2 as QtControls import org.kde.plasma.core 2.0 as PlasmaCore -import "private" as Private +import "styles" as Styles /** * A check box is a component that can be switched on (checked) or off @@ -32,37 +33,10 @@ import "private" as Private * Qt.Key_Select, Qt.Key_Return, and Qt.Key_Enter hardware keys that send the * clicked signal. * - * All elements of this component are defined in DualStateButton, its base component. + * @inherit QtQuick.Controls.CheckBox */ -Private.DualStateButton { +QtControls.CheckBox { id: checkBox - view: PlasmaCore.FrameSvgItem { - imagePath: "widgets/button" - prefix: "normal" - width: theme.mSize(theme.defaultFont).height + margins.left - height: theme.mSize(theme.defaultFont).height + margins.top - PlasmaCore.SvgItem { - svg: PlasmaCore.Svg { - id: checkmarkSvg - imagePath: "widgets/checkmarks" - } - elementId: "checkbox" - opacity: checked ? 1 : 0 - anchors { - fill: parent - margins: parent.margins.left/2 - } - Behavior on opacity { - NumberAnimation { - duration: units.longDuration - easing.type: Easing.InOutQuad - } - } - } - } - - activeFocusOnTab: true - - shadow: Private.ButtonShadow {} + style: Styles.CheckBoxStyle {} } diff --git a/src/declarativeimports/plasmacomponents/qml/styles/CheckBoxStyle.qml b/src/declarativeimports/plasmacomponents/qml/styles/CheckBoxStyle.qml new file mode 100644 index 000000000..1cbc92872 --- /dev/null +++ b/src/declarativeimports/plasmacomponents/qml/styles/CheckBoxStyle.qml @@ -0,0 +1,39 @@ +/* + * Copyright 2014 Marco Martin + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Library General Public License as + * published by the Free Software Foundation; either version 2, 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 Library General Public License for more details + * + * You should have received a copy of the GNU Library General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 2.010-1301, USA. + */ + +import QtQuick 2.0 +import QtQuick.Controls.Styles 1.1 as QtQuickControlStyle + +import org.kde.plasma.core 2.0 as PlasmaCore +import org.kde.plasma.components 2.0 as PlasmaComponents + + +QtQuickControlStyle.CheckBoxStyle { + id: checkboxStyle + + label: PlasmaComponents.Label { + text: control.text + } + //Not needed? + background: Item {} + + spacing: Math.round(units.mSize(theme.defaultFont).height/4) + + //indicator: +}