Skip to content

Commit

Permalink
Merge pull request #53 from Solaris-Skunk-Werks/ssw-wide-da-pane
Browse files Browse the repository at this point in the history 
Add DA availability codes to widescreen equipment info pane
  • Loading branch information
@WEKarnesky
WEKarnesky authored Sep 28, 2019
2 parents d7bfa8d + af2310a commit 6dfddf7
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 5 deletions.
23 changes: 20 additions & 3 deletions ssw/src/main/java/ssw/gui/frmMainWide.form
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5356,7 +5356,7 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
<GridBagConstraints gridX="0" gridY="6" gridWidth="0" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="0" insetsBottom="4" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
<GridBagConstraints gridX="0" gridY="7" gridWidth="0" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="0" insetsBottom="4" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
Expand Down Expand Up @@ -5400,14 +5400,14 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
<GridBagConstraints gridX="-1" gridY="-1" gridWidth="2" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="4" insetsRight="3" anchor="17" weightX="0.0" weightY="0.0"/>
<GridBagConstraints gridX="0" gridY="8" gridWidth="2" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="4" insetsRight="3" anchor="17" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JLabel" name="lblInfoMountRestrict">
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
<GridBagConstraints gridX="2" gridY="7" gridWidth="7" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="3" insetsBottom="4" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
<GridBagConstraints gridX="2" gridY="8" gridWidth="7" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="3" insetsBottom="4" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
Expand All @@ -5428,6 +5428,23 @@
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JLabel" name="jLabel2">
<Properties>
<Property name="text" type="java.lang.String" value="Availability (DA)"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
<GridBagConstraints gridX="0" gridY="6" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="3" anchor="17" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JLabel" name="lblInfoAVDA">
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
<GridBagConstraints gridX="1" gridY="6" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="3" insetsBottom="0" insetsRight="3" anchor="10" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="pnlLACrits">
Expand Down
24 changes: 22 additions & 2 deletions ssw/src/main/java/ssw/gui/frmMainWide.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2763,6 +2763,7 @@ private void ShowInfoOn( abPlaceable p ) {
lblInfoAVSL.setText( AC.GetISSLCode() + " / " + AC.GetCLSLCode() );
lblInfoAVSW.setText( AC.GetISSWCode() + " / " + AC.GetCLSWCode() );
lblInfoAVCI.setText( AC.GetISCICode() + " / " + AC.GetCLCICode() );
lblInfoAVDA.setText( AC.GetISDACode() + " / " + AC.GetCLDACode() );
switch( AC.GetTechBase() ) {
case AvailableCode.TECH_INNER_SPHERE:
lblInfoIntro.setText( AC.GetISIntroDate() + " (" + AC.GetISIntroFaction() + ")" );
Expand Down Expand Up @@ -4885,6 +4886,8 @@ private void initComponents() {
lblInfoMountRestrict = new javax.swing.JLabel();
jLabel55 = new javax.swing.JLabel();
lblInfoRulesLevel = new javax.swing.JLabel();
jLabel2 = new javax.swing.JLabel();
lblInfoAVDA = new javax.swing.JLabel();
pnlLACrits = new javax.swing.JPanel();
scrLACrits = new javax.swing.JScrollPane();
lstLACrits = new javax.swing.JList();
Expand Down Expand Up @@ -8092,7 +8095,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
jSeparator14.setBorder(javax.swing.BorderFactory.createEtchedBorder());
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 6;
gridBagConstraints.gridy = 7;
gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
gridBagConstraints.insets = new java.awt.Insets(4, 0, 4, 0);
Expand Down Expand Up @@ -8132,13 +8135,15 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {

jLabel33.setText("Mounting Restrictions");
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 8;
gridBagConstraints.gridwidth = 2;
gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
gridBagConstraints.insets = new java.awt.Insets(0, 0, 4, 3);
pnlEquipInfo.add(jLabel33, gridBagConstraints);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 2;
gridBagConstraints.gridy = 7;
gridBagConstraints.gridy = 8;
gridBagConstraints.gridwidth = 7;
gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
gridBagConstraints.insets = new java.awt.Insets(0, 3, 4, 0);
Expand All @@ -8160,6 +8165,19 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
gridBagConstraints.insets = new java.awt.Insets(0, 3, 0, 0);
pnlEquipInfo.add(lblInfoRulesLevel, gridBagConstraints);

jLabel2.setText("Availability (DA)");
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 6;
gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
gridBagConstraints.insets = new java.awt.Insets(0, 0, 0, 3);
pnlEquipInfo.add(jLabel2, gridBagConstraints);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
gridBagConstraints.gridy = 6;
gridBagConstraints.insets = new java.awt.Insets(0, 3, 0, 3);
pnlEquipInfo.add(lblInfoAVDA, gridBagConstraints);

pnlEquipment.add(pnlEquipInfo, new org.netbeans.lib.awtextra.AbsoluteConstraints(10, 320, 610, -1));

pnlLACrits.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createEtchedBorder(), "Left Arm", javax.swing.border.TitledBorder.CENTER, javax.swing.border.TitledBorder.DEFAULT_POSITION));
Expand Down Expand Up @@ -14769,6 +14787,7 @@ private void setViewToolbar(boolean Visible)
private javax.swing.JLabel jLabel17;
private javax.swing.JLabel jLabel18;
private javax.swing.JLabel jLabel19;
private javax.swing.JLabel jLabel2;
private javax.swing.JLabel jLabel20;
private javax.swing.JLabel jLabel21;
private javax.swing.JLabel jLabel22;
Expand Down Expand Up @@ -14900,6 +14919,7 @@ private void setViewToolbar(boolean Visible)
private javax.swing.JLabel lblHSNumber;
private javax.swing.JLabel lblHeatSinkType;
private javax.swing.JLabel lblInfoAVCI;
private javax.swing.JLabel lblInfoAVDA;
private javax.swing.JLabel lblInfoAVSL;
private javax.swing.JLabel lblInfoAVSW;
private javax.swing.JLabel lblInfoAmmo;
Expand Down

0 comments on commit 6dfddf7

Please sign in to comment.