Droog71
/
magarena
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace log icon in game log titlebar and add icon to show keywords glossary screen.

master
lodici 2016-10-09 15:03:53 +01:00
parent 10123d0ca7
commit b239bb6107
4 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
resources/magic/data/icons/w_key16.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 396 B

BIN
resources/magic/data/icons/w_log16.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 503 B

3
src/magic/data/MagicIcon.java
View File

@ -6,12 +6,13 @@ import java.util.Set;
public enum MagicIcon {
FIREMIND("w_firemind.png"),
KEY("w_key16.png"),
LAYOUT("w-layout.png"),
ILLEGAL("card_illegal.png"),
LEGAL("card_legal.png"),
BANNED("card_banned.png"),
RESTRICTED("card_restricted.png"),
LOG_FILE("w_examine.png"),
LOG_FILE("w_log16.png"),
ARROW_UP("w_up.png"),
ARROW_DOWN("w_down.png"),
MENU("w_menu5@18.png"),

25
src/magic/ui/widget/duel/sidebar/LogStackViewer.java
View File

@ -38,7 +38,9 @@ class LogStackViewer extends JPanel {
private static final String _S5 = "Stack";
private static final String _S6 = "Cycle message style";
private static final String _S7 = "Click to cycle through various styles for the log/stack messages.";
private static final String _S8 = "Keywords glossary";
private static final String _S9 = "Quick reference...";
private final LogViewer logViewer;
private final StackViewer stackViewer;
private final ActionButtonTitleBar logTitleBar;
@ -104,10 +106,26 @@ class LogStackViewer extends JPanel {
);
}
private JButton getKeywordsActionButton() {
return new ActionBarButton(
MagicImages.getIcon(MagicIcon.KEY),
UiString.get(UiString.get(_S8)),
UiString.get(UiString.get(_S9)),
new AbstractAction() {
@Override
public void actionPerformed(ActionEvent e) {
ScreenController.showKeywordsScreen();
}
}
);
}
private List<JButton> getLogActionButtons() {
final List<JButton> btns = new ArrayList<>();
btns.add(getMessageStyleActionButton());
btns.add(getKeywordsActionButton());
btns.add(getLogFileActionButton());
btns.add(getMessageStyleActionButton());
btns.add(getLogViewActionButton(MagicIcon.ARROW_DOWN));
for (JButton btn : btns) {
btn.setFocusable(false);
@ -117,8 +135,9 @@ class LogStackViewer extends JPanel {
private List<JButton> getStackActionButtons() {
final List<JButton> btns = new ArrayList<>();
btns.add(getMessageStyleActionButton());
btns.add(getKeywordsActionButton());
btns.add(getLogFileActionButton());
btns.add(getMessageStyleActionButton());
btns.add(getLogViewActionButton(MagicIcon.ARROW_UP));
for (JButton btn : btns) {
btn.setFocusable(false);