From b531fe90a84e9639a5394dc4e8f18f6e3456e2f3 Mon Sep 17 00:00:00 2001
From: William Pearson <w.pearson@samsung.com>
Date: Wed, 8 Nov 2023 12:39:33 -0700
Subject: [PATCH] Update Android SDK/JDK setting tooltips to match RDOC_CONFIG

Previously, the SDK tooltip was inconsistent between the label and the
text field/button, with the latter incorrectly saying the location of
adb.exe should be used. There also was no description at all for the
JDK option.

I've copied the descriptions from the RDOC_CONFIG macros in
android_tools.cpp, which should make it easier to set these correctly.
---
 qrenderdoc/Windows/Dialogs/SettingsDialog.ui | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/qrenderdoc/Windows/Dialogs/SettingsDialog.ui b/qrenderdoc/Windows/Dialogs/SettingsDialog.ui
index ea9f6c4ebe..d6e754be33 100644
--- a/qrenderdoc/Windows/Dialogs/SettingsDialog.ui
+++ b/qrenderdoc/Windows/Dialogs/SettingsDialog.ui
@@ -1231,7 +1231,7 @@ Only happens if the capture is not in the recent files list.</string>
           <item row="0" column="0">
            <widget class="QLabel" name="label_24">
             <property name="toolTip">
-             <string>The location of the Android SDK, used to locate tools for controlling Android devices.</string>
+             <string>The location of the root of the Android SDK. This path should contain folders such as build-tools and platform-tools.</string>
             </property>
             <property name="text">
              <string>Android SDK root path</string>
@@ -1241,14 +1241,14 @@ Only happens if the capture is not in the recent files list.</string>
           <item row="1" column="0">
            <widget class="QLineEdit" name="Android_SDKPath">
             <property name="toolTip">
-             <string>The location of adb.exe, used to control Android devices.</string>
+             <string>The location of the root of the Android SDK. This path should contain folders such as build-tools and platform-tools.</string>
             </property>
            </widget>
           </item>
           <item row="1" column="1">
            <widget class="QPushButton" name="browseAndroidSDKPath">
             <property name="toolTip">
-             <string>The location of adb.exe, used to control Android devices.</string>
+             <string>The location of the root of the Android SDK. This path should contain folders such as build-tools and platform-tools.</string>
             </property>
             <property name="text">
              <string>Browse</string>
@@ -1257,16 +1257,26 @@ Only happens if the capture is not in the recent files list.</string>
           </item>
           <item row="2" column="0">
            <widget class="QLabel" name="label_7">
+            <property name="toolTip">
+             <string>The location of the root of the Java JDK. This path should contain folders such as bin and lib.</string>
+            </property>
             <property name="text">
              <string>Java JDK path</string>
             </property>
            </widget>
           </item>
           <item row="3" column="0">
-           <widget class="QLineEdit" name="Android_JDKPath"/>
+           <widget class="QLineEdit" name="Android_JDKPath">
+            <property name="toolTip">
+             <string>The location of the root of the Java JDK. This path should contain folders such as bin and lib.</string>
+            </property>
+           </widget>
           </item>
           <item row="3" column="1">
            <widget class="QPushButton" name="browseJDKPath">
+            <property name="toolTip">
+             <string>The location of the root of the Java JDK. This path should contain folders such as bin and lib.</string>
+            </property>
             <property name="text">
              <string>Browse</string>
             </property>