Rearranged the panels for better spacing.

This commit is contained in:
Raman Arora 2020-05-22 14:39:54 -04:00
parent 94bb10f56d
commit d792826ea7
2 changed files with 249 additions and 232 deletions

View File

@ -11,9 +11,18 @@
<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/> <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/> <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/> <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
<AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,2,53,0,0,1,-67"/> <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,2,53,0,0,3,92"/>
</AuxValues> </AuxValues>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
<SubComponents>
<Container class="javax.swing.JPanel" name="topPanel">
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
<BorderConstraints direction="First"/>
</Constraint>
</Constraints>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/> <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
<SubComponents> <SubComponents>
<Container class="javax.swing.JPanel" name="callDetailsPanel"> <Container class="javax.swing.JPanel" name="callDetailsPanel">
@ -65,7 +74,7 @@
</Group> </Group>
</Group> </Group>
</Group> </Group>
<EmptySpace min="81" pref="103" max="32767" attributes="0"/> <EmptySpace min="81" max="32767" attributes="0"/>
</Group> </Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
@ -247,19 +256,10 @@
</Component> </Component>
</SubComponents> </SubComponents>
</Container> </Container>
<Container class="javax.swing.JPanel" name="bottomPanel">
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
<BorderConstraints direction="Last"/>
</Constraint>
</Constraints>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
<SubComponents>
<Container class="javax.swing.JPanel" name="otherAttributesPanel"> <Container class="javax.swing.JPanel" name="otherAttributesPanel">
<Constraints> <Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription"> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
<BorderConstraints direction="First"/> <BorderConstraints direction="Last"/>
</Constraint> </Constraint>
</Constraints> </Constraints>
@ -320,6 +320,17 @@
</Container> </Container>
</SubComponents> </SubComponents>
</Container> </Container>
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="bottomPanel">
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
<BorderConstraints direction="Last"/>
</Constraint>
</Constraints>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
<SubComponents>
<Container class="javax.swing.JPanel" name="localAccountInfoPanel"> <Container class="javax.swing.JPanel" name="localAccountInfoPanel">
<Constraints> <Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription"> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
@ -343,7 +354,7 @@
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Component id="localAccountIdLabel" min="-2" max="-2" attributes="0"/> <Component id="localAccountIdLabel" min="-2" max="-2" attributes="0"/>
<Component id="dataSourceNameLabel" min="-2" pref="130" max="-2" attributes="0"/> <Component id="dataSourceNameLabel" min="-2" pref="130" max="-2" attributes="0"/>
<Component id="deviceIdLabel" alignment="0" pref="230" max="32767" attributes="0"/> <Component id="deviceIdLabel" alignment="0" pref="437" max="32767" attributes="0"/>
</Group> </Group>
</Group> </Group>
<Group type="102" alignment="0" attributes="0"> <Group type="102" alignment="0" attributes="0">
@ -351,7 +362,7 @@
<Component id="sourceSectionLabel" min="-2" max="-2" attributes="0"/> <Component id="sourceSectionLabel" min="-2" max="-2" attributes="0"/>
</Group> </Group>
</Group> </Group>
<EmptySpace pref="35" max="32767" attributes="0"/> <EmptySpace pref="243" max="32767" attributes="0"/>
</Group> </Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>

View File

