Commit 98ed0164 authored by Christiaan Janssen's avatar Christiaan Janssen
Browse files

QmlProfiler: clean up old code

Change-Id: Id464b073eb05341e48876ace9ff39e16d6302144
Reviewed-on: http://codereview.qt.nokia.com/530

Reviewed-by: default avatarChristiaan Janssen <christiaan.janssen@nokia.com>
parent b7796436
......@@ -42,8 +42,6 @@ Rectangle {
property bool xRay: false //useful for seeing "nested" ranges (but redraw is buggy -- QGV problem?)
property Item currentItem //currently selected item in the view
property bool zooming:false
// move the cursor in the editor
signal updateCursorPosition
property string fileName: ""
......@@ -184,10 +182,8 @@ Rectangle {
property real prevXStep: -1
property real possibleEndTime: startTime + (rangeMover.width*Plotter.xScale(canvas))
onPossibleEndTimeChanged: {
var set = ((zooming && prevXStep != canvas.canvasWindow.x) || !zooming);
prevXStep = canvas.canvasWindow.x;
if (set)
endTime = possibleEndTime
endTime = possibleEndTime
}
onEndTimeChanged: updateTimeline()
......
......@@ -42,10 +42,8 @@ Item {
property real prevXStep: -1
property real possibleValue: (canvas.canvasWindow.x + x) * Plotter.xScale(canvas)
onPossibleValueChanged: {
var set = (!zooming || (zooming && prevXStep != canvas.canvasWindow.x))
prevXStep = canvas.canvasWindow.x;
if (set)
value = possibleValue
value = possibleValue
}
property real value
......
/**************************************************************************
**
** This file is part of Qt Creator
**
** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
**
** Contact: Nokia Corporation (info@qt.nokia.com)
**
** No Commercial Usage
**
** This file contains pre-release code and may not be distributed.
** You may use this file in accordance with the terms and conditions
** contained in the Technology Preview License Agreement accompanying
** this package.
**
** 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, Nokia gives you certain additional
** rights. These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** If you have questions regarding the use of this file, please contact
** Nokia at info@qt.nokia.com.
**
**************************************************************************/
import QtQuick 1.0
Rectangle {
id: button
property alias text: textItem.text
property bool recording: false
signal clicked
width: 80; height: textItem.height + 8
border.width: 1
border.color: Qt.darker(button.color, 1.4)
radius: height/2
smooth: true
color: "#049e0e"
Text {
id: textItem
anchors.centerIn: parent
font.pixelSize: 14
color: "white"
text: "Recording"
}
MouseArea {
id: mouseArea
anchors.fill: parent
onClicked: {
recording = !recording;
button.clicked()
}
}
StateGroup {
id: recordState
states: State {
name: "recording"
when: recording
PropertyChanges { target: button; color: "#ff120c"; }
PropertyChanges { target: textItem; text: "Stop" }
}
}
StateGroup {
states: State {
name: "pressed"; when: mouseArea.pressed && mouseArea.containsMouse
PropertyChanges { target: button; color: Qt.darker(color, 1.1); explicit: true }
PropertyChanges { target: textItem; x: textItem.x + 1; y: textItem.y + 1; explicit: true }
}
}
}
......@@ -9,7 +9,6 @@
<file>range.png</file>
<file>RangeDetails.qml</file>
<file>RangeMover.qml</file>
<file>RecordButton.qml</file>
<file>ToolButton.qml</file>
<file>analyzer_category_small.png</file>
<file>TimeDisplay.qml</file>
......
......@@ -51,7 +51,6 @@ OTHER_FILES += \
qml/MainView.qml \
qml/RangeDetails.qml \
qml/RangeMover.qml \
qml/RecordButton.qml \
qml/ToolButton.qml \
qml/MainView.js \
qml/TimeDisplay.qml
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment