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

Rename Planar Map to Command Center

Browse Source
This commit is contained in:
drdev
2014-12-06 21:01:48 +00:00
parent e9d31c0f0c
commit 10450d51a8
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@@ -1284,7 +1284,7 @@ forge-gui-mobile/src/forge/screens/match/winlose/GauntletWinLose.java -text
forge-gui-mobile/src/forge/screens/match/winlose/LimitedWinLose.java -text forge-gui-mobile/src/forge/screens/match/winlose/LimitedWinLose.java -text
forge-gui-mobile/src/forge/screens/match/winlose/QuestWinLose.java -text forge-gui-mobile/src/forge/screens/match/winlose/QuestWinLose.java -text
forge-gui-mobile/src/forge/screens/match/winlose/ViewWinLose.java -text forge-gui-mobile/src/forge/screens/match/winlose/ViewWinLose.java -text
forge-gui-mobile/src/forge/screens/planarconquest/ConquestMapScreen.java -text forge-gui-mobile/src/forge/screens/planarconquest/CommandCenterScreen.java -text
forge-gui-mobile/src/forge/screens/planarconquest/ConquestMenu.java -text forge-gui-mobile/src/forge/screens/planarconquest/ConquestMenu.java -text
forge-gui-mobile/src/forge/screens/planarconquest/ConquestPrefsScreen.java -text forge-gui-mobile/src/forge/screens/planarconquest/ConquestPrefsScreen.java -text
forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java -text forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java -text

10
forge-gui-mobile/src/forge/screens/planarconquest/ConquestMapScreen.java → forge-gui-mobile/src/forge/screens/planarconquest/CommandCenterScreen.java
View File

@@ -40,7 +40,7 @@ import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FLabel; import forge.toolbox.FLabel;
import forge.util.Utils; import forge.util.Utils;
public class ConquestMapScreen extends FScreen implements IVConquestBase { public class CommandCenterScreen extends FScreen implements IVConquestBase {
private static final Color BACK_COLOR = FSkinColor.fromRGB(1, 2, 2); private static final Color BACK_COLOR = FSkinColor.fromRGB(1, 2, 2);
private static final float BORDER_THICKNESS = Utils.scale(1); private static final float BORDER_THICKNESS = Utils.scale(1);
private static final FSkinFont REGION_NAME_FONT = FSkinFont.get(15); private static final FSkinFont REGION_NAME_FONT = FSkinFont.get(15);
@@ -57,13 +57,13 @@ public class ConquestMapScreen extends FScreen implements IVConquestBase {
private ConquestData model; private ConquestData model;
public ConquestMapScreen() { public CommandCenterScreen() {
super("", ConquestMenu.getMenu()); super("", ConquestMenu.getMenu());
btnEndDay.setCommand(new FEventHandler() { btnEndDay.setCommand(new FEventHandler() {
@Override @Override
public void handleEvent(FEvent e) { public void handleEvent(FEvent e) {
model.endDay(ConquestMapScreen.this); model.endDay(CommandCenterScreen.this);
} }
}); });
} }
@@ -359,7 +359,7 @@ public class ConquestMapScreen extends FScreen implements IVConquestBase {
@Override @Override
public void activate(int idx) { public void activate(int idx) {
ConquestMapScreen.this.activate(commanderRow.panels[idx]); CommandCenterScreen.this.activate(commanderRow.panels[idx]);
} }
}); });
} }
@@ -382,7 +382,7 @@ public class ConquestMapScreen extends FScreen implements IVConquestBase {
@Override @Override
public void activate(int idx) { public void activate(int idx) {
ConquestMapScreen.this.activate(regionDisplay.opponents[idx]); CommandCenterScreen.this.activate(regionDisplay.opponents[idx]);
} }
}); });
} }

16
forge-gui-mobile/src/forge/screens/planarconquest/ConquestMenu.java
View File

@@ -20,13 +20,13 @@ import forge.toolbox.FEvent.FEventHandler;
public class ConquestMenu extends FPopupMenu { public class ConquestMenu extends FPopupMenu {
private static final ConquestMenu conquestMenu = new ConquestMenu(); private static final ConquestMenu conquestMenu = new ConquestMenu();
private static final ConquestMapScreen mapScreen = new ConquestMapScreen(); private static final CommandCenterScreen commanderCenterScreen = new CommandCenterScreen();
private static final ConquestPrefsScreen prefsScreen = new ConquestPrefsScreen(); private static final ConquestPrefsScreen prefsScreen = new ConquestPrefsScreen();
private static final FMenuItem mapItem = new FMenuItem("Planar Map", FSkinImage.QUEST_MAP, new FEventHandler() { private static final FMenuItem mapItem = new FMenuItem("Command Center", FSkinImage.QUEST_MAP, new FEventHandler() {
@Override @Override
public void handleEvent(FEvent e) { public void handleEvent(FEvent e) {
Forge.openScreen(mapScreen); Forge.openScreen(commanderCenterScreen);
} }
}); });
@@ -56,14 +56,14 @@ public class ConquestMenu extends FPopupMenu {
FModel.getConquest().load(ConquestDataIO.loadData(data)); FModel.getConquest().load(ConquestDataIO.loadData(data));
((DeckController<Deck>)EditorType.PlanarConquest.getController()).setRootFolder(FModel.getConquest().getDecks()); ((DeckController<Deck>)EditorType.PlanarConquest.getController()).setRootFolder(FModel.getConquest().getDecks());
if (reason == LaunchReason.StartPlanarConquest) { if (reason == LaunchReason.StartPlanarConquest) {
Forge.openScreen(mapScreen); Forge.openScreen(commanderCenterScreen);
} }
else { else {
mapScreen.update(); commanderCenterScreen.update();
if (reason == LaunchReason.LoadConquest) { if (reason == LaunchReason.LoadConquest) {
Forge.back(); Forge.back();
if (Forge.onHomeScreen()) { //open map screen if Load Conquest screen was opening direct from home screen if (Forge.onHomeScreen()) { //open map screen if Load Conquest screen was opening direct from home screen
Forge.openScreen(mapScreen); Forge.openScreen(commanderCenterScreen);
} }
} }
else { else {
@@ -72,7 +72,7 @@ public class ConquestMenu extends FPopupMenu {
Forge.back(); //remove LoadConquestScreen from screen stack Forge.back(); //remove LoadConquestScreen from screen stack
} }
if (Forge.onHomeScreen()) { //open map screen if New Conquest screen was opening direct from home screen if (Forge.onHomeScreen()) { //open map screen if New Conquest screen was opening direct from home screen
Forge.openScreen(mapScreen); Forge.openScreen(commanderCenterScreen);
} }
} }
} }
@@ -93,7 +93,7 @@ public class ConquestMenu extends FPopupMenu {
@Override @Override
protected void buildMenu() { protected void buildMenu() {
FScreen currentScreen = Forge.getCurrentScreen(); FScreen currentScreen = Forge.getCurrentScreen();
addItem(mapItem); mapItem.setSelected(currentScreen == mapScreen); addItem(mapItem); mapItem.setSelected(currentScreen == commanderCenterScreen);
addItem(new FMenuItem("New Conquest", FSkinImage.NEW, new FEventHandler() { addItem(new FMenuItem("New Conquest", FSkinImage.NEW, new FEventHandler() {
@Override @Override
public void handleEvent(FEvent e) { public void handleEvent(FEvent e) {