GUI: added preferences settings for card icons (enable abilities icons and playable icon);

Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.form

@@ -4273,7 +4273,7 @@
                       <EmptySpace max="-2" attributes="0"/>
                       <Group type="103" groupAlignment="0" attributes="0">
                           <Component id="panelCardImages" max="32767" attributes="0"/>
-                          <Component id="jPanel1" max="32767" attributes="0"/>
+                          <Component id="panelCardStyles" max="32767" attributes="0"/>
                           <Component id="panelBackgroundImages" alignment="0" max="32767" attributes="0"/>
                       </Group>
                       <EmptySpace max="-2" attributes="0"/>
@@ -4284,12 +4284,12 @@
               <Group type="103" groupAlignment="0" attributes="0">
                   <Group type="102" alignment="0" attributes="0">
                       <EmptySpace max="-2" attributes="0"/>
-                      <Component id="jPanel1" min="-2" max="-2" attributes="0"/>
+                      <Component id="panelCardStyles" min="-2" max="-2" attributes="0"/>
                       <EmptySpace max="-2" attributes="0"/>
                       <Component id="panelCardImages" min="-2" max="-2" attributes="0"/>
                       <EmptySpace max="-2" attributes="0"/>
                       <Component id="panelBackgroundImages" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace max="32767" attributes="0"/>
+                      <EmptySpace pref="98" max="32767" attributes="0"/>
                   </Group>
               </Group>
             </DimensionLayout>
@@ -4448,7 +4448,7 @@
                 </Component>
               </SubComponents>
             </Container>
-            <Container class="javax.swing.JPanel" name="jPanel1">
+            <Container class="javax.swing.JPanel" name="panelCardStyles">
               <Properties>
                 <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
                   <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
@@ -4461,67 +4461,41 @@
                 </Property>
               </Properties>
 
-              <Layout>
+              <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBoxLayout">
-                <DimensionLayout dim="0">
+                <Property name="axis" type="int" value="1"/>
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <Group type="102" attributes="0">
-                          <Group type="103" groupAlignment="0" attributes="0">
-                              <Component id="cbCardRenderImageFallback" min="-2" max="-2" attributes="0"/>
-                              <Component id="cbCardRenderShowReminderText" min="-2" max="-2" attributes="0"/>
-                              <Component id="cbCardRenderHideSetSymbol" min="-2" max="-2" attributes="0"/>
-                              <Component id="cbCardRenderShowAbilityTextOverlay" min="-2" max="-2" attributes="0"/>
-                          </Group>
-                          <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                      </Group>
-                  </Group>
-                </DimensionLayout>
-                <DimensionLayout dim="1">
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <Group type="102" alignment="0" attributes="0">
-                          <Component id="cbCardRenderImageFallback" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace max="-2" attributes="0"/>
-                          <Component id="cbCardRenderShowReminderText" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace max="-2" attributes="0"/>
-                          <Component id="cbCardRenderShowAbilityTextOverlay" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace max="-2" attributes="0"/>
-                          <Component id="cbCardRenderHideSetSymbol" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                      </Group>
-                  </Group>
-                </DimensionLayout>
               </Layout>
               <SubComponents>
                 <Component class="javax.swing.JCheckBox" name="cbCardRenderImageFallback">
                   <Properties>
                     <Property name="text" type="java.lang.String" value="Render mode: MTGO style (off) or IMAGE style (on)"/>
                   </Properties>
-                  <Events>
+                </Component>
-                    <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="cbCardRenderImageFallbackActionPerformed"/>
+                <Component class="javax.swing.JCheckBox" name="cbCardRenderIconsForAbilities">
-                  </Events>
+                  <Properties>
+                    <Property name="text" type="java.lang.String" value="Enable card icons for abilities (example: flying, deathtouch)"/>
+                  </Properties>
+                </Component>
+                <Component class="javax.swing.JCheckBox" name="cbCardRenderIconsForPlayable">
+                  <Properties>
+                    <Property name="text" type="java.lang.String" value="Enable card icons for playable abilities (example: if you can activate card&apos;s ability then show a special icon in the corner)"/>
+                  </Properties>
+                </Component>
+                <Component class="javax.swing.JSeparator" name="jSeparator1">
                 </Component>
                 <Component class="javax.swing.JCheckBox" name="cbCardRenderShowReminderText">
                   <Properties>
                     <Property name="text" type="java.lang.String" value="Show reminder text in rendered card textboxes"/>
                   </Properties>
