feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QML Designer: Fix UI text

Browse Source 
Fix capitalization of strings and the wording of tooltips.

Task-number: QTCREATORBUG-27055
Change-Id: Id8e324b44574b9cf0d1522ae204b452cea6193cd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
This commit is contained in:
Leena Miettinen
2022-02-16 17:09:37 +01:00
parent d0852fb2a1
commit 1a90f06fe5
11 changed files with 29 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
share/qtcreator/qmldesigner/itemLibraryQmlSources/Assets.qml
View File

@@ -167,7 +167,7 @@ Item {
Dialog { Dialog {
id: renameFolderDialog id: renameFolderDialog
title: qsTr("Rename folder") title: qsTr("Rename Folder")
anchors.centerIn: parent anchors.centerIn: parent
closePolicy: Popup.CloseOnEscape closePolicy: Popup.CloseOnEscape
implicitWidth: 280 implicitWidth: 280
@@ -192,13 +192,13 @@ Item {
} }
Text { Text {
text: qsTr("Folder Name cannot be empty.") text: qsTr("Folder name cannot be empty.")
color: "#ff0000" color: "#ff0000"
visible: folderRename.text === "" && !renameFolderDialog.renameError visible: folderRename.text === "" && !renameFolderDialog.renameError
} }
Text { Text {
text: qsTr("Could not rename directory. Make sure no folder with the same name exists.") text: qsTr("Could not rename folder. Make sure no folder with the same name exists.")
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
width: renameFolderDialog.width width: renameFolderDialog.width
color: "#ff0000" color: "#ff0000"
@@ -259,7 +259,7 @@ Item {
Dialog { Dialog {
id: newFolderDialog id: newFolderDialog
title: qsTr("Create new folder") title: qsTr("Create New Folder")
anchors.centerIn: parent anchors.centerIn: parent
closePolicy: Popup.CloseOnEscape closePolicy: Popup.CloseOnEscape
modal: true modal: true
@@ -269,7 +269,7 @@ Item {
Row { Row {
Text { Text {
text: qsTr("Folder Name: ") text: qsTr("Folder name: ")
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
color: StudioTheme.Values.themeTextColor color: StudioTheme.Values.themeTextColor
} }
@@ -287,7 +287,7 @@ Item {
} }
Text { Text {
text: qsTr("Folder Name cannot be empty.") text: qsTr("Folder name cannot be empty.")
color: "#ff0000" color: "#ff0000"
anchors.right: parent.right anchors.right: parent.right
visible: folderName.text === "" visible: folderName.text === ""
@@ -329,7 +329,7 @@ Item {
Dialog { Dialog {
id: confirmDeleteFolderDialog id: confirmDeleteFolderDialog
title: qsTr("Folder not empty") title: qsTr("Folder Not Empty")
anchors.centerIn: parent anchors.centerIn: parent
closePolicy: Popup.CloseOnEscape closePolicy: Popup.CloseOnEscape
implicitWidth: 300 implicitWidth: 300
@@ -342,7 +342,7 @@ Item {
Text { Text {
id: folderNotEmpty id: folderNotEmpty
text: qsTr("Folder '%1' is not empty. Are you sure you want to delete it?") text: qsTr("Folder \"%1\" is not empty. Delete it anyway?")
.arg(contextDir ? contextDir.dirName : "") .arg(contextDir ? contextDir.dirName : "")
color: StudioTheme.Values.themeTextColor color: StudioTheme.Values.themeTextColor
wrapMode: Text.WordWrap wrapMode: Text.WordWrap

8
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtMultimedia/MediaPlayerSection.qml
View File

@@ -59,8 +59,8 @@ Section {
PropertyLabel { PropertyLabel {
visible: root.showAudioOutput visible: root.showAudioOutput
text: qsTr("Audio Output") text: qsTr("Audio output")
tooltip: qsTr("Holds the target audio output.") tooltip: qsTr("Target audio output.")
} }
SecondColumnLayout { SecondColumnLayout {
@@ -80,8 +80,8 @@ Section {
PropertyLabel { PropertyLabel {
visible: root.showVideoOutput visible: root.showVideoOutput
text: qsTr("Video Output") text: qsTr("Video output")
tooltip: qsTr("Holds the target video output.") tooltip: qsTr("Target video output.")
} }
SecondColumnLayout { SecondColumnLayout {

4
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/AbstractButtonSection.qml
View File

@@ -41,7 +41,7 @@ import QtQuickDesignerTheme 1.0
import StudioTheme 1.0 as StudioTheme import StudioTheme 1.0 as StudioTheme
Section { Section {
caption: qsTr("Button content") caption: qsTr("Button Content")
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
@@ -49,7 +49,7 @@ Section {
SectionLayout { SectionLayout {
PropertyLabel { PropertyLabel {
text: qsTr("Text") text: qsTr("Text")
tooltip: qsTr("The text displayed on the button.") tooltip: qsTr("Text displayed on the button.")
} }
SecondColumnLayout { SecondColumnLayout {

10
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/LoaderSpecifics.qml
View File

@@ -41,7 +41,7 @@ Column {
SectionLayout { SectionLayout {
PropertyLabel { PropertyLabel {
text: qsTr("Active") text: qsTr("Active")
tooltip: qsTr("This property is true if the Loader is currently active.") tooltip: qsTr("Whether the loader is currently active.")
} }
SecondColumnLayout { SecondColumnLayout {
@@ -57,7 +57,7 @@ Column {
PropertyLabel { PropertyLabel {
text: qsTr("Source") text: qsTr("Source")
tooltip: qsTr("This property holds the URL of the QML component to instantiate.") tooltip: qsTr("URL of the component to instantiate.")
} }
SecondColumnLayout { SecondColumnLayout {
@@ -70,8 +70,8 @@ Column {
} }
PropertyLabel { PropertyLabel {
text: qsTr("Source Component") text: qsTr("Source component")
tooltip: qsTr("This property holds the component to instantiate.") tooltip: qsTr("Component to instantiate.")
} }
SecondColumnLayout { SecondColumnLayout {
@@ -88,7 +88,7 @@ Column {
PropertyLabel { PropertyLabel {
text: qsTr("Asynchronous") text: qsTr("Asynchronous")
tooltip: qsTr("This property holds whether the component will be instantiated asynchronously.") tooltip: qsTr("Whether the component will be instantiated asynchronously.")
} }
SecondColumnLayout { SecondColumnLayout {

4
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ComponentSection.qml
View File

@@ -218,7 +218,7 @@ Section {
AbstractButton { AbstractButton {
id: editAnnotationButton id: editAnnotationButton
buttonIcon: StudioTheme.Constants.edit buttonIcon: StudioTheme.Constants.edit
tooltip: qsTr("Edit annotation") tooltip: qsTr("Edit Annotation")
onClicked: annotationEditor.showWidget() onClicked: annotationEditor.showWidget()
onHoveredChanged: annotationEditor.checkAux() onHoveredChanged: annotationEditor.checkAux()
} }
@@ -226,7 +226,7 @@ Section {
AbstractButton { AbstractButton {
id: removeAnnotationButton id: removeAnnotationButton
buttonIcon: StudioTheme.Constants.closeCross buttonIcon: StudioTheme.Constants.closeCross
tooltip: qsTr("Remove annotation") tooltip: qsTr("Remove Annotation")
onClicked: annotationEditor.removeFullAnnotation() onClicked: annotationEditor.removeFullAnnotation()
onHoveredChanged: annotationEditor.checkAux() onHoveredChanged: annotationEditor.checkAux()
} }

4
src/plugins/qmldesigner/assetexporterplugin/assetexporter.cpp
View File

@@ -129,7 +129,7 @@ void AssetExporter::exportQml(const Utils::FilePaths &qmlFiles, const Utils::Fil
.arg(exportAssets? tr("Yes") : tr("No"))); .arg(exportAssets? tr("Yes") : tr("No")));
if (m_perComponentExport) if (m_perComponentExport)
ExportNotification::addInfo(tr("Each component is exported separately")); ExportNotification::addInfo(tr("Each component is exported separately."));
notifyProgress(0.0); notifyProgress(0.0);
m_exportFiles = qmlFiles; m_exportFiles = qmlFiles;
@@ -394,7 +394,7 @@ void AssetExporter::writeMetadata() const
{ {
if (m_cancelled) { if (m_cancelled) {
notifyProgress(1.0); notifyProgress(1.0);
ExportNotification::addInfo(tr("Export cancelled.")); ExportNotification::addInfo(tr("Export canceled."));
m_currentState.change(ParsingState::ExportingDone); m_currentState.change(ParsingState::ExportingDone);
return; return;
} }

2
src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
View File

@@ -150,7 +150,7 @@ Edit3DWidget::Edit3DWidget(Edit3DView *view) :
tr("Your file does not import Qt Quick 3D.<br><br>" tr("Your file does not import Qt Quick 3D.<br><br>"
"To create a 3D view, add the QtQuick3D module in the Library view. Or click" "To create a 3D view, add the QtQuick3D module in the Library view. Or click"
" <a href=\"#add_import\"><span style=\"text-decoration:none;color:%1\">here</span></a> " " <a href=\"#add_import\"><span style=\"text-decoration:none;color:%1\">here</span></a> "
"here to add it immediately.<br><br>" "to add it immediately.<br><br>"
"To import 3D assets from another tool, click the \"Add New Assets...\" button in the Assets tab of the Library view."); "To import 3D assets from another tool, click the \"Add New Assets...\" button in the Assets tab of the Library view.");
m_onboardingLabel->setText(labelText.arg(Utils::creatorTheme()->color(Utils::Theme::TextColorLink).name())); m_onboardingLabel->setText(labelText.arg(Utils::creatorTheme()->color(Utils::Theme::TextColorLink).name()));
m_onboardingLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter); m_onboardingLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);

2
src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp
View File

@@ -768,7 +768,7 @@ void NavigatorTreeModel::handleItemLibraryItemDrop(const QMimeData *mimeData, in
"NavigatorTreeModel", "NavigatorTreeModel",
"Inserting materials under imported 3D component nodes is not supported. " "Inserting materials under imported 3D component nodes is not supported. "
"Materials used in imported 3D components have to be modified inside the component itself.\n\n" "Materials used in imported 3D components have to be modified inside the component itself.\n\n"
"Would you like to go into component '%1'?") "Would you like to go into component \"%1\"?")
.arg(targetProperty.parentModelNode().id()), .arg(targetProperty.parentModelNode().id()),
QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes | QMessageBox::No,
QMessageBox::No); QMessageBox::No);

2
src/plugins/qmldesigner/components/transitioneditor/transitioneditorview.cpp
View File

@@ -301,7 +301,7 @@ ModelNode TransitionEditorView::addNewTransition()
if (!properties.isEmpty()) if (!properties.isEmpty())
properties.chop(2); properties.chop(2);
Core::AsynchronousMessageBox::warning( Core::AsynchronousMessageBox::warning(
tr("No properties to animate found."), tr("No Property Changes to Animate"),
tr("To add transitions, first change the properties that you want to animate in states (%1).") tr("To add transitions, first change the properties that you want to animate in states (%1).")
.arg(properties)); .arg(properties));
} }

4
src/plugins/qmldesigner/qmldesignerplugin.cpp
View File

@@ -257,9 +257,9 @@ bool QmlDesignerPlugin::initialize(const QStringList & /*arguments*/, QString *e
designerActionManager().addDesignerAction(startNanotraceAction); designerActionManager().addDesignerAction(startNanotraceAction);
auto shutDownNanotraceAction = new ModelNodeAction("ShutDown Nanotrace", auto shutDownNanotraceAction = new ModelNodeAction("ShutDown Nanotrace",
QObject::tr("ShutDown Nanotrace"), QObject::tr("Shut Down Nanotrace"),
shutdownNanotraceIcon(), shutdownNanotraceIcon(),
QObject::tr("ShutDown Nanotrace"), QObject::tr("Shut Down Nanotrace"),
ComponentCoreConstants::eventListCategory, ComponentCoreConstants::eventListCategory,
QKeySequence(), QKeySequence(),
220, 220,

3
src/plugins/qmlprojectmanager/qmlmultilanguageaspect.cpp
View File

@@ -76,8 +76,7 @@ QmlMultiLanguageAspect::QmlMultiLanguageAspect(ProjectExplorer::Target *target)
setVisible(isMultilanguagePresent()); setVisible(isMultilanguagePresent());
setSettingsKey(Constants::USE_MULTILANGUAGE_KEY); setSettingsKey(Constants::USE_MULTILANGUAGE_KEY);
setLabel(tr("Use MultiLanguage in Form Editor."), BoolAspect::LabelPlacement::AtCheckBox); setLabel(tr("Use MultiLanguage in Form Editor."), BoolAspect::LabelPlacement::AtCheckBox);
setToolTip(tr("By enabling this Form Editor can read translations\n" setToolTip(tr("Reads translations from MultiLanguage plugin."));
"from MultiLanguage plugin."));
setDefaultValue(!databaseFilePath().isEmpty()); setDefaultValue(!databaseFilePath().isEmpty());
QVariantMap getDefaultValues; QVariantMap getDefaultValues;