Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Android SDK/JDK setting tooltips to match RDOC_CONFIG #3120

Merged
merged 1 commit into from
Nov 9, 2023
+14 −4
Merged

Update Android SDK/JDK setting tooltips to match RDOC_CONFIG #3120

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions qrenderdoc/Windows/Dialogs/SettingsDialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down