From 76c093d966d0b3a6de7037430201b52ba7326d93 Mon Sep 17 00:00:00 2001 From: Zachary Kline Date: Sun, 12 Jul 2020 20:22:52 -0700 Subject: [PATCH 1/5] Add several accessible names. --- forge-gui-desktop/src/main/java/forge/gui/CardDetailPanel.java | 1 + forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java | 2 +- .../src/main/java/forge/screens/match/views/VPrompt.java | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/forge-gui-desktop/src/main/java/forge/gui/CardDetailPanel.java b/forge-gui-desktop/src/main/java/forge/gui/CardDetailPanel.java index a3e4018f21b..a32a99e971b 100644 --- a/forge-gui-desktop/src/main/java/forge/gui/CardDetailPanel.java +++ b/forge-gui-desktop/src/main/java/forge/gui/CardDetailPanel.java @@ -97,6 +97,7 @@ public class CardDetailPanel extends SkinnedPanel { cdArea.setBorder(new EmptyBorder(2, 6, 2, 6)); cdArea.setOpaque(false); cdArea.setFocusable(true); + cdArea.getAccessibleContext().setAccessibleName("Card textbox"); scrArea = new FScrollPane(cdArea, false); add(nameCostLabel); diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java b/forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java index 21928c2ce24..860516afaf8 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java @@ -183,7 +183,7 @@ public class VLobby implements ILobbyView { if (lobby.hasControl()) { pnlStart.setOpaque(false); pnlStart.add(btnStart, "align center"); - + btnStart.getAccessibleContext().setAccessibleName("Start game"); // Start button event handling btnStart.addActionListener(new ActionListener() { @Override diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/views/VPrompt.java b/forge-gui-desktop/src/main/java/forge/screens/match/views/VPrompt.java index 9aad473f1d4..c9081919200 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/match/views/VPrompt.java +++ b/forge-gui-desktop/src/main/java/forge/screens/match/views/VPrompt.java @@ -94,7 +94,8 @@ public class VPrompt implements IVDoc { tarMessage.setForeground(FSkin.getColor(FSkin.Colors.CLR_TEXT)); tarMessage.setMargin(new Insets(3, 3, 3, 3)); - + tarMessage.getAccessibleContext().setAccessibleName("Prompt"); + tarMessage.setFocusable(true); // Allow tab to navigate to the prompt. messageScroller.getViewport().getView().addMouseListener(new MouseAdapter() { @Override public void mouseEntered(final MouseEvent e) { From 9da6f28bc0e2fc054bdabdb8a8b54b2ecccd9cba Mon Sep 17 00:00:00 2001 From: Zachary Kline Date: Mon, 13 Jul 2020 09:59:59 -0700 Subject: [PATCH 2/5] Alternate start button handling. --- .../src/main/java/forge/screens/home/StartButton.java | 3 ++- forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/StartButton.java b/forge-gui-desktop/src/main/java/forge/screens/home/StartButton.java index 0825b865f61..a3014a20488 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/StartButton.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/StartButton.java @@ -23,7 +23,8 @@ public class StartButton extends SkinnedButton { setRolloverIcon(FSkin.getIcon(FSkinProp.IMG_BTN_START_OVER)); setIcon(FSkin.getIcon(FSkinProp.IMG_BTN_START_UP)); setPressedIcon(FSkin.getIcon(FSkinProp.IMG_BTN_START_DOWN)); - + // Accessible name. + this.getAccessibleContext().setAccessibleName("Start game"); addFocusListener(new FocusListener() { @Override public void focusLost(FocusEvent arg0) { diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java b/forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java index 860516afaf8..efe8a075a92 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java @@ -183,7 +183,6 @@ public class VLobby implements ILobbyView { if (lobby.hasControl()) { pnlStart.setOpaque(false); pnlStart.add(btnStart, "align center"); - btnStart.getAccessibleContext().setAccessibleName("Start game"); // Start button event handling btnStart.addActionListener(new ActionListener() { @Override From 4af7c1d8395bb8826f40b93c941ad018b0eac15f Mon Sep 17 00:00:00 2001 From: Zachary Kline Date: Tue, 14 Jul 2020 15:52:52 -0700 Subject: [PATCH 3/5] Add names for tables in deck editor. --- .../src/main/java/forge/itemmanager/ItemManager.java | 1 + 1 file changed, 1 insertion(+) diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/ItemManager.java b/forge-gui-desktop/src/main/java/forge/itemmanager/ItemManager.java index b0b4660fa74..845299ba96c 100644 --- a/forge-gui-desktop/src/main/java/forge/itemmanager/ItemManager.java +++ b/forge-gui-desktop/src/main/java/forge/itemmanager/ItemManager.java @@ -451,6 +451,7 @@ public abstract class ItemManager extends JPanel implem @Override public void setCaption(final String caption) { this.lblCaption.setText(caption); +this.lblCaption.setLabelFor(this.listView.getTable()); } /** From 87533decd8b8b7abb6e1dd25ed32ccc127ae9120 Mon Sep 17 00:00:00 2001 From: Zachary Kline Date: Tue, 14 Jul 2020 16:39:19 -0700 Subject: [PATCH 4/5] Quest combo box labels. --- .../screens/home/quest/VSubmenuQuestStart.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestStart.java b/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestStart.java index bb51d9248dd..16cb3ade5a0 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestStart.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestStart.java @@ -57,22 +57,17 @@ public enum VSubmenuQuestStart implements IVSubmenu { private final FLabel lblStartingWorld = new FLabel.Builder().text(localizer.getMessage("lblStartingWorld") + ":").build(); private final FComboBoxWrapper cbxStartingWorld = new FComboBoxWrapper<>(); - /* Second column */ private final FLabel lblStartingPool = new FLabel.Builder().text(localizer.getMessage("lblStartingPool") + ":").build(); private final FComboBoxWrapper cbxStartingPool = new FComboBoxWrapper<>(); - private final FLabel lblUnrestricted = new FLabel.Builder().text(localizer.getMessage("lblAllCardsAvailable")).build(); private final FLabel lblPreconDeck = new FLabel.Builder().text(localizer.getMessage("lblStarterEventdeck") +":").build(); private final FComboBoxWrapper cbxPreconDeck = new FComboBoxWrapper<>(); - private final FLabel lblFormat = new FLabel.Builder().text(localizer.getMessage("lblSanctionedFormat") + ":").build(); private final FComboBoxWrapper cbxFormat = new FComboBoxWrapper<>(); - private final FLabel lblCustomDeck = new FLabel.Builder().text(localizer.getMessage("lblCustomdeck")).build(); private final FComboBoxWrapper cbxCustomDeck = new FComboBoxWrapper<>(); - private final FLabel btnDefineCustomFormat = new FLabel.Builder().opaque(true).hoverable(true).text(localizer.getMessage("lblDefineCustomFormat")).build(); private final FLabel btnSelectFormat = new FLabel.Builder().opaque(true).hoverable(true).text(localizer.getMessage("lblSelectFormat")).build(); @@ -89,10 +84,8 @@ public enum VSubmenuQuestStart implements IVSubmenu { private final FLabel lblPrizedCards = new FLabel.Builder().text(localizer.getMessage("lblPrizedCards")).build(); private final FComboBoxWrapper cbxPrizedCards = new FComboBoxWrapper<>(); - private final FLabel lblPrizeFormat = new FLabel.Builder().text(localizer.getMessage("lblSanctionedFormat") + ":").build(); private final FComboBoxWrapper cbxPrizeFormat = new FComboBoxWrapper<>(); - private final FLabel lblPrizeUnrestricted = new FLabel.Builder().text(localizer.getMessage("lblAllCardsAvailableWin")).build(); private final FLabel lblPrizeSameAsStarting = new FLabel.Builder().text(localizer.getMessage("lblOnlySetsInStarting")).build(); @@ -195,6 +188,13 @@ public enum VSubmenuQuestStart implements IVSubmenu { boxCompleteSet.setToolTipText(localizer.getMessage("lblboxCompleteSet")); boxAllowDuplicates.setToolTipText(localizer.getMessage("lblboxAllowDuplicates")); + lblStartingWorld.setLabelFor(cbxStartingWorld.getComponent()); + lblStartingPool.setLabelFor(cbxStartingPool.getComponent()); + lblPreconDeck.setLabelFor(cbxPreconDeck.getComponent()); + lblFormat.setLabelFor(cbxFormat.getComponent()); + lblCustomDeck.setLabelFor(cbxCustomDeck.getComponent()); + lblPrizedCards.setLabelFor(cbxPrizedCards.getComponent()); + lblPrizeFormat.setLabelFor(cbxPrizeFormat.getComponent()); cbxStartingPool.addItem(StartingPoolType.Complete); cbxStartingPool.addItem(StartingPoolType.Sanctioned); From 44a36396dfbc91e5b0b1845d9066cc4e7267e378 Mon Sep 17 00:00:00 2001 From: Zachary Kline Date: Tue, 14 Jul 2020 21:35:26 -0700 Subject: [PATCH 5/5] Formatting fixes. --- .../main/java/forge/itemmanager/ItemManager.java | 2 +- .../screens/home/quest/VSubmenuQuestStart.java | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/ItemManager.java b/forge-gui-desktop/src/main/java/forge/itemmanager/ItemManager.java index 845299ba96c..28d1f766f68 100644 --- a/forge-gui-desktop/src/main/java/forge/itemmanager/ItemManager.java +++ b/forge-gui-desktop/src/main/java/forge/itemmanager/ItemManager.java @@ -451,7 +451,7 @@ public abstract class ItemManager extends JPanel implem @Override public void setCaption(final String caption) { this.lblCaption.setText(caption); -this.lblCaption.setLabelFor(this.listView.getTable()); + this.lblCaption.setLabelFor(this.listView.getTable()); } /** diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestStart.java b/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestStart.java index 16cb3ade5a0..aa07c291bd5 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestStart.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestStart.java @@ -188,13 +188,13 @@ public enum VSubmenuQuestStart implements IVSubmenu { boxCompleteSet.setToolTipText(localizer.getMessage("lblboxCompleteSet")); boxAllowDuplicates.setToolTipText(localizer.getMessage("lblboxAllowDuplicates")); - lblStartingWorld.setLabelFor(cbxStartingWorld.getComponent()); - lblStartingPool.setLabelFor(cbxStartingPool.getComponent()); - lblPreconDeck.setLabelFor(cbxPreconDeck.getComponent()); - lblFormat.setLabelFor(cbxFormat.getComponent()); - lblCustomDeck.setLabelFor(cbxCustomDeck.getComponent()); - lblPrizedCards.setLabelFor(cbxPrizedCards.getComponent()); - lblPrizeFormat.setLabelFor(cbxPrizeFormat.getComponent()); + lblStartingWorld.setLabelFor(cbxStartingWorld.getComponent()); + lblStartingPool.setLabelFor(cbxStartingPool.getComponent()); + lblPreconDeck.setLabelFor(cbxPreconDeck.getComponent()); + lblFormat.setLabelFor(cbxFormat.getComponent()); + lblCustomDeck.setLabelFor(cbxCustomDeck.getComponent()); + lblPrizedCards.setLabelFor(cbxPrizedCards.getComponent()); + lblPrizeFormat.setLabelFor(cbxPrizeFormat.getComponent()); cbxStartingPool.addItem(StartingPoolType.Complete); cbxStartingPool.addItem(StartingPoolType.Sanctioned);