-                  <Events>
-                    <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="cbCardRenderShowReminderTextActionPerformed"/>
-                  </Events>
                 </Component>
                 <Component class="javax.swing.JCheckBox" name="cbCardRenderHideSetSymbol">
                   <Properties>
                     <Property name="text" type="java.lang.String" value="Hide set symbols on cards (more space on the type line for card types)"/>
                   </Properties>
-                  <Events>
-                    <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="cbCardRenderHideSetSymbolActionPerformed"/>
-                  </Events>
                 </Component>
                 <Component class="javax.swing.JCheckBox" name="cbCardRenderShowAbilityTextOverlay">
                   <Properties>
                     <Property name="text" type="java.lang.String" value="Show ability text as overlay in big card view"/>
                   </Properties>
-                  <Events>
-                    <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="cbCardRenderShowAbilityTextOverlayActionPerformed"/>
-                  </Events>
                 </Component>
               </SubComponents>
             </Container>

Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java

@@ -84,6 +84,8 @@ public class PreferencesDialog extends javax.swing.JDialog {
     public static final String KEY_CARD_IMAGES_PREF_LANGUAGE = "cardImagesPreferedImageLaguage";
 
     public static final String KEY_CARD_RENDERING_FALLBACK = "cardRenderingFallback";
+    public static final String KEY_CARD_RENDERING_ICONS_FOR_ABILITIES = "cardRenderingIconsForAbilities";
+    public static final String KEY_CARD_RENDERING_ICONS_FOR_PLAYABLE = "cardRenderingIconsForPlayable";
     public static final String KEY_CARD_RENDERING_REMINDER_TEXT = "cardRenderingReminderText";
     public static final String KEY_CARD_RENDERING_ABILITY_TEXT_OVERLAY = "cardRenderingAbilityTextOverlay";
     public static final String KEY_CARD_RENDERING_SET_SYMBOL = "cardRenderingSetSymbol";
@@ -508,8 +510,11 @@ public class PreferencesDialog extends javax.swing.JDialog {
         labelNumberOfDownloadThreads = new javax.swing.JLabel();
         cbNumberOfDownloadThreads = new javax.swing.JComboBox();
         labelHint1 = new javax.swing.JLabel();
-        jPanel1 = new javax.swing.JPanel();
+        panelCardStyles = new javax.swing.JPanel();
         cbCardRenderImageFallback = new javax.swing.JCheckBox();
+        cbCardRenderIconsForAbilities = new javax.swing.JCheckBox();
+        cbCardRenderIconsForPlayable = new javax.swing.JCheckBox();
+        jSeparator1 = new javax.swing.JSeparator();
         cbCardRenderShowReminderText = new javax.swing.JCheckBox();
         cbCardRenderHideSetSymbol = new javax.swing.JCheckBox();
         cbCardRenderShowAbilityTextOverlay = new javax.swing.JCheckBox();
@@ -667,7 +672,7 @@ public class PreferencesDialog extends javax.swing.JDialog {
         showFullImagePath.setSelected(true);
         showFullImagePath.setToolTipText("Show the path Xmage is expecting for this card's image (only displays if missing)");
         showFullImagePath.setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR));
-        showFullImagePath.setText("Display image path for missing images");
+        showFullImagePath.setLabel("Display image path for missing images");
         showFullImagePath.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 showFullImagePathActionPerformed(evt);
@@ -1635,60 +1640,27 @@ public class PreferencesDialog extends javax.swing.JDialog {
                     .add(cbPreferedImageLanguage, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
         );
 
-        jPanel1.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createEtchedBorder(), "Card styles (restart xmage to apply new settings)"));
+        panelCardStyles.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createEtchedBorder(), "Card styles (restart xmage to apply new settings)"));
+        panelCardStyles.setLayout(new javax.swing.BoxLayout(panelCardStyles, javax.swing.BoxLayout.Y_AXIS));
 
         cbCardRenderImageFallback.setText("Render mode: MTGO style (off) or IMAGE style (on)");
-        cbCardRenderImageFallback.addActionListener(new java.awt.event.ActionListener() {
+        panelCardStyles.add(cbCardRenderImageFallback);
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
+
-                cbCardRenderImageFallbackActionPerformed(evt);
+        cbCardRenderIconsForAbilities.setText("Enable card icons for abilities (example: flying, deathtouch)");
-            }
+        panelCardStyles.add(cbCardRenderIconsForAbilities);
-        });
+
+        cbCardRenderIconsForPlayable.setText("Enable card icons for playable abilities (example: if you can activate card's ability then show a special icon in the corner)");
+        panelCardStyles.add(cbCardRenderIconsForPlayable);
+        panelCardStyles.add(jSeparator1);
 
         cbCardRenderShowReminderText.setText("Show reminder text in rendered card textboxes");
