Merge branch 'gui_changes' into developorig7

This commit is contained in:
rishwanth1995 2018-03-06 15:30:59 -05:00
commit eff300e558
2 changed files with 10 additions and 10 deletions

View File

@ -37,10 +37,10 @@
<Component id="profileListScrollPane" max="32767" attributes="0"/>
<Group type="102" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
<Component id="ingestSettingsButton" alignment="0" min="-2" pref="128" max="-2" attributes="0"/>
<Component id="profileListLabel" alignment="0" min="-2" pref="102" max="-2" attributes="0"/>
<Component id="ingestSettingsButton" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="profileListLabel" alignment="0" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace min="0" pref="523" max="32767" attributes="0"/>
<EmptySpace min="0" pref="458" max="32767" attributes="0"/>
</Group>
</Group>
<EmptySpace max="-2" attributes="0"/>
@ -51,9 +51,9 @@
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Component id="profileListLabel" min="-2" pref="27" max="-2" attributes="0"/>
<Component id="profileListLabel" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="profileListScrollPane" pref="385" max="32767" attributes="0"/>
<Component id="profileListScrollPane" pref="362" max="32767" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="ingestSettingsButton" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="18" max="-2" attributes="0"/>

View File

@ -274,18 +274,18 @@ final class IngestProfileSelectionPanel extends JPanel {
.addComponent(profileListScrollPane)
.addGroup(layout.createSequentialGroup()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(ingestSettingsButton, javax.swing.GroupLayout.PREFERRED_SIZE, 128, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(profileListLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 102, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGap(0, 523, Short.MAX_VALUE)))
.addComponent(ingestSettingsButton)
.addComponent(profileListLabel))
.addGap(0, 458, Short.MAX_VALUE)))
.addContainerGap())
);
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addContainerGap()
.addComponent(profileListLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 27, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(profileListLabel)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(profileListScrollPane, javax.swing.GroupLayout.DEFAULT_SIZE, 385, Short.MAX_VALUE)
.addComponent(profileListScrollPane, javax.swing.GroupLayout.DEFAULT_SIZE, 362, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(ingestSettingsButton)
.addGap(18, 18, 18))