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 lblOk and lblOK (#4040)

Browse Source
This commit is contained in:
Northmoc
2023-10-30 14:50:28 -04:00
committed by GitHub
parent 68b5cca38e
commit 77725b6e6d
25 changed files with 21 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui-desktop/src/main/java/forge/deckchooser/FDeckChooser.java
View File

@@ -69,7 +69,7 @@ public class FDeckChooser extends JPanel implements IDecksComboBoxListener {
final Dimension parentSize = JOptionPane.getRootFrame().getSize();
chooser.setMinimumSize(new Dimension((int)(parentSize.getWidth() / 2), (int)parentSize.getHeight() - 200));
final Localizer localizer = Localizer.getInstance();
final FOptionPane optionPane = new FOptionPane(null, title, null, chooser, ImmutableList.of(localizer.getMessage("lblOk"), localizer.getMessage("lblCancel")), 0);
final FOptionPane optionPane = new FOptionPane(null, title, null, chooser, ImmutableList.of(localizer.getMessage("lblOK"), localizer.getMessage("lblCancel")), 0);
optionPane.setDefaultFocus(chooser);
chooser.lstDecks.setItemActivateCommand(new UiCommand() {
@Override

2
forge-gui-desktop/src/main/java/forge/screens/home/quest/DialogChooseFormats.java
View File

@@ -86,7 +86,7 @@ public class DialogChooseFormats {
}
};
FButton btnOk = new FButton(localizer.getMessage("lblOk"));
FButton btnOk = new FButton(localizer.getMessage("lblOK"));
btnOk.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent arg0) {

2
forge-gui-desktop/src/main/java/forge/screens/home/quest/DialogChoosePoolDistribution.java
View File

@@ -48,7 +48,7 @@ public class DialogChoosePoolDistribution {
private final FTextField numberOfBoostersField = new FTextField.Builder().text("0").maxLength(10).build();
private final FButton btnOk = new FButton(localizer.getMessage("lblOk"));
private final FButton btnOk = new FButton(localizer.getMessage("lblOK"));
private Runnable callback;

2
forge-gui-desktop/src/main/java/forge/screens/match/VAssignCombatDamage.java
View File

@@ -86,7 +86,7 @@ public class VAssignCombatDamage {
private final JLabel lblTotalDamage = new FLabel.Builder().text(localizer.getMessage("lblTotalDamageText")).build();
private final JLabel lblAssignRemaining = new FLabel.Builder().text(localizer.getMessage("lblAssignRemainingText")).build();
// Label Buttons
private final FButton btnOK = new FButton(localizer.getMessage("lblOk"));
private final FButton btnOK = new FButton(localizer.getMessage("lblOK"));
private final FButton btnReset = new FButton(localizer.getMessage("lblReset"));
private final FButton btnAuto = new FButton(localizer.getMessage("lblAuto"));
private final FButton btnSkip = new FButton(localizer.getMessage("lblSkip"));

2
forge-gui-desktop/src/main/java/forge/screens/match/VAssignGenericAmount.java
View File

@@ -73,7 +73,7 @@ public class VAssignGenericAmount {
private final JLabel lblTotalAmount;
private final boolean atLeastOne;
// Label Buttons
private final FButton btnOK = new FButton(localizer.getMessage("lblOk"));
private final FButton btnOK = new FButton(localizer.getMessage("lblOK"));
private final FButton btnReset = new FButton(localizer.getMessage("lblReset"));
private static class AssignTarget {

2
forge-gui-desktop/src/main/java/forge/screens/match/views/VPrompt.java
View File

@@ -59,7 +59,7 @@ public class VPrompt implements IVDoc<CPrompt> {
private final DragTab tab = new DragTab(localizer.getMessage("lblPrompt"));
// Various components
private final FButton btnOK = new FButton(localizer.getMessage("lblOk"));
private final FButton btnOK = new FButton(localizer.getMessage("lblOK"));
private final FButton btnCancel = new FButton(localizer.getMessage("lblCancel"));
private final FHtmlViewer tarMessage = new FHtmlViewer();
private final FScrollPane messageScroller = new FScrollPane(tarMessage, false,