From e165805b8c59e7254b62d1d202d2e80df7b588be Mon Sep 17 00:00:00 2001 From: leriomaggio Date: Mon, 23 Aug 2021 00:33:44 +0100 Subject: [PATCH] Updated dialog mobile deck import (removed useless field) + translations --- .../src/forge/deck/FDeckImportDialog.java | 15 +-------------- forge-gui/res/languages/de-DE.properties | 2 -- forge-gui/res/languages/en-US.properties | 2 -- forge-gui/res/languages/es-ES.properties | 2 -- forge-gui/res/languages/it-IT.properties | 2 -- forge-gui/res/languages/ja-JP.properties | 2 -- forge-gui/res/languages/zh-CN.properties | 2 -- 7 files changed, 1 insertion(+), 26 deletions(-) diff --git a/forge-gui-mobile/src/forge/deck/FDeckImportDialog.java b/forge-gui-mobile/src/forge/deck/FDeckImportDialog.java index a28ba25d567..ec155f7a237 100644 --- a/forge-gui-mobile/src/forge/deck/FDeckImportDialog.java +++ b/forge-gui-mobile/src/forge/deck/FDeckImportDialog.java @@ -41,14 +41,7 @@ public class FDeckImportDialog extends FDialog { private final Callback callback; private final FTextArea txtInput = add(new FTextArea(true)); - private final FCheckBox newEditionCheck = add(new FCheckBox(Localizer.getInstance().getMessage("lblImportLatestVersionCard"), true)); private final FCheckBox dateTimeCheck = add(new FCheckBox(Localizer.getInstance().getMessage("lblUseOnlySetsReleasedBefore"), false)); - /*setting onlyCoreExpCheck to false allow the copied cards to pass the check of deck contents - forge-core\src\main\java\forge\deck\Deck.javaDeck.java starting @ Line 320 which is called by - forge-gui-mobile\src\forge\deck\FDeckEditor.java starting @ Line 373 - (as of latest commit: 8e6655e3ee67688cff66b422d4722c58392eaa7e) - */ - private final FCheckBox onlyCoreExpCheck = add(new FCheckBox(Localizer.getInstance().getMessage("lblUseOnlyCoreAndExpansionSets"), false)); private final FComboBox monthDropdown = add(new FComboBox<>()); //don't need wrappers since skin can't change while this dialog is open private final FComboBox yearDropdown = add(new FComboBox<>()); @@ -62,7 +55,7 @@ public class FDeckImportDialog extends FDialog { super(Localizer.getInstance().getMessage("lblImportFromClipboard"), 2); callback = callback0; - controller = new DeckImportController(replacingDeck, newEditionCheck, dateTimeCheck, onlyCoreExpCheck, monthDropdown, yearDropdown); + controller = new DeckImportController(dateTimeCheck, monthDropdown, yearDropdown, replacingDeck); txtInput.setText(Forge.getClipboard().getContents()); //just pull import directly off the clipboard initButton(0, Localizer.getInstance().getMessage("lblImport"), new FEventHandler() { @@ -159,7 +152,6 @@ public class FDeckImportDialog extends FDialog { h = monthDropdown.getHeight(); float fieldPadding = padding / 2; - newEditionCheck.setBounds(x, y, w, h); y += h + fieldPadding; dateTimeCheck.setBounds(x, y, w, h); y += h + fieldPadding; @@ -168,8 +160,6 @@ public class FDeckImportDialog extends FDialog { monthDropdown.setBounds(x, y, dropDownWidth, h); yearDropdown.setBounds(x + dropDownWidth + fieldPadding, y, dropDownWidth, h); y += h + fieldPadding; - - onlyCoreExpCheck.setBounds(x, y, w, h); y += h + 2 * padding; } h = txtInput.getPreferredHeight(w); @@ -179,9 +169,6 @@ public class FDeckImportDialog extends FDialog { } txtInput.setBounds(x, y, w, h); y += h + padding; - if (showOptions) { - h = newEditionCheck.getHeight(); - } return y; } } diff --git a/forge-gui/res/languages/de-DE.properties b/forge-gui/res/languages/de-DE.properties index 5bd3ad388e9..63350aa78da 100644 --- a/forge-gui/res/languages/de-DE.properties +++ b/forge-gui/res/languages/de-DE.properties @@ -1179,9 +1179,7 @@ lblOldLandCount=%d Länder lblNewLandCount=%d hinzugefügte Länder lblNewTotalCount=%d Karten #FDeckImportDialog.java -lblImportLatestVersionCard=Importiere neueste Kartenversion lblUseOnlySetsReleasedBefore=Nur Sets verwenden vor: -lblUseOnlyCoreAndExpansionSets=Nutze nur Haupt- u. Erweiterungssets lblFollowingCardsCannotBeImported=Folgende Karten können nicht importiert werden, wegen Tippfehlern, Seteinschränkungen oder weil nicht in Forge: lblImportRemainingCards=Verbleibende Karten importieren? lblNoKnownCardsOnClipboard=Keine Karten in der Zwischenablage gefunden.\n\nKopiere eine Deckliste in die Zwischenablage und versuche es erneut. diff --git a/forge-gui/res/languages/en-US.properties b/forge-gui/res/languages/en-US.properties index c0d9291d39c..7904747d980 100644 --- a/forge-gui/res/languages/en-US.properties +++ b/forge-gui/res/languages/en-US.properties @@ -1180,9 +1180,7 @@ lblOldLandCount=%d lands lblNewLandCount=%d added lands lblNewTotalCount=%d cards #FDeckImportDialog.java -lblImportLatestVersionCard=Import latest version of card lblUseOnlySetsReleasedBefore=Use only sets released before: -lblUseOnlyCoreAndExpansionSets=Use only core and expansion sets lblFollowingCardsCannotBeImported=The following cards cannot be imported due to misspelling, set restrictions, or not being in Forge yet: lblImportRemainingCards=Import remaining cards? lblNoKnownCardsOnClipboard=No known cards found on clipboard.\n\nCopy the decklist to the clipboard, then reopen this dialog. diff --git a/forge-gui/res/languages/es-ES.properties b/forge-gui/res/languages/es-ES.properties index 8c5db083b80..0faf914d5b6 100644 --- a/forge-gui/res/languages/es-ES.properties +++ b/forge-gui/res/languages/es-ES.properties @@ -1179,9 +1179,7 @@ lblOldLandCount=%d tierras lblNewLandCount=%d tierras añadidas lblNewTotalCount=%d cartas #FDeckImportDialog.java -lblImportLatestVersionCard=Importar la última versión de la carta lblUseOnlySetsReleasedBefore=Utilizar sólo las ediciones liberadas antes de: -lblUseOnlyCoreAndExpansionSets=Utiliza sólo ediciones core o de expansión lblFollowingCardsCannotBeImported=Las siguientes cartas no pueden ser importadas debido a errores ortográficos, restricciones establecidas, o por no estar en Forge todavía: lblImportRemainingCards=¿Importar las cartas restantes? lblNoKnownCardsOnClipboard=No se han encontrado cartas conocidas en el portapapeles.\n\nCopia la lista del mazo en el portapapeles y, a continuación, vuelve a abrir este cuadro de diálogo. diff --git a/forge-gui/res/languages/it-IT.properties b/forge-gui/res/languages/it-IT.properties index a798eb0e077..b7444f834b3 100644 --- a/forge-gui/res/languages/it-IT.properties +++ b/forge-gui/res/languages/it-IT.properties @@ -1178,9 +1178,7 @@ lblOldLandCount= %d terre lblNewLandCount= %d terre aggiunte lblNewTotalCount= %d carte #FDeckImportDialog.java -lblImportLatestVersionCard=Importa l''ultima versione della carta lblUseOnlySetsReleasedBefore=Utilizzare solo espansioni rilasciate prima di: -lblUseOnlyCoreAndExpansionSets=Utilizzare solo set base e di espansione lblFollowingCardsCannotBeImported=Le seguenti carte non possono essere importate a causa di errori di ortografia, restrizioni delle espansioni o per non essere ancora in Forge: lblImportRemainingCards=Importa le carte rimanenti? lblNoKnownCardsOnClipboard=Nessuna carta nota trovata negli appunti. \n \nCopia la lista dei mazzi negli appunti, quindi riapri questa finestra. diff --git a/forge-gui/res/languages/ja-JP.properties b/forge-gui/res/languages/ja-JP.properties index f4f79519e18..4c334550626 100644 --- a/forge-gui/res/languages/ja-JP.properties +++ b/forge-gui/res/languages/ja-JP.properties @@ -1180,9 +1180,7 @@ lblOldLandCount=%d枚の土地 lblNewLandCount=%d枚の追加された土地 lblNewTotalCount=%d枚のカード #FDeckImportDialog.java -lblImportLatestVersionCard=最新セットのカードでインポート lblUseOnlySetsReleasedBefore=このセットより前のセットのみを使用： -lblUseOnlyCoreAndExpansionSets=コアと拡張セットのみを使用する lblFollowingCardsCannotBeImported=次のカードは、つづりの間違い、制限の設定、またはまだ Forge にないためにインポートできません： lblImportRemainingCards=残りのカードをインポートしますか？ lblNoKnownCardsOnClipboard=クリップボードに既知のカードが見つかりません。\n\nデッキリストをクリップボードにコピーしてから、このダイアログを再度開きます。 diff --git a/forge-gui/res/languages/zh-CN.properties b/forge-gui/res/languages/zh-CN.properties index 5c91cf0566b..70cf37e3405 100644 --- a/forge-gui/res/languages/zh-CN.properties +++ b/forge-gui/res/languages/zh-CN.properties @@ -1180,9 +1180,7 @@ lblOldLandCount=%d张地牌 lblNewLandCount=添加%d张地牌 lblNewTotalCount=%d张牌 #FDeckImportDialog.java -lblImportLatestVersionCard=导入卡牌的最新版本 lblUseOnlySetsReleasedBefore=只用之前上市系列的版本： -lblUseOnlyCoreAndExpansionSets=只使用核心系列和拓展系列 lblFollowingCardsCannotBeImported=由于拼写错误，系列限制或forge尚未实现，以下卡牌没有被导入： lblImportRemainingCards=导入剩余的卡？ lblNoKnownCardsOnClipboard=在剪切板找不到已知的卡牌。\n\n将套牌列表复制到剪切板，然后重新打开此对话框。