Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

GUI, table: improved save/load table config for new tourney dialog (miss num seats, decks, skill, player types and other params, related to #12981)

Browse source
This commit is contained in:
Oleg Agafonov 2024-10-12 11:31:42 +04:00
parent d9e558f9c3
commit 2b9ae8e0aa
7 changed files with 147 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Mage.Client/src/main/java/mage/client/table/NewPlayerPanel.java
View file

@ -17,19 +17,12 @@ public class NewPlayerPanel extends javax.swing.JPanel {
private final JFileChooser fcSelectDeck;
/**
* Creates new form NewPlayerPanel
*/
public NewPlayerPanel() {
initComponents();
fcSelectDeck = new JFileChooser();
fcSelectDeck.setAcceptAllFileFilterUsed(false);
fcSelectDeck.addChoosableFileFilter(new DeckFileFilter("dck", "XMage's deck files (*.dck)"));
String deckPath = MageFrame.getPreferences().get("defaultDeckPath", "");
if (deckPath.isEmpty()) {
deckPath = ClientDefaultSettings.deckPath;
}
this.txtPlayerDeck.setText(deckPath);
this.txtPlayerDeck.setText("");
this.txtPlayerName.setText(ClientDefaultSettings.computerName);
}
@ -62,7 +55,6 @@ public class NewPlayerPanel extends javax.swing.JPanel {
return;
}
this.txtPlayerDeck.setText(path);
MageFrame.getPreferences().put("defaultDeckPath", path);
}
public String getPlayerName() {

1
Mage.Client/src/main/java/mage/client/table/TablePlayerPanel.java
View file

@ -39,7 +39,6 @@ public class TablePlayerPanel extends javax.swing.JPanel {
}
this.newPlayerPanel.setDeckFile(playerDeck);
this.newPlayerPanel.setSkillLevel(playerSkill);
}
public boolean joinTable(UUID roomId, UUID tableId) throws IOException, ClassNotFoundException {

18
Mage.Client/src/main/java/mage/client/table/TournamentPlayerPanel.java
View file

@ -22,15 +22,31 @@ public class TournamentPlayerPanel extends javax.swing.JPanel {
this.pnlPlayerName.setVisible(false);
}
public void init(int playerNum) {
public void init(int playerNum, PlayerType playerType, int playerSkill) {
cbPlayerType.setModel(new DefaultComboBoxModel(SessionHandler.getPlayerTypes()));
this.lblPlayerNum.setText("Player " + playerNum);
if (ClientDefaultSettings.otherPlayerIndex != null) {
Integer index = Integer.parseInt(ClientDefaultSettings.otherPlayerIndex);
if (index >= cbPlayerType.getItemCount()) {
cbPlayerType.setSelectedIndex(cbPlayerType.getItemCount() - 1);
} else {
cbPlayerType.setSelectedIndex(index);
}
}
if (playerType != null) {
this.cbPlayerType.setSelectedItem(playerType);
}
this.spnLevel.setValue(playerSkill);
}
public JComboBox getPlayerType() {
return this.cbPlayerType;
}
public int getPlayerSkill() {
return (Integer) this.spnLevel.getValue();
}
public boolean joinTournamentTable(UUID roomId, UUID tableId, DeckCardLists deckCardLists) {
if (this.cbPlayerType.getSelectedItem() != PlayerType.HUMAN) {
return SessionHandler.joinTournamentTable(