@ -85,6 +85,7 @@ public class CallLogArtifactViewer extends javax.swing.JPanel implements Artifac
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
private void initComponents() { private void initComponents() {
topPanel = new javax.swing.JPanel();
callDetailsPanel = new javax.swing.JPanel(); callDetailsPanel = new javax.swing.JPanel();
toOrFromNumberLabel = new javax.swing.JLabel(); toOrFromNumberLabel = new javax.swing.JLabel();
personaButton1 = new javax.swing.JButton(); personaButton1 = new javax.swing.JButton();
@ -99,10 +100,10 @@ public class CallLogArtifactViewer extends javax.swing.JPanel implements Artifac
otherRecipientsPanel = new javax.swing.JPanel(); otherRecipientsPanel = new javax.swing.JPanel();
otherRecipientsListPanel = new javax.swing.JPanel(); otherRecipientsListPanel = new javax.swing.JPanel();
otherRecipientsLabel = new javax.swing.JLabel(); otherRecipientsLabel = new javax.swing.JLabel();
bottomPanel = new javax.swing.JPanel();
otherAttributesPanel = new javax.swing.JPanel(); otherAttributesPanel = new javax.swing.JPanel();
otherInfoLabel = new javax.swing.JLabel(); otherInfoLabel = new javax.swing.JLabel();
otherAttributesListPanel = new javax.swing.JPanel(); otherAttributesListPanel = new javax.swing.JPanel();
bottomPanel = new javax.swing.JPanel();
localAccountInfoPanel = new javax.swing.JPanel(); localAccountInfoPanel = new javax.swing.JPanel();
jLabel4 = new javax.swing.JLabel(); jLabel4 = new javax.swing.JLabel();
dataSourceNameLabel = new javax.swing.JLabel(); dataSourceNameLabel = new javax.swing.JLabel();
@ -114,6 +115,8 @@ public class CallLogArtifactViewer extends javax.swing.JPanel implements Artifac
setLayout(new java.awt.BorderLayout()); setLayout(new java.awt.BorderLayout());
topPanel.setLayout(new java.awt.BorderLayout());
callDetailsPanel.setPreferredSize(new java.awt.Dimension(400, 150)); callDetailsPanel.setPreferredSize(new java.awt.Dimension(400, 150));
org.openide.awt.Mnemonics.setLocalizedText(toOrFromNumberLabel, org.openide.util.NbBundle.getMessage(CallLogArtifactViewer.class, "CallLogArtifactViewer.toOrFromNumberLabel.text")); // NOI18N org.openide.awt.Mnemonics.setLocalizedText(toOrFromNumberLabel, org.openide.util.NbBundle.getMessage(CallLogArtifactViewer.class, "CallLogArtifactViewer.toOrFromNumberLabel.text")); // NOI18N
@ -174,7 +177,7 @@ public class CallLogArtifactViewer extends javax.swing.JPanel implements Artifac
.addComponent(toOrFromNumberLabel) .addComponent(toOrFromNumberLabel)
.addGap(92, 92, 92) .addGap(92, 92, 92)
.addComponent(personaButton1))))))) .addComponent(personaButton1)))))))
.addGap(81, 103, Short.MAX_VALUE)) .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
); );
callDetailsPanelLayout.setVerticalGroup( callDetailsPanelLayout.setVerticalGroup(
callDetailsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) callDetailsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@ -200,7 +203,7 @@ public class CallLogArtifactViewer extends javax.swing.JPanel implements Artifac
.addGap(33, 33, 33)) .addGap(33, 33, 33))
); );
add(callDetailsPanel, java.awt.BorderLayout.PAGE_START); topPanel.add(callDetailsPanel, java.awt.BorderLayout.PAGE_START);
javax.swing.GroupLayout otherRecipientsListPanelLayout = new javax.swing.GroupLayout(otherRecipientsListPanel); javax.swing.GroupLayout otherRecipientsListPanelLayout = new javax.swing.GroupLayout(otherRecipientsListPanel);
otherRecipientsListPanel.setLayout(otherRecipientsListPanelLayout); otherRecipientsListPanel.setLayout(otherRecipientsListPanelLayout);
@ -237,9 +240,7 @@ public class CallLogArtifactViewer extends javax.swing.JPanel implements Artifac
.addContainerGap()) .addContainerGap())
); );
add(otherRecipientsPanel, java.awt.BorderLayout.CENTER); topPanel.add(otherRecipientsPanel, java.awt.BorderLayout.CENTER);
bottomPanel.setLayout(new java.awt.BorderLayout());
otherInfoLabel.setFont(otherInfoLabel.getFont().deriveFont(otherInfoLabel.getFont().getStyle() | java.awt.Font.BOLD)); otherInfoLabel.setFont(otherInfoLabel.getFont().deriveFont(otherInfoLabel.getFont().getStyle() | java.awt.Font.BOLD));
org.openide.awt.Mnemonics.setLocalizedText(otherInfoLabel, org.openide.util.NbBundle.getMessage(CallLogArtifactViewer.class, "CallLogArtifactViewer.otherInfoLabel.text")); // NOI18N org.openide.awt.Mnemonics.setLocalizedText(otherInfoLabel, org.openide.util.NbBundle.getMessage(CallLogArtifactViewer.class, "CallLogArtifactViewer.otherInfoLabel.text")); // NOI18N
@ -277,7 +278,11 @@ public class CallLogArtifactViewer extends javax.swing.JPanel implements Artifac
.addContainerGap()) .addContainerGap())
); );
bottomPanel.add(otherAttributesPanel, java.awt.BorderLayout.PAGE_START); topPanel.add(otherAttributesPanel, java.awt.BorderLayout.PAGE_END);
add(topPanel, java.awt.BorderLayout.PAGE_START);
bottomPanel.setLayout(new java.awt.BorderLayout());
org.openide.awt.Mnemonics.setLocalizedText(jLabel4, org.openide.util.NbBundle.getMessage(CallLogArtifactViewer.class, "CallLogArtifactViewer.jLabel4.text")); // NOI18N org.openide.awt.Mnemonics.setLocalizedText(jLabel4, org.openide.util.NbBundle.getMessage(CallLogArtifactViewer.class, "CallLogArtifactViewer.jLabel4.text")); // NOI18N
@ -310,11 +315,11 @@ public class CallLogArtifactViewer extends javax.swing.JPanel implements Artifac
.addGroup(localAccountInfoPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(localAccountInfoPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(localAccountIdLabel) .addComponent(localAccountIdLabel)
.addComponent(dataSourceNameLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 130, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(dataSourceNameLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 130, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(deviceIdLabel, javax.swing.GroupLayout.DEFAULT_SIZE, 230, Short.MAX_VALUE))) .addComponent(deviceIdLabel, javax.swing.GroupLayout.DEFAULT_SIZE, 437, Short.MAX_VALUE)))
.addGroup(localAccountInfoPanelLayout.createSequentialGroup() .addGroup(localAccountInfoPanelLayout.createSequentialGroup()
.addGap(25, 25, 25) .addGap(25, 25, 25)
.addComponent(sourceSectionLabel))) .addComponent(sourceSectionLabel)))
.addContainerGap(35, Short.MAX_VALUE)) .addContainerGap(243, Short.MAX_VALUE))
); );
localAccountInfoPanelLayout.setVerticalGroup( localAccountInfoPanelLayout.setVerticalGroup(
localAccountInfoPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) localAccountInfoPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@ -376,6 +381,7 @@ public class CallLogArtifactViewer extends javax.swing.JPanel implements Artifac
private javax.swing.JLabel sourceSectionLabel; private javax.swing.JLabel sourceSectionLabel;
private javax.swing.JLabel toOrFromNameLabel; private javax.swing.JLabel toOrFromNameLabel;
private javax.swing.JLabel toOrFromNumberLabel; private javax.swing.JLabel toOrFromNumberLabel;
private javax.swing.JPanel topPanel;
// End of variables declaration//GEN-END:variables // End of variables declaration//GEN-END:variables
@Override @Override