From 10284642bc8221b7d13170beb2b711b5ed78fc54 Mon Sep 17 00:00:00 2001 From: Plopman <> Date: Tue, 14 Feb 2017 21:06:07 +0100 Subject: [PATCH] Use spinner instead of combobox for AI skill. Fix #1111 and #118 --- .../mage/client/table/NewPlayerPanel.form | 34 ++++++----------- .../mage/client/table/NewPlayerPanel.java | 38 +++++++++++-------- .../client/table/TournamentPlayerPanel.form | 29 +++++--------- .../client/table/TournamentPlayerPanel.java | 28 ++++++++------ 4 files changed, 59 insertions(+), 70 deletions(-) diff --git a/Mage.Client/src/main/java/mage/client/table/NewPlayerPanel.form b/Mage.Client/src/main/java/mage/client/table/NewPlayerPanel.form index 3fe8692701f..a8566e380a3 100644 --- a/Mage.Client/src/main/java/mage/client/table/NewPlayerPanel.form +++ b/Mage.Client/src/main/java/mage/client/table/NewPlayerPanel.form @@ -1,6 +1,6 @@ -
+ @@ -26,20 +26,21 @@ - - + + - + - + - - + + + @@ -52,7 +53,7 @@ - + @@ -101,21 +102,10 @@ - + - - - - - - - - - - - - - + + diff --git a/Mage.Client/src/main/java/mage/client/table/NewPlayerPanel.java b/Mage.Client/src/main/java/mage/client/table/NewPlayerPanel.java index 7d28ba8f8ac..f7c7a85a98f 100644 --- a/Mage.Client/src/main/java/mage/client/table/NewPlayerPanel.java +++ b/Mage.Client/src/main/java/mage/client/table/NewPlayerPanel.java @@ -66,9 +66,6 @@ public class NewPlayerPanel extends javax.swing.JPanel { if (Config.defaultComputerName != null) { this.txtPlayerName.setText(Config.defaultComputerName); } - if (cbLevel.getModel().getSize() > 0) { - cbLevel.setSelectedIndex(cbLevel.getModel().getSize()/2); - } } public void setPlayerName(String playerName) { @@ -115,11 +112,11 @@ public class NewPlayerPanel extends javax.swing.JPanel { public int getLevel() { - return Integer.valueOf((String)this.cbLevel.getSelectedItem()); + return (Integer)spnLevel.getValue(); } public void showLevel(boolean show) { - this.cbLevel.setVisible(show); + this.spnLevel.setVisible(show); this.lblLevel.setVisible(show); } @@ -146,21 +143,29 @@ public class NewPlayerPanel extends javax.swing.JPanel { btnPlayerDeck = new javax.swing.JButton(); btnGenerate = new javax.swing.JButton(); lblLevel = new javax.swing.JLabel(); - cbLevel = new javax.swing.JComboBox(); + spnLevel = new javax.swing.JSpinner(); lblPlayerName.setText("Name:"); lblPlayerDeck.setText("Deck:"); btnPlayerDeck.setText("..."); - btnPlayerDeck.addActionListener(evt -> btnPlayerDeckActionPerformed(evt)); + btnPlayerDeck.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + btnPlayerDeckActionPerformed(evt); + } + }); btnGenerate.setText("Generate"); - btnGenerate.addActionListener(evt -> btnGenerateActionPerformed(evt)); + btnGenerate.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + btnGenerateActionPerformed(evt); + } + }); lblLevel.setText("Skill:"); - cbLevel.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "1", "2", "3", "4", "5", "6", "7", "8", "9", "10" })); + spnLevel.setModel(new javax.swing.SpinnerNumberModel(6, 1, 10, 1)); javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); this.setLayout(layout); @@ -174,18 +179,19 @@ public class NewPlayerPanel extends javax.swing.JPanel { .addComponent(lblPlayerName)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(txtPlayerName, javax.swing.GroupLayout.DEFAULT_SIZE, 321, Short.MAX_VALUE) - .addComponent(txtPlayerDeck, javax.swing.GroupLayout.DEFAULT_SIZE, 321, Short.MAX_VALUE)) + .addComponent(txtPlayerName, javax.swing.GroupLayout.DEFAULT_SIZE, 310, Short.MAX_VALUE) + .addComponent(txtPlayerDeck, javax.swing.GroupLayout.DEFAULT_SIZE, 310, Short.MAX_VALUE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) .addGroup(layout.createSequentialGroup() .addComponent(btnPlayerDeck, javax.swing.GroupLayout.PREFERRED_SIZE, 24, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(btnGenerate, javax.swing.GroupLayout.PREFERRED_SIZE, 87, javax.swing.GroupLayout.PREFERRED_SIZE)) .addGroup(layout.createSequentialGroup() .addComponent(lblLevel) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(cbLevel, javax.swing.GroupLayout.PREFERRED_SIZE, 54, javax.swing.GroupLayout.PREFERRED_SIZE)))) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(spnLevel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGap(64, 64, 64)))) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -194,7 +200,7 @@ public class NewPlayerPanel extends javax.swing.JPanel { .addComponent(txtPlayerName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(lblPlayerName) .addComponent(lblLevel) - .addComponent(cbLevel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addComponent(spnLevel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addGap(3, 3, 3) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(lblPlayerDeck) @@ -216,10 +222,10 @@ public class NewPlayerPanel extends javax.swing.JPanel { // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JButton btnGenerate; private javax.swing.JButton btnPlayerDeck; - private javax.swing.JComboBox cbLevel; private javax.swing.JLabel lblLevel; private javax.swing.JLabel lblPlayerDeck; private javax.swing.JLabel lblPlayerName; + private javax.swing.JSpinner spnLevel; private javax.swing.JTextField txtPlayerDeck; private javax.swing.JTextField txtPlayerName; // End of variables declaration//GEN-END:variables diff --git a/Mage.Client/src/main/java/mage/client/table/TournamentPlayerPanel.form b/Mage.Client/src/main/java/mage/client/table/TournamentPlayerPanel.form index 64f59218325..26b597f4572 100644 --- a/Mage.Client/src/main/java/mage/client/table/TournamentPlayerPanel.form +++ b/Mage.Client/src/main/java/mage/client/table/TournamentPlayerPanel.form @@ -1,6 +1,6 @@ - + @@ -78,11 +78,11 @@ - - + + - + @@ -90,9 +90,9 @@ - + @@ -110,23 +110,12 @@ - + - - - - - - - - - - - - - + + - + diff --git a/Mage.Client/src/main/java/mage/client/table/TournamentPlayerPanel.java b/Mage.Client/src/main/java/mage/client/table/TournamentPlayerPanel.java index 2f220eaddb7..97b866a4fa7 100644 --- a/Mage.Client/src/main/java/mage/client/table/TournamentPlayerPanel.java +++ b/Mage.Client/src/main/java/mage/client/table/TournamentPlayerPanel.java @@ -69,7 +69,7 @@ public class TournamentPlayerPanel extends javax.swing.JPanel { tableId, this.txtPlayerName.getText(), (String)this.cbPlayerType.getSelectedItem(), - Integer.valueOf((String)this.cbLevel.getSelectedItem()), + (Integer)spnLevel.getValue(), deckCardLists, ""); } @@ -93,23 +93,27 @@ public class TournamentPlayerPanel extends javax.swing.JPanel { txtPlayerName = new javax.swing.JTextField(); jLabel2 = new javax.swing.JLabel(); jLabel3 = new javax.swing.JLabel(); - cbLevel = new javax.swing.JComboBox(); + spnLevel = new javax.swing.JSpinner(); jLabel1.setLabelFor(cbPlayerType); jLabel1.setText("Type:"); cbPlayerType.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" })); - cbPlayerType.addActionListener(evt -> cbPlayerTypeActionPerformed(evt)); + cbPlayerType.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + cbPlayerTypeActionPerformed(evt); + } + }); - lblPlayerNum.setFont(new java.awt.Font("Tahoma", 1, 11)); + lblPlayerNum.setFont(new java.awt.Font("Tahoma", 1, 11)); // NOI18N lblPlayerNum.setText("Player Num:"); jLabel2.setText("Name:"); jLabel3.setText("Skill:"); - cbLevel.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "1", "2", "3", "4", "5", "6", "7", "8", "9", "10" })); - cbLevel.setSelectedIndex(9); + spnLevel.setModel(new javax.swing.SpinnerNumberModel(6, 1, 10, 1)); + spnLevel.setRequestFocusEnabled(false); javax.swing.GroupLayout pnlPlayerNameLayout = new javax.swing.GroupLayout(pnlPlayerName); pnlPlayerName.setLayout(pnlPlayerNameLayout); @@ -118,19 +122,19 @@ public class TournamentPlayerPanel extends javax.swing.JPanel { .addGroup(pnlPlayerNameLayout.createSequentialGroup() .addComponent(jLabel3) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(cbLevel, javax.swing.GroupLayout.PREFERRED_SIZE, 54, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(spnLevel, javax.swing.GroupLayout.PREFERRED_SIZE, 51, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGap(67, 67, 67) .addComponent(jLabel2) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(txtPlayerName, javax.swing.GroupLayout.DEFAULT_SIZE, 190, Short.MAX_VALUE)) + .addComponent(txtPlayerName, javax.swing.GroupLayout.DEFAULT_SIZE, 130, Short.MAX_VALUE)) ); pnlPlayerNameLayout.setVerticalGroup( pnlPlayerNameLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(pnlPlayerNameLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(txtPlayerName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(cbLevel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(jLabel3) - .addComponent(jLabel2)) + .addComponent(jLabel2) + .addComponent(spnLevel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) ); javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); @@ -172,13 +176,13 @@ public class TournamentPlayerPanel extends javax.swing.JPanel { // Variables declaration - do not modify//GEN-BEGIN:variables - private javax.swing.JComboBox cbLevel; private javax.swing.JComboBox cbPlayerType; private javax.swing.JLabel jLabel1; private javax.swing.JLabel jLabel2; private javax.swing.JLabel jLabel3; private javax.swing.JLabel lblPlayerNum; private javax.swing.JPanel pnlPlayerName; + private javax.swing.JSpinner spnLevel; private javax.swing.JTextField txtPlayerName; // End of variables declaration//GEN-END:variables