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

Merge branch 'cleanlayout' into 'master'

Browse Source 
Deskop layout: remove obsolete elements

See merge request core-developers/forge!4167
This commit is contained in:
Michael Kamensky
2021-03-12 04:17:50 +00:00
parent 016bdf6077 e08e214fc1
commit 1fb4e4af9c
2 changed files with 1 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
forge-gui-desktop/src/main/java/forge/gui/framework/EDocID.java
View File

@@ -79,11 +79,6 @@ public enum EDocID {
REPORT_COMBAT (),
REPORT_LOG (),
// Player panel, deprecated, to be removed in a few months
// from now (2015-04-10) to allow users' match layouts to update
@Deprecated
REPORT_PLAYERS (),
DEV_MODE (),
BUTTON_DOCK (),
@@ -105,36 +100,13 @@ public enum EDocID {
HAND_4 (),
HAND_5 (),
HAND_6 (),
HAND_7 (),
// Command zones, deprecated, to be removed in a few months
// from now (2015-04-10) to allow users' match layouts to update
@Deprecated
COMMAND_0 (),
@Deprecated
COMMAND_1 (),
@Deprecated
COMMAND_2 (),
@Deprecated
COMMAND_3 (),
@Deprecated
COMMAND_4 (),
@Deprecated
COMMAND_5 (),
@Deprecated
COMMAND_6 (),
@Deprecated
COMMAND_7 ();
HAND_7 ();
public final static EDocID[] Fields = new EDocID[] {FIELD_0, FIELD_1, FIELD_2, FIELD_3, FIELD_4, FIELD_5, FIELD_6, FIELD_7};
public final static EDocID[] Hands = new EDocID[] {HAND_0, HAND_1, HAND_2, HAND_3, HAND_4, HAND_5, HAND_6, HAND_7};
static {
for (int i = 0; i < 8; i++) EDocID.Fields[i].setDoc(new VEmptyDoc(EDocID.Fields[i]));
for (int i = 0; i < 8; i++) EDocID.Hands[i].setDoc(new VEmptyDoc(EDocID.Hands[i]));
for (final EDocID deprecated : new EDocID[] {REPORT_PLAYERS, COMMAND_0, COMMAND_1, COMMAND_2, COMMAND_3, COMMAND_4, COMMAND_5, COMMAND_6, COMMAND_7}) {
deprecated.setDoc(new VEmptyDoc(deprecated));
}
}
public final static EDocID[] VarDocs = ObjectArrays.concat(Fields, Hands, EDocID.class);

3
forge-gui/res/defaults/match.xml
View File

@@ -4,7 +4,6 @@
<doc>REPORT_STACK</doc>
<doc>REPORT_COMBAT</doc>
<doc>REPORT_LOG</doc>
<doc>REPORT_PLAYERS</doc>
</cell>
<cell x="0.0" y="0.643" w="0.2" h="0.357">
<doc>REPORT_MESSAGE</doc>
@@ -14,7 +13,6 @@
</cell>
<cell x="0.2" y="0.0" w="0.6" h="0.364">
<doc>FIELD_1</doc>
<doc>COMMAND_1</doc>
</cell>
<cell x="0.2" y="0.732" w="0.6" h="0.268">
<doc>HAND_0</doc>
@@ -24,7 +22,6 @@
</cell>
<cell x="0.2" y="0.364" w="0.6" h="0.368">
<doc>FIELD_0</doc>
<doc>COMMAND_0</doc>
</cell>
<cell x="0.8" y="0.466" w="0.2" h="0.534">
<doc>CARD_PICTURE</doc>