external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 20:58:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Diable players tab and team combo boxes for now

Browse Source
This commit is contained in:
drdev
2014-05-23 11:29:37 +00:00
parent 3fc0e512ba
commit 5bf3759d16
2 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
forge-gui-mobile/src/forge/screens/constructed/ConstructedScreen.java
View File

@@ -176,7 +176,9 @@ public class ConstructedScreen extends LaunchScreen {
updatePlayersFromPrefs(); updatePlayersFromPrefs();
//disable player count and variants for now until they work properly //disable player count and variants for now until they work properly
lblPlayers.setEnabled(false);
cbPlayerCount.setEnabled(false); cbPlayerCount.setEnabled(false);
lblVariants.setEnabled(false);
cbVariants.setEnabled(false); cbVariants.setEnabled(false);
} }
@@ -427,8 +429,8 @@ public class ConstructedScreen extends LaunchScreen {
private final FToggleSwitch humanAiSwitch = new FToggleSwitch("Human", "AI"); private final FToggleSwitch humanAiSwitch = new FToggleSwitch("Human", "AI");
private boolean playerIsArchenemy = false; private boolean playerIsArchenemy = false;
private FComboBox<Object> teamComboBox = new FComboBox<Object>(); private FComboBox<Object> cbTeam = new FComboBox<Object>();
private FComboBox<Object> aeTeamComboBox = new FComboBox<Object>(); private FComboBox<Object> cbArchenemyTeam = new FComboBox<Object>();
private final FLabel btnDeck = new FLabel.ButtonBuilder().text("Deck: (None)").build(); private final FLabel btnDeck = new FLabel.ButtonBuilder().text("Deck: (None)").build();
private final FLabel btnSchemeDeck = new FLabel.ButtonBuilder().text("Scheme Deck: (None)").build(); private final FLabel btnSchemeDeck = new FLabel.ButtonBuilder().text("Scheme Deck: (None)").build();
@@ -473,10 +475,10 @@ public class ConstructedScreen extends LaunchScreen {
add(newLabel("Team:")); add(newLabel("Team:"));
populateTeamsComboBoxes(); populateTeamsComboBoxes();
teamComboBox.setChangedHandler(teamChangedHandler); cbTeam.setChangedHandler(teamChangedHandler);
aeTeamComboBox.setChangedHandler(teamChangedHandler); cbArchenemyTeam.setChangedHandler(teamChangedHandler);
add(teamComboBox); add(cbTeam);
add(aeTeamComboBox); add(cbArchenemyTeam);
add(btnDeck); add(btnDeck);
btnDeck.setCommand(new FEventHandler() { btnDeck.setCommand(new FEventHandler() {
@@ -553,6 +555,10 @@ public class ConstructedScreen extends LaunchScreen {
lstPlanarDecks.setSelectedIndex(0); lstPlanarDecks.setSelectedIndex(0);
updateVanguardList(); updateVanguardList();
//disable team combo boxes for now
cbTeam.setEnabled(false);
cbArchenemyTeam.setEnabled(false);
} }
@Override @Override
@@ -576,11 +582,11 @@ public class ConstructedScreen extends LaunchScreen {
humanAiSwitch.setPosition(x, y); humanAiSwitch.setPosition(x, y);
w = x - avatarSize - 3 * PADDING; w = x - avatarSize - 3 * PADDING;
x = avatarSize + 2 * PADDING; x = avatarSize + 2 * PADDING;
if (aeTeamComboBox.isVisible()) { if (cbArchenemyTeam.isVisible()) {
aeTeamComboBox.setBounds(x, y, w, fieldHeight); cbArchenemyTeam.setBounds(x, y, w, fieldHeight);
} }
else { else {
teamComboBox.setBounds(x, y, w, fieldHeight); cbTeam.setBounds(x, y, w, fieldHeight);
} }
y += dy; y += dy;
@@ -692,9 +698,9 @@ public class ConstructedScreen extends LaunchScreen {
|| (isArchenemyApplied && playerIsArchenemy); || (isArchenemyApplied && playerIsArchenemy);
btnSchemeDeck.setVisible(archenemyVisiblity); btnSchemeDeck.setVisible(archenemyVisiblity);
teamComboBox.setVisible(!isArchenemyApplied); cbTeam.setVisible(!isArchenemyApplied);
aeTeamComboBox.setVisible(isArchenemyApplied); cbArchenemyTeam.setVisible(isArchenemyApplied);
aeTeamComboBox.setEnabled(!(isArchenemyApplied && playerIsArchenemy)); cbArchenemyTeam.setEnabled(!(isArchenemyApplied && playerIsArchenemy));
btnPlanarDeck.setVisible(appliedVariants.contains(GameType.Planechase)); btnPlanarDeck.setVisible(appliedVariants.contains(GameType.Planechase));
btnVanguardAvatar.setVisible(appliedVariants.contains(GameType.Vanguard)); btnVanguardAvatar.setVisible(appliedVariants.contains(GameType.Vanguard));
@@ -709,16 +715,16 @@ public class ConstructedScreen extends LaunchScreen {
} }
private void populateTeamsComboBoxes() { private void populateTeamsComboBoxes() {
aeTeamComboBox.addItem("Archenemy"); cbArchenemyTeam.addItem("Archenemy");
aeTeamComboBox.addItem("Heroes"); cbArchenemyTeam.addItem("Heroes");
aeTeamComboBox.setSelectedIndex(archenemyTeams.get(index) - 1); cbArchenemyTeam.setSelectedIndex(archenemyTeams.get(index) - 1);
aeTeamComboBox.setEnabled(playerIsArchenemy); cbArchenemyTeam.setEnabled(playerIsArchenemy);
for (int i = 1; i <= MAX_PLAYERS; i++) { for (int i = 1; i <= MAX_PLAYERS; i++) {
teamComboBox.addItem("Team " + i); cbTeam.addItem("Team " + i);
} }
teamComboBox.setSelectedIndex(teams.get(index) - 1); cbTeam.setSelectedIndex(teams.get(index) - 1);
teamComboBox.setEnabled(true); cbTeam.setEnabled(true);
} }
private FEventHandler teamChangedHandler = new FEventHandler() { private FEventHandler teamChangedHandler = new FEventHandler() {
@@ -736,7 +742,7 @@ public class ConstructedScreen extends LaunchScreen {
for (PlayerPanel pp : playerPanels) { for (PlayerPanel pp : playerPanels) {
int i = pp.index; int i = pp.index;
archenemyTeams.set(i, i == lastArchenemy ? 1 : 2); archenemyTeams.set(i, i == lastArchenemy ? 1 : 2);
pp.aeTeamComboBox.setSelectedIndex(i == lastArchenemy ? 0 : 1); pp.cbArchenemyTeam.setSelectedIndex(i == lastArchenemy ? 0 : 1);
pp.toggleIsPlayerArchenemy(); pp.toggleIsPlayerArchenemy();
} }
} }

4
forge-gui-mobile/src/forge/screens/match/MatchScreen.java
View File

@@ -79,7 +79,9 @@ public class MatchScreen extends FScreen {
menuBar = add(new FMenuBar()); menuBar = add(new FMenuBar());
menuBar.addTab("Game", new VGameMenu()); menuBar.addTab("Game", new VGameMenu());
menuBar.addTab("Players (" + playerPanels.size() + ")", new VPlayers()); VPlayers players = new VPlayers();
menuBar.addTab("Players (" + playerPanels.size() + ")", players);
players.getMenuTab().setEnabled(false); //disable players tab for now
menuBar.addTab("Log", log); menuBar.addTab("Log", log);
menuBar.addTab("Dev", devMenu); menuBar.addTab("Dev", devMenu);
menuBar.addTab("Stack (0)", stack); menuBar.addTab("Stack (0)", stack);