-        cbCardRenderShowReminderText.addActionListener(new java.awt.event.ActionListener() {
+        panelCardStyles.add(cbCardRenderShowReminderText);
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                cbCardRenderShowReminderTextActionPerformed(evt);
-            }
-        });
 
         cbCardRenderHideSetSymbol.setText("Hide set symbols on cards (more space on the type line for card types)");
-        cbCardRenderHideSetSymbol.addActionListener(new java.awt.event.ActionListener() {
+        panelCardStyles.add(cbCardRenderHideSetSymbol);
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                cbCardRenderHideSetSymbolActionPerformed(evt);
-            }
-        });
 
         cbCardRenderShowAbilityTextOverlay.setText("Show ability text as overlay in big card view");
-        cbCardRenderShowAbilityTextOverlay.addActionListener(new java.awt.event.ActionListener() {
+        panelCardStyles.add(cbCardRenderShowAbilityTextOverlay);
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                cbCardRenderShowAbilityTextOverlayActionPerformed(evt);
-            }
-        });
-
-        org.jdesktop.layout.GroupLayout jPanel1Layout = new org.jdesktop.layout.GroupLayout(jPanel1);
-        jPanel1.setLayout(jPanel1Layout);
-        jPanel1Layout.setHorizontalGroup(
-                jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                        .add(jPanel1Layout.createSequentialGroup()
-                                .add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                                        .add(cbCardRenderImageFallback)
-                                        .add(cbCardRenderShowReminderText)
-                                        .add(cbCardRenderHideSetSymbol)
-                                        .add(cbCardRenderShowAbilityTextOverlay))
-                                .add(0, 0, Short.MAX_VALUE))
-        );
-        jPanel1Layout.setVerticalGroup(
-                jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                        .add(jPanel1Layout.createSequentialGroup()
-                                .add(cbCardRenderImageFallback)
-                                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                                .add(cbCardRenderShowReminderText)
-                                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                                .add(cbCardRenderShowAbilityTextOverlay)
-                                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                                .add(cbCardRenderHideSetSymbol)
-                                .add(0, 0, Short.MAX_VALUE))
-        );
 
         panelBackgroundImages.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createEtchedBorder(), "Background images"));
 
