diff options
author | Daniel Teske <daniel.teske@theqtcompany.com> | 2014-11-21 17:07:40 +0100 |
---|---|---|
committer | Daniel Teske <daniel.teske@theqtcompany.com> | 2014-11-21 17:24:00 +0100 |
commit | d295b304d17eaf09ea5e715c21163917504e1329 (patch) | |
tree | fd000bb1f62047a957a299012c5020061c3b44cc | |
parent | 1a1ec5080155c40eb9b04dcb9d1b842977b7fa51 (diff) |
Android Settings Dialog: Fix tab order
Task-number: QTCREATORBUG-13484
Change-Id: I1d63ceb485a0bde87010f86dce540c4c37da8b48
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
-rw-r--r-- | src/plugins/android/androidsettingswidget.ui | 426 |
1 files changed, 213 insertions, 213 deletions
diff --git a/src/plugins/android/androidsettingswidget.ui b/src/plugins/android/androidsettingswidget.ui index 147d49ed55..7343d334c4 100644 --- a/src/plugins/android/androidsettingswidget.ui +++ b/src/plugins/android/androidsettingswidget.ui @@ -14,24 +14,24 @@ <string>Android Configuration</string> </property> <layout class="QGridLayout" name="gridLayout"> - <item row="2" column="0"> - <widget class="QLabel" name="SDKLocationLabel"> + <item row="0" column="0"> + <widget class="QLabel" name="OpenJDKLocationLabel"> <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> <property name="text"> - <string>Android SDK location:</string> + <string>JDK location:</string> </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property> </widget> </item> - <item row="11" column="1"> - <widget class="Utils::PathChooser" name="AntLocationPathChooser" native="true"/> + <item row="0" column="1"> + <widget class="Utils::PathChooser" name="OpenJDKLocationPathChooser" native="true"/> </item> <item row="1" column="1"> <layout class="QHBoxLayout" name="horizontalLayout_5"> @@ -69,6 +69,47 @@ </item> </layout> </item> + <item row="0" column="2"> + <widget class="QToolButton" name="downloadOpenJDKToolButton"> + <property name="toolTip"> + <string>Download JDK</string> + </property> + <property name="icon"> + <iconset resource="android.qrc"> + <normaloff>:/android/images/download.png</normaloff>:/android/images/download.png</iconset> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="SDKLocationLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <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="1"> + <widget class="Utils::PathChooser" name="SDKLocationPathChooser" native="true"/> + </item> + <item row="2" column="2"> + <widget class="QToolButton" name="downloadSDKToolButton"> + <property name="toolTip"> + <string>Download Android SDK</string> + </property> + <property name="icon"> + <iconset resource="android.qrc"> + <normaloff>:/android/images/download.png</normaloff>:/android/images/download.png</iconset> + </property> + </widget> + </item> <item row="3" column="1"> <layout class="QHBoxLayout" name="horizontalLayout_4"> <item> @@ -105,13 +146,29 @@ </item> </layout> </item> - <item row="0" column="1"> - <widget class="Utils::PathChooser" name="OpenJDKLocationPathChooser" native="true"/> + <item row="4" column="0"> + <widget class="QLabel" name="NDKLocationLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Android NDK location:</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + </widget> </item> - <item row="11" column="2"> - <widget class="QToolButton" name="downloadAntToolButton"> + <item row="4" column="1"> + <widget class="Utils::PathChooser" name="NDKLocationPathChooser" native="true"/> + </item> + <item row="4" column="2"> + <widget class="QToolButton" name="downloadNDKToolButton"> <property name="toolTip"> - <string>Download Ant</string> + <string>Download Android NDK</string> </property> <property name="icon"> <iconset resource="android.qrc"> @@ -119,6 +176,146 @@ </property> </widget> </item> + <item row="5" column="1"> + <layout class="QHBoxLayout" name="horizontalLayout_6"> + <property name="spacing"> + <number>2</number> + </property> + <item> + <widget class="QLabel" name="gdbWarningIconLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string/> + </property> + <property name="pixmap"> + <pixmap resource="../coreplugin/core.qrc">:/core/images/error.png</pixmap> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="gdbWarningLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string><a href="xx">The GDB in the NDK appears to have broken python support.</a></string> + </property> + </widget> + </item> + </layout> + </item> + <item row="6" column="1"> + <layout class="QHBoxLayout" name="horizontalLayout_3"> + <property name="spacing"> + <number>2</number> + </property> + <item> + <widget class="QLabel" name="ndkWarningIconLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string/> + </property> + <property name="pixmap"> + <pixmap resource="../coreplugin/core.qrc">:/core/images/error.png</pixmap> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="toolchainFoundLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string/> + </property> + </widget> + </item> + </layout> + </item> + <item row="8" column="1"> + <widget class="QCheckBox" name="CreateKitCheckBox"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Automatically create kits for Android tool chains</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="9" column="1"> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <property name="spacing"> + <number>2</number> + </property> + <item> + <widget class="QLabel" name="kitWarningIconLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string/> + </property> + <property name="pixmap"> + <pixmap resource="../coreplugin/core.qrc">:/core/images/warning.png</pixmap> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="kitWarningLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string/> + </property> + <property name="wordWrap"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </item> + <item row="10" column="1"> + <widget class="QCheckBox" name="UseGradleCheckBox"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Use Gradle instead of Ant</string> + </property> + </widget> + </item> <item row="11" column="0"> <widget class="QLabel" name="AntLocationLabel"> <property name="sizePolicy"> @@ -135,21 +332,13 @@ </property> </widget> </item> - <item row="2" column="2"> - <widget class="QToolButton" name="downloadSDKToolButton"> - <property name="toolTip"> - <string>Download Android SDK</string> - </property> - <property name="icon"> - <iconset resource="android.qrc"> - <normaloff>:/android/images/download.png</normaloff>:/android/images/download.png</iconset> - </property> - </widget> + <item row="11" column="1"> + <widget class="Utils::PathChooser" name="AntLocationPathChooser" native="true"/> </item> - <item row="4" column="2"> - <widget class="QToolButton" name="downloadNDKToolButton"> + <item row="11" column="2"> + <widget class="QToolButton" name="downloadAntToolButton"> <property name="toolTip"> - <string>Download Android NDK</string> + <string>Download Ant</string> </property> <property name="icon"> <iconset resource="android.qrc"> @@ -276,195 +465,6 @@ </layout> </widget> </item> - <item row="0" column="0"> - <widget class="QLabel" name="OpenJDKLocationLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>JDK location:</string> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - </widget> - </item> - <item row="6" column="1"> - <layout class="QHBoxLayout" name="horizontalLayout_3"> - <property name="spacing"> - <number>2</number> - </property> - <item> - <widget class="QLabel" name="ndkWarningIconLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string/> - </property> - <property name="pixmap"> - <pixmap resource="../coreplugin/core.qrc">:/core/images/error.png</pixmap> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="toolchainFoundLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string/> - </property> - </widget> - </item> - </layout> - </item> - <item row="4" column="0"> - <widget class="QLabel" name="NDKLocationLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Android NDK location:</string> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - </widget> - </item> - <item row="4" column="1"> - <widget class="Utils::PathChooser" name="NDKLocationPathChooser" native="true"/> - </item> - <item row="0" column="2"> - <widget class="QToolButton" name="downloadOpenJDKToolButton"> - <property name="toolTip"> - <string>Download JDK</string> - </property> - <property name="icon"> - <iconset resource="android.qrc"> - <normaloff>:/android/images/download.png</normaloff>:/android/images/download.png</iconset> - </property> - </widget> - </item> - <item row="8" column="1"> - <widget class="QCheckBox" name="CreateKitCheckBox"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Automatically create kits for Android tool chains</string> - </property> - <property name="checked"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="9" column="1"> - <layout class="QHBoxLayout" name="horizontalLayout_2"> - <property name="spacing"> - <number>2</number> - </property> - <item> - <widget class="QLabel" name="kitWarningIconLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string/> - </property> - <property name="pixmap"> - <pixmap resource="../coreplugin/core.qrc">:/core/images/warning.png</pixmap> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="kitWarningLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string/> - </property> - <property name="wordWrap"> - <bool>true</bool> - </property> - </widget> - </item> - </layout> - </item> - <item row="2" column="1"> - <widget class="Utils::PathChooser" name="SDKLocationPathChooser" native="true"/> - </item> - <item row="5" column="1"> - <layout class="QHBoxLayout" name="horizontalLayout_6"> - <property name="spacing"> - <number>2</number> - </property> - <item> - <widget class="QLabel" name="gdbWarningIconLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string/> - </property> - <property name="pixmap"> - <pixmap resource="../coreplugin/core.qrc">:/core/images/error.png</pixmap> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="gdbWarningLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string><a href="xx">The GDB in the NDK appears to have broken python support.</a></string> - </property> - </widget> - </item> - </layout> - </item> - <item row="10" column="1"> - <widget class="QCheckBox" name="UseGradleCheckBox"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Use Gradle instead of Ant</string> - </property> - </widget> - </item> </layout> </widget> <customwidgets> |