From 0357e99d064111c38cc06f73e47cafc4e8bbf625 Mon Sep 17 00:00:00 2001 From: lodici Date: Sat, 22 Jul 2017 10:42:59 +0100 Subject: [PATCH] replace icon for card (script) screen. --- resources/magic/data/icons/ui/card-screen.png | Bin 0 -> 902 bytes resources/magic/data/icons/ui/w_edit.png | Bin 577 -> 0 bytes src/magic/data/MagicIcon.java | 2 +- .../ui/screen/card/explorer/ExplorerScreen.java | 12 +++++++----- 4 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 resources/magic/data/icons/ui/card-screen.png delete mode 100644 resources/magic/data/icons/ui/w_edit.png diff --git a/resources/magic/data/icons/ui/card-screen.png b/resources/magic/data/icons/ui/card-screen.png new file mode 100644 index 0000000000000000000000000000000000000000..6d327074325f06f3e386ba73396e304b545c912f GIT binary patch literal 902 zcmV;119|+3P)P001Be1^@s6=bY0900001b5ch_0Itp) z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;js(W8VM(0{2NoK~zXfwUyexSoGC3y9O{q*;9@7(n+1K(l}#b!Q@x$nGx4VzJ!m0nG|R7qM7u4?sTz(Cu2S zrlt5yAb9Xo__Jhsy?%utLh5dHIvvea5QD*R5svO1Y6ObM1$%)z zBypObEjwQhaIDp8y~0OC z$wNr!dmtQitCdQ{E`&uzqtT=2-^7djDHe7VzdfusQeR z`X&J|jK$(#;P2>>G6)Gdrz4#DIU``VjTvkLcvYhMltBuG!dA@W8=92!8%Wy|RNEVr z^()NeIzCcGe&kRogCITJk%FB~l_R-VBqR^XWHN^dfSLR*m&-XJJdWfcsQV9abX?Gy zOd@#*cKjMDX|3684*$U>FJ)^or3N9B{7fBXI4!=25Y+hsUHlKD!pY@w<*ENVj55q< cAHy)rUw!9egcS@n?EnA(07*qoM6N<$g7nRjVE_OC literal 0 HcmV?d00001 diff --git a/resources/magic/data/icons/ui/w_edit.png b/resources/magic/data/icons/ui/w_edit.png deleted file mode 100644 index 52e6ac12e2213e01106f64ac45da2ce1d0d73cc4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 577 zcmV-H0>1r;P)-rkLS-pdXz-Y>`Ve4p=gen@Q$z<|AyR4M>$kE9cl`X%*AIxeY4 zQn#cTNslEhMu8s!t^!lQSN@H8;8di{7l9W*mBvv8?zl=JB>I8(3E+3&L-PL(cmkY^ z^gtO{Oh9LW9$*Og1xy0_A_-h}A51ubb(g&a+y;L7`4muzA~6cofEnNiune374g+(E zI!}R)uyO>J60il}C@=tgO3ohv7DeJ3a5Dj$13LYQ(n@(4>4`qzcXI1jKm`~F>IsPl z(XIGxrZOsC5oz3yZqvgVPjn{LvK5m>45xVqTXtiPWS-+*5hRW|=pW#`f9p=54vZBw zsz)94F3|0&)PQMVu*jX^8Su_K=Csd{v9Lz&Knz761d5hQK_n>ii{Y3r66Rnn@Y@;34|C3TtETC0epJ{Z_0i7k^~Xr&@4k(~~( z!Cgtj+#g+%R+^M-Q*TQ;VrHLPsYq|Lo{|&25mhrH>Ff@27tHLrc3b=fal8a(BVzG; P00000NkvXXu0mjfnx*#Y diff --git a/src/magic/data/MagicIcon.java b/src/magic/data/MagicIcon.java index a42355816c..dafb5c5dcb 100644 --- a/src/magic/data/MagicIcon.java +++ b/src/magic/data/MagicIcon.java @@ -9,6 +9,7 @@ public enum MagicIcon { // ../ui/... icons. // ALERT("ui/alert-16.png"), + CARD_SCREEN("ui/card-screen.png"), CARDFLOW("ui/cardflow-28.png"), CHECKBOX_OFF("ui/checkbox-16.png"), CHECKBOX_ON("ui/checkbox-selected-16.png"), @@ -23,7 +24,6 @@ public enum MagicIcon { CUBE("ui/w_cube.png"), CYCLE("ui/w_cycle.png"), DECK("ui/w_deck.png"), - EDIT("ui/w_edit.png"), ENCHANTMENTS("ui/w_enchantments.png"), EXPERIENCE("ui/rank-16.png"), FAST_FORWARD("ui/fast-forward-16.png"), diff --git a/src/magic/ui/screen/card/explorer/ExplorerScreen.java b/src/magic/ui/screen/card/explorer/ExplorerScreen.java index 1d06b665ee..87ddd862e6 100644 --- a/src/magic/ui/screen/card/explorer/ExplorerScreen.java +++ b/src/magic/ui/screen/card/explorer/ExplorerScreen.java @@ -36,6 +36,10 @@ public class ExplorerScreen extends HeaderFooterScreen MagicIcon.CARDFLOW, Color.BLACK, Color.WHITE ); + private static final ImageIcon CARD_ICON = ImageHelper.getRecoloredIcon( + MagicIcon.CARD_SCREEN, Color.BLACK, Color.WHITE + ); + private ExplorerContentPanel contentPanel; private ExplorerHeaderPanel headerPanel; @@ -65,15 +69,13 @@ public class ExplorerScreen extends HeaderFooterScreen } private void setFooterButtons() { - addFooterGroup( + addToFooter( PlainMenuButton.build(this::doShowCardFlowScreen, CARDFLOW_ICON, MText.get(_S7), MText.get(_S8) ), PlainMenuButton.build(this::doShowScriptScreen, - MagicIcon.EDIT, MText.get(_S3), MText.get(_S4) - ) - ); - addToFooter( + CARD_ICON, MText.get(_S3), MText.get(_S4) + ), PlainMenuButton.build(this::doSelectRandomCard, MagicIcon.RANDOM, MText.get(_S5), MText.get(_S6) )