Skip to content

Commit

Permalink
Complete remerge of GUI
Browse files Browse the repository at this point in the history
  • Loading branch information
AustinMroz committed Jun 6, 2019
1 parent 8817226 commit 12cf900
Showing 1 changed file with 11 additions and 2 deletions.
13 changes: 11 additions & 2 deletions src/com/dabomstew/pkrandom/gui/RandomizerGUI.java
Original file line number Diff line number Diff line change
Expand Up @@ -2582,6 +2582,7 @@ public void approveSelection() {
pokeLimitBtn = new javax.swing.JButton();
raceModeCB = new javax.swing.JCheckBox();
brokenMovesCB = new javax.swing.JCheckBox();
RandomizeMatchupsCB = new javax.swing.JCheckBox();
romInfoPanel = new javax.swing.JPanel();
riRomNameLabel = new javax.swing.JLabel();
riRomCodeLabel = new javax.swing.JLabel();
Expand Down Expand Up @@ -2807,6 +2808,10 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
brokenMovesCB.setText(bundle.getString("RandomizerGUI.brokenMovesCB.text")); // NOI18N
brokenMovesCB.setToolTipText(bundle.getString("RandomizerGUI.brokenMovesCB.toolTipText")); // NOI18N

RandomizeMatchupsCB.setText(bundle.getString("RandomizerGUI.RandomizeMatchupsCB.text")); // NOI18N
RandomizeMatchupsCB.setToolTipText(bundle.getString("RandomizerGUI.RandomizeMatchupsCB.toolTipText")); // NOI18N


javax.swing.GroupLayout generalOptionsPanelLayout = new javax.swing.GroupLayout(generalOptionsPanel);
generalOptionsPanel.setLayout(generalOptionsPanelLayout);
generalOptionsPanelLayout.setHorizontalGroup(
Expand All @@ -2819,7 +2824,8 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(pokeLimitBtn))
.addComponent(raceModeCB)
.addComponent(brokenMovesCB))
.addComponent(brokenMovesCB)
.addComponent(RandomizeMatchupsCB))
.addContainerGap(22, Short.MAX_VALUE))
);
generalOptionsPanelLayout.setVerticalGroup(
Expand All @@ -2833,6 +2839,8 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
.addComponent(raceModeCB)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(brokenMovesCB)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(RandomizeMatchupsCB)
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);

Expand Down Expand Up @@ -4578,7 +4586,7 @@ public void mouseClicked(java.awt.event.MouseEvent evt) {
.addComponent(romInfoPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGap(28, 28, 28)
.addComponent(gameMascotLabel)
.addGap(18, 37, Short.MAX_VALUE)
.addGap(18, 31, Short.MAX_VALUE)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(openROMButton, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 159, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(saveROMButton, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 159, javax.swing.GroupLayout.PREFERRED_SIZE)
Expand Down Expand Up @@ -4625,6 +4633,7 @@ public void mouseClicked(java.awt.event.MouseEvent evt) {
}// </editor-fold>//GEN-END:initComponents

// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JCheckBox RandomizeMatchupsCB;
private javax.swing.JPanel abilitiesPanel;
private javax.swing.JPanel baseStatsPanel;
private javax.swing.JCheckBox brokenMovesCB;
Expand Down

0 comments on commit 12cf900

Please sign in to comment.