This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch delivery
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/delivery by this push:
new 3d4fb684021 UI: fixed conditional gradle version info label.
new d78728dec84 Merge pull request #5343 from
mbien/gradle-options-combo-fix
3d4fb684021 is described below
commit 3d4fb6840215b08470c7f5bc0c37257452f4280a
Author: Michael Bien <mbie...@gmail.com>
AuthorDate: Sun Jan 22 16:25:26 2023 +0100
UI: fixed conditional gradle version info label.
#5274 overlooked an invisible label which is only visible if
an unsupported version is selected in the combo box. This
fixes the layout so that making the label visible does not disturb
other UI components.
---
.../modules/gradle/options/SettingsPanel.form | 53 +++++++++++-----------
.../modules/gradle/options/SettingsPanel.java | 35 +++++++-------
2 files changed, 43 insertions(+), 45 deletions(-)
diff --git
a/extide/gradle/src/org/netbeans/modules/gradle/options/SettingsPanel.form
b/extide/gradle/src/org/netbeans/modules/gradle/options/SettingsPanel.form
index e593939462a..bae51bb9039 100644
--- a/extide/gradle/src/org/netbeans/modules/gradle/options/SettingsPanel.form
+++ b/extide/gradle/src/org/netbeans/modules/gradle/options/SettingsPanel.form
@@ -181,24 +181,6 @@
<Group type="102" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
- <Group type="102" alignment="0" attributes="0">
- <Component id="lblGradleUserHome" min="-2"
max="-2" attributes="0"/>
- <EmptySpace min="-2" pref="9" max="-2"
attributes="0"/>
- <Group type="103" groupAlignment="0"
attributes="0">
- <Group type="102" attributes="0">
- <EmptySpace min="-2" pref="231"
max="-2" attributes="0"/>
- <Component id="lbVersionInfo"
pref="2" max="32767" attributes="0"/>
- <EmptySpace min="-2" pref="78"
max="-2" attributes="0"/>
- </Group>
- <Group type="102" alignment="1"
attributes="0">
- <Component id="tfGradleUserHome"
max="32767" attributes="0"/>
- <EmptySpace max="-2" attributes="0"/>
- <Component id="btGradleUserHome"
linkSize="3" min="-2" pref="105" max="-2" attributes="0"/>
- </Group>
- </Group>
- <EmptySpace min="-2" max="-2"
attributes="0"/>
- <Component id="btDefaultHome" min="-2"
pref="105" max="-2" attributes="0"/>
- </Group>
<Group type="102" alignment="0" attributes="0">
<Component id="lblGradleDistribution"
min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
@@ -206,7 +188,7 @@
<Group type="102" alignment="0"
attributes="0">
<Component id="rbUseStandardGradle"
min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
- <Component id="cbGradleVersion"
max="32767" attributes="0"/>
+ <Component id="cbGradleVersion"
pref="107" max="32767" attributes="0"/>
</Group>
<Group type="102" alignment="0"
attributes="0">
<Component id="rbUseCustomGradle"
min="-2" max="-2" attributes="0"/>
@@ -225,6 +207,23 @@
</Group>
<EmptySpace min="0" pref="0" max="32767"
attributes="0"/>
</Group>
+ <Group type="102" alignment="0" attributes="0">
+ <Component id="lblGradleUserHome" min="-2"
max="-2" attributes="0"/>
+ <EmptySpace min="-2" pref="9" max="-2"
attributes="0"/>
+ <Group type="103" groupAlignment="0"
attributes="0">
+ <Group type="102" attributes="0">
+ <EmptySpace min="6" pref="6"
max="-2" attributes="0"/>
+ <Component id="lbVersionInfo"
max="32767" attributes="0"/>
+ </Group>
+ <Group type="102" alignment="0"
attributes="0">
+ <Component id="tfGradleUserHome"
max="32767" attributes="0"/>
+ <EmptySpace max="-2" attributes="0"/>
+ <Component id="btGradleUserHome"
linkSize="3" min="-2" pref="105" max="-2" attributes="0"/>
+ <EmptySpace min="-2" max="-2"
attributes="0"/>
+ <Component id="btDefaultHome"
min="-2" pref="105" max="-2" attributes="0"/>
+ </Group>
+ </Group>
+ </Group>
</Group>
<EmptySpace min="2" pref="2" max="-2"
attributes="0"/>
</Group>
@@ -233,32 +232,32 @@
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
- <EmptySpace max="32767" attributes="0"/>
+ <EmptySpace min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="lblGradleUserHome" alignment="3"
min="-2" max="-2" attributes="0"/>
<Component id="tfGradleUserHome" alignment="3"
min="-2" max="-2" attributes="0"/>
<Component id="btGradleUserHome" alignment="3"
min="-2" max="-2" attributes="0"/>
<Component id="btDefaultHome" alignment="3"
min="-2" max="-2" attributes="0"/>
</Group>
- <EmptySpace max="-2" attributes="0"/>
- <Component id="lbVersionInfo" min="-2" max="-2"
attributes="0"/>
- <EmptySpace max="-2" attributes="0"/>
+ <EmptySpace min="-2" max="-2" attributes="0"/>
+ <Component id="lbVersionInfo" max="32767"
attributes="0"/>
+ <EmptySpace min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="lblGradleDistribution"
alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="cbGradleVersion" alignment="3"
min="-2" max="-2" attributes="0"/>
<Component id="rbUseStandardGradle"
alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
- <EmptySpace max="-2" attributes="0"/>
+ <EmptySpace min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="rbUseCustomGradle" alignment="3"
min="-2" max="-2" attributes="0"/>
<Component id="tfUseCustomGradle" alignment="3"
min="-2" max="-2" attributes="0"/>
<Component id="btUseCustomGradle" alignment="3"
min="-2" max="-2" attributes="0"/>
</Group>
- <EmptySpace type="unrelated" max="-2"
attributes="0"/>
+ <EmptySpace type="unrelated" min="-2" max="-2"
attributes="0"/>
<Component id="cbPreferWrapper" min="-2" max="-2"
attributes="0"/>
- <EmptySpace max="-2" attributes="0"/>
+ <EmptySpace min="-2" max="-2" attributes="0"/>
<Component id="cbStartDaemonOnStart" min="-2"
max="-2" attributes="0"/>
- <EmptySpace max="-2" attributes="0"/>
+ <EmptySpace min="-2" max="-2" attributes="0"/>
<Component id="cbSilentInstall" min="-2" max="-2"
attributes="0"/>
</Group>
</Group>
diff --git
a/extide/gradle/src/org/netbeans/modules/gradle/options/SettingsPanel.java
b/extide/gradle/src/org/netbeans/modules/gradle/options/SettingsPanel.java
index 7094ea75e8a..fbc06af4209 100644
--- a/extide/gradle/src/org/netbeans/modules/gradle/options/SettingsPanel.java
+++ b/extide/gradle/src/org/netbeans/modules/gradle/options/SettingsPanel.java
@@ -265,20 +265,6 @@ public class SettingsPanel extends javax.swing.JPanel {
.addGroup(jPanel1Layout.createSequentialGroup()
.addContainerGap()
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(jPanel1Layout.createSequentialGroup()
- .addComponent(lblGradleUserHome)
- .addGap(9, 9, 9)
-
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(jPanel1Layout.createSequentialGroup()
- .addGap(231, 231, 231)
- .addComponent(lbVersionInfo,
javax.swing.GroupLayout.DEFAULT_SIZE, 2, Short.MAX_VALUE)
- .addGap(78, 78, 78))
-
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING,
jPanel1Layout.createSequentialGroup()
- .addComponent(tfGradleUserHome)
-
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(btGradleUserHome,
javax.swing.GroupLayout.PREFERRED_SIZE, 105,
javax.swing.GroupLayout.PREFERRED_SIZE)))
-
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(btDefaultHome,
javax.swing.GroupLayout.PREFERRED_SIZE, 105,
javax.swing.GroupLayout.PREFERRED_SIZE))
.addGroup(jPanel1Layout.createSequentialGroup()
.addComponent(lblGradleDistribution)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
@@ -286,7 +272,7 @@ public class SettingsPanel extends javax.swing.JPanel {
.addGroup(jPanel1Layout.createSequentialGroup()
.addComponent(rbUseStandardGradle)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(cbGradleVersion, 0,
javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addComponent(cbGradleVersion, 0, 107,
Short.MAX_VALUE))
.addGroup(jPanel1Layout.createSequentialGroup()
.addComponent(rbUseCustomGradle)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
@@ -298,7 +284,20 @@ public class SettingsPanel extends javax.swing.JPanel {
.addComponent(cbSilentInstall)
.addComponent(cbStartDaemonOnStart)
.addComponent(cbPreferWrapper))
- .addGap(0, 0, Short.MAX_VALUE)))
+ .addGap(0, 0, Short.MAX_VALUE))
+ .addGroup(jPanel1Layout.createSequentialGroup()
+ .addComponent(lblGradleUserHome)
+ .addGap(9, 9, 9)
+
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(jPanel1Layout.createSequentialGroup()
+ .addGap(6, 6, 6)
+ .addComponent(lbVersionInfo,
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
Short.MAX_VALUE))
+ .addGroup(jPanel1Layout.createSequentialGroup()
+ .addComponent(tfGradleUserHome)
+
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(btGradleUserHome,
javax.swing.GroupLayout.PREFERRED_SIZE, 105,
javax.swing.GroupLayout.PREFERRED_SIZE)
+
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(btDefaultHome,
javax.swing.GroupLayout.PREFERRED_SIZE, 105,
javax.swing.GroupLayout.PREFERRED_SIZE)))))
.addGap(2, 2, 2))
);
@@ -307,14 +306,14 @@ public class SettingsPanel extends javax.swing.JPanel {
jPanel1Layout.setVerticalGroup(
jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel1Layout.createSequentialGroup()
- .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE,
Short.MAX_VALUE)
+ .addContainerGap()
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(lblGradleUserHome)
.addComponent(tfGradleUserHome,
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(btGradleUserHome)
.addComponent(btDefaultHome))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(lbVersionInfo)
+ .addComponent(lbVersionInfo,
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(lblGradleDistribution)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
