diff options
author | Tim Jenssen <tim.jenssen@theqtcompany.com> | 2014-10-30 14:45:56 +0100 |
---|---|---|
committer | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2014-10-30 16:47:05 +0100 |
commit | 67fef997664cf6a10decea34d102ec03c372c168 (patch) | |
tree | 3bad1fe529c33e7fb4f10b2d6edf431085e00cab /share | |
parent | 4c737d7157d1dac567ae83378e3728803976891b (diff) | |
download | qt-creator-67fef997664cf6a10decea34d102ec03c372c168.tar.gz |
QmlDesigner: toolTip -> tooltip and some qsTr fixes
- "tooltip" is how it is in the component so use this everywhere
Change-Id: Ib8caa26365e50e1f68e04768b051941bbebe146e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Diffstat (limited to 'share')
10 files changed, 44 insertions, 44 deletions
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ButtonRowButton.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ButtonRowButton.qml index daf3093456..d6168f0952 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ButtonRowButton.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ButtonRowButton.qml @@ -43,7 +43,7 @@ Item { signal clicked() - property alias toolTip: toolTipArea.toolTip + property alias tooltip: toolTipArea.tooltip width: 24 + leftPadding height: 24 diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorEditor.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorEditor.qml index 2b166723b4..44801ea478 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorEditor.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorEditor.qml @@ -199,7 +199,7 @@ Column { colorEditor.backendValue.resetValue() gradientLine.deleteGradient() } - toolTip: qsTr("Solid Color") + tooltip: qsTr("Solid Color") } ButtonRowButton { visible: supportGradient @@ -209,7 +209,7 @@ Column { gradientLine.addGradient() } - toolTip: qsTr("Gradient") + tooltip: qsTr("Gradient") } ButtonRowButton { iconSource: "images/icon_color_none.png" @@ -217,7 +217,7 @@ Column { colorEditor.color = "#00000000" gradientLine.deleteGradient() } - toolTip: qsTr("Transparent") + tooltip: qsTr("Transparent") } } diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FlickableSection.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FlickableSection.qml index 269126ec6a..021780bb10 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FlickableSection.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FlickableSection.qml @@ -98,7 +98,7 @@ Section { Label { text: qsTr("Behavior") - toolTip: qsTr("Bounds behavior") + tooltip: qsTr("Bounds behavior") } SecondColumnLayout { @@ -126,7 +126,7 @@ Section { Label { text: qsTr("Max. velocity") - toolTip: qsTr("Maximum flick velocity") + tooltip: qsTr("Maximum flick velocity") } SecondColumnLayout { @@ -143,7 +143,7 @@ Section { Label { text: qsTr("Deceleration") - toolTip: qsTr("Flick deceleration") + tooltip: qsTr("Flick deceleration") } SecondColumnLayout { diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/Label.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/Label.qml index 54833d24de..9583930d41 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/Label.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/Label.qml @@ -36,7 +36,7 @@ import QtQuick.Controls.Private 1.0 Controls.Label { id: label - property alias toolTip: toolTipArea.toolTip + property alias tooltip: toolTipArea.tooltip width: Math.max(Math.min(240, parent.width - 220), 80) color: "#eee" @@ -49,6 +49,6 @@ Controls.Label { ToolTipArea { id: toolTipArea anchors.fill: parent - toolTip: label.text + tooltip: label.text } } diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ToolTipArea.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ToolTipArea.qml index 9bc53b77b3..57355f5483 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ToolTipArea.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ToolTipArea.qml @@ -41,11 +41,11 @@ MouseArea { hoverEnabled: true - property string toolTip + property string tooltip Timer { interval: 1000 - running: mouseArea.containsMouse && toolTip.length - onTriggered: Tooltip.showText(mouseArea, Qt.point(mouseArea.mouseX, mouseArea.mouseY), toolTip) + running: mouseArea.containsMouse && tooltip.length + onTriggered: Tooltip.showText(mouseArea, Qt.point(mouseArea.mouseX, mouseArea.mouseY), tooltip) } } diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/GridViewSpecifics.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/GridViewSpecifics.qml index 6e611d6bfe..a5a589e512 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/GridViewSpecifics.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/GridViewSpecifics.qml @@ -50,7 +50,7 @@ Column { Label { text: qsTr("Cache") - toolTip: qsTr("Cache buffer") + tooltip: qsTr("Cache buffer") } SectionLayout { @@ -117,7 +117,7 @@ Column { Label { text: qsTr("Navigation wraps") - toolTip: qsTr("Determines whether the grid wraps key navigation.") + tooltip: qsTr("Determines whether the grid wraps key navigation.") } SectionLayout { @@ -145,7 +145,7 @@ Column { Label { text: qsTr("Snap mode") - toolTip: qsTr("Determines how the view scrolling will settle following a drag or flick.") + tooltip: qsTr("Determines how the view scrolling will settle following a drag or flick.") } SecondColumnLayout { @@ -169,7 +169,7 @@ Column { Label { text: qsTr("Range") - toolTip: qsTr("Highlight range") + tooltip: qsTr("Highlight range") } SecondColumnLayout { @@ -184,7 +184,7 @@ Column { Label { text: qsTr("Move duration") - toolTip: qsTr("Move animation duration of the highlight delegate.") + tooltip: qsTr("Move animation duration of the highlight delegate.") } SectionLayout { @@ -202,7 +202,7 @@ Column { Label { text: qsTr("Move speed") - toolTip: qsTr("Move animation speed of the highlight delegate.") + tooltip: qsTr("Move animation speed of the highlight delegate.") } SectionLayout { @@ -220,7 +220,7 @@ Column { Label { text: qsTr("Preferred begin") - toolTip: qsTr("Preferred highlight begin - must be smaller than Preferred end.") + tooltip: qsTr("Preferred highlight begin - must be smaller than Preferred end.") } SectionLayout { @@ -238,7 +238,7 @@ Column { Label { text: qsTr("Preferred end") - toolTip: qsTr("Preferred highlight end - must be larger than Preferred begin.") + tooltip: qsTr("Preferred highlight end - must be larger than Preferred begin.") } SectionLayout { @@ -256,7 +256,7 @@ Column { Label { text: qsTr("Follows current") - toolTip: qsTr("Determines whether the highlight is managed by the view.") + tooltip: qsTr("Determines whether the highlight is managed by the view.") } SectionLayout { diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ListViewSpecifics.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ListViewSpecifics.qml index df998572d8..7325ae918f 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ListViewSpecifics.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ListViewSpecifics.qml @@ -50,7 +50,7 @@ Column { Label { text: qsTr("Cache") - toolTip: qsTr("Cache buffer") + tooltip: qsTr("Cache buffer") } SectionLayout { @@ -68,7 +68,7 @@ Column { Label { text: qsTr("Navigation wraps") - toolTip: qsTr("Determines whether the grid wraps key navigation.") + tooltip: qsTr("Determines whether the grid wraps key navigation.") } SectionLayout { @@ -83,7 +83,7 @@ Column { Label { text: qsTr("Orientation") - toolTip: qsTr("Orientation of the list.") + tooltip: qsTr("Orientation of the list.") } SecondColumnLayout { @@ -114,7 +114,7 @@ Column { Label { text: qsTr("Snap mode") - toolTip: qsTr("Determines how the view scrolling will settle following a drag or flick.") + tooltip: qsTr("Determines how the view scrolling will settle following a drag or flick.") } SecondColumnLayout { @@ -131,7 +131,7 @@ Column { Label { text: qsTr("Spacing") - toolTip: qsTr("Spacing between items.") + tooltip: qsTr("Spacing between items.") } SectionLayout { @@ -159,7 +159,7 @@ Column { Label { text: qsTr("Range") - toolTip: qsTr("Highlight range") + tooltip: qsTr("Highlight range") } SecondColumnLayout { @@ -178,7 +178,7 @@ Column { Label { text: qsTr("Move duration") - toolTip: qsTr("Move animation duration of the highlight delegate.") + tooltip: qsTr("Move animation duration of the highlight delegate.") } SectionLayout { @@ -196,7 +196,7 @@ Column { Label { text: qsTr("Move speed") - toolTip: qsTr("Move animation speed of the highlight delegate.") + tooltip: qsTr("Move animation speed of the highlight delegate.") } SectionLayout { @@ -214,7 +214,7 @@ Column { Label { text: qsTr("Resize duration") - toolTip: qsTr("Resize animation duration of the highlight delegate.") + tooltip: qsTr("Resize animation duration of the highlight delegate.") } SectionLayout { @@ -232,7 +232,7 @@ Column { Label { text: qsTr("Preferred begin") - toolTip: qsTr("Preferred highlight begin - must be smaller than Preferred end.") + tooltip: qsTr("Preferred highlight begin - must be smaller than Preferred end.") } SectionLayout { @@ -250,7 +250,7 @@ Column { Label { text: qsTr("Preferred end") - toolTip: qsTr("Preferred highlight end - must be larger than Preferred begin.") + tooltip: qsTr("Preferred highlight end - must be larger than Preferred begin.") } SectionLayout { @@ -268,7 +268,7 @@ Column { Label { text: qsTr("Follows current") - toolTip: qsTr("Determines whether the highlight is managed by the view.") + tooltip: qsTr("Determines whether the highlight is managed by the view.") } SectionLayout { diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/MouseAreaSpecifics.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/MouseAreaSpecifics.qml index eca582f0cf..a47cd5aad1 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/MouseAreaSpecifics.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/MouseAreaSpecifics.qml @@ -44,7 +44,7 @@ Column { SectionLayout { Label { text: qsTr("Enabled") - toolTip: qsTr("This property holds whether the item accepts mouse events.") + tooltip: qsTr("This property holds whether the item accepts mouse events.") } SecondColumnLayout { @@ -59,7 +59,7 @@ Column { Label { text: qsTr("Hover Enabled") - toolTip: qsTr("This property holds whether hover events are handled.") + tooltip: qsTr("This property holds whether hover events are handled.") } SecondColumnLayout { diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/PathViewSpecifics.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/PathViewSpecifics.qml index 41e43e88a6..9d7ef5c84a 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/PathViewSpecifics.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/PathViewSpecifics.qml @@ -45,7 +45,7 @@ Column { Label { text: qsTr("Drag margin") - toolTip: qsTr("Drag margin") + tooltip: qsTr("Drag margin") } SecondColumnLayout { @@ -80,7 +80,7 @@ Column { Label { text: qsTr("Interactive") - toolTip: qsTr("A user cannot drag or flick a PathView that is not interactive.") + tooltip: qsTr("A user cannot drag or flick a PathView that is not interactive.") } SecondColumnLayout { @@ -95,7 +95,7 @@ Column { Label { text: qsTr("Offset") - toolTip: qsTr("Specifies how far along the path the items are from their initial positions. This is a real number that ranges from 0.0 to the count of items in the model.") + tooltip: qsTr("Specifies how far along the path the items are from their initial positions. This is a real number that ranges from 0.0 to the count of items in the model.") } SecondColumnLayout { @@ -113,7 +113,7 @@ Column { Label { text: qsTr("Item count") - toolTip: qsTr("pathItemCount: number of items visible on the path at any one time.") + tooltip: qsTr("pathItemCount: number of items visible on the path at any one time.") } SecondColumnLayout { @@ -139,7 +139,7 @@ Column { Label { text: qsTr("Range") - toolTip: qsTr("Highlight range") + tooltip: qsTr("Highlight range") } SecondColumnLayout { @@ -158,7 +158,7 @@ Column { Label { text: qsTr("Move duration") - toolTip: qsTr("Move animation duration of the highlight delegate.") + tooltip: qsTr("Move animation duration of the highlight delegate.") } SecondColumnLayout { @@ -176,7 +176,7 @@ Column { Label { text: qsTr("Preferred begin") - toolTip: qsTr("Preferred highlight begin - must be smaller than Preferred end. Note that the user has to add a highlight component.") + tooltip: qsTr("Preferred highlight begin - must be smaller than Preferred end. Note that the user has to add a highlight component.") } SecondColumnLayout { @@ -194,7 +194,7 @@ Column { Label { text: qsTr("Preferred end") - toolTip: qsTr("Preferred highlight end - must be larger than Preferred begin. Note that the user has to add a highlight component.") + tooltip: qsTr("Preferred highlight end - must be larger than Preferred begin. Note that the user has to add a highlight component.") } SecondColumnLayout { diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextInputSection.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextInputSection.qml index 1e45f1ff78..da48d952e5 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextInputSection.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextInputSection.qml @@ -73,7 +73,7 @@ Section { Label { visible: textInputSection.isTextInput text: qsTr("Pass. char") - toolTip: qsTr("Character displayed when users enter passwords.") + tooltip: qsTr("Character displayed when users enter passwords.") } LineEdit { |