diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/views/DeckStarRenderer.java b/forge-gui-desktop/src/main/java/forge/itemmanager/views/DeckStarRenderer.java index 15abb763f65..cd6e641c425 100644 --- a/forge-gui-desktop/src/main/java/forge/itemmanager/views/DeckStarRenderer.java +++ b/forge-gui-desktop/src/main/java/forge/itemmanager/views/DeckStarRenderer.java @@ -82,7 +82,7 @@ public class DeckStarRenderer extends ItemCellRenderer { } else if (DeckPreferences.getPrefs(deck).getStarCount() == 0) { this.setToolTipText("Click to add " + deck.getName() + " to your favorites"); - skinImage = FSkin.getImage(FSkinProp.IMG_STAR_OUTINE); + skinImage = FSkin.getImage(FSkinProp.IMG_STAR_OUTLINE); } else { //TODO: consider supporting more than 1 star this.setToolTipText("Click to remove " + deck.getName() + " from your favorites"); diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/views/StarRenderer.java b/forge-gui-desktop/src/main/java/forge/itemmanager/views/StarRenderer.java index 197e791d894..be64ea0bf4d 100644 --- a/forge-gui-desktop/src/main/java/forge/itemmanager/views/StarRenderer.java +++ b/forge-gui-desktop/src/main/java/forge/itemmanager/views/StarRenderer.java @@ -83,7 +83,7 @@ public class StarRenderer extends ItemCellRenderer { } else if (CardPreferences.getPrefs(card).getStarCount() == 0) { this.setToolTipText("Click to add " + card.getName() + " to your favorites"); - skinImage = FSkin.getImage(FSkinProp.IMG_STAR_OUTINE); + skinImage = FSkin.getImage(FSkinProp.IMG_STAR_OUTLINE); } else { //TODO: consider supporting more than 1 star this.setToolTipText("Click to remove " + card.getName() + " from your favorites"); diff --git a/forge-gui-mobile/src/forge/assets/FSkinImage.java b/forge-gui-mobile/src/forge/assets/FSkinImage.java index a0ea9b8b76b..64075d15770 100644 --- a/forge-gui-mobile/src/forge/assets/FSkinImage.java +++ b/forge-gui-mobile/src/forge/assets/FSkinImage.java @@ -174,22 +174,45 @@ public enum FSkinImage implements FImage { INFORMATION (FSkinProp.ICO_INFORMATION, SourceFile.ICONS), WARNING (FSkinProp.ICO_WARNING, SourceFile.ICONS), ERROR (FSkinProp.ICO_ERROR, SourceFile.ICONS), + DELETE (FSkinProp.ICO_DELETE, SourceFile.ICONS), + HDDELETE (FSkinProp.ICO_HDDELETE, SourceFile.BUTTONS), + DELETE_OVER (FSkinProp.ICO_DELETE_OVER, SourceFile.ICONS), + EDIT (FSkinProp.ICO_EDIT, SourceFile.ICONS), + HDEDIT (FSkinProp.ICO_HDEDIT, SourceFile.BUTTONS), + EDIT_OVER (FSkinProp.ICO_EDIT_OVER, SourceFile.ICONS), + OPEN (FSkinProp.ICO_OPEN, SourceFile.ICONS), + HDOPEN (FSkinProp.ICO_HDOPEN, SourceFile.BUTTONS), + MINUS (FSkinProp.ICO_MINUS, SourceFile.ICONS), + HDMINUS (FSkinProp.ICO_HDMINUS, SourceFile.BUTTONS), + NEW (FSkinProp.ICO_NEW, SourceFile.ICONS), + PLUS (FSkinProp.ICO_PLUS, SourceFile.ICONS), + HDPLUS (FSkinProp.ICO_HDPLUS, SourceFile.BUTTONS), + PRINT (FSkinProp.ICO_PRINT, SourceFile.ICONS), + SAVE (FSkinProp.ICO_SAVE, SourceFile.ICONS), + HDSAVE (FSkinProp.ICO_HDSAVE, SourceFile.BUTTONS), SAVEAS (FSkinProp.ICO_SAVEAS, SourceFile.ICONS), + HDSAVEAS (FSkinProp.ICO_HDSAVEAS, SourceFile.BUTTONS), + CLOSE (FSkinProp.ICO_CLOSE, SourceFile.ICONS), LIST (FSkinProp.ICO_LIST, SourceFile.ICONS), CARD_IMAGE (FSkinProp.ICO_CARD_IMAGE, SourceFile.ICONS), + FOLDER (FSkinProp.ICO_FOLDER, SourceFile.ICONS), + HDFOLDER (FSkinProp.ICO_HDFOLDER, SourceFile.BUTTONS), + SEARCH (FSkinProp.ICO_SEARCH, SourceFile.ICONS), + HDSEARCH (FSkinProp.ICO_HDSEARCH, SourceFile.BUTTONS), + UNKNOWN (FSkinProp.ICO_UNKNOWN, SourceFile.ICONS), LOGO (FSkinProp.ICO_LOGO, SourceFile.ICONS), @@ -208,8 +231,11 @@ public enum FSkinImage implements FImage { CUR_TAB (FSkinProp.IMG_CUR_TAB, SourceFile.ICONS), //Editor images - STAR_OUTINE (FSkinProp.IMG_STAR_OUTINE, SourceFile.ICONS), + STAR_OUTLINE (FSkinProp.IMG_STAR_OUTLINE, SourceFile.ICONS), + HDSTAR_OUTLINE (FSkinProp.IMG_HDSTAR_OUTLINE, SourceFile.BUTTONS), STAR_FILLED (FSkinProp.IMG_STAR_FILLED, SourceFile.ICONS), + HDSTAR_FILLED (FSkinProp.IMG_HDSTAR_FILLED, SourceFile.BUTTONS), + ARTIFACT (FSkinProp.IMG_ARTIFACT, SourceFile.MANAICONS), CREATURE (FSkinProp.IMG_CREATURE, SourceFile.MANAICONS), ENCHANTMENT (FSkinProp.IMG_ENCHANTMENT, SourceFile.MANAICONS), diff --git a/forge-gui-mobile/src/forge/deck/AddBasicLandsDialog.java b/forge-gui-mobile/src/forge/deck/AddBasicLandsDialog.java index 416e66cd080..aab37b4c0a0 100644 --- a/forge-gui-mobile/src/forge/deck/AddBasicLandsDialog.java +++ b/forge-gui-mobile/src/forge/deck/AddBasicLandsDialog.java @@ -324,7 +324,7 @@ public class AddBasicLandsDialog extends FDialog { } }); lblCount = add(new FLabel.Builder().text("0").font(FSkinFont.get(18)).align(Align.center).build()); - btnSubtract = add(new FLabel.ButtonBuilder().icon(FSkinImage.MINUS).command(new FEventHandler() { + btnSubtract = add(new FLabel.ButtonBuilder().icon(Forge.hdbuttons ? FSkinImage.HDMINUS : FSkinImage.MINUS).command(new FEventHandler() { @Override public void handleEvent(FEvent e) { if (count > 0) { @@ -334,7 +334,7 @@ public class AddBasicLandsDialog extends FDialog { } } }).build()); - btnAdd = add(new FLabel.ButtonBuilder().icon(FSkinImage.PLUS).command(new FEventHandler() { + btnAdd = add(new FLabel.ButtonBuilder().icon(Forge.hdbuttons ? FSkinImage.HDPLUS : FSkinImage.PLUS).command(new FEventHandler() { @Override public void handleEvent(FEvent e) { if (maxCount == 0 || count < maxCount) { diff --git a/forge-gui-mobile/src/forge/deck/FDeckEditor.java b/forge-gui-mobile/src/forge/deck/FDeckEditor.java index 29568111671..56b33e2020d 100644 --- a/forge-gui-mobile/src/forge/deck/FDeckEditor.java +++ b/forge-gui-mobile/src/forge/deck/FDeckEditor.java @@ -235,7 +235,7 @@ public class FDeckEditor extends TabPageScreen { protected final DeckHeader deckHeader = add(new DeckHeader()); protected final FLabel lblName = deckHeader.add(new FLabel.Builder().font(FSkinFont.get(16)).insets(new Vector2(Utils.scale(5), 0)).build()); - private final FLabel btnSave = deckHeader.add(new FLabel.Builder().icon(FSkinImage.SAVE).align(Align.center).pressedColor(Header.BTN_PRESSED_COLOR).build()); + private final FLabel btnSave = deckHeader.add(new FLabel.Builder().icon(Forge.hdbuttons ? FSkinImage.HDSAVE : FSkinImage.SAVE).align(Align.center).pressedColor(Header.BTN_PRESSED_COLOR).build()); private final FLabel btnMoreOptions = deckHeader.add(new FLabel.Builder().text("...").font(FSkinFont.get(20)).align(Align.center).pressedColor(Header.BTN_PRESSED_COLOR).build()); public FDeckEditor(EditorType editorType0, DeckProxy editDeck, boolean showMainDeck) { @@ -365,7 +365,7 @@ public class FDeckEditor extends TabPageScreen { } })); if (!isLimitedEditor()) { - addItem(new FMenuItem(localizer.getMessage("lblImportFromClipboard"), FSkinImage.OPEN, new FEventHandler() { + addItem(new FMenuItem(localizer.getMessage("lblImportFromClipboard"), Forge.hdbuttons ? FSkinImage.HDOPEN : FSkinImage.OPEN, new FEventHandler() { @Override public void handleEvent(FEvent e) { FDeckImportDialog dialog = new FDeckImportDialog(!deck.isEmpty(), new Callback() { @@ -384,7 +384,7 @@ public class FDeckEditor extends TabPageScreen { setSelectedPage(getMainDeckPage()); //select main deck page if needed so main deck if visible below dialog } })); - addItem(new FMenuItem(localizer.getMessage("lblSaveAs"), FSkinImage.SAVEAS, new FEventHandler() { + addItem(new FMenuItem(localizer.getMessage("lblSaveAs"), Forge.hdbuttons ? FSkinImage.HDSAVEAS : FSkinImage.SAVEAS, new FEventHandler() { @Override public void handleEvent(FEvent e) { String defaultName = editorType.getController().getNextAvailableName(); @@ -400,7 +400,7 @@ public class FDeckEditor extends TabPageScreen { })); } if (allowRename()) { - addItem(new FMenuItem(localizer.getMessage("lblRenameDeck"), FSkinImage.EDIT, new FEventHandler() { + addItem(new FMenuItem(localizer.getMessage("lblRenameDeck"), Forge.hdbuttons ? FSkinImage.HDEDIT : FSkinImage.EDIT, new FEventHandler() { @Override public void handleEvent(FEvent e) { FOptionPane.showInputDialog(localizer.getMessage("lblNewNameDeck"), deck.getName(), new Callback() { @@ -413,7 +413,7 @@ public class FDeckEditor extends TabPageScreen { })); } if (allowDelete()) { - addItem(new FMenuItem(localizer.getMessage("lblDeleteDeck"), FSkinImage.DELETE, new FEventHandler() { + addItem(new FMenuItem(localizer.getMessage("lblDeleteDeck"), Forge.hdbuttons ? FSkinImage.HDDELETE : FSkinImage.DELETE, new FEventHandler() { @Override public void handleEvent(FEvent e) { FOptionPane.showConfirmDialog( @@ -974,7 +974,7 @@ public class FDeckEditor extends TabPageScreen { private boolean initialized, needRefreshWhenShown; protected CatalogPage(ItemManagerConfig config) { - this(config, Localizer.getInstance().getMessage("lblCatalog"), FSkinImage.FOLDER); + this(config, Localizer.getInstance().getMessage("lblCatalog"), Forge.hdbuttons ? FSkinImage.HDFOLDER : FSkinImage.FOLDER); } protected CatalogPage(ItemManagerConfig config, String caption0, FImage icon0) { super(config, caption0, icon0); @@ -1166,7 +1166,7 @@ public class FDeckEditor extends TabPageScreen { //add option to add or remove card from favorites final CardPreferences prefs = CardPreferences.getPrefs(card); if (prefs.getStarCount() == 0) { - menu.addItem(new FMenuItem(localizer.getMessage("lblAddFavorites"), FSkinImage.STAR_FILLED, new FEventHandler() { + menu.addItem(new FMenuItem(localizer.getMessage("lblAddFavorites"), Forge.hdbuttons ? FSkinImage.HDSTAR_FILLED : FSkinImage.STAR_FILLED, new FEventHandler() { @Override public void handleEvent(FEvent e) { prefs.setStarCount(1); @@ -1175,7 +1175,7 @@ public class FDeckEditor extends TabPageScreen { })); } else { - menu.addItem(new FMenuItem(localizer.getMessage("lblRemoveFavorites"), FSkinImage.STAR_OUTINE, new FEventHandler() { + menu.addItem(new FMenuItem(localizer.getMessage("lblRemoveFavorites"), Forge.hdbuttons ? FSkinImage.HDSTAR_OUTLINE : FSkinImage.STAR_OUTLINE, new FEventHandler() { @Override public void handleEvent(FEvent e) { prefs.setStarCount(0); @@ -1340,7 +1340,7 @@ public class FDeckEditor extends TabPageScreen { switch (deckSection) { default: case Main: - addItem(menu, localizer.getMessage("lblAdd"), null, FSkinImage.PLUS, true, false, new Callback() { + addItem(menu, localizer.getMessage("lblAdd"), null, Forge.hdbuttons ? FSkinImage.HDPLUS : FSkinImage.PLUS, true, false, new Callback() { @Override public void run(Integer result) { if (result == null || result <= 0) { return; } @@ -1355,7 +1355,7 @@ public class FDeckEditor extends TabPageScreen { } }); if (!parentScreen.isLimitedEditor()) { - addItem(menu, localizer.getMessage("lblRemove"), null, FSkinImage.MINUS, false, false, new Callback() { + addItem(menu, localizer.getMessage("lblRemove"), null, Forge.hdbuttons ? FSkinImage.HDMINUS : FSkinImage.MINUS, false, false, new Callback() { @Override public void run(Integer result) { if (result == null || result <= 0) { return; } @@ -1381,7 +1381,7 @@ public class FDeckEditor extends TabPageScreen { addCommanderItems(menu, card, false, false); break; case Sideboard: - addItem(menu, localizer.getMessage("lblAdd"), null, FSkinImage.PLUS, true, false, new Callback() { + addItem(menu, localizer.getMessage("lblAdd"), null, Forge.hdbuttons ? FSkinImage.HDPLUS : FSkinImage.PLUS, true, false, new Callback() { @Override public void run(Integer result) { if (result == null || result <= 0) { return; } @@ -1396,7 +1396,7 @@ public class FDeckEditor extends TabPageScreen { } }); if (!parentScreen.isLimitedEditor()) { - addItem(menu, localizer.getMessage("lblRemove"), null, FSkinImage.MINUS, false, false, new Callback() { + addItem(menu, localizer.getMessage("lblRemove"), null, Forge.hdbuttons ? FSkinImage.HDMINUS : FSkinImage.MINUS, false, false, new Callback() { @Override public void run(Integer result) { if (result == null || result <= 0) { return; } @@ -1421,7 +1421,7 @@ public class FDeckEditor extends TabPageScreen { break; case Commander: if (parentScreen.editorType != EditorType.PlanarConquest || isPartnerCommander(card)) { - addItem(menu, localizer.getMessage("lblRemove"), null, FSkinImage.MINUS, false, false, new Callback() { + addItem(menu, localizer.getMessage("lblRemove"), null, Forge.hdbuttons ? FSkinImage.HDMINUS : FSkinImage.MINUS, false, false, new Callback() { @Override public void run(Integer result) { if (result == null || result <= 0) { @@ -1436,7 +1436,7 @@ public class FDeckEditor extends TabPageScreen { } break; case Avatar: - addItem(menu, localizer.getMessage("lblRemove"), null, FSkinImage.MINUS, false, false, new Callback() { + addItem(menu, localizer.getMessage("lblRemove"), null, Forge.hdbuttons ? FSkinImage.HDMINUS : FSkinImage.MINUS, false, false, new Callback() { @Override public void run(Integer result) { if (result == null || result <= 0) { return; } @@ -1446,7 +1446,7 @@ public class FDeckEditor extends TabPageScreen { }); break; case Schemes: - addItem(menu, localizer.getMessage("lblAdd"), null, FSkinImage.PLUS, true, false, new Callback() { + addItem(menu, localizer.getMessage("lblAdd"), null, Forge.hdbuttons ? FSkinImage.HDPLUS : FSkinImage.PLUS, true, false, new Callback() { @Override public void run(Integer result) { if (result == null || result <= 0) { return; } @@ -1454,7 +1454,7 @@ public class FDeckEditor extends TabPageScreen { addCard(card, result); } }); - addItem(menu, localizer.getMessage("lblRemove"), null, FSkinImage.MINUS, false, false, new Callback() { + addItem(menu, localizer.getMessage("lblRemove"), null, Forge.hdbuttons ? FSkinImage.HDMINUS : FSkinImage.MINUS, false, false, new Callback() { @Override public void run(Integer result) { if (result == null || result <= 0) { return; } @@ -1464,7 +1464,7 @@ public class FDeckEditor extends TabPageScreen { }); break; case Planes: - addItem(menu, localizer.getMessage("lblAdd"), null, FSkinImage.PLUS, true, false, new Callback() { + addItem(menu, localizer.getMessage("lblAdd"), null, Forge.hdbuttons ? FSkinImage.HDPLUS : FSkinImage.PLUS, true, false, new Callback() { @Override public void run(Integer result) { if (result == null || result <= 0) { return; } @@ -1472,7 +1472,7 @@ public class FDeckEditor extends TabPageScreen { addCard(card, result); } }); - addItem(menu, localizer.getMessage("lblRemove"), null, FSkinImage.MINUS, false, false, new Callback() { + addItem(menu, localizer.getMessage("lblRemove"), null, Forge.hdbuttons ? FSkinImage.HDMINUS : FSkinImage.MINUS, false, false, new Callback() { @Override public void run(Integer result) { if (result == null || result <= 0) { return; } diff --git a/forge-gui-mobile/src/forge/itemmanager/DeckManager.java b/forge-gui-mobile/src/forge/itemmanager/DeckManager.java index 363a70bf27a..5f0fe585ea5 100644 --- a/forge-gui-mobile/src/forge/itemmanager/DeckManager.java +++ b/forge-gui-mobile/src/forge/itemmanager/DeckManager.java @@ -1,5 +1,6 @@ package forge.itemmanager; +import forge.Forge; import forge.Graphics; import forge.assets.FSkinColor; import forge.assets.FSkinFont; @@ -124,7 +125,11 @@ public final class DeckManager extends ItemManager implements IHasGam } //draw favorite, name, path and color on first line - g.drawImage(DeckPreferences.getPrefs(deck).getStarCount() > 0 ? FSkinImage.STAR_FILLED : FSkinImage.STAR_OUTINE, x, y, IMAGE_SIZE, IMAGE_SIZE); + if (Forge.hdbuttons) + g.drawImage(DeckPreferences.getPrefs(deck).getStarCount() > 0 ? FSkinImage.HDSTAR_FILLED : FSkinImage.HDSTAR_OUTLINE, x, y, IMAGE_SIZE, IMAGE_SIZE); + else + g.drawImage(DeckPreferences.getPrefs(deck).getStarCount() > 0 ? FSkinImage.STAR_FILLED : FSkinImage.STAR_OUTLINE, x, y, IMAGE_SIZE, IMAGE_SIZE); + x += IMAGE_SIZE + FList.PADDING; ColorSet deckColor = deck.getColor(); float availableNameWidth = w - CardFaceSymbols.getWidth(deckColor, IMAGE_SIZE) - IMAGE_SIZE - 2 * FList.PADDING; diff --git a/forge-gui-mobile/src/forge/itemmanager/ItemManager.java b/forge-gui-mobile/src/forge/itemmanager/ItemManager.java index 64e1a239a00..1324153f252 100644 --- a/forge-gui-mobile/src/forge/itemmanager/ItemManager.java +++ b/forge-gui-mobile/src/forge/itemmanager/ItemManager.java @@ -87,7 +87,7 @@ public abstract class ItemManager extends FContainer im private final TextSearchFilter searchFilter; private final FLabel btnSearch = new FLabel.ButtonBuilder() - .icon(FSkinImage.SEARCH).iconScaleFactor(0.9f).build(); + .icon(Forge.hdbuttons ? FSkinImage.HDSEARCH : FSkinImage.SEARCH).iconScaleFactor(0.9f).build(); private final FLabel btnView = new FLabel.ButtonBuilder() .iconScaleFactor(0.9f).build(); //icon set later private final FLabel btnAdvancedSearchOptions = new FLabel.Builder() @@ -148,7 +148,7 @@ public abstract class ItemManager extends FContainer im FPopupMenu menu = new FPopupMenu() { @Override protected void buildMenu() { - addItem(new FMenuItem(Localizer.getInstance().getMessage("lblAdvancedSearch"), FSkinImage.SEARCH, new FEventHandler() { + addItem(new FMenuItem(Localizer.getInstance().getMessage("lblAdvancedSearch"), Forge.hdbuttons ? FSkinImage.HDSEARCH : FSkinImage.SEARCH, new FEventHandler() { @Override public void handleEvent(FEvent e) { if (advancedSearchFilter == null) { @@ -158,7 +158,7 @@ public abstract class ItemManager extends FContainer im advancedSearchFilter.edit(); } })); - addItem(new FMenuItem(Localizer.getInstance().getMessage("lblResetFilters"), FSkinImage.DELETE, new FEventHandler() { + addItem(new FMenuItem(Localizer.getInstance().getMessage("lblResetFilters"), Forge.hdbuttons ? FSkinImage.HDDELETE : FSkinImage.DELETE, new FEventHandler() { @Override public void handleEvent(FEvent e) { resetFilters(); diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/AdvancedSearchFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/AdvancedSearchFilter.java index d028f3812be..d99ee726106 100644 --- a/forge-gui-mobile/src/forge/itemmanager/filters/AdvancedSearchFilter.java +++ b/forge-gui-mobile/src/forge/itemmanager/filters/AdvancedSearchFilter.java @@ -118,7 +118,7 @@ public class AdvancedSearchFilter extends ItemFilter protected void buildMenu() { //add a menu item for each filter to allow easily editing just that filter for (final IFilterControl control : model.getControls()) { - FMenuItem item = new FMenuItem(control.getFilter().toString(), FSkinImage.EDIT, new FEventHandler() { + FMenuItem item = new FMenuItem(control.getFilter().toString(), Forge.hdbuttons ? FSkinImage.HDEDIT : FSkinImage.EDIT, new FEventHandler() { @Override public void handleEvent(FEvent e) { model.editFilterControl(control, onFilterChange); @@ -127,13 +127,13 @@ public class AdvancedSearchFilter extends ItemFilter item.setTextRenderer(new TextRenderer()); //ensure symbols are displayed addItem(item); } - addItem(new FMenuItem(Localizer.getInstance().getMessage("lblEditExpression"), FSkinImage.EDIT, new FEventHandler() { + addItem(new FMenuItem(Localizer.getInstance().getMessage("lblEditExpression"), Forge.hdbuttons ? FSkinImage.HDEDIT : FSkinImage.EDIT, new FEventHandler() { @Override public void handleEvent(FEvent e) { edit(); } })); - addItem(new FMenuItem(Localizer.getInstance().getMessage("lblRemoveFilter"), FSkinImage.DELETE, new FEventHandler() { + addItem(new FMenuItem(Localizer.getInstance().getMessage("lblRemoveFilter"), Forge.hdbuttons ? FSkinImage.HDDELETE : FSkinImage.DELETE, new FEventHandler() { @Override public void handleEvent(FEvent e) { reset(); diff --git a/forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java b/forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java index 028a274db9a..5f0ba1e9be1 100644 --- a/forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java +++ b/forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java @@ -642,7 +642,7 @@ public class PlayerPanel extends FContainer { private FLabel createNameRandomizer() { final FLabel newNameBtn = new FLabel.Builder().iconInBackground(false) - .icon(FSkinImage.EDIT).opaque(false).build(); + .icon(Forge.hdbuttons ? FSkinImage.HDEDIT : FSkinImage.EDIT).opaque(false).build(); newNameBtn.setCommand(new FEventHandler() { @Override public void handleEvent(FEvent e) { diff --git a/forge-gui-mobile/src/forge/screens/match/views/VAssignDamage.java b/forge-gui-mobile/src/forge/screens/match/views/VAssignDamage.java index 24acb489a04..7dc2743c412 100644 --- a/forge-gui-mobile/src/forge/screens/match/views/VAssignDamage.java +++ b/forge-gui-mobile/src/forge/screens/match/views/VAssignDamage.java @@ -17,6 +17,7 @@ */ package forge.screens.match.views; +import forge.Forge; import forge.Graphics; import forge.assets.FImage; import forge.assets.FSkinColor; @@ -224,7 +225,7 @@ public class VAssignDamage extends FDialog { assignDamageTo(card, false); } }).build()); - btnAdd = add(new FLabel.ButtonBuilder().icon(FSkinImage.PLUS).command(new FEventHandler() { + btnAdd = add(new FLabel.ButtonBuilder().icon(Forge.hdbuttons ? FSkinImage.HDPLUS : FSkinImage.PLUS).command(new FEventHandler() { @Override public void handleEvent(FEvent e) { assignDamageTo(card, true); diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestCollectionScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestCollectionScreen.java index c30a1b50372..8a42dad34ba 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestCollectionScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestCollectionScreen.java @@ -7,6 +7,7 @@ import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList; import forge.FThreads; +import forge.Forge; import forge.assets.FImage; import forge.assets.FSkinFont; import forge.assets.FSkinImage; @@ -236,7 +237,7 @@ public class ConquestCollectionScreen extends TabPageScreen { @Override protected FSkinImage getVerbIcon() { - return FSkinImage.PLUS; + return Forge.hdbuttons ? FSkinImage.HDPLUS : FSkinImage.PLUS; } @Override @@ -317,7 +318,7 @@ public class QuestSpellShopScreen extends TabPageScreen { private static class InventoryPage extends SpellShopBasePage { protected FLabel lblSellExtras = add(new FLabel.Builder().text(localizer.getMessage("lblSellAllExtras")) - .icon(FSkinImage.MINUS).iconScaleFactor(1f).align(Align.right).font(FSkinFont.get(16)) + .icon(Forge.hdbuttons ? FSkinImage.HDMINUS : FSkinImage.MINUS).iconScaleFactor(1f).align(Align.right).font(FSkinFont.get(16)) .command(new FEventHandler() { @Override public void handleEvent(FEvent e) { @@ -366,7 +367,7 @@ public class QuestSpellShopScreen extends TabPageScreen { @Override protected FSkinImage getVerbIcon() { - return FSkinImage.MINUS; + return Forge.hdbuttons ? FSkinImage.HDMINUS : FSkinImage.MINUS; } @Override diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestTournamentsScreen.java b/forge-gui-mobile/src/forge/screens/quest/QuestTournamentsScreen.java index 6b9173f79a7..c8613bf9f42 100644 --- a/forge-gui-mobile/src/forge/screens/quest/QuestTournamentsScreen.java +++ b/forge-gui-mobile/src/forge/screens/quest/QuestTournamentsScreen.java @@ -455,7 +455,11 @@ public class QuestTournamentsScreen extends QuestLaunchScreen implements IQuestT FTextureRegionImage avatar1 = new FTextureRegionImage(FSkin.getAvatars().get(iconIDs[j])); FTextureRegionImage avatar2 = new FTextureRegionImage(FSkin.getAvatars().get(iconIDs[j+1])); */ - labels[j] = add(new FLabel.Builder().icon(currentMatch ? FSkinImage.STAR_FILLED : FSkinImage.STAR_OUTINE).text(labelText).align(Align.center).font(FSkinFont.get(16)).build()); + if (Forge.hdbuttons) + labels[j] = add(new FLabel.Builder().icon(currentMatch ? FSkinImage.HDSTAR_FILLED : FSkinImage.HDSTAR_OUTLINE).text(labelText).align(Align.center).font(FSkinFont.get(16)).build()); + else + labels[j] = add(new FLabel.Builder().icon(currentMatch ? FSkinImage.STAR_FILLED : FSkinImage.STAR_OUTLINE).text(labelText).align(Align.center).font(FSkinFont.get(16)).build()); + labels[j].setBounds(x, y, w, labels[j].getAutoSizeBounds().height); if (currentMatch) { labels[j].setTextColor(FSkinColor.get(FSkinColor.Colors.CLR_ACTIVE)); diff --git a/forge-gui-mobile/src/forge/screens/settings/FilesPage.java b/forge-gui-mobile/src/forge/screens/settings/FilesPage.java index cedfdcdac4d..bb2ff928276 100644 --- a/forge-gui-mobile/src/forge/screens/settings/FilesPage.java +++ b/forge-gui-mobile/src/forge/screens/settings/FilesPage.java @@ -1,5 +1,6 @@ package forge.screens.settings; +import forge.Forge; import forge.download.GuiDownloadAchievementImages; import forge.download.GuiDownloadPicturesLQ; import forge.download.GuiDownloadPrices; @@ -31,7 +32,7 @@ public class FilesPage extends TabPage { private final Localizer localizer = Localizer.getInstance(); protected FilesPage() { - super(Localizer.getInstance().getMessage("lblFiles"), FSkinImage.OPEN); + super(Localizer.getInstance().getMessage("lblFiles"), Forge.hdbuttons ? FSkinImage.HDOPEN : FSkinImage.OPEN); lstItems.setListItemRenderer(new FilesItemRenderer()); diff --git a/forge-gui-mobile/src/forge/toolbox/FFileChooser.java b/forge-gui-mobile/src/forge/toolbox/FFileChooser.java index b6c4939df97..68bfd16368b 100644 --- a/forge-gui-mobile/src/forge/toolbox/FFileChooser.java +++ b/forge-gui-mobile/src/forge/toolbox/FFileChooser.java @@ -367,14 +367,14 @@ public class FFileChooser extends FDialog { @Override protected void buildMenu() { String suffix = value.isDirectory() ? " Folder" : " File"; - addItem(new FMenuItem("Rename" + suffix, FSkinImage.EDIT, + addItem(new FMenuItem("Rename" + suffix, Forge.hdbuttons ? FSkinImage.HDEDIT : FSkinImage.EDIT, new FEventHandler() { @Override public void handleEvent(FEvent e) { renameFile(value); } })); - addItem(new FMenuItem("Delete" + suffix, FSkinImage.DELETE, + addItem(new FMenuItem("Delete" + suffix, Forge.hdbuttons ? FSkinImage.HDDELETE : FSkinImage.DELETE, new FEventHandler() { @Override public void handleEvent(FEvent e) { @@ -392,7 +392,7 @@ public class FFileChooser extends FDialog { public void drawValue(Graphics g, Integer index, File value, FSkinFont font, FSkinColor foreColor, FSkinColor backColor, boolean pressed, float x, float y, float w, float h) { if (value.isDirectory()) { float iconSize = h; - g.drawImage(FSkinImage.FOLDER, x, y + (h - iconSize) / 2, iconSize, iconSize); + g.drawImage(Forge.hdbuttons ? FSkinImage.HDFOLDER : FSkinImage.FOLDER, x, y + (h - iconSize) / 2, iconSize, iconSize); x += iconSize + FList.PADDING; } g.drawText(value.getName(), font, foreColor, x, y, w, h, false, Align.left, true); diff --git a/forge-gui-mobile/src/forge/toolbox/ListChooser.java b/forge-gui-mobile/src/forge/toolbox/ListChooser.java index a6df1607acb..065e9dce99e 100644 --- a/forge-gui-mobile/src/forge/toolbox/ListChooser.java +++ b/forge-gui-mobile/src/forge/toolbox/ListChooser.java @@ -25,6 +25,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import forge.FThreads; +import forge.Forge; import forge.Graphics; import forge.assets.FSkinFont; import forge.assets.FSkinImage; @@ -105,19 +106,19 @@ public class ListChooser extends FContainer { advancedSearchFilter = lstChoices.getListItemRenderer().getAdvancedSearchFilter(this); if (advancedSearchFilter != null) { btnSearch = add(new FLabel.ButtonBuilder() - .icon(FSkinImage.SEARCH).iconScaleFactor(0.9f).command(new FEventHandler() { + .icon(Forge.hdbuttons ? FSkinImage.HDSEARCH : FSkinImage.SEARCH).iconScaleFactor(0.9f).command(new FEventHandler() { @Override public void handleEvent(FEvent e) { FPopupMenu menu = new FPopupMenu() { @Override protected void buildMenu() { - addItem(new FMenuItem(Localizer.getInstance().getMessage("lblAdvancedSearch"), FSkinImage.SEARCH, new FEventHandler() { + addItem(new FMenuItem(Localizer.getInstance().getMessage("lblAdvancedSearch"), Forge.hdbuttons ? FSkinImage.HDSEARCH : FSkinImage.SEARCH, new FEventHandler() { @Override public void handleEvent(FEvent e) { advancedSearchFilter.edit(); } })); - addItem(new FMenuItem(Localizer.getInstance().getMessage("lblResetFilters"), FSkinImage.DELETE, new FEventHandler() { + addItem(new FMenuItem(Localizer.getInstance().getMessage("lblResetFilters"), Forge.hdbuttons ? FSkinImage.HDDELETE : FSkinImage.DELETE, new FEventHandler() { @Override public void handleEvent(FEvent e) { resetFilters(); diff --git a/forge-gui/res/skins/default/sprite_buttons.png b/forge-gui/res/skins/default/sprite_buttons.png index bc86ca7b101..82ecce3a909 100644 Binary files a/forge-gui/res/skins/default/sprite_buttons.png and b/forge-gui/res/skins/default/sprite_buttons.png differ diff --git a/forge-gui/src/main/java/forge/assets/FSkinProp.java b/forge-gui/src/main/java/forge/assets/FSkinProp.java index 2fce84d832d..96f2111eefb 100644 --- a/forge-gui/src/main/java/forge/assets/FSkinProp.java +++ b/forge-gui/src/main/java/forge/assets/FSkinProp.java @@ -48,21 +48,21 @@ public enum FSkinProp { //zone images IMG_ZONE_HAND (new int[] {280, 40, 40, 40}, PropType.IMAGE), - IMG_HDZONE_HAND (new int[] {2, 132, 128, 128}, PropType.BUTTONS), + IMG_HDZONE_HAND (new int[] {2, 136, 128, 128}, PropType.BUTTONS), IMG_ZONE_LIBRARY (new int[] {280, 0, 40, 40}, PropType.IMAGE), - IMG_HDZONE_LIBRARY (new int[] {132, 132, 128, 128}, PropType.BUTTONS), + IMG_HDZONE_LIBRARY (new int[] {132, 136, 128, 128}, PropType.BUTTONS), IMG_ZONE_EXILE (new int[] {320, 40, 40, 40}, PropType.IMAGE), - IMG_HDZONE_EXILE (new int[] {262, 132, 128, 128}, PropType.BUTTONS), + IMG_HDZONE_EXILE (new int[] {262, 136, 128, 128}, PropType.BUTTONS), IMG_ZONE_FLASHBACK (new int[] {280, 80, 40, 40}, PropType.IMAGE), - IMG_HDZONE_FLASHBACK (new int[] {262, 2, 128, 128}, PropType.BUTTONS), + IMG_HDZONE_FLASHBACK (new int[] {262, 6, 128, 128}, PropType.BUTTONS), IMG_ZONE_GRAVEYARD (new int[] {320, 0, 40, 40}, PropType.IMAGE), - IMG_HDZONE_GRAVEYARD (new int[] {132, 2, 128, 128}, PropType.BUTTONS), + IMG_HDZONE_GRAVEYARD (new int[] {132, 6, 128, 128}, PropType.BUTTONS), - IMG_HDZONE_MANAPOOL (new int[] {2, 2, 128, 128}, PropType.BUTTONS), + IMG_HDZONE_MANAPOOL (new int[] {2, 6, 128, 128}, PropType.BUTTONS), IMG_ZONE_POISON (new int[] {320, 80, 40, 40}, PropType.IMAGE), @@ -210,27 +210,50 @@ public enum FSkinProp { ICO_INFORMATION (new int[] {592, 800, 32, 32}, PropType.ICON), ICO_WARNING (new int[] {560, 832, 32, 32}, PropType.ICON), ICO_ERROR (new int[] {592, 832, 32, 32}, PropType.ICON), + ICO_DELETE (new int[] {640, 480, 20, 20}, PropType.ICON), + ICO_HDDELETE (new int[] {392, 134, 64, 64}, PropType.BUTTONS), + ICO_DELETE_OVER (new int[] {660, 480, 20, 20}, PropType.ICON), + ICO_EDIT (new int[] {640, 500, 20, 20}, PropType.ICON), + ICO_HDEDIT (new int[] {392, 200, 64, 64}, PropType.BUTTONS), + ICO_EDIT_OVER (new int[] {660, 500, 20, 20}, PropType.ICON), + ICO_OPEN (new int[] {660, 520, 20, 20}, PropType.ICON), + ICO_HDOPEN (new int[] {392, 68, 64, 64}, PropType.BUTTONS), + ICO_MINUS (new int[] {660, 620, 20, 20}, PropType.ICON), + ICO_HDMINUS (new int[] {391, 1506, 64, 64}, PropType.BUTTONS), + ICO_NEW (new int[] {660, 540, 20, 20}, PropType.ICON), + ICO_PLUS (new int[] {660, 600, 20, 20}, PropType.ICON), + ICO_HDPLUS (new int[] {391, 1572, 64, 64}, PropType.BUTTONS), + ICO_PRINT (new int[] {660, 640, 20, 20}, PropType.ICON), + ICO_SAVE (new int[] {660, 560, 20, 20}, PropType.ICON), + ICO_HDSAVE (new int[] {391, 1704, 64, 64}, PropType.BUTTONS), ICO_SAVEAS (new int[] {660, 580, 20, 20}, PropType.ICON), + ICO_HDSAVEAS (new int[] {391, 1638, 64, 64}, PropType.BUTTONS), + ICO_CLOSE (new int[] {640, 640, 20, 20}, PropType.ICON), ICO_LIST (new int[] {640, 660, 20, 20}, PropType.ICON), ICO_CARD_IMAGE (new int[] {660, 660, 20, 20}, PropType.ICON), + ICO_FOLDER (new int[] {640, 680, 20, 20}, PropType.ICON), + ICO_HDFOLDER (new int[] {392, 2, 64, 64}, PropType.BUTTONS), + ICO_SEARCH (new int[] {660, 680, 20, 20}, PropType.ICON), + ICO_HDSEARCH (new int[] {391, 1374, 64, 64}, PropType.BUTTONS), + ICO_UNKNOWN (new int[] {0, 720, 80, 80}, PropType.ICON), ICO_LOGO (new int[] {480, 0, 200, 200}, PropType.ICON), ICO_FLIPCARD (new int[] {400, 0, 80, 120}, PropType.ICON), - ICO_HDFLIPCARD (new int[] {2, 1264, 387, 500}, PropType.BUTTONS), + ICO_HDFLIPCARD (new int[] {2, 1268, 387, 500}, PropType.BUTTONS), ICO_FAVICON (new int[] {0, 640, 80, 80}, PropType.ICON), ICO_LOCK (new int[] {620, 800, 48, 48}, PropType.ICON), @@ -244,8 +267,11 @@ public enum FSkinProp { IMG_CUR_TAB (new int[] {644, 764, 32, 32}, PropType.IMAGE), //editor images - IMG_STAR_OUTINE (new int[] {640, 460, 20, 20}, PropType.IMAGE), + IMG_STAR_OUTLINE (new int[] {640, 460, 20, 20}, PropType.IMAGE), + IMG_HDSTAR_OUTLINE (new int[] {391, 1308, 64, 64}, PropType.BUTTONS), IMG_STAR_FILLED (new int[] {660, 460, 20, 20}, PropType.IMAGE), + IMG_HDSTAR_FILLED (new int[] {391, 1440, 64, 64}, PropType.BUTTONS), + IMG_ARTIFACT (new int[] {412, 658, 80, 80}, PropType.MANAICONS), IMG_CREATURE (new int[] {2, 740, 80, 80}, PropType.MANAICONS), IMG_ENCHANTMENT (new int[] {84, 740, 80, 80}, PropType.MANAICONS), @@ -303,24 +329,24 @@ public enum FSkinProp { IMG_HDBTN_START_UP (new int[] {2, 2, 588, 312}, PropType.BTNSTART), IMG_HDBTN_START_OVER (new int[] {1183, 2, 588, 312}, PropType.BTNSTART), IMG_HDBTN_START_DOWN (new int[] {593, 2, 588, 312}, PropType.BTNSTART), - IMG_HDBTN_UP_LEFT (new int[] {2, 262, 160, 165}, PropType.BUTTONS), - IMG_HDBTN_UP_CENTER (new int[] {162, 262, 1, 165}, PropType.BUTTONS), - IMG_HDBTN_UP_RIGHT (new int[] {322, 262, 160, 165}, PropType.BUTTONS), - IMG_HDBTN_OVER_LEFT (new int[] {2, 429, 160, 165}, PropType.BUTTONS), - IMG_HDBTN_OVER_CENTER (new int[] {162, 429, 1, 165}, PropType.BUTTONS), - IMG_HDBTN_OVER_RIGHT (new int[] {322, 429, 160, 165}, PropType.BUTTONS), - IMG_HDBTN_DOWN_LEFT (new int[] {2, 596, 160, 165}, PropType.BUTTONS), - IMG_HDBTN_DOWN_CENTER (new int[] {162, 596, 1, 165}, PropType.BUTTONS), - IMG_HDBTN_DOWN_RIGHT (new int[] {322, 596, 160, 165}, PropType.BUTTONS), - IMG_HDBTN_FOCUS_LEFT (new int[] {2, 763, 160, 165}, PropType.BUTTONS), - IMG_HDBTN_FOCUS_CENTER (new int[] {162, 763, 1, 165}, PropType.BUTTONS), - IMG_HDBTN_FOCUS_RIGHT (new int[] {322, 763, 160, 165}, PropType.BUTTONS), - IMG_HDBTN_TOGGLE_LEFT (new int[] {2, 930, 160, 165}, PropType.BUTTONS), - IMG_HDBTN_TOGGLE_CENTER (new int[] {162, 930, 1, 165}, PropType.BUTTONS), - IMG_HDBTN_TOGGLE_RIGHT (new int[] {322, 930, 160, 165}, PropType.BUTTONS), - IMG_HDBTN_DISABLED_LEFT (new int[] {2, 1097, 160, 165}, PropType.BUTTONS), - IMG_HDBTN_DISABLED_CENTER (new int[] {162, 1097, 1, 165}, PropType.BUTTONS), - IMG_HDBTN_DISABLED_RIGHT (new int[] {322, 1097, 160, 165}, PropType.BUTTONS), + IMG_HDBTN_UP_LEFT (new int[] {2, 266, 160, 165}, PropType.BUTTONS), + IMG_HDBTN_UP_CENTER (new int[] {162, 266, 1, 165}, PropType.BUTTONS), + IMG_HDBTN_UP_RIGHT (new int[] {322, 266, 160, 165}, PropType.BUTTONS), + IMG_HDBTN_OVER_LEFT (new int[] {2, 433, 160, 165}, PropType.BUTTONS), + IMG_HDBTN_OVER_CENTER (new int[] {162, 433, 1, 165}, PropType.BUTTONS), + IMG_HDBTN_OVER_RIGHT (new int[] {322, 433, 160, 165}, PropType.BUTTONS), + IMG_HDBTN_DOWN_LEFT (new int[] {2, 600, 160, 165}, PropType.BUTTONS), + IMG_HDBTN_DOWN_CENTER (new int[] {162, 600, 1, 165}, PropType.BUTTONS), + IMG_HDBTN_DOWN_RIGHT (new int[] {322, 600, 160, 165}, PropType.BUTTONS), + IMG_HDBTN_FOCUS_LEFT (new int[] {2, 767, 160, 165}, PropType.BUTTONS), + IMG_HDBTN_FOCUS_CENTER (new int[] {162, 767, 1, 165}, PropType.BUTTONS), + IMG_HDBTN_FOCUS_RIGHT (new int[] {322, 767, 160, 165}, PropType.BUTTONS), + IMG_HDBTN_TOGGLE_LEFT (new int[] {2, 934, 160, 165}, PropType.BUTTONS), + IMG_HDBTN_TOGGLE_CENTER (new int[] {162, 934, 1, 165}, PropType.BUTTONS), + IMG_HDBTN_TOGGLE_RIGHT (new int[] {322, 934, 160, 165}, PropType.BUTTONS), + IMG_HDBTN_DISABLED_LEFT (new int[] {2, 1101, 160, 165}, PropType.BUTTONS), + IMG_HDBTN_DISABLED_CENTER (new int[] {162, 1101, 1, 165}, PropType.BUTTONS), + IMG_HDBTN_DISABLED_RIGHT (new int[] {322, 1101, 160, 165}, PropType.BUTTONS), IMG_FAV1 (new int[] {0, 0, 100, 100}, PropType.FAVICON), IMG_FAV2 (new int[] {100, 0, 100, 100}, PropType.FAVICON),