Commit 0b82b54c authored by Eike Ziller's avatar Eike Ziller

Remove remaining usages of Qt Quick 1 / Declarative

Qml editor widgets were still linking against declarative
for qml type registering. Registering is no longer necessary
since they are no longer used in QML.

Also removes the unused qtcomponents.

qmlpuppet of course still links against declarative, but that's not run
in the same process.

Task-number: QTCREATORBUG-10273
Change-Id: Ied12d38d58da5ff3bc694905b84dcd76cbce03af
Reviewed-by: default avatarThomas Hartmann <Thomas.Hartmann@digia.com>
parent c148f4fe
/****************************************************************************
**
** Copyright (C) 2013 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 1.0
import "custom" as Components
Components.Button {
id:button
// dm: this is wrong
width: Math.max(sizehint.width, button.iconSource !== "" ? labelItem.contentsWidth + 8 : 0 )
height: Math.max(22, sizehint.height)
property variant sizehint: backgroundItem.sizeFromContents(80, 6)
property bool defaultbutton
property string hint
background: QStyleItem {
id: styleitem
anchors.fill: parent
elementType: "button"
sunken: pressed || checked
raised: !(pressed || checked)
hover: containsMouse
text: button.iconSource === "" ? button.text : ""
focus: button.focus
hint: button.hint
// If no icon, let the style do the drawing
activeControl: focus ? "default" : ""
Connections{
target: button
onToolTipTriggered: styleitem.showTip()
}
function showTip(){
showToolTip(tooltip);
}
}
label: Item {
// Used as a fallback since I can't pass the imageURL
// directly to the style object
visible: button.iconSource !== ""
property int contentsWidth : row.width
Row {
id: row
anchors.centerIn: parent
anchors.verticalCenterOffset: -1
spacing: 4
Image {
source: iconSource
anchors.verticalCenter: parent.verticalCenter
fillMode: Image.Stretch //mm Image should shrink if button is too small, depends on QTBUG-14957
}
Text {
id:text
color: textColor
anchors.verticalCenter: parent.verticalCenter
text: button.text
horizontalAlignment: Text.Center
}
}
}
Keys.onSpacePressed:clicked()
}
/****************************************************************************
**
** Copyright (C) 2013 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 1.0
import "custom" as Components
Components.ButtonRow {
}
/****************************************************************************
**
** Copyright (C) 2013 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 1.0
import "custom" as Components
// jb : Size should not depend on background, we should make it consistent
Components.CheckBox{
id:checkbox
property string text
property string hint
height:20
width: Math.max(110, backgroundItem.textWidth(text) + 40)
background: QStyleItem {
elementType:"checkbox"
sunken:pressed
on:checked || pressed
hover:containsMouse
text:checkbox.text
enabled:checkbox.enabled
focus:checkbox.focus
hint:checkbox.hint
}
Keys.onSpacePressed:checked = !checked
}
/****************************************************************************
**
** Copyright (C) 2013 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 1.0
import "custom" as Components
Components.ChoiceList {
id: choicelist
property int buttonHeight: backgroundItem.sizeFromContents(100, 18).height
property int buttonWidth: backgroundItem.sizeFromContents(100, 18).width
property string hint
height: buttonHeight
width: buttonWidth
topMargin: 4
bottomMargin: 4
background: QStyleItem {
anchors.fill: parent
elementType: "combobox"
sunken: pressed
raised: !pressed
hover: containsMouse
enabled: choicelist.enabled
text: currentItemText
focus: choicelist.focus
hint: choicelist.hint
}
listItem: Item {
id:item
height: 22
anchors.left: parent.left
width: choicelist.width
QStyleItem {
anchors.fill: parent
elementType: "comboboxitem"
text: itemText
selected: highlighted
}
}
popupFrame: QStyleItem {
property string popupLocation: backgroundItem.styleHint("comboboxpopup") ? "center" : "below"
property int fw: backgroundItem.pixelMetric("menupanelwidth");
anchors.leftMargin: backgroundItem.pixelMetric("menuhmargin") + fw
anchors.rightMargin: backgroundItem.pixelMetric("menuhmargin") + fw
anchors.topMargin: backgroundItem.pixelMetric("menuvmargin") + fw
anchors.bottomMargin: backgroundItem.pixelMetric("menuvmargin") + fw
elementType: "menu"
effect: DropShadow {
blurRadius: 18
color: "#90000000"
xOffset: 1
yOffset: 1
}
}
}
/****************************************************************************
**
** Copyright (C) 2013 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 1.0
import "custom" as Components
MenuBase {
id: choiceList
property ListModel model
}
/****************************************************************************
**
** Copyright (C) 2013 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 1.0
import "custom" as Components
// jens: ContainsMouse breaks drag functionality
QStyleItem {
id: dial
width:100
height:100
property alias maximumValue: range.maximumValue
property alias minimumValue: range.minimumValue
property alias containsMouse: mouseArea.containsMouse
property alias value: range.value
property bool wrapping: false
property bool tickmarks: true // not implemented
RangeModel {
id: range
minimumValue: 0.0
maximumValue: 1.0
stepSize: 0.0
value: 0
}
MouseArea {
id: mouseArea
anchors.fill:parent
property bool inDrag
hoverEnabled:true
onPositionChanged: {
if (pressed) {
value = valueFromPoint(mouseX, mouseY)
inDrag = true
}
}
onPressed: {
value = valueFromPoint(mouseX, mouseY)
dial.focus = true
}
onReleased:inDrag = false;
function bound(val) { return Math.max(minimumValue, Math.min(maximumValue, val)); }
function valueFromPoint(x, y)
{
var yy = height/2.0 - y;
var xx = x - width/2.0;
var a = (xx || yy) ? Math.atan2(yy, xx) : 0;
if (a < Math.PI/ -2)
a = a + Math.PI * 2;
var dist = 0;
var minv = minimumValue*100, maxv = maximumValue*100;
if (minimumValue < 0) {
dist = -minimumValue;
minv = 0;
maxv = maximumValue + dist;
}
var r = maxv - minv;
var v;
if (wrapping)
v = (0.5 + minv + r * (Math.PI * 3 / 2 - a) / (2 * Math.PI));
else
v = (0.5 + minv + r* (Math.PI * 4 / 3 - a) / (Math.PI * 10 / 6));
if (dist > 0)
v -= dist;
return maximumValue - bound(v/100)
}
}
WheelArea {
id: wheelarea
anchors.fill: parent
horizontalMinimumValue: dial.minimumValue
horizontalMaximumValue: dial.maximumValue
verticalMinimumValue: dial.minimumValue
verticalMaximumValue: dial.maximumValue
property double step: (dial.maximumValue - dial.minimumValue)/100
onVerticalWheelMoved: {
value += verticalDelta/4*step
}
onHorizontalWheelMoved: {
value += horizontalDelta/4*step
}
}
elementType:"dial"
sunken: mouseArea.pressed
maximum: range.maximumValue*90
minimum: range.minimumValue*90
focus:dial.focus
value: visualPos*90
enabled: dial.enabled
property double visualPos : range.value
Behavior on visualPos {
enabled: !mouseArea.inDrag
NumberAnimation {
duration: 300
easing.type: Easing.OutSine
}
}
}
/****************************************************************************
**
** Copyright (C) 2013 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 1.0
import "custom" as Components
QStyleBackground {
width: 100
height: 100
default property alias children: content.children
style: QStyleItem {
id: styleitem
elementType: "frame"
}
Item {
id: content
anchors.fill: parent
anchors.margins: frameWidth
property int frameWidth: styleitem.pixelMetric("defaultframewidth");
}
}
/****************************************************************************
**
** Copyright (C) 2013 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 1.0
import "custom" as Components
Components.GroupBox {
id: groupbox
width: Math.max(200, contentWidth + sizeHint.width)
height: contentHeight + sizeHint.height + 4
property variant sizeHint: backgroundItem.sizeFromContents(0, 24)
property bool flat: false
background : QStyleItem {
id: styleitem
elementType: "groupbox"
anchors.fill: parent
text: groupbox.title
hover: checkbox.containsMouse
on: checkbox.checked
focus: checkbox.activeFocus
activeControl: checkable ? "checkbox" : ""
sunken: !flat
}
}
/****************************************************************************
**
** Copyright (C) 2013 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 1.0
MenuBase {
}
/****************************************************************************
**
** Copyright (C) 2013 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 1.0
MenuItemBase {
}
/****************************************************************************
**
** Copyright (C) 2013 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 1.0
import "custom" as Components
Components.ProgressBar {
id:progressbar
property variant sizehint: backgroundItem.sizeFromContents(23, 23)
property int orientation: Qt.Horizontal
property string hint
height: orientation === Qt.Horizontal ? sizehint.height : 200
width: orientation === Qt.Horizontal ? 200 : sizehint.height
background: QStyleItem {
anchors.fill: parent
elementType: "progressbar"
// XXX: since desktop uses int instead of real, the progressbar
// range [0..1] must be stretched to a good precision
property int factor