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

Android: Fix UI text capitalization and punctuation

Browse Source 
Change-Id: I5fd24f164d45fea6e666e0e95f82273d2f91f934
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
This commit is contained in:
Leena Miettinen
2020-07-01 16:52:17 +02:00
parent 67634d0d46
commit ec05ab94fd
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/android/androidmanifesteditoriconcontainerwidget.cpp
View File

@@ -53,7 +53,7 @@ AndroidManifestEditorIconContainerWidget::AndroidManifestEditorIconContainerWidg
auto masterIconButton = new AndroidManifestEditorIconWidget(this, auto masterIconButton = new AndroidManifestEditorIconWidget(this,
lowDpiIconSize, lowDpiIconSize,
lowDpiIconSize, lowDpiIconSize,
tr("Master icon"), tr("Select master icon")); tr("Master icon"), tr("Select master icon."));
masterIconButton->setIcon(QIcon::fromTheme(QLatin1String("document-open"), Utils::Icons::OPENFILE.icon())); masterIconButton->setIcon(QIcon::fromTheme(QLatin1String("document-open"), Utils::Icons::OPENFILE.icon()));
iconLayout->addWidget(masterIconButton); iconLayout->addWidget(masterIconButton);
iconLayout->addStretch(1); iconLayout->addStretch(1);
@@ -69,7 +69,7 @@ AndroidManifestEditorIconContainerWidget::AndroidManifestEditorIconContainerWidg
auto lIconButton = new AndroidManifestEditorIconWidget(this, auto lIconButton = new AndroidManifestEditorIconWidget(this,
lowDpiIconSize, lowDpiIconSize,
lowDpiIconSize, lowDpiIconSize,
tr("Low DPI icon"), tr("Select low DPI icon"), tr("Low DPI icon"), tr("Select low DPI icon."),
textEditorWidget, textEditorWidget,
lowDpiIconPath, lowDpiIconPath,
iconFileName); iconFileName);
@@ -80,7 +80,7 @@ AndroidManifestEditorIconContainerWidget::AndroidManifestEditorIconContainerWidg
auto mIconButton = new AndroidManifestEditorIconWidget(this, auto mIconButton = new AndroidManifestEditorIconWidget(this,
mediumDpiIconSize, mediumDpiIconSize,
mediumDpiIconSize, mediumDpiIconSize,
tr("Medium DPI icon"), tr("Select medium DPI icon"), tr("Medium DPI icon"), tr("Select medium DPI icon."),
textEditorWidget, textEditorWidget,
mediumDpiIconPath, mediumDpiIconPath,
iconFileName); iconFileName);
@@ -91,7 +91,7 @@ AndroidManifestEditorIconContainerWidget::AndroidManifestEditorIconContainerWidg
auto hIconButton = new AndroidManifestEditorIconWidget(this, auto hIconButton = new AndroidManifestEditorIconWidget(this,
highDpiIconSize, highDpiIconSize,
highDpiIconSize, highDpiIconSize,
tr("High DPI icon"), tr("Select high DPI icon"), tr("High DPI icon"), tr("Select high DPI icon."),
textEditorWidget, textEditorWidget,
highDpiIconPath, highDpiIconPath,
iconFileName); iconFileName);

2
src/plugins/android/androidmanifesteditoriconwidget.cpp
View File

@@ -87,7 +87,7 @@ AndroidManifestEditorIconWidget::AndroidManifestEditorIconWidget(
m_scaleWarningLabel->setMinimumSize(clearAndWarningSize); m_scaleWarningLabel->setMinimumSize(clearAndWarningSize);
m_scaleWarningLabel->setMaximumSize(clearAndWarningSize); m_scaleWarningLabel->setMaximumSize(clearAndWarningSize);
m_scaleWarningLabel->setPixmap(Utils::Icons::WARNING.icon().pixmap(clearAndWarningSize)); m_scaleWarningLabel->setPixmap(Utils::Icons::WARNING.icon().pixmap(clearAndWarningSize));
m_scaleWarningLabel->setToolTip(tr("Icon scaled up")); m_scaleWarningLabel->setToolTip(tr("Icon scaled up."));
m_scaleWarningLabel->setVisible(false); m_scaleWarningLabel->setVisible(false);
} }
auto label = new QLabel(tr("Click to select..."), parent); auto label = new QLabel(tr("Click to select..."), parent);

