diff --git a/components/PrivacyLevel.qml b/components/PrivacyLevel.qml deleted file mode 100644 index 63c9b2ba..00000000 --- a/components/PrivacyLevel.qml +++ /dev/null @@ -1,153 +0,0 @@ -// Copyright (c) 2014-2018, The Monero Project -// -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without modification, are -// permitted provided that the following conditions are met: -// -// 1. Redistributions of source code must retain the above copyright notice, this list of -// conditions and the following disclaimer. -// -// 2. Redistributions in binary form must reproduce the above copyright notice, this list -// of conditions and the following disclaimer in the documentation and/or other -// materials provided with the distribution. -// -// 3. Neither the name of the copyright holder nor the names of its contributors may be -// used to endorse or promote products derived from this software without specific -// prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY -// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL -// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF -// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -// @TODO: Remove component after wizard redesign - -import QtQuick 2.0 - -Item { - id: item - property int fillLevel: 0 - height: 70 - clip: true - - Rectangle { - anchors.left: parent.left - anchors.right: parent.right - anchors.top: parent.top - height: 24 - //radius: 4 - color: "#DBDBDB" - } - - Rectangle { - id: bar - anchors.left: parent.left - anchors.right: parent.right - anchors.top: parent.top - anchors.topMargin: 1 - height: 24 - //radius: 4 - color: "#FFFFFF" - - Rectangle { - id: fillRect - anchors.top: parent.top - anchors.bottom: parent.bottom - anchors.left: parent.left - anchors.margins: 4 - //radius: 2 - width: row.x - - color: "#FF6C3C" - - Timer { - interval: 500 - running: true - repeat: false - onTriggered: fillRect.loaded = true - } - - property bool loaded: false - Behavior on width { - enabled: fillRect.loaded - NumberAnimation { duration: 100; easing.type: Easing.InQuad } - } - } - - MouseArea { - anchors.fill: parent - function positionBar() { - var xDiff = 999999 - var index = -1 - for(var i = 0; i < 14; ++i) { - var tmp = Math.abs(row.positions[i].currentX + row.x - mouseX) - if(tmp < xDiff) { - xDiff = tmp - index = i - } - } - - if(index !== -1) { - fillRect.width = Qt.binding(function(){ return row.positions[index].currentX + row.x }) - item.fillLevel = index - } - } - - onClicked: positionBar() - onMouseXChanged: positionBar() - } - } - - Row { - id: row - anchors.right: bar.right - anchors.rightMargin: 8 - anchors.top: bar.bottom - anchors.topMargin: -1 - property var positions: new Array() - - Row { - id: row2 - spacing: bar.width / 14 - - Repeater { - model: 4 - - delegate: TickDelegate { - id: delegateItem2 - currentX: x + row2.x - currentIndex: index - mainTick: currentIndex === 0 - Component.onCompleted: { - row.positions[currentIndex] = delegateItem2 - } - } - } - } - - Row { - id: row1 - spacing: bar.width / 14 - - Repeater { - model: 10 - - delegate: TickDelegate { - id: delegateItem1 - currentX: x + row1.x - currentIndex: index + 4 - mainTick: currentIndex === 13 - Component.onCompleted: { - row.positions[currentIndex] = delegateItem1 - } - } - } - } - } -} diff --git a/components/TickDelegate.qml b/components/TickDelegate.qml deleted file mode 100644 index b09b0ceb..00000000 --- a/components/TickDelegate.qml +++ /dev/null @@ -1,72 +0,0 @@ -// Copyright (c) 2014-2018, The Monero Project -// -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without modification, are -// permitted provided that the following conditions are met: -// -// 1. Redistributions of source code must retain the above copyright notice, this list of -// conditions and the following disclaimer. -// -// 2. Redistributions in binary form must reproduce the above copyright notice, this list -// of conditions and the following disclaimer in the documentation and/or other -// materials provided with the distribution. -// -// 3. Neither the name of the copyright holder nor the names of its contributors may be -// used to endorse or promote products derived from this software without specific -// prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY -// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL -// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF -// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -import QtQuick 2.0 - -import "../components" as MoneroComponents - -Item { - id: delegateItem - width: 1 - height: 48 - property bool mainTick: false - property int currentIndex - property int currentX - - Image { - anchors.horizontalCenter: parent.horizontalCenter - anchors.top: parent.top - visible: parent.mainTick - source: "../images/privacyTick.png" - - Text { - anchors.right: parent.right - anchors.rightMargin: 12 - anchors.bottom: parent.bottom - anchors.bottomMargin: 2 - font.family: "Arial" - font.bold: true - font.pixelSize: 12 * scaleRatio - color: MoneroComponents.Style.defaultFontColor - text: { - if(currentIndex === 0) return qsTr("Default") + translationManager.emptyString - if(currentIndex === 13) return qsTr("High") + translationManager.emptyString - return "" - } - } - } - - Rectangle { - anchors.top: parent.top - anchors.topMargin: 14 - width: 1 - color: "#DBDBDB" - height: 8 - visible: !parent.mainTick - } -} diff --git a/images/privacyTick.png b/images/privacyTick.png deleted file mode 100644 index 9b6ecfed..00000000 Binary files a/images/privacyTick.png and /dev/null differ diff --git a/qml.qrc b/qml.qrc index 085a36f8..6bc3a1f3 100644 --- a/qml.qrc +++ b/qml.qrc @@ -44,15 +44,12 @@ components/StandardDropdown.qml images/whiteDropIndicator.png images/whiteDropIndicator@2x.png - components/PrivacyLevel.qml - images/privacyTick.png components/CheckBox.qml images/uncheckedIcon.png images/uncheckedIcon@2x.png components/DatePicker.qml images/prevMonth.png images/prevMonth@2x.png - components/TickDelegate.qml components/TitleBar.qml images/collapseRightPanel.png images/expandRightPanel.png