@@ -1787,7 +1759,7 @@ public class PreferencesDialog extends javax.swing.JDialog {
                 .addContainerGap()
                 .add(tabImagesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
                     .add(panelCardImages, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                                        .add(jPanel1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .add(panelCardStyles, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                     .add(panelBackgroundImages, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
                 .addContainerGap())
         );
@@ -1795,12 +1767,12 @@ public class PreferencesDialog extends javax.swing.JDialog {
             tabImagesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
             .add(tabImagesLayout.createSequentialGroup()
                 .addContainerGap()
-                                .add(jPanel1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                .add(panelCardStyles, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                 .add(panelCardImages, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                 .add(panelBackgroundImages, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                                .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                .addContainerGap(98, Short.MAX_VALUE))
         );
 
         tabsPanel.addTab("Images", tabImages);
@@ -2777,7 +2749,7 @@ public class PreferencesDialog extends javax.swing.JDialog {
 
         tabsPanel.addTab("Themes", tabThemes);
 
-        saveButton.setText("Save");
+        saveButton.setLabel("Save");
         saveButton.setMaximumSize(new java.awt.Dimension(100, 30));
         saveButton.setMinimumSize(new java.awt.Dimension(100, 30));
         saveButton.setPreferredSize(new java.awt.Dimension(100, 30));
@@ -2788,7 +2760,7 @@ public class PreferencesDialog extends javax.swing.JDialog {
             }
         });
 
-        exitButton.setText("Exit");
+        exitButton.setLabel("Exit");
         exitButton.setMaximumSize(new java.awt.Dimension(100, 30));
         exitButton.setMinimumSize(new java.awt.Dimension(100, 30));
         exitButton.setPreferredSize(new java.awt.Dimension(100, 30));
@@ -2957,6 +2929,8 @@ public class PreferencesDialog extends javax.swing.JDialog {
 
         // rendering
         save(prefs, dialog.cbCardRenderImageFallback, KEY_CARD_RENDERING_FALLBACK, "true", "false", UPDATE_CACHE_POLICY);
+        save(prefs, dialog.cbCardRenderIconsForAbilities, KEY_CARD_RENDERING_ICONS_FOR_ABILITIES, "true", "false", UPDATE_CACHE_POLICY);
+        save(prefs, dialog.cbCardRenderIconsForPlayable, KEY_CARD_RENDERING_ICONS_FOR_PLAYABLE, "true", "false", UPDATE_CACHE_POLICY);
         save(prefs, dialog.cbCardRenderHideSetSymbol, KEY_CARD_RENDERING_SET_SYMBOL, "true", "false", UPDATE_CACHE_POLICY);
         save(prefs, dialog.cbCardRenderShowReminderText, KEY_CARD_RENDERING_REMINDER_TEXT, "true", "false", UPDATE_CACHE_POLICY);
         save(prefs, dialog.cbCardRenderShowAbilityTextOverlay, KEY_CARD_RENDERING_ABILITY_TEXT_OVERLAY, "true", "false", UPDATE_CACHE_POLICY);
@@ -3240,18 +3214,6 @@ public class PreferencesDialog extends javax.swing.JDialog {
         // TODO add your handling code here:
     }//GEN-LAST:event_cbAutoOrderTriggerActionPerformed
 
-    private void cbCardRenderImageFallbackActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cbCardRenderImageFallbackActionPerformed
-        // TODO add your handling code here:
-    }//GEN-LAST:event_cbCardRenderImageFallbackActionPerformed
-
-    private void cbCardRenderShowReminderTextActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cbCardRenderShowReminderTextActionPerformed
-        // TODO add your handling code here:
-    }//GEN-LAST:event_cbCardRenderShowReminderTextActionPerformed
-
-    private void cbCardRenderHideSetSymbolActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cbCardRenderHideSetSymbolActionPerformed
-        // TODO add your handling code here:
-    }//GEN-LAST:event_cbCardRenderHideSetSymbolActionPerformed
-
     private void bttnResetControlsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_bttnResetControlsActionPerformed
         getKeybindButtons().forEach((bttn) -> {
             String id = bttn.getKey();
@@ -3306,10 +3268,6 @@ public class PreferencesDialog extends javax.swing.JDialog {
         // TODO add your handling code here:
     }//GEN-LAST:event_cbThemeActionPerformed
 
-    private void cbCardRenderShowAbilityTextOverlayActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cbCardRenderShowAbilityTextOverlayActionPerformed
-        // TODO add your handling code here:
-    }//GEN-LAST:event_cbCardRenderShowAbilityTextOverlayActionPerformed
-
     private void showProxySettings() {
         Connection.ProxyType proxyType = (Connection.ProxyType) cbProxyType.getSelectedItem();
         switch (proxyType) {
@@ -3503,6 +3461,8 @@ public class PreferencesDialog extends javax.swing.JDialog {
 
         // rendering settings
         load(prefs, dialog.cbCardRenderImageFallback, KEY_CARD_RENDERING_FALLBACK, "true", "false");
+        load(prefs, dialog.cbCardRenderIconsForAbilities, KEY_CARD_RENDERING_ICONS_FOR_ABILITIES, "true", "true");
+        load(prefs, dialog.cbCardRenderIconsForPlayable, KEY_CARD_RENDERING_ICONS_FOR_PLAYABLE, "true", "true");
         load(prefs, dialog.cbCardRenderHideSetSymbol, KEY_CARD_RENDERING_SET_SYMBOL, "true");
         load(prefs, dialog.cbCardRenderShowReminderText, KEY_CARD_RENDERING_REMINDER_TEXT, "true");
         load(prefs, dialog.cbCardRenderShowAbilityTextOverlay, KEY_CARD_RENDERING_ABILITY_TEXT_OVERLAY, "true");
@@ -3814,6 +3774,14 @@ public class PreferencesDialog extends javax.swing.JDialog {
         }
     }
 
+    public static boolean getRenderIconsForAbilities() {
+        return (getCachedValue(PreferencesDialog.KEY_CARD_RENDERING_ICONS_FOR_ABILITIES, "true").equals("true"));
+    }
+
+    public static boolean getRenderIconsForPlayable() {
+        return (getCachedValue(PreferencesDialog.KEY_CARD_RENDERING_ICONS_FOR_PLAYABLE, "true").equals("true"));
+    }
+
     private static int getDefaultControlMofier(String key) {
         switch (key) {
             default:
@@ -4025,6 +3993,8 @@ public class PreferencesDialog extends javax.swing.JDialog {
     private javax.swing.JCheckBox cbAutoOrderTrigger;
     private javax.swing.JComboBox cbBattlefieldFeedbackColorizingMode;
     private javax.swing.JCheckBox cbCardRenderHideSetSymbol;
+    private javax.swing.JCheckBox cbCardRenderIconsForAbilities;
+    private javax.swing.JCheckBox cbCardRenderIconsForPlayable;
     private javax.swing.JCheckBox cbCardRenderImageFallback;
     private javax.swing.JCheckBox cbCardRenderShowAbilityTextOverlay;
     private javax.swing.JCheckBox cbCardRenderShowReminderText;
@@ -4091,7 +4061,6 @@ public class PreferencesDialog extends javax.swing.JDialog {
     private javax.swing.JLabel jLabelOpponentsTurn;
     private javax.swing.JLabel jLabelUpkeep;
     private javax.swing.JLabel jLabelYourTurn;
-    private javax.swing.JPanel jPanel1;
     private javax.swing.JPanel jPanel10;
     private javax.swing.JPanel jPanel11;
     private javax.swing.JPanel jPanel12;
@@ -4116,6 +4085,7 @@ public class PreferencesDialog extends javax.swing.JDialog {
     private javax.swing.JPanel jPanel31;
     private javax.swing.JPanel jPanel32;
     private javax.swing.JPanel jPanel33;
+    private javax.swing.JSeparator jSeparator1;
     private mage.client.components.KeyBindButton keyCancelSkip;
     private mage.client.components.KeyBindButton keyConfirm;
     private mage.client.components.KeyBindButton keyEndStep;
@@ -4168,6 +4138,7 @@ public class PreferencesDialog extends javax.swing.JDialog {
     private javax.swing.JCheckBox nonLandPermanentsInOnePile;
     private javax.swing.JPanel panelBackgroundImages;
     private javax.swing.JPanel panelCardImages;
+    private javax.swing.JPanel panelCardStyles;
     private javax.swing.JPanel phases_stopSettings;
     private javax.swing.JPanel pnlProxy;
     private javax.swing.JPanel pnlProxySettings;

Mage.Client/src/main/java/mage/client/util/GUISizeHelper.java

@@ -138,7 +138,7 @@ public final class GUISizeHelper {
 
         int otherZonesCardSize = PreferencesDialog.getCachedValue(PreferencesDialog.KEY_GUI_CARD_OTHER_ZONES_SIZE, 14);
         otherZonesCardDimension = new Dimension(CARD_IMAGE_WIDTH * otherZonesCardSize / 42, CARD_IMAGE_HEIGHT * otherZonesCardSize / 42);
-        if (PreferencesDialog.getCachedValue(PreferencesDialog.KEY_CARD_RENDERING_FALLBACK, "false").equals("false")) {
+        if (PreferencesDialog.getRenderMode() == 0) {
             otherZonesCardVerticalOffset = CardRenderer.getCardTopHeight(otherZonesCardDimension.width);
         } else if (otherZonesCardSize > 29) {
             otherZonesCardVerticalOffset = otherZonesCardDimension.height / 8;

Mage.Client/src/main/java/org/mage/card/arcane/MageLayer.java

@@ -10,6 +10,7 @@ import mage.cards.MageCardLocation;
 import mage.cards.MageCardSpace;
 import mage.client.cards.CardIconsPanel;
 import mage.client.cards.CardIconsPanelFactory;
+import mage.client.dialog.PreferencesDialog;
 import mage.constants.Zone;
 import mage.util.DebugUtil;
 import mage.view.CardView;
@@ -146,11 +147,15 @@ public class MageLayer extends MageCard {
             this.iconsPanels.add(this.iconsDebugPanel);
         } else {
             // NORMAL mode -- multiple panels
+            if (PreferencesDialog.getRenderIconsForAbilities()) {
                 this.iconsAbilitiesPanel = CardIconsPanelFactory.createAbilitiesPanel();
                 this.iconsPanels.add(this.iconsAbilitiesPanel);
+            }
+            if (PreferencesDialog.getRenderIconsForPlayable()) {
                 this.iconsPlayablePanel = CardIconsPanelFactory.createPlayablePanel();
                 this.iconsPanels.add(this.iconsPlayablePanel);
             }
+        }
 
         this.iconsPanels.forEach(panel -> this.mainLayerIcons.add(panel));
     }