diff --git a/src/plugins/qmlprofiler/qml/HorizontalGradientBorder.qml b/src/plugins/qmlprofiler/qml/HorizontalGradientBorder.qml deleted file mode 100644 index 16cf2b86e46..00000000000 --- a/src/plugins/qmlprofiler/qml/HorizontalGradientBorder.qml +++ /dev/null @@ -1,40 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -****************************************************************************/ - -import QtQuick 2.1 - -Rectangle { - property color topColor - property color bottomColor - height: 6 - gradient: Gradient { - GradientStop { position: 0.0; color: bottomColor; } - GradientStop { position: 1.0; color: topColor; } - } -} diff --git a/src/plugins/qmlprofiler/qml/MainView.qml b/src/plugins/qmlprofiler/qml/MainView.qml index 21d102fdb33..0f5c805604d 100644 --- a/src/plugins/qmlprofiler/qml/MainView.qml +++ b/src/plugins/qmlprofiler/qml/MainView.qml @@ -403,13 +403,13 @@ Rectangle { color: labels.color } - // Gradient borders - VerticalGradientBorder { + // border between labels and timeline + Rectangle { anchors.left: labels.right anchors.top: labels.top anchors.bottom: labelsTail.bottom - leftColor: "#00000000" - rightColor: "#86000000" + width: 1 + color: "#858585" } } @@ -484,20 +484,4 @@ Rectangle { } } } - - VerticalGradientBorder { - anchors.right: root.right - anchors.top: root.top - anchors.bottom: root.bottom - rightColor: "#00000000" - leftColor: "#86000000" - } - - HorizontalGradientBorder { - anchors.bottom: root.bottom - anchors.left: root.left - anchors.right: root.right - bottomColor: "#00000000" - topColor: "#86000000" - } } diff --git a/src/plugins/qmlprofiler/qml/TimeDisplay.qml b/src/plugins/qmlprofiler/qml/TimeDisplay.qml index 7ab1ab877db..107a5678d9e 100644 --- a/src/plugins/qmlprofiler/qml/TimeDisplay.qml +++ b/src/plugins/qmlprofiler/qml/TimeDisplay.qml @@ -92,26 +92,9 @@ Canvas { context.lineTo(width, height-1); context.stroke(); - // gradient borders - var gradientDark = "rgba(0, 0, 0, 0.53125)"; - var gradientClear = "rgba(0, 0, 0, 0)"; - var grad = context.createLinearGradient(0, 0, 0, 6); - grad.addColorStop(0,gradientDark); - grad.addColorStop(1,gradientClear); - context.fillStyle = grad; - context.fillRect(0, 0, width, 6); - - grad = context.createLinearGradient(0, 0, 6, 0); - grad.addColorStop(0,gradientDark); - grad.addColorStop(1,gradientClear); - context.fillStyle = grad; - context.fillRect(0, 0, 6, height); - - grad = context.createLinearGradient(width, 0, width-6, 0); - grad.addColorStop(0,gradientDark); - grad.addColorStop(1,gradientClear); - context.fillStyle = grad; - context.fillRect(width-6, 0, 6, height); + // left border + context.fillStyle = "#858585"; + context.fillRect(0, 0, 1, height); } function prettyPrintTime( t ) diff --git a/src/plugins/qmlprofiler/qml/VerticalGradientBorder.qml b/src/plugins/qmlprofiler/qml/VerticalGradientBorder.qml deleted file mode 100644 index a143800ccbd..00000000000 --- a/src/plugins/qmlprofiler/qml/VerticalGradientBorder.qml +++ /dev/null @@ -1,45 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -****************************************************************************/ - -import QtQuick 2.1 - -Item { - property color leftColor - property color rightColor - width: 6 - HorizontalGradientBorder { - anchors.left: parent.right - anchors.top: parent.top - transformOrigin: Item.TopLeft - rotation: 90 - width: parent.height - topColor: rightColor - bottomColor: leftColor - } -} diff --git a/src/plugins/qmlprofiler/qml/qmlprofiler.qrc b/src/plugins/qmlprofiler/qml/qmlprofiler.qrc index f503f72510e..1e45c140656 100644 --- a/src/plugins/qmlprofiler/qml/qmlprofiler.qrc +++ b/src/plugins/qmlprofiler/qml/qmlprofiler.qrc @@ -16,8 +16,6 @@ Overview.js SelectionRange.qml SelectionRangeDetails.qml - HorizontalGradientBorder.qml - VerticalGradientBorder.qml arrow_down.png arrow_right.png dialog_shadow.png diff --git a/src/plugins/qmlprofiler/qmlprofiler.pro b/src/plugins/qmlprofiler/qmlprofiler.pro index afb1d772c43..98ddfcf431c 100644 --- a/src/plugins/qmlprofiler/qmlprofiler.pro +++ b/src/plugins/qmlprofiler/qmlprofiler.pro @@ -83,6 +83,4 @@ OTHER_FILES += \ qml/TimeMarks.qml \ qml/SelectionRange.qml \ qml/SelectionRangeDetails.qml \ - qml/Overview.qml \ - qml/VerticalGradientBorder.qml \ - qml/HorizontalGradientBorder.qml + qml/Overview.qml diff --git a/src/plugins/qmlprofiler/qmlprofiler.qbs b/src/plugins/qmlprofiler/qmlprofiler.qbs index aadb049735e..1ad7fa543d4 100644 --- a/src/plugins/qmlprofiler/qmlprofiler.qbs +++ b/src/plugins/qmlprofiler/qmlprofiler.qbs @@ -73,8 +73,6 @@ QtcPlugin { "SelectionRangeDetails.qml", "TimeDisplay.qml", "TimeMarks.qml", - "HorizontalGradientBorder.qml", - "VerticalGradientBorder.qml", "qmlprofiler.qrc", ] }