diff options
Diffstat (limited to 'src/plugins/android/androidsettingswidget.ui')
| -rw-r--r-- | src/plugins/android/androidsettingswidget.ui | 164 |
1 files changed, 83 insertions, 81 deletions
diff --git a/src/plugins/android/androidsettingswidget.ui b/src/plugins/android/androidsettingswidget.ui index 56eba59b99..b4542e8d4c 100644 --- a/src/plugins/android/androidsettingswidget.ui +++ b/src/plugins/android/androidsettingswidget.ui @@ -66,7 +66,7 @@ <number>0</number> </property> <item> - <widget class="QGroupBox" name="javaSettingsGroup"> + <widget class="QGroupBox" name="javaSettingsGroupBox"> <property name="minimumSize"> <size> <width>0</width> @@ -124,72 +124,22 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox"> + <widget class="QGroupBox" name="androidSettingsGroupBox"> <property name="title"> <string>Android Settings</string> </property> <layout class="QGridLayout" name="gridLayout_3"> - <item row="0" column="0"> - <widget class="QLabel" name="SDKLocationLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Fixed" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Android SDK location:</string> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - </widget> - </item> - <item row="0" column="5"> - <widget class="QToolButton" name="sdkToolsAutoDownloadButton"> - <property name="toolTip"> - <string>Automatically download Android SDK Tools to selected location.</string> - </property> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item row="0" column="6"> - <widget class="QToolButton" name="downloadSDKToolButton"> - <property name="toolTip"> - <string>Open Android SDK download URL in the system's browser.</string> - </property> - </widget> - </item> - <item row="2" column="6"> - <widget class="QToolButton" name="downloadNDKToolButton"> - <property name="toolTip"> - <string>Open Android NDK download URL in the system's browser.</string> - </property> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item row="0" column="1" colspan="4"> - <widget class="Utils::PathChooser" name="SDKLocationPathChooser" native="true"/> - </item> - <item row="5" column="0" colspan="7"> - <widget class="Utils::DetailsWidget" name="androidDetailsWidget" native="true"/> - </item> - <item row="2" column="0"> - <widget class="QLabel" name="ndkComboBoxLabel"> - <property name="text"> - <string>Android NDK list:</string> - </property> - </widget> - </item> <item row="2" column="1" rowspan="3"> <widget class="QListWidget" name="ndkListWidget"> <property name="sizeAdjustPolicy"> <enum>QAbstractScrollArea::AdjustToContents</enum> </property> + <property name="iconSize"> + <size> + <width>16</width> + <height>16</height> + </size> + </property> <property name="resizeMode"> <enum>QListView::Adjust</enum> </property> @@ -201,7 +151,7 @@ </property> </widget> </item> - <item row="2" column="2" rowspan="3" colspan="3"> + <item row="2" column="2" rowspan="3" colspan="4"> <layout class="QVBoxLayout" name="verticalLayout_3"> <item> <widget class="QPushButton" name="addCustomNdkButton"> @@ -256,13 +206,66 @@ </item> </layout> </item> + <item row="5" column="0" colspan="7"> + <widget class="Utils::DetailsWidget" name="androidDetailsWidget" native="true"/> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="ndkComboBoxLabel"> + <property name="text"> + <string>Android NDK list:</string> + </property> + </widget> + </item> + <item row="0" column="6"> + <widget class="QToolButton" name="downloadSDKToolButton"> + <property name="toolTip"> + <string>Open Android SDK download URL in the system's browser.</string> + </property> + </widget> + </item> + <item row="0" column="0"> + <widget class="QLabel" name="SDKLocationLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Android SDK location:</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + </widget> + </item> + <item row="2" column="6"> + <widget class="QToolButton" name="downloadNDKToolButton"> + <property name="toolTip"> + <string>Open Android NDK download URL in the system's browser.</string> + </property> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="Utils::PathChooser" name="SDKLocationPathChooser" native="true"/> + </item> + <item row="0" column="2" colspan="4"> + <widget class="QPushButton" name="sdkToolsAutoDownloadButton"> + <property name="text"> + <string>Set Up SDK</string> + </property> + </widget> + </item> </layout> </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_2"> + <widget class="QGroupBox" name="androidOpenSSLSettingsGroupBox"> <property name="title"> - <string>Android OpenSSL settings</string> + <string>Android OpenSSL settings (Optional)</string> </property> <layout class="QGridLayout" name="gridLayout_2"> <item row="0" column="0"> @@ -274,29 +277,35 @@ </sizepolicy> </property> <property name="text"> - <string>OpenSSL .pri location:</string> + <string>OpenSSL binaries location:</string> </property> </widget> </item> - <item row="0" column="1"> - <widget class="Utils::PathChooser" name="openSslPathChooser" native="true"> - <property name="toolTip"> - <string>Select the path of the prebuilt OpenSSL binaries.</string> - </property> - </widget> + <item row="1" column="0" colspan="4"> + <widget class="Utils::DetailsWidget" name="openSslDetailsWidget" native="true"/> </item> - <item row="0" column="2"> - <widget class="QToolButton" name="downloadOpenSSLPrebuiltLibs"> + <item row="0" column="3"> + <widget class="QPushButton" name="downloadOpenSSLPrebuiltLibs"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <property name="toolTip"> - <string>Automatically download OpenSSL prebuilt libraries. If the automatic download fails, the download URL will be opened in the system's browser for manual download.</string> + <string>Automatically download OpenSSL prebuilt libraries. 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"> - <string/> + <string>Download OpenSSL</string> </property> </widget> </item> - <item row="1" column="0" colspan="3"> - <widget class="Utils::DetailsWidget" name="openSslDetailsWidget" native="true"/> + <item row="0" column="1" colspan="2"> + <widget class="Utils::PathChooser" name="openSslPathChooser" native="true"> + <property name="toolTip"> + <string>Select the path of the prebuilt OpenSSL binaries.</string> + </property> + </widget> </item> </layout> </widget> @@ -473,13 +482,6 @@ </property> </spacer> </item> - <item> - <widget class="QPushButton" name="nativeAvdManagerButton"> - <property name="text"> - <string>Native AVD Manager...</string> - </property> - </widget> - </item> </layout> </item> </layout> |