summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Uwe Broulik <[email protected]>2017-01-04 16:42:10 +0100
committerKai Uwe Broulik <[email protected]>2017-01-04 16:42:10 +0100
commitfb6a95332a3cfb6b048c55b9c0aad0e46c50dfe0 (patch)
treea6a63db3d2e549982bb8cb983d59516eb162be39
parent8fea513310f285414d91123c23a808cae7994cb8 (diff)
[Fifteen Puzzle] Remove custom color picker
The round color picker looked fancy but for the sake of consistency and code quantity just use the standard component we have for this. Differential Revision: https://phabricator.kde.org/D3961
-rw-r--r--applets/fifteenPuzzle/package/contents/ui/ColorPicker.qml60
-rw-r--r--applets/fifteenPuzzle/package/contents/ui/configAppearance.qml9
2 files changed, 5 insertions, 64 deletions
diff --git a/applets/fifteenPuzzle/package/contents/ui/ColorPicker.qml b/applets/fifteenPuzzle/package/contents/ui/ColorPicker.qml
deleted file mode 100644
index 22ef04d..0000000
--- a/applets/fifteenPuzzle/package/contents/ui/ColorPicker.qml
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2014 Martin Yrjölä <[email protected]>
- *
- * 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) version 3 or any later version
- * accepted by the membership of KDE e.V. (or its successor approved
- * by the membership of KDE e.V.), which shall act as a proxy
- * defined in Section 14 of version 3 of the license.
- *
- * 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.2
-import QtQuick.Layouts 1.0
-import QtQuick.Controls 1.2 as QtControls
-import QtQuick.Dialogs 1.0 as QtDialogs
-import org.kde.plasma.core 2.0 as PlasmaCore
-
-Item {
- id: colorPicker
-
- property alias chosenColor: colorDialog.color
-
- width: childrenRect.width
- height: childrenRect.height
- Layout.alignment: Qt.AlignVCenter
-
- Rectangle {
- color: colorDialog.color
- radius: width / 2
- height: 20
- width: height
- opacity: enabled ? 1 : 0.5
- border {
- width: mouseArea.containsMouse ? 3 : 1
- color: Qt.darker(colorDialog.color, 1.5)
- }
-
- QtDialogs.ColorDialog {
- id: colorDialog
- }
- }
-
- MouseArea {
- id: mouseArea
- anchors.fill: parent
- hoverEnabled: true
- onClicked: {
- colorDialog.open()
- }
- }
-}
diff --git a/applets/fifteenPuzzle/package/contents/ui/configAppearance.qml b/applets/fifteenPuzzle/package/contents/ui/configAppearance.qml
index 5dfd231..3381e6b 100644
--- a/applets/fifteenPuzzle/package/contents/ui/configAppearance.qml
+++ b/applets/fifteenPuzzle/package/contents/ui/configAppearance.qml
@@ -24,6 +24,7 @@
import QtQuick 2.0
import QtQuick.Controls 1.2 as QtControls
import QtQuick.Layouts 1.0 as QtLayouts
+import org.kde.kquickcontrols 2.0 as KQC
Item {
id: appearancePage
@@ -31,8 +32,8 @@ Item {
height: childrenRect.height
property alias cfg_boardSize: sizeSpinBox.value
- property alias cfg_boardColor: pieceColorPicker.chosenColor
- property alias cfg_numberColor: numberColorPicker.chosenColor
+ property alias cfg_boardColor: pieceColorPicker.color
+ property alias cfg_numberColor: numberColorPicker.color
property alias cfg_showNumerals: showNumeralsCheckBox.checked
property alias cfg_useImage: useImageCheckBox.checked
@@ -66,7 +67,7 @@ Item {
QtLayouts.Layout.alignment: Qt.AlignRight
}
- ColorPicker {
+ KQC.ColorButton {
id: pieceColorPicker
}
@@ -75,7 +76,7 @@ Item {
QtLayouts.Layout.alignment: Qt.AlignRight
}
- ColorPicker {
+ KQC.ColorButton {
id: numberColorPicker
}