10
src/plugins/android/androidsettingswidget.cpp
View File

@@ -284,7 +284,7 @@ QVariant AvdModel::itemData(const AndroidDeviceInfo &info, int column, int role)
AvdModel::AvdModel() AvdModel::AvdModel()
{ {
//: AVD - Android Virtual Device //: AVD - Android Virtual Device
setHeader({tr("AVD Name"), tr("API"), tr("CPU/ABI"), tr("Device type"), tr("Target"), tr("SD-card size")}); setHeader({tr("AVD Name"), tr("API"), tr("CPU/ABI"), tr("Device Type"), tr("Target"), tr("SD-card Size")});
} }
void AndroidSettingsWidget::showEvent(QShowEvent *event) void AndroidSettingsWidget::showEvent(QShowEvent *event)
@@ -413,7 +413,7 @@ AndroidSettingsWidget::AndroidSettingsWidget()
currentSDKPath = AndroidConfig::defaultSdkPath(); currentSDKPath = AndroidConfig::defaultSdkPath();
m_ui.SDKLocationPathChooser->setFilePath(currentSDKPath); m_ui.SDKLocationPathChooser->setFilePath(currentSDKPath);
m_ui.SDKLocationPathChooser->setPromptDialogTitle(tr("Select Android SDK folder")); m_ui.SDKLocationPathChooser->setPromptDialogTitle(tr("Select Android SDK Folder"));
m_ui.openSslPathChooser->setPromptDialogTitle(tr("Select OpenSSL Include Project File")); m_ui.openSslPathChooser->setPromptDialogTitle(tr("Select OpenSSL Include Project File"));
FilePath currentOpenSslPath = m_androidConfig.openSslLocation(); FilePath currentOpenSslPath = m_androidConfig.openSslLocation();
@@ -619,7 +619,7 @@ void AndroidSettingsWidget::validateSdk()
// Ask user to install essential SDK components. Works only for sdk tools version >= 26.0.0 // Ask user to install essential SDK components. Works only for sdk tools version >= 26.0.0
QString message = tr("Android SDK installation is missing necessary packages. Do you " QString message = tr("Android SDK installation is missing necessary packages. Do you "
"want to install the missing packages?"); "want to install the missing packages?");
auto userInput = QMessageBox::information(this, tr("Missing Android SDK packages"), auto userInput = QMessageBox::information(this, tr("Missing Android SDK Packages"),
message, QMessageBox::Yes | QMessageBox::No); message, QMessageBox::Yes | QMessageBox::No);
if (userInput == QMessageBox::Yes) { if (userInput == QMessageBox::Yes) {
m_ui.managerTabWidget->setCurrentWidget(m_ui.sdkManagerTab); m_ui.managerTabWidget->setCurrentWidget(m_ui.sdkManagerTab);
@@ -697,7 +697,7 @@ void AndroidSettingsWidget::downloadOpenSslRepo(const bool silent)
msgBox.setText(tr("OpenSSL prebuilt libraries cloning failed. ") + msgSuffix msgBox.setText(tr("OpenSSL prebuilt libraries cloning failed. ") + msgSuffix
+ tr("Opening OpenSSL URL for manual download.")); + tr("Opening OpenSSL URL for manual download."));
msgBox.addButton(tr("OK"), QMessageBox::YesRole); msgBox.addButton(tr("OK"), QMessageBox::YesRole);
QAbstractButton *openButton = msgBox.addButton(tr("Open download URL"), QMessageBox::ActionRole); QAbstractButton *openButton = msgBox.addButton(tr("Open Download URL"), QMessageBox::ActionRole);
msgBox.exec(); msgBox.exec();
if (msgBox.clickedButton() == openButton) if (msgBox.clickedButton() == openButton)
@@ -721,7 +721,7 @@ void AndroidSettingsWidget::downloadOpenSslRepo(const bool silent)
connect(gitCloner, &QtcProcess::errorOccurred, this, [=](QProcess::ProcessError error) { connect(gitCloner, &QtcProcess::errorOccurred, this, [=](QProcess::ProcessError error) {
openSslProgressDialog->close(); openSslProgressDialog->close();
if (error == QProcess::FailedToStart) { if (error == QProcess::FailedToStart) {
failDialog(tr("The git tool might not be installed properly on your system. ")); failDialog(tr("The Git tool might not be installed properly on your system. "));
} else { } else {
failDialog(); failDialog();
} }