diff options
author | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2014-05-12 14:54:17 +0200 |
---|---|---|
committer | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2014-05-12 14:57:15 +0200 |
commit | d9727c2816529c5f17437d414dd8194ee067c8f7 (patch) | |
tree | 2cad4598205db5590ed71712302e530a1ea2fc20 /share | |
parent | 3c413fc358f3b50b94b9372b7666b13d9eaec6f0 (diff) | |
download | qt-creator-d9727c2816529c5f17437d414dd8194ee067c8f7.tar.gz |
QmlDesigner.PropertyEditor: Enabling tooltips for labels
The old property editor did support tooltips and many labels
have properly defiend tooltips.
In QtQuick.Controls we have to use private API for tooltips
to show up.
Change-Id: If1c50b58e8388b8846c2dd07fcd326f09d67d127
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Diffstat (limited to 'share')
3 files changed, 58 insertions, 4 deletions
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/Label.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/Label.qml index 3395542cda..9a209cb094 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/Label.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/Label.qml @@ -30,11 +30,12 @@ import QtQuick 2.1 import QtQuick.Controls 1.1 as Controls import QtQuick.Layouts 1.0 +import QtQuick.Controls.Private 1.0 Controls.Label { id: label - property string toolTip: "" + property alias toolTip: toolTipArea.toolTip width: parent.width < 300 ? 80 : Math.min(140, parent.width - 220) color: "#eee" @@ -44,7 +45,9 @@ Controls.Label { Layout.minimumWidth: width Layout.maximumWidth: width -// Component.onCompleted: { -// label.Layout.preferredWidth = width -// } + ToolTipArea { + id: toolTipArea + anchors.fill: parent + toolTip: label.text + } } diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ToolTipArea.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ToolTipArea.qml new file mode 100644 index 0000000000..7e1da82fbc --- /dev/null +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ToolTipArea.qml @@ -0,0 +1,50 @@ +/**************************************************************************** +** +** 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 +import QtQuick.Controls 1.1 as Controls +import QtQuick.Layouts 1.0 +import QtQuick.Controls.Private 1.0 + +MouseArea { + id: mouseArea + + onExited: Tooltip.hideText() + onCanceled: Tooltip.hideText() + + hoverEnabled: true + + property string toolTip + + Timer { + interval: 1000 + running: mouseArea.containsMouse && toolTip.length + onTriggered: Tooltip.showText(mouseArea, Qt.point(mouseArea.mouseX, mouseArea.mouseY), toolTip) + } +} diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/qmldir b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/qmldir index 7f22ccec86..e474f5e3ce 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/qmldir +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/qmldir @@ -38,3 +38,4 @@ CustomComboBoxStyle 2.0 CustomComboBoxStyle.qml CustomSpinBoxStyle 2.0 CustomSpinBoxStyle.qml CustomCheckBoxStyle 2.0 CustomCheckBoxStyle.qml ColorLogic 2.0 ColorLogic.qml +ToolTipArea 2.0 ToolTipArea.qml |