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

Android: move tooltip from ui to widget class and shorten long phrases

Browse Source 
Change-Id: I15bd9f54e7d4dbc3fae62b331172d6bc8e74e7ad
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Assam Boudjelthia
2020-07-22 13:14:55 +03:00
parent f1c0393d52
commit ee1b8c2f16
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -429,13 +429,22 @@ AndroidSettingsWidget::AndroidSettingsWidget()
m_ui.downloadSDKToolButton->setIcon(downloadIcon); m_ui.downloadSDKToolButton->setIcon(downloadIcon);
m_ui.downloadNDKToolButton->setIcon(downloadIcon); m_ui.downloadNDKToolButton->setIcon(downloadIcon);
m_ui.downloadOpenJDKToolButton->setIcon(downloadIcon); m_ui.downloadOpenJDKToolButton->setIcon(downloadIcon);
m_ui.sdkToolsAutoDownloadButton->setToolTip(tr( m_ui.sdkToolsAutoDownloadButton->setToolTip(
"Automatically download Android SDK Tools to selected location.\n\n" tr("Automatically download Android SDK Tools to selected location.\n\n"
"If the selected path contains no valid SDK Tools, the SDK Tools package " "If the selected path contains no valid SDK Tools, the SDK Tools package is downloaded\n"
"is downloaded from %1, and extracted to the selected path.\n" "from %1,\n"
"After the SDK Tools are properly set up, you are prompted to install " "and extracted to the selected path.\n"
"any essential packages required for Qt to build for Android.") "After the SDK Tools are properly set up, you are prompted to install any essential\n"
.arg(m_androidConfig.sdkToolsUrl().toString())); "packages required for Qt to build for Android.")
.arg(m_androidConfig.sdkToolsUrl().toString()));
m_ui.downloadOpenSSLPrebuiltLibs->setToolTip(
tr("Automatically download OpenSSL prebuilt libraries.\n\n"
"These libraries can be shipped with your application if any SSL operations\n"
"are performed. Find the checkbox under \"Projects > Build > Build Steps >\n"
"Build Android APK > Additional Libraries\".\n"
"If the automatic download fails, Qt Creator proposes to open the download URL\n"
"in the system's browser for manual download."));
connect(m_ui.SDKLocationPathChooser, &PathChooser::rawPathChanged, connect(m_ui.SDKLocationPathChooser, &PathChooser::rawPathChanged,
this, &AndroidSettingsWidget::onSdkPathChanged); this, &AndroidSettingsWidget::onSdkPathChanged);

3
src/plugins/android/androidsettingswidget.ui
View File

@@ -277,9 +277,6 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="toolTip">
<string>Automatically download OpenSSL prebuilt libraries. These libraries can be shipped with your application from "Projects > Build > Build Steps > Build Android APK > Additional Libraries" if any SSL operations are performed. If the automatic download fails, Qt Creator proposes to open the download URL in the system's browser for manual download.</string>
</property>
<property name="text"> <property name="text">
<string>Download OpenSSL</string> <string>Download OpenSSL</string>
</property> </property>