diff --git a/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.form b/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.form
index e1a279311c..013b40f3e7 100644
--- a/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.form
+++ b/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.form
@@ -4273,7 +4273,7 @@
-
+
@@ -4284,12 +4284,12 @@
-
+
-
+
@@ -4448,7 +4448,7 @@
-
+
@@ -4461,67 +4461,41 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
diff --git a/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java b/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java
index 700ae49280..60b04022ae 100644
--- a/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java
+++ b/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);
@@ -677,29 +682,29 @@ public class PreferencesDialog extends javax.swing.JDialog {
org.jdesktop.layout.GroupLayout main_cardLayout = new org.jdesktop.layout.GroupLayout(main_card);
main_card.setLayout(main_cardLayout);
main_cardLayout.setHorizontalGroup(
- main_cardLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(main_cardLayout.createSequentialGroup()
- .add(6, 6, 6)
- .add(main_cardLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(main_cardLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING, false)
- .add(tooltipDelayLabel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .add(tooltipDelay, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
- .add(main_cardLayout.createSequentialGroup()
- .add(showCardName)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
- .add(showFullImagePath)))
- .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ main_cardLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(main_cardLayout.createSequentialGroup()
+ .add(6, 6, 6)
+ .add(main_cardLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(main_cardLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING, false)
+ .add(tooltipDelayLabel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .add(tooltipDelay, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .add(main_cardLayout.createSequentialGroup()
+ .add(showCardName)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
+ .add(showFullImagePath)))
+ .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
main_cardLayout.setVerticalGroup(
- main_cardLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(main_cardLayout.createSequentialGroup()
- .add(main_cardLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(showCardName)
- .add(showFullImagePath))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(tooltipDelayLabel)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(tooltipDelay, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ main_cardLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(main_cardLayout.createSequentialGroup()
+ .add(main_cardLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+ .add(showCardName)
+ .add(showFullImagePath))
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(tooltipDelayLabel)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(tooltipDelay, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
main_game.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createEtchedBorder(), "Game"));
@@ -786,48 +791,48 @@ public class PreferencesDialog extends javax.swing.JDialog {
org.jdesktop.layout.GroupLayout main_gameLayout = new org.jdesktop.layout.GroupLayout(main_game);
main_game.setLayout(main_gameLayout);
main_gameLayout.setHorizontalGroup(
- main_gameLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(main_gameLayout.createSequentialGroup()
- .addContainerGap()
- .add(main_gameLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(main_gameLayout.createSequentialGroup()
- .add(main_gameLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
- .add(showPlayerNamesPermanently, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .add(nonLandPermanentsInOnePile, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .add(cbConfirmEmptyManaPool, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .add(cbAllowRequestToShowHandCards, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .add(cbShowStormCounter, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .add(cbAskMoveToGraveOrder, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .add(showAbilityPickerForced, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
- .add(0, 0, Short.MAX_VALUE))
- .add(displayLifeOnAvatar, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
- .addContainerGap())
+ main_gameLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(main_gameLayout.createSequentialGroup()
+ .addContainerGap()
+ .add(main_gameLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(main_gameLayout.createSequentialGroup()
+ .add(main_gameLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
+ .add(showPlayerNamesPermanently, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .add(nonLandPermanentsInOnePile, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .add(cbConfirmEmptyManaPool, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .add(cbAllowRequestToShowHandCards, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .add(cbShowStormCounter, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .add(cbAskMoveToGraveOrder, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .add(showAbilityPickerForced, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .add(0, 0, Short.MAX_VALUE))
+ .add(displayLifeOnAvatar, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addContainerGap())
);
main_gameLayout.setVerticalGroup(
- main_gameLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(main_gameLayout.createSequentialGroup()
- .add(nonLandPermanentsInOnePile)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(showPlayerNamesPermanently)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(displayLifeOnAvatar)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(showAbilityPickerForced)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(cbAllowRequestToShowHandCards)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(cbShowStormCounter)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(cbConfirmEmptyManaPool)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(cbAskMoveToGraveOrder))
+ main_gameLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(main_gameLayout.createSequentialGroup()
+ .add(nonLandPermanentsInOnePile)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(showPlayerNamesPermanently)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(displayLifeOnAvatar)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(showAbilityPickerForced)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(cbAllowRequestToShowHandCards)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(cbShowStormCounter)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(cbConfirmEmptyManaPool)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(cbAskMoveToGraveOrder))
);
nonLandPermanentsInOnePile.getAccessibleContext().setAccessibleName("nonLandPermanentsInOnePile");
main_battlefield.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createEtchedBorder(), "Battlefield"));
- cbBattlefieldFeedbackColorizingMode.setModel(new javax.swing.DefaultComboBoxModel(new String[]{"Disable colorizing", "Enable one color for all phases", "Enable multicolor for different phases"}));
+ cbBattlefieldFeedbackColorizingMode.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Disable colorizing", "Enable one color for all phases", "Enable multicolor for different phases" }));
cbBattlefieldFeedbackColorizingMode.setToolTipText("Battlefield feedback panel colorizing on your turn (e.g. use green color if you must select card or answer to request)");
cbBattlefieldFeedbackColorizingMode.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -841,46 +846,46 @@ public class PreferencesDialog extends javax.swing.JDialog {
org.jdesktop.layout.GroupLayout main_battlefieldLayout = new org.jdesktop.layout.GroupLayout(main_battlefield);
main_battlefield.setLayout(main_battlefieldLayout);
main_battlefieldLayout.setHorizontalGroup(
- main_battlefieldLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(main_battlefieldLayout.createSequentialGroup()
- .addContainerGap()
- .add(lblBattlefieldFeedbackColorizingMode)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(cbBattlefieldFeedbackColorizingMode, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 278, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ main_battlefieldLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(main_battlefieldLayout.createSequentialGroup()
+ .addContainerGap()
+ .add(lblBattlefieldFeedbackColorizingMode)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(cbBattlefieldFeedbackColorizingMode, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 278, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
main_battlefieldLayout.setVerticalGroup(
- main_battlefieldLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(main_battlefieldLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(lblBattlefieldFeedbackColorizingMode)
- .add(cbBattlefieldFeedbackColorizingMode, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+ main_battlefieldLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(main_battlefieldLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+ .add(lblBattlefieldFeedbackColorizingMode)
+ .add(cbBattlefieldFeedbackColorizingMode, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
);
org.jdesktop.layout.GroupLayout tabMainLayout = new org.jdesktop.layout.GroupLayout(tabMain);
tabMain.setLayout(tabMainLayout);
tabMainLayout.setHorizontalGroup(
- tabMainLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(tabMainLayout.createSequentialGroup()
- .addContainerGap()
- .add(tabMainLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(org.jdesktop.layout.GroupLayout.TRAILING, main_card, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .add(org.jdesktop.layout.GroupLayout.TRAILING, main_gamelog, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .add(main_game, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .add(org.jdesktop.layout.GroupLayout.TRAILING, main_battlefield, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
- .addContainerGap())
+ tabMainLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(tabMainLayout.createSequentialGroup()
+ .addContainerGap()
+ .add(tabMainLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(org.jdesktop.layout.GroupLayout.TRAILING, main_card, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .add(org.jdesktop.layout.GroupLayout.TRAILING, main_gamelog, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .add(main_game, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .add(org.jdesktop.layout.GroupLayout.TRAILING, main_battlefield, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addContainerGap())
);
tabMainLayout.setVerticalGroup(
- tabMainLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(tabMainLayout.createSequentialGroup()
- .addContainerGap()
- .add(main_card, 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(main_game, 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(main_gamelog, 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(main_battlefield, 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))
+ tabMainLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(tabMainLayout.createSequentialGroup()
+ .addContainerGap()
+ .add(main_card, 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(main_game, 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(main_gamelog, 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(main_battlefield, 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))
);
main_card.getAccessibleContext().setAccessibleName("Game panel");
@@ -890,18 +895,18 @@ public class PreferencesDialog extends javax.swing.JDialog {
tabGuiSize.setMaximumSize(new java.awt.Dimension(527, 423));
tabGuiSize.setMinimumSize(new java.awt.Dimension(527, 423));
java.awt.GridBagLayout tabGuiSizeLayout = new java.awt.GridBagLayout();
- tabGuiSizeLayout.columnWidths = new int[]{0};
- tabGuiSizeLayout.rowHeights = new int[]{0, 20, 0};
- tabGuiSizeLayout.columnWeights = new double[]{1.0};
- tabGuiSizeLayout.rowWeights = new double[]{1.0, 0.0, 1.0};
+ tabGuiSizeLayout.columnWidths = new int[] {0};
+ tabGuiSizeLayout.rowHeights = new int[] {0, 20, 0};
+ tabGuiSizeLayout.columnWeights = new double[] {1.0};
+ tabGuiSizeLayout.rowWeights = new double[] {1.0, 0.0, 1.0};
tabGuiSize.setLayout(tabGuiSizeLayout);
guiSizeBasic.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createEtchedBorder(), "Size basic elements"));
guiSizeBasic.setMinimumSize(new java.awt.Dimension(600, 180));
guiSizeBasic.setPreferredSize(new java.awt.Dimension(600, 180));
java.awt.GridBagLayout guiSizeBasicLayout = new java.awt.GridBagLayout();
- guiSizeBasicLayout.columnWeights = new double[]{1.0, 1.0, 1.0};
- guiSizeBasicLayout.rowWeights = new double[]{1.0, 0.2, 1.0, 0.2};
+ guiSizeBasicLayout.columnWeights = new double[] {1.0, 1.0, 1.0};
+ guiSizeBasicLayout.rowWeights = new double[] {1.0, 0.2, 1.0, 0.2};
guiSizeBasic.setLayout(guiSizeBasicLayout);
sliderFontSize.setMajorTickSpacing(5);
@@ -1090,8 +1095,8 @@ public class PreferencesDialog extends javax.swing.JDialog {
guiSizeGame.setMinimumSize(new java.awt.Dimension(600, 180));
guiSizeGame.setPreferredSize(new java.awt.Dimension(600, 180));
java.awt.GridBagLayout guiSizeGameLayout = new java.awt.GridBagLayout();
- guiSizeGameLayout.columnWeights = new double[]{1.0, 1.0, 1.0, 1.0};
- guiSizeGameLayout.rowWeights = new double[]{1.0, 0.2, 1.0, 0.2};
+ guiSizeGameLayout.columnWeights = new double[] {1.0, 1.0, 1.0, 1.0};
+ guiSizeGameLayout.rowWeights = new double[] {1.0, 0.2, 1.0, 0.2};
guiSizeGame.setLayout(guiSizeGameLayout);
sliderCardSizeHand.setMajorTickSpacing(5);
@@ -1435,115 +1440,115 @@ public class PreferencesDialog extends javax.swing.JDialog {
org.jdesktop.layout.GroupLayout tabPhasesLayout = new org.jdesktop.layout.GroupLayout(tabPhases);
tabPhases.setLayout(tabPhasesLayout);
tabPhasesLayout.setHorizontalGroup(
- tabPhasesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(tabPhasesLayout.createSequentialGroup()
+ tabPhasesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(tabPhasesLayout.createSequentialGroup()
+ .add(tabPhasesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(tabPhasesLayout.createSequentialGroup()
+ .add(tabPhasesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(tabPhasesLayout.createSequentialGroup()
+ .add(20, 20, 20)
.add(tabPhasesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(tabPhasesLayout.createSequentialGroup()
- .add(tabPhasesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(tabPhasesLayout.createSequentialGroup()
- .add(20, 20, 20)
- .add(tabPhasesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(tabPhasesLayout.createSequentialGroup()
- .add(tabPhasesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(jLabelUpkeep)
- .add(jLabelBeforeCombat)
- .add(jLabelEndofCombat)
- .add(jLabelMain2)
- .add(jLabelEndOfTurn))
- .add(77, 77, 77)
- .add(tabPhasesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(tabPhasesLayout.createSequentialGroup()
- .add(2, 2, 2)
- .add(jLabelYourTurn)
- .add(32, 32, 32)
- .add(jLabelOpponentsTurn))
- .add(tabPhasesLayout.createSequentialGroup()
- .add(13, 13, 13)
- .add(tabPhasesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
- .add(checkBoxDrawYou)
- .add(checkBoxUpkeepYou)
- .add(checkBoxMainYou)
- .add(checkBoxBeforeCYou)
- .add(checkBoxEndOfCYou)
- .add(checkBoxMain2You)
- .add(checkBoxEndTurnYou))
- .add(78, 78, 78)
- .add(tabPhasesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
- .add(checkBoxUpkeepOthers)
- .add(checkBoxBeforeCOthers)
- .add(checkBoxMainOthers)
- .add(checkBoxEndOfCOthers)
- .add(checkBoxDrawOthers)
- .add(checkBoxMain2Others)
- .add(checkBoxEndTurnOthers)))))
- .add(tabPhasesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING, false)
- .add(org.jdesktop.layout.GroupLayout.LEADING, jLabelMain1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .add(org.jdesktop.layout.GroupLayout.LEADING, jLabelDraw, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))))
- .add(tabPhasesLayout.createSequentialGroup()
- .addContainerGap()
- .add(jLabelHeadLine)))
- .add(0, 0, Short.MAX_VALUE))
- .add(tabPhasesLayout.createSequentialGroup()
- .addContainerGap()
- .add(phases_stopSettings, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
- .addContainerGap())
+ .add(tabPhasesLayout.createSequentialGroup()
+ .add(tabPhasesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(jLabelUpkeep)
+ .add(jLabelBeforeCombat)
+ .add(jLabelEndofCombat)
+ .add(jLabelMain2)
+ .add(jLabelEndOfTurn))
+ .add(77, 77, 77)
+ .add(tabPhasesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(tabPhasesLayout.createSequentialGroup()
+ .add(2, 2, 2)
+ .add(jLabelYourTurn)
+ .add(32, 32, 32)
+ .add(jLabelOpponentsTurn))
+ .add(tabPhasesLayout.createSequentialGroup()
+ .add(13, 13, 13)
+ .add(tabPhasesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
+ .add(checkBoxDrawYou)
+ .add(checkBoxUpkeepYou)
+ .add(checkBoxMainYou)
+ .add(checkBoxBeforeCYou)
+ .add(checkBoxEndOfCYou)
+ .add(checkBoxMain2You)
+ .add(checkBoxEndTurnYou))
+ .add(78, 78, 78)
+ .add(tabPhasesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
+ .add(checkBoxUpkeepOthers)
+ .add(checkBoxBeforeCOthers)
+ .add(checkBoxMainOthers)
+ .add(checkBoxEndOfCOthers)
+ .add(checkBoxDrawOthers)
+ .add(checkBoxMain2Others)
+ .add(checkBoxEndTurnOthers)))))
+ .add(tabPhasesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING, false)
+ .add(org.jdesktop.layout.GroupLayout.LEADING, jLabelMain1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .add(org.jdesktop.layout.GroupLayout.LEADING, jLabelDraw, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))))
+ .add(tabPhasesLayout.createSequentialGroup()
+ .addContainerGap()
+ .add(jLabelHeadLine)))
+ .add(0, 0, Short.MAX_VALUE))
+ .add(tabPhasesLayout.createSequentialGroup()
+ .addContainerGap()
+ .add(phases_stopSettings, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
+ .addContainerGap())
);
tabPhasesLayout.setVerticalGroup(
- tabPhasesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(tabPhasesLayout.createSequentialGroup()
- .addContainerGap()
- .add(tabPhasesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
- .add(tabPhasesLayout.createSequentialGroup()
- .add(jLabelOpponentsTurn)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
- .add(checkBoxUpkeepOthers))
- .add(tabPhasesLayout.createSequentialGroup()
- .add(tabPhasesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
- .add(tabPhasesLayout.createSequentialGroup()
- .add(jLabelHeadLine)
- .add(20, 20, 20))
- .add(jLabelYourTurn))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
- .add(tabPhasesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
- .add(checkBoxUpkeepYou)
- .add(jLabelUpkeep))))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(tabPhasesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
- .add(jLabelDraw)
- .add(checkBoxDrawYou)
- .add(checkBoxDrawOthers))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(tabPhasesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
- .add(jLabelMain1)
- .add(checkBoxMainYou)
- .add(checkBoxMainOthers))
- .add(tabPhasesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(tabPhasesLayout.createSequentialGroup()
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(tabPhasesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(org.jdesktop.layout.GroupLayout.TRAILING, jLabelBeforeCombat)
- .add(org.jdesktop.layout.GroupLayout.TRAILING, checkBoxBeforeCYou)))
- .add(tabPhasesLayout.createSequentialGroup()
- .add(6, 6, 6)
- .add(checkBoxBeforeCOthers)))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(tabPhasesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
- .add(jLabelEndofCombat)
- .add(checkBoxEndOfCYou)
- .add(checkBoxEndOfCOthers))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(tabPhasesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
- .add(jLabelMain2)
- .add(checkBoxMain2You)
- .add(checkBoxMain2Others))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(tabPhasesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
- .add(checkBoxEndTurnYou)
- .add(jLabelEndOfTurn)
- .add(checkBoxEndTurnOthers))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
- .add(phases_stopSettings, 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))
+ tabPhasesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(tabPhasesLayout.createSequentialGroup()
+ .addContainerGap()
+ .add(tabPhasesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
+ .add(tabPhasesLayout.createSequentialGroup()
+ .add(jLabelOpponentsTurn)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
+ .add(checkBoxUpkeepOthers))
+ .add(tabPhasesLayout.createSequentialGroup()
+ .add(tabPhasesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
+ .add(tabPhasesLayout.createSequentialGroup()
+ .add(jLabelHeadLine)
+ .add(20, 20, 20))
+ .add(jLabelYourTurn))
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
+ .add(tabPhasesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
+ .add(checkBoxUpkeepYou)
+ .add(jLabelUpkeep))))
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(tabPhasesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
+ .add(jLabelDraw)
+ .add(checkBoxDrawYou)
+ .add(checkBoxDrawOthers))
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(tabPhasesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
+ .add(jLabelMain1)
+ .add(checkBoxMainYou)
+ .add(checkBoxMainOthers))
+ .add(tabPhasesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(tabPhasesLayout.createSequentialGroup()
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(tabPhasesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(org.jdesktop.layout.GroupLayout.TRAILING, jLabelBeforeCombat)
+ .add(org.jdesktop.layout.GroupLayout.TRAILING, checkBoxBeforeCYou)))
+ .add(tabPhasesLayout.createSequentialGroup()
+ .add(6, 6, 6)
+ .add(checkBoxBeforeCOthers)))
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(tabPhasesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
+ .add(jLabelEndofCombat)
+ .add(checkBoxEndOfCYou)
+ .add(checkBoxEndOfCOthers))
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(tabPhasesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
+ .add(jLabelMain2)
+ .add(checkBoxMain2You)
+ .add(checkBoxMain2Others))
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(tabPhasesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
+ .add(checkBoxEndTurnYou)
+ .add(jLabelEndOfTurn)
+ .add(checkBoxEndTurnOthers))
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
+ .add(phases_stopSettings, 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))
);
tabsPanel.addTab("Phases & Priority", tabPhases);
@@ -1574,7 +1579,7 @@ public class PreferencesDialog extends javax.swing.JDialog {
});
cbPreferedImageLanguage.setMaximumRowCount(20);
- cbPreferedImageLanguage.setModel(new javax.swing.DefaultComboBoxModel<>(new String[]{"Item 1", "Item 2", "Item 3", "Item 4"}));
+ cbPreferedImageLanguage.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
labelPreferedImageLanguage.setText("Default images language:");
labelPreferedImageLanguage.setFocusable(false);
@@ -1582,113 +1587,80 @@ public class PreferencesDialog extends javax.swing.JDialog {
labelNumberOfDownloadThreads.setText("Default download threads:");
cbNumberOfDownloadThreads.setMaximumRowCount(20);
- cbNumberOfDownloadThreads.setModel(new javax.swing.DefaultComboBoxModel(new String[]{"Item 1", "Item 2", "Item 3", "Item 4"}));
+ cbNumberOfDownloadThreads.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
labelHint1.setText("(change it to 1-3 if image source bans your IP for too many connections)");
org.jdesktop.layout.GroupLayout panelCardImagesLayout = new org.jdesktop.layout.GroupLayout(panelCardImages);
panelCardImages.setLayout(panelCardImagesLayout);
panelCardImagesLayout.setHorizontalGroup(
- panelCardImagesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(panelCardImagesLayout.createSequentialGroup()
+ panelCardImagesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(panelCardImagesLayout.createSequentialGroup()
+ .add(panelCardImagesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(panelCardImagesLayout.createSequentialGroup()
+ .add(cbUseDefaultImageFolder)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(txtImageFolderPath)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(btnBrowseImageLocation))
+ .add(panelCardImagesLayout.createSequentialGroup()
+ .add(panelCardImagesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(cbSaveToZipFiles)
+ .add(panelCardImagesLayout.createSequentialGroup()
.add(panelCardImagesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(panelCardImagesLayout.createSequentialGroup()
- .add(cbUseDefaultImageFolder)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(txtImageFolderPath)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(btnBrowseImageLocation))
- .add(panelCardImagesLayout.createSequentialGroup()
- .add(panelCardImagesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(cbSaveToZipFiles)
- .add(panelCardImagesLayout.createSequentialGroup()
- .add(panelCardImagesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(labelNumberOfDownloadThreads)
- .add(labelPreferedImageLanguage))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(panelCardImagesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(cbPreferedImageLanguage, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 153, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(panelCardImagesLayout.createSequentialGroup()
- .add(cbNumberOfDownloadThreads, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 153, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
- .add(labelHint1)))))
- .add(0, 0, Short.MAX_VALUE)))
- .addContainerGap())
+ .add(labelNumberOfDownloadThreads)
+ .add(labelPreferedImageLanguage))
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(panelCardImagesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(cbPreferedImageLanguage, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 153, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .add(panelCardImagesLayout.createSequentialGroup()
+ .add(cbNumberOfDownloadThreads, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 153, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
+ .add(labelHint1)))))
+ .add(0, 0, Short.MAX_VALUE)))
+ .addContainerGap())
);
panelCardImagesLayout.setVerticalGroup(
- panelCardImagesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(panelCardImagesLayout.createSequentialGroup()
- .add(panelCardImagesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(cbUseDefaultImageFolder)
- .add(txtImageFolderPath, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(btnBrowseImageLocation))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
- .add(cbSaveToZipFiles)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
- .add(panelCardImagesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(labelNumberOfDownloadThreads)
- .add(cbNumberOfDownloadThreads, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(labelHint1))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
- .add(panelCardImagesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(labelPreferedImageLanguage)
- .add(cbPreferedImageLanguage, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
+ panelCardImagesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(panelCardImagesLayout.createSequentialGroup()
+ .add(panelCardImagesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+ .add(cbUseDefaultImageFolder)
+ .add(txtImageFolderPath, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .add(btnBrowseImageLocation))
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
+ .add(cbSaveToZipFiles)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
+ .add(panelCardImagesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+ .add(labelNumberOfDownloadThreads)
+ .add(cbNumberOfDownloadThreads, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .add(labelHint1))
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
+ .add(panelCardImagesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+ .add(labelPreferedImageLanguage)
+ .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() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- cbCardRenderImageFallbackActionPerformed(evt);
- }
- });
+ panelCardStyles.add(cbCardRenderImageFallback);
+
+ 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() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- cbCardRenderShowReminderTextActionPerformed(evt);
- }
- });
+ panelCardStyles.add(cbCardRenderShowReminderText);
cbCardRenderHideSetSymbol.setText("Hide set symbols on cards (more space on the type line for card types)");
- cbCardRenderHideSetSymbol.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- cbCardRenderHideSetSymbolActionPerformed(evt);
- }
- });
+ panelCardStyles.add(cbCardRenderHideSetSymbol);
cbCardRenderShowAbilityTextOverlay.setText("Show ability text as overlay in big card view");
- cbCardRenderShowAbilityTextOverlay.addActionListener(new java.awt.event.ActionListener() {
- 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))
- );
+ panelCardStyles.add(cbCardRenderShowAbilityTextOverlay);
panelBackgroundImages.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createEtchedBorder(), "Background images"));
@@ -1742,65 +1714,65 @@ public class PreferencesDialog extends javax.swing.JDialog {
org.jdesktop.layout.GroupLayout panelBackgroundImagesLayout = new org.jdesktop.layout.GroupLayout(panelBackgroundImages);
panelBackgroundImages.setLayout(panelBackgroundImagesLayout);
panelBackgroundImagesLayout.setHorizontalGroup(
- panelBackgroundImagesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(panelBackgroundImagesLayout.createSequentialGroup()
- .add(panelBackgroundImagesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(panelBackgroundImagesLayout.createSequentialGroup()
- .add(cbUseDefaultBackground)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
- .add(txtBackgroundImagePath)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(btnBrowseBackgroundImage))
- .add(panelBackgroundImagesLayout.createSequentialGroup()
- .add(cbUseRandomBattleImage)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
- .add(txtBattlefieldImagePath)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(btnBrowseBattlefieldImage))
- .add(panelBackgroundImagesLayout.createSequentialGroup()
- .add(cbUseDefaultBattleImage)
- .add(0, 0, Short.MAX_VALUE)))
- .addContainerGap())
+ panelBackgroundImagesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(panelBackgroundImagesLayout.createSequentialGroup()
+ .add(panelBackgroundImagesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(panelBackgroundImagesLayout.createSequentialGroup()
+ .add(cbUseDefaultBackground)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
+ .add(txtBackgroundImagePath)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(btnBrowseBackgroundImage))
+ .add(panelBackgroundImagesLayout.createSequentialGroup()
+ .add(cbUseRandomBattleImage)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
+ .add(txtBattlefieldImagePath)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(btnBrowseBattlefieldImage))
+ .add(panelBackgroundImagesLayout.createSequentialGroup()
+ .add(cbUseDefaultBattleImage)
+ .add(0, 0, Short.MAX_VALUE)))
+ .addContainerGap())
);
panelBackgroundImagesLayout.setVerticalGroup(
- panelBackgroundImagesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(panelBackgroundImagesLayout.createSequentialGroup()
- .add(cbUseDefaultBattleImage)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(panelBackgroundImagesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(cbUseDefaultBackground)
- .add(txtBackgroundImagePath, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(btnBrowseBackgroundImage))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(panelBackgroundImagesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(cbUseRandomBattleImage)
- .add(txtBattlefieldImagePath, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(btnBrowseBattlefieldImage))
- .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ panelBackgroundImagesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(panelBackgroundImagesLayout.createSequentialGroup()
+ .add(cbUseDefaultBattleImage)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(panelBackgroundImagesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+ .add(cbUseDefaultBackground)
+ .add(txtBackgroundImagePath, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .add(btnBrowseBackgroundImage))
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(panelBackgroundImagesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+ .add(cbUseRandomBattleImage)
+ .add(txtBattlefieldImagePath, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .add(btnBrowseBattlefieldImage))
+ .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
org.jdesktop.layout.GroupLayout tabImagesLayout = new org.jdesktop.layout.GroupLayout(tabImages);
tabImages.setLayout(tabImagesLayout);
tabImagesLayout.setHorizontalGroup(
- tabImagesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(tabImagesLayout.createSequentialGroup()
- .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(panelBackgroundImages, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
- .addContainerGap())
+ tabImagesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(tabImagesLayout.createSequentialGroup()
+ .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(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())
);
tabImagesLayout.setVerticalGroup(
- 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)
- .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))
+ tabImagesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(tabImagesLayout.createSequentialGroup()
+ .addContainerGap()
+ .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(98, Short.MAX_VALUE))
);
tabsPanel.addTab("Images", tabImages);
@@ -1874,48 +1846,48 @@ public class PreferencesDialog extends javax.swing.JDialog {
org.jdesktop.layout.GroupLayout sounds_backgroundMusicLayout = new org.jdesktop.layout.GroupLayout(sounds_backgroundMusic);
sounds_backgroundMusic.setLayout(sounds_backgroundMusicLayout);
sounds_backgroundMusicLayout.setHorizontalGroup(
- sounds_backgroundMusicLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(sounds_backgroundMusicLayout.createSequentialGroup()
- .addContainerGap()
- .add(jLabel16)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(txtBattlefieldIBGMPath)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(btnBattlefieldBGMBrowse))
- .add(sounds_backgroundMusicLayout.createSequentialGroup()
- .add(cbEnableBattlefieldBGM)
- .add(0, 0, Short.MAX_VALUE))
+ sounds_backgroundMusicLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(sounds_backgroundMusicLayout.createSequentialGroup()
+ .addContainerGap()
+ .add(jLabel16)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(txtBattlefieldIBGMPath)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(btnBattlefieldBGMBrowse))
+ .add(sounds_backgroundMusicLayout.createSequentialGroup()
+ .add(cbEnableBattlefieldBGM)
+ .add(0, 0, Short.MAX_VALUE))
);
sounds_backgroundMusicLayout.setVerticalGroup(
- sounds_backgroundMusicLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(sounds_backgroundMusicLayout.createSequentialGroup()
- .add(cbEnableBattlefieldBGM)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(sounds_backgroundMusicLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(txtBattlefieldIBGMPath, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(btnBattlefieldBGMBrowse)
- .add(jLabel16)))
+ sounds_backgroundMusicLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(sounds_backgroundMusicLayout.createSequentialGroup()
+ .add(cbEnableBattlefieldBGM)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(sounds_backgroundMusicLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+ .add(txtBattlefieldIBGMPath, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .add(btnBattlefieldBGMBrowse)
+ .add(jLabel16)))
);
org.jdesktop.layout.GroupLayout tabSoundsLayout = new org.jdesktop.layout.GroupLayout(tabSounds);
tabSounds.setLayout(tabSoundsLayout);
tabSoundsLayout.setHorizontalGroup(
- tabSoundsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(tabSoundsLayout.createSequentialGroup()
- .addContainerGap()
- .add(tabSoundsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(sounds_clips, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .add(org.jdesktop.layout.GroupLayout.TRAILING, sounds_backgroundMusic, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
- .addContainerGap())
+ tabSoundsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(tabSoundsLayout.createSequentialGroup()
+ .addContainerGap()
+ .add(tabSoundsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(sounds_clips, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .add(org.jdesktop.layout.GroupLayout.TRAILING, sounds_backgroundMusic, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addContainerGap())
);
tabSoundsLayout.setVerticalGroup(
- tabSoundsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(tabSoundsLayout.createSequentialGroup()
- .addContainerGap()
- .add(sounds_clips, 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(sounds_backgroundMusic, 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))
+ tabSoundsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(tabSoundsLayout.createSequentialGroup()
+ .addContainerGap()
+ .add(sounds_clips, 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(sounds_backgroundMusic, 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))
);
sounds_clips.getAccessibleContext().setAccessibleDescription("");
@@ -1939,12 +1911,12 @@ public class PreferencesDialog extends javax.swing.JDialog {
org.jdesktop.layout.GroupLayout jPanel10Layout = new org.jdesktop.layout.GroupLayout(jPanel10);
jPanel10.setLayout(jPanel10Layout);
jPanel10Layout.setHorizontalGroup(
- jPanel10Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 0, Short.MAX_VALUE)
+ jPanel10Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 0, Short.MAX_VALUE)
);
jPanel10Layout.setVerticalGroup(
- jPanel10Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 0, Short.MAX_VALUE)
+ jPanel10Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 0, Short.MAX_VALUE)
);
avatarPanel.add(jPanel10);
@@ -1957,12 +1929,12 @@ public class PreferencesDialog extends javax.swing.JDialog {
org.jdesktop.layout.GroupLayout jPanel11Layout = new org.jdesktop.layout.GroupLayout(jPanel11);
jPanel11.setLayout(jPanel11Layout);
jPanel11Layout.setHorizontalGroup(
- jPanel11Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 0, Short.MAX_VALUE)
+ jPanel11Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 0, Short.MAX_VALUE)
);
jPanel11Layout.setVerticalGroup(
- jPanel11Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 0, Short.MAX_VALUE)
+ jPanel11Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 0, Short.MAX_VALUE)
);
avatarPanel.add(jPanel11);
@@ -1975,12 +1947,12 @@ public class PreferencesDialog extends javax.swing.JDialog {
org.jdesktop.layout.GroupLayout jPanel12Layout = new org.jdesktop.layout.GroupLayout(jPanel12);
jPanel12.setLayout(jPanel12Layout);
jPanel12Layout.setHorizontalGroup(
- jPanel12Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 0, Short.MAX_VALUE)
+ jPanel12Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 0, Short.MAX_VALUE)
);
jPanel12Layout.setVerticalGroup(
- jPanel12Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 0, Short.MAX_VALUE)
+ jPanel12Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 0, Short.MAX_VALUE)
);
avatarPanel.add(jPanel12);
@@ -1993,12 +1965,12 @@ public class PreferencesDialog extends javax.swing.JDialog {
org.jdesktop.layout.GroupLayout jPanel13Layout = new org.jdesktop.layout.GroupLayout(jPanel13);
jPanel13.setLayout(jPanel13Layout);
jPanel13Layout.setHorizontalGroup(
- jPanel13Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 0, Short.MAX_VALUE)
+ jPanel13Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 0, Short.MAX_VALUE)
);
jPanel13Layout.setVerticalGroup(
- jPanel13Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 0, Short.MAX_VALUE)
+ jPanel13Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 0, Short.MAX_VALUE)
);
avatarPanel.add(jPanel13);
@@ -2011,12 +1983,12 @@ public class PreferencesDialog extends javax.swing.JDialog {
org.jdesktop.layout.GroupLayout jPanel14Layout = new org.jdesktop.layout.GroupLayout(jPanel14);
jPanel14.setLayout(jPanel14Layout);
jPanel14Layout.setHorizontalGroup(
- jPanel14Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 0, Short.MAX_VALUE)
+ jPanel14Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 0, Short.MAX_VALUE)
);
jPanel14Layout.setVerticalGroup(
- jPanel14Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 0, Short.MAX_VALUE)
+ jPanel14Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 0, Short.MAX_VALUE)
);
avatarPanel.add(jPanel14);
@@ -2029,12 +2001,12 @@ public class PreferencesDialog extends javax.swing.JDialog {
org.jdesktop.layout.GroupLayout jPanel15Layout = new org.jdesktop.layout.GroupLayout(jPanel15);
jPanel15.setLayout(jPanel15Layout);
jPanel15Layout.setHorizontalGroup(
- jPanel15Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 0, Short.MAX_VALUE)
+ jPanel15Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 0, Short.MAX_VALUE)
);
jPanel15Layout.setVerticalGroup(
- jPanel15Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 0, Short.MAX_VALUE)
+ jPanel15Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 0, Short.MAX_VALUE)
);
avatarPanel.add(jPanel15);
@@ -2047,12 +2019,12 @@ public class PreferencesDialog extends javax.swing.JDialog {
org.jdesktop.layout.GroupLayout jPanel16Layout = new org.jdesktop.layout.GroupLayout(jPanel16);
jPanel16.setLayout(jPanel16Layout);
jPanel16Layout.setHorizontalGroup(
- jPanel16Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 0, Short.MAX_VALUE)
+ jPanel16Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 0, Short.MAX_VALUE)
);
jPanel16Layout.setVerticalGroup(
- jPanel16Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 0, Short.MAX_VALUE)
+ jPanel16Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 0, Short.MAX_VALUE)
);
avatarPanel.add(jPanel16);
@@ -2065,12 +2037,12 @@ public class PreferencesDialog extends javax.swing.JDialog {
org.jdesktop.layout.GroupLayout jPanel17Layout = new org.jdesktop.layout.GroupLayout(jPanel17);
jPanel17.setLayout(jPanel17Layout);
jPanel17Layout.setHorizontalGroup(
- jPanel17Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 0, Short.MAX_VALUE)
+ jPanel17Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 0, Short.MAX_VALUE)
);
jPanel17Layout.setVerticalGroup(
- jPanel17Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 0, Short.MAX_VALUE)
+ jPanel17Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 0, Short.MAX_VALUE)
);
avatarPanel.add(jPanel17);
@@ -2083,12 +2055,12 @@ public class PreferencesDialog extends javax.swing.JDialog {
org.jdesktop.layout.GroupLayout jPanel18Layout = new org.jdesktop.layout.GroupLayout(jPanel18);
jPanel18.setLayout(jPanel18Layout);
jPanel18Layout.setHorizontalGroup(
- jPanel18Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 0, Short.MAX_VALUE)
+ jPanel18Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 0, Short.MAX_VALUE)
);
jPanel18Layout.setVerticalGroup(
- jPanel18Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 0, Short.MAX_VALUE)
+ jPanel18Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 0, Short.MAX_VALUE)
);
avatarPanel.add(jPanel18);
@@ -2101,12 +2073,12 @@ public class PreferencesDialog extends javax.swing.JDialog {
org.jdesktop.layout.GroupLayout jPanel19Layout = new org.jdesktop.layout.GroupLayout(jPanel19);
jPanel19.setLayout(jPanel19Layout);
jPanel19Layout.setHorizontalGroup(
- jPanel19Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 0, Short.MAX_VALUE)
+ jPanel19Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 0, Short.MAX_VALUE)
);
jPanel19Layout.setVerticalGroup(
- jPanel19Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 0, Short.MAX_VALUE)
+ jPanel19Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 0, Short.MAX_VALUE)
);
avatarPanel.add(jPanel19);
@@ -2119,12 +2091,12 @@ public class PreferencesDialog extends javax.swing.JDialog {
org.jdesktop.layout.GroupLayout jPanel20Layout = new org.jdesktop.layout.GroupLayout(jPanel20);
jPanel20.setLayout(jPanel20Layout);
jPanel20Layout.setHorizontalGroup(
- jPanel20Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 0, Short.MAX_VALUE)
+ jPanel20Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 0, Short.MAX_VALUE)
);
jPanel20Layout.setVerticalGroup(
- jPanel20Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 0, Short.MAX_VALUE)
+ jPanel20Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 0, Short.MAX_VALUE)
);
avatarPanel.add(jPanel20);
@@ -2137,12 +2109,12 @@ public class PreferencesDialog extends javax.swing.JDialog {
org.jdesktop.layout.GroupLayout jPanel21Layout = new org.jdesktop.layout.GroupLayout(jPanel21);
jPanel21.setLayout(jPanel21Layout);
jPanel21Layout.setHorizontalGroup(
- jPanel21Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 0, Short.MAX_VALUE)
+ jPanel21Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 0, Short.MAX_VALUE)
);
jPanel21Layout.setVerticalGroup(
- jPanel21Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 0, Short.MAX_VALUE)
+ jPanel21Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 0, Short.MAX_VALUE)
);
avatarPanel.add(jPanel21);
@@ -2155,12 +2127,12 @@ public class PreferencesDialog extends javax.swing.JDialog {
org.jdesktop.layout.GroupLayout jPanel22Layout = new org.jdesktop.layout.GroupLayout(jPanel22);
jPanel22.setLayout(jPanel22Layout);
jPanel22Layout.setHorizontalGroup(
- jPanel22Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 0, Short.MAX_VALUE)
+ jPanel22Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 0, Short.MAX_VALUE)
);
jPanel22Layout.setVerticalGroup(
- jPanel22Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 0, Short.MAX_VALUE)
+ jPanel22Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 0, Short.MAX_VALUE)
);
avatarPanel.add(jPanel22);
@@ -2173,12 +2145,12 @@ public class PreferencesDialog extends javax.swing.JDialog {
org.jdesktop.layout.GroupLayout jPanel23Layout = new org.jdesktop.layout.GroupLayout(jPanel23);
jPanel23.setLayout(jPanel23Layout);
jPanel23Layout.setHorizontalGroup(
- jPanel23Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 0, Short.MAX_VALUE)
+ jPanel23Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 0, Short.MAX_VALUE)
);
jPanel23Layout.setVerticalGroup(
- jPanel23Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 0, Short.MAX_VALUE)
+ jPanel23Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 0, Short.MAX_VALUE)
);
avatarPanel.add(jPanel23);
@@ -2191,12 +2163,12 @@ public class PreferencesDialog extends javax.swing.JDialog {
org.jdesktop.layout.GroupLayout jPanel24Layout = new org.jdesktop.layout.GroupLayout(jPanel24);
jPanel24.setLayout(jPanel24Layout);
jPanel24Layout.setHorizontalGroup(
- jPanel24Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 0, Short.MAX_VALUE)
+ jPanel24Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 0, Short.MAX_VALUE)
);
jPanel24Layout.setVerticalGroup(
- jPanel24Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 0, Short.MAX_VALUE)
+ jPanel24Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 0, Short.MAX_VALUE)
);
avatarPanel.add(jPanel24);
@@ -2209,12 +2181,12 @@ public class PreferencesDialog extends javax.swing.JDialog {
org.jdesktop.layout.GroupLayout jPanel25Layout = new org.jdesktop.layout.GroupLayout(jPanel25);
jPanel25.setLayout(jPanel25Layout);
jPanel25Layout.setHorizontalGroup(
- jPanel25Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 0, Short.MAX_VALUE)
+ jPanel25Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 0, Short.MAX_VALUE)
);
jPanel25Layout.setVerticalGroup(
- jPanel25Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 0, Short.MAX_VALUE)
+ jPanel25Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 0, Short.MAX_VALUE)
);
avatarPanel.add(jPanel25);
@@ -2227,12 +2199,12 @@ public class PreferencesDialog extends javax.swing.JDialog {
org.jdesktop.layout.GroupLayout jPanel26Layout = new org.jdesktop.layout.GroupLayout(jPanel26);
jPanel26.setLayout(jPanel26Layout);
jPanel26Layout.setHorizontalGroup(
- jPanel26Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 0, Short.MAX_VALUE)
+ jPanel26Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 0, Short.MAX_VALUE)
);
jPanel26Layout.setVerticalGroup(
- jPanel26Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 0, Short.MAX_VALUE)
+ jPanel26Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 0, Short.MAX_VALUE)
);
avatarPanel.add(jPanel26);
@@ -2245,12 +2217,12 @@ public class PreferencesDialog extends javax.swing.JDialog {
org.jdesktop.layout.GroupLayout jPanel27Layout = new org.jdesktop.layout.GroupLayout(jPanel27);
jPanel27.setLayout(jPanel27Layout);
jPanel27Layout.setHorizontalGroup(
- jPanel27Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 0, Short.MAX_VALUE)
+ jPanel27Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 0, Short.MAX_VALUE)
);
jPanel27Layout.setVerticalGroup(
- jPanel27Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 0, Short.MAX_VALUE)
+ jPanel27Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 0, Short.MAX_VALUE)
);
avatarPanel.add(jPanel27);
@@ -2263,12 +2235,12 @@ public class PreferencesDialog extends javax.swing.JDialog {
org.jdesktop.layout.GroupLayout jPanel28Layout = new org.jdesktop.layout.GroupLayout(jPanel28);
jPanel28.setLayout(jPanel28Layout);
jPanel28Layout.setHorizontalGroup(
- jPanel28Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 0, Short.MAX_VALUE)
+ jPanel28Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 0, Short.MAX_VALUE)
);
jPanel28Layout.setVerticalGroup(
- jPanel28Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 0, Short.MAX_VALUE)
+ jPanel28Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 0, Short.MAX_VALUE)
);
avatarPanel.add(jPanel28);
@@ -2281,12 +2253,12 @@ public class PreferencesDialog extends javax.swing.JDialog {
org.jdesktop.layout.GroupLayout jPanel29Layout = new org.jdesktop.layout.GroupLayout(jPanel29);
jPanel29.setLayout(jPanel29Layout);
jPanel29Layout.setHorizontalGroup(
- jPanel29Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 0, Short.MAX_VALUE)
+ jPanel29Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 0, Short.MAX_VALUE)
);
jPanel29Layout.setVerticalGroup(
- jPanel29Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 0, Short.MAX_VALUE)
+ jPanel29Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 0, Short.MAX_VALUE)
);
avatarPanel.add(jPanel29);
@@ -2299,12 +2271,12 @@ public class PreferencesDialog extends javax.swing.JDialog {
org.jdesktop.layout.GroupLayout jPanel30Layout = new org.jdesktop.layout.GroupLayout(jPanel30);
jPanel30.setLayout(jPanel30Layout);
jPanel30Layout.setHorizontalGroup(
- jPanel30Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 0, Short.MAX_VALUE)
+ jPanel30Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 0, Short.MAX_VALUE)
);
jPanel30Layout.setVerticalGroup(
- jPanel30Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 0, Short.MAX_VALUE)
+ jPanel30Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 0, Short.MAX_VALUE)
);
avatarPanel.add(jPanel30);
@@ -2317,12 +2289,12 @@ public class PreferencesDialog extends javax.swing.JDialog {
org.jdesktop.layout.GroupLayout jPanel31Layout = new org.jdesktop.layout.GroupLayout(jPanel31);
jPanel31.setLayout(jPanel31Layout);
jPanel31Layout.setHorizontalGroup(
- jPanel31Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 0, Short.MAX_VALUE)
+ jPanel31Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 0, Short.MAX_VALUE)
);
jPanel31Layout.setVerticalGroup(
- jPanel31Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 0, Short.MAX_VALUE)
+ jPanel31Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 0, Short.MAX_VALUE)
);
avatarPanel.add(jPanel31);
@@ -2335,12 +2307,12 @@ public class PreferencesDialog extends javax.swing.JDialog {
org.jdesktop.layout.GroupLayout jPanel32Layout = new org.jdesktop.layout.GroupLayout(jPanel32);
jPanel32.setLayout(jPanel32Layout);
jPanel32Layout.setHorizontalGroup(
- jPanel32Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 0, Short.MAX_VALUE)
+ jPanel32Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 0, Short.MAX_VALUE)
);
jPanel32Layout.setVerticalGroup(
- jPanel32Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 0, Short.MAX_VALUE)
+ jPanel32Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 0, Short.MAX_VALUE)
);
avatarPanel.add(jPanel32);
@@ -2352,12 +2324,12 @@ public class PreferencesDialog extends javax.swing.JDialog {
org.jdesktop.layout.GroupLayout jPanel33Layout = new org.jdesktop.layout.GroupLayout(jPanel33);
jPanel33.setLayout(jPanel33Layout);
jPanel33Layout.setHorizontalGroup(
- jPanel33Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 0, Short.MAX_VALUE)
+ jPanel33Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 0, Short.MAX_VALUE)
);
jPanel33Layout.setVerticalGroup(
- jPanel33Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 0, Short.MAX_VALUE)
+ jPanel33Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 0, Short.MAX_VALUE)
);
avatarPanel.add(jPanel33);
@@ -2367,16 +2339,16 @@ public class PreferencesDialog extends javax.swing.JDialog {
org.jdesktop.layout.GroupLayout tabAvatarsLayout = new org.jdesktop.layout.GroupLayout(tabAvatars);
tabAvatars.setLayout(tabAvatarsLayout);
tabAvatarsLayout.setHorizontalGroup(
- tabAvatarsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(tabAvatarsLayout.createSequentialGroup()
- .add(avatarPane, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 528, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(0, 0, Short.MAX_VALUE))
+ tabAvatarsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(tabAvatarsLayout.createSequentialGroup()
+ .add(avatarPane, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 528, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .add(0, 0, Short.MAX_VALUE))
);
tabAvatarsLayout.setVerticalGroup(
- tabAvatarsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(tabAvatarsLayout.createSequentialGroup()
- .add(avatarPane, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addContainerGap())
+ tabAvatarsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(tabAvatarsLayout.createSequentialGroup()
+ .add(avatarPane, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addContainerGap())
);
tabsPanel.addTab("Avatars", tabAvatars);
@@ -2399,27 +2371,27 @@ public class PreferencesDialog extends javax.swing.JDialog {
org.jdesktop.layout.GroupLayout connection_serversLayout = new org.jdesktop.layout.GroupLayout(connection_servers);
connection_servers.setLayout(connection_serversLayout);
connection_serversLayout.setHorizontalGroup(
- connection_serversLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(connection_serversLayout.createSequentialGroup()
- .add(connection_serversLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(connection_serversLayout.createSequentialGroup()
- .addContainerGap()
- .add(lblURLServerList, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 96, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(txtURLServerList, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 370, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .add(connection_serversLayout.createSequentialGroup()
- .add(141, 141, 141)
- .add(jLabel17)))
- .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ connection_serversLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(connection_serversLayout.createSequentialGroup()
+ .add(connection_serversLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(connection_serversLayout.createSequentialGroup()
+ .addContainerGap()
+ .add(lblURLServerList, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 96, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(txtURLServerList, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 370, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+ .add(connection_serversLayout.createSequentialGroup()
+ .add(141, 141, 141)
+ .add(jLabel17)))
+ .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
connection_serversLayout.setVerticalGroup(
- connection_serversLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(connection_serversLayout.createSequentialGroup()
- .add(connection_serversLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
- .add(lblURLServerList, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .add(txtURLServerList, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 26, Short.MAX_VALUE))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(jLabel17))
+ connection_serversLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(connection_serversLayout.createSequentialGroup()
+ .add(connection_serversLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
+ .add(lblURLServerList, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .add(txtURLServerList, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 26, Short.MAX_VALUE))
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(jLabel17))
);
lblProxyType.setText("Proxy:");
@@ -2465,99 +2437,99 @@ public class PreferencesDialog extends javax.swing.JDialog {
org.jdesktop.layout.GroupLayout pnlProxyLayout = new org.jdesktop.layout.GroupLayout(pnlProxy);
pnlProxy.setLayout(pnlProxyLayout);
pnlProxyLayout.setHorizontalGroup(
- pnlProxyLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(pnlProxyLayout.createSequentialGroup()
- .addContainerGap()
- .add(pnlProxyLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(pnlProxyLayout.createSequentialGroup()
- .add(rememberPswd)
- .add(47, 47, 47)
- .add(jLabel11)
- .add(34, 34, 34))
- .add(pnlProxyLayout.createSequentialGroup()
- .add(pnlProxyLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(lblProxyPort)
- .add(lblProxyPassword)
- .add(lblProxyServer)
- .add(lblProxyUserName))
- .add(19, 19, 19)
- .add(pnlProxyLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(txtProxyPort, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 58, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(pnlProxyLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING, false)
- .add(org.jdesktop.layout.GroupLayout.LEADING, txtPasswordField)
- .add(org.jdesktop.layout.GroupLayout.LEADING, txtProxyUserName, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 148, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .add(txtProxyServer))
- .addContainerGap())))
+ pnlProxyLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(pnlProxyLayout.createSequentialGroup()
+ .addContainerGap()
+ .add(pnlProxyLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(pnlProxyLayout.createSequentialGroup()
+ .add(rememberPswd)
+ .add(47, 47, 47)
+ .add(jLabel11)
+ .add(34, 34, 34))
+ .add(pnlProxyLayout.createSequentialGroup()
+ .add(pnlProxyLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(lblProxyPort)
+ .add(lblProxyPassword)
+ .add(lblProxyServer)
+ .add(lblProxyUserName))
+ .add(19, 19, 19)
+ .add(pnlProxyLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(txtProxyPort, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 58, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .add(pnlProxyLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING, false)
+ .add(org.jdesktop.layout.GroupLayout.LEADING, txtPasswordField)
+ .add(org.jdesktop.layout.GroupLayout.LEADING, txtProxyUserName, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 148, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+ .add(txtProxyServer))
+ .addContainerGap())))
);
pnlProxyLayout.setVerticalGroup(
- pnlProxyLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(pnlProxyLayout.createSequentialGroup()
- .add(6, 6, 6)
- .add(pnlProxyLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(txtProxyServer, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(lblProxyServer))
- .add(8, 8, 8)
- .add(pnlProxyLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(lblProxyPort)
- .add(txtProxyPort, 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(pnlProxyLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(txtProxyUserName, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(lblProxyUserName))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(pnlProxyLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(txtPasswordField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(lblProxyPassword))
- .add(18, 18, 18)
- .add(pnlProxyLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(rememberPswd)
- .add(jLabel11))
- .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ pnlProxyLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(pnlProxyLayout.createSequentialGroup()
+ .add(6, 6, 6)
+ .add(pnlProxyLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+ .add(txtProxyServer, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .add(lblProxyServer))
+ .add(8, 8, 8)
+ .add(pnlProxyLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+ .add(lblProxyPort)
+ .add(txtProxyPort, 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(pnlProxyLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+ .add(txtProxyUserName, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .add(lblProxyUserName))
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(pnlProxyLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+ .add(txtPasswordField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .add(lblProxyPassword))
+ .add(18, 18, 18)
+ .add(pnlProxyLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+ .add(rememberPswd)
+ .add(jLabel11))
+ .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
org.jdesktop.layout.GroupLayout pnlProxySettingsLayout = new org.jdesktop.layout.GroupLayout(pnlProxySettings);
pnlProxySettings.setLayout(pnlProxySettingsLayout);
pnlProxySettingsLayout.setHorizontalGroup(
- pnlProxySettingsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(pnlProxySettingsLayout.createSequentialGroup()
- .addContainerGap()
- .add(pnlProxy, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addContainerGap())
+ pnlProxySettingsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(pnlProxySettingsLayout.createSequentialGroup()
+ .addContainerGap()
+ .add(pnlProxy, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addContainerGap())
);
pnlProxySettingsLayout.setVerticalGroup(
- pnlProxySettingsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(pnlProxySettingsLayout.createSequentialGroup()
- .add(pnlProxy, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addContainerGap())
+ pnlProxySettingsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(pnlProxySettingsLayout.createSequentialGroup()
+ .add(pnlProxy, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addContainerGap())
);
org.jdesktop.layout.GroupLayout tabConnectionLayout = new org.jdesktop.layout.GroupLayout(tabConnection);
tabConnection.setLayout(tabConnectionLayout);
tabConnectionLayout.setHorizontalGroup(
- tabConnectionLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(org.jdesktop.layout.GroupLayout.TRAILING, tabConnectionLayout.createSequentialGroup()
- .addContainerGap()
- .add(tabConnectionLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
- .add(pnlProxySettings, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .add(org.jdesktop.layout.GroupLayout.LEADING, tabConnectionLayout.createSequentialGroup()
- .add(lblProxyType)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
- .add(cbProxyType, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 126, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .add(connection_servers, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
- .addContainerGap())
+ tabConnectionLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(org.jdesktop.layout.GroupLayout.TRAILING, tabConnectionLayout.createSequentialGroup()
+ .addContainerGap()
+ .add(tabConnectionLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
+ .add(pnlProxySettings, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .add(org.jdesktop.layout.GroupLayout.LEADING, tabConnectionLayout.createSequentialGroup()
+ .add(lblProxyType)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
+ .add(cbProxyType, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 126, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+ .add(connection_servers, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addContainerGap())
);
tabConnectionLayout.setVerticalGroup(
- tabConnectionLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(tabConnectionLayout.createSequentialGroup()
- .addContainerGap()
- .add(connection_servers, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(tabConnectionLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(lblProxyType)
- .add(cbProxyType, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .add(18, 18, 18)
- .add(pnlProxySettings, 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))
+ tabConnectionLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(tabConnectionLayout.createSequentialGroup()
+ .addContainerGap()
+ .add(connection_servers, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(tabConnectionLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(lblProxyType)
+ .add(cbProxyType, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+ .add(18, 18, 18)
+ .add(pnlProxySettings, 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))
);
pnlProxySettings.getAccessibleContext().setAccessibleDescription("");
@@ -2621,94 +2593,94 @@ public class PreferencesDialog extends javax.swing.JDialog {
org.jdesktop.layout.GroupLayout tabControlsLayout = new org.jdesktop.layout.GroupLayout(tabControls);
tabControls.setLayout(tabControlsLayout);
tabControlsLayout.setHorizontalGroup(
- tabControlsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(tabControlsLayout.createSequentialGroup()
- .addContainerGap()
- .add(tabControlsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
- .add(bttnResetControls, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .add(tabControlsLayout.createSequentialGroup()
- .add(tabControlsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(labelCancel)
- .add(labelNextTurn)
- .add(labelEndStep)
- .add(labelMainStep)
- .add(labelYourTurn)
- .add(lebelSkip)
- .add(labelPriorEnd)
- .add(labelSkipStep)
- .add(labelConfirm)
- .add(labelToggleRecordMacro)
- .add(labelSwitchChat))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
- .add(tabControlsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(keyConfirm, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 100, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(keyCancelSkip, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 100, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(keyNextTurn, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 100, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(keySkipStack, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 100, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(keyYourTurn, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 100, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(keyMainStep, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 100, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(keyPriorEnd, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 100, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(keySkipStep, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 100, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(keyEndStep, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 100, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(keyToggleRecordMacro, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 100, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(keySwitchChat, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 100, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
- .add(controlsDescriptionLabel)
- .addContainerGap())
+ tabControlsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(tabControlsLayout.createSequentialGroup()
+ .addContainerGap()
+ .add(tabControlsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
+ .add(bttnResetControls, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .add(tabControlsLayout.createSequentialGroup()
+ .add(tabControlsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(labelCancel)
+ .add(labelNextTurn)
+ .add(labelEndStep)
+ .add(labelMainStep)
+ .add(labelYourTurn)
+ .add(lebelSkip)
+ .add(labelPriorEnd)
+ .add(labelSkipStep)
+ .add(labelConfirm)
+ .add(labelToggleRecordMacro)
+ .add(labelSwitchChat))
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
+ .add(tabControlsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(keyConfirm, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 100, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .add(keyCancelSkip, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 100, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .add(keyNextTurn, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 100, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .add(keySkipStack, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 100, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .add(keyYourTurn, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 100, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .add(keyMainStep, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 100, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .add(keyPriorEnd, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 100, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .add(keySkipStep, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 100, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .add(keyEndStep, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 100, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .add(keyToggleRecordMacro, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 100, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .add(keySwitchChat, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 100, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))))
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
+ .add(controlsDescriptionLabel)
+ .addContainerGap())
);
tabControlsLayout.setVerticalGroup(
- tabControlsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(tabControlsLayout.createSequentialGroup()
- .addContainerGap()
- .add(tabControlsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
- .add(tabControlsLayout.createSequentialGroup()
- .add(tabControlsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(labelConfirm)
- .add(keyConfirm, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
- .add(tabControlsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(labelCancel)
- .add(keyCancelSkip, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
- .add(tabControlsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(labelNextTurn)
- .add(keyNextTurn, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
- .add(tabControlsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(labelEndStep)
- .add(keyEndStep, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
- .add(tabControlsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(labelSkipStep)
- .add(keySkipStep, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
- .add(tabControlsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(labelMainStep)
- .add(keyMainStep, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
- .add(tabControlsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(labelYourTurn)
- .add(keyYourTurn, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
- .add(tabControlsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(lebelSkip)
- .add(keySkipStack, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
- .add(tabControlsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(labelPriorEnd)
- .add(keyPriorEnd, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
- .add(tabControlsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(labelToggleRecordMacro)
- .add(keyToggleRecordMacro, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
- .add(tabControlsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(labelSwitchChat)
- .add(keySwitchChat, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
- .add(bttnResetControls))
- .add(controlsDescriptionLabel))
- .addContainerGap())
+ tabControlsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(tabControlsLayout.createSequentialGroup()
+ .addContainerGap()
+ .add(tabControlsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
+ .add(tabControlsLayout.createSequentialGroup()
+ .add(tabControlsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+ .add(labelConfirm)
+ .add(keyConfirm, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
+ .add(tabControlsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+ .add(labelCancel)
+ .add(keyCancelSkip, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
+ .add(tabControlsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+ .add(labelNextTurn)
+ .add(keyNextTurn, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
+ .add(tabControlsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+ .add(labelEndStep)
+ .add(keyEndStep, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
+ .add(tabControlsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+ .add(labelSkipStep)
+ .add(keySkipStep, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
+ .add(tabControlsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+ .add(labelMainStep)
+ .add(keyMainStep, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
+ .add(tabControlsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+ .add(labelYourTurn)
+ .add(keyYourTurn, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
+ .add(tabControlsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+ .add(lebelSkip)
+ .add(keySkipStack, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
+ .add(tabControlsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+ .add(labelPriorEnd)
+ .add(keyPriorEnd, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
+ .add(tabControlsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+ .add(labelToggleRecordMacro)
+ .add(keyToggleRecordMacro, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
+ .add(tabControlsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+ .add(labelSwitchChat)
+ .add(keySwitchChat, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
+ .add(bttnResetControls))
+ .add(controlsDescriptionLabel))
+ .addContainerGap())
);
tabsPanel.addTab("Controls", tabControls);
@@ -2733,51 +2705,51 @@ public class PreferencesDialog extends javax.swing.JDialog {
org.jdesktop.layout.GroupLayout themesCategoryLayout = new org.jdesktop.layout.GroupLayout(themesCategory);
themesCategory.setLayout(themesCategoryLayout);
themesCategoryLayout.setHorizontalGroup(
- themesCategoryLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(themesCategoryLayout.createSequentialGroup()
- .addContainerGap()
- .add(lbSelectLabel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 96, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(themesCategoryLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(lbThemeHint)
- .add(cbTheme, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 303, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .addContainerGap(303, Short.MAX_VALUE))
+ themesCategoryLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(themesCategoryLayout.createSequentialGroup()
+ .addContainerGap()
+ .add(lbSelectLabel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 96, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(themesCategoryLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(lbThemeHint)
+ .add(cbTheme, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 303, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+ .addContainerGap(303, Short.MAX_VALUE))
);
themesCategoryLayout.setVerticalGroup(
- themesCategoryLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(themesCategoryLayout.createSequentialGroup()
- .add(themesCategoryLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
- .add(cbTheme, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(lbSelectLabel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 22, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(lbThemeHint)
- .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ themesCategoryLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(themesCategoryLayout.createSequentialGroup()
+ .add(themesCategoryLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
+ .add(cbTheme, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .add(lbSelectLabel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 22, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(lbThemeHint)
+ .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
org.jdesktop.layout.GroupLayout tabThemesLayout = new org.jdesktop.layout.GroupLayout(tabThemes);
tabThemes.setLayout(tabThemesLayout);
tabThemesLayout.setHorizontalGroup(
- tabThemesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 750, Short.MAX_VALUE)
- .add(tabThemesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(tabThemesLayout.createSequentialGroup()
- .addContainerGap()
- .add(themesCategory, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addContainerGap()))
+ tabThemesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 750, Short.MAX_VALUE)
+ .add(tabThemesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(tabThemesLayout.createSequentialGroup()
+ .addContainerGap()
+ .add(themesCategory, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addContainerGap()))
);
tabThemesLayout.setVerticalGroup(
- tabThemesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 526, Short.MAX_VALUE)
- .add(tabThemesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(tabThemesLayout.createSequentialGroup()
- .add(21, 21, 21)
- .add(themesCategory, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addContainerGap(430, Short.MAX_VALUE)))
+ tabThemesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 526, Short.MAX_VALUE)
+ .add(tabThemesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(tabThemesLayout.createSequentialGroup()
+ .add(21, 21, 21)
+ .add(themesCategory, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .addContainerGap(430, Short.MAX_VALUE)))
);
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));
@@ -2802,27 +2774,27 @@ public class PreferencesDialog extends javax.swing.JDialog {
org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(getContentPane());
getContentPane().setLayout(layout);
layout.setHorizontalGroup(
- layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(layout.createSequentialGroup()
- .addContainerGap()
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
- .add(org.jdesktop.layout.GroupLayout.LEADING, tabsPanel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .add(layout.createSequentialGroup()
- .add(0, 0, Short.MAX_VALUE)
- .add(saveButton, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 100, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(exitButton, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 100, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
- .add(6, 6, 6))
+ layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(layout.createSequentialGroup()
+ .addContainerGap()
+ .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
+ .add(org.jdesktop.layout.GroupLayout.LEADING, tabsPanel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .add(layout.createSequentialGroup()
+ .add(0, 0, Short.MAX_VALUE)
+ .add(saveButton, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 100, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(exitButton, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 100, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
+ .add(6, 6, 6))
);
layout.setVerticalGroup(
- layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(layout.createSequentialGroup()
- .add(tabsPanel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 554, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(saveButton, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 30, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(exitButton, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 30, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .addContainerGap())
+ layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(layout.createSequentialGroup()
+ .add(tabsPanel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 554, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+ .add(saveButton, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 30, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .add(exitButton, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 30, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+ .addContainerGap())
);
pack();
@@ -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;
diff --git a/Mage.Client/src/main/java/mage/client/util/GUISizeHelper.java b/Mage.Client/src/main/java/mage/client/util/GUISizeHelper.java
index d8cf3a5a99..352b88f610 100644
--- a/Mage.Client/src/main/java/mage/client/util/GUISizeHelper.java
+++ b/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;
diff --git a/Mage.Client/src/main/java/org/mage/card/arcane/MageLayer.java b/Mage.Client/src/main/java/org/mage/card/arcane/MageLayer.java
index 296b532569..e9cfbfdcfd 100644
--- a/Mage.Client/src/main/java/org/mage/card/arcane/MageLayer.java
+++ b/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,10 +147,14 @@ public class MageLayer extends MageCard {
this.iconsPanels.add(this.iconsDebugPanel);
} else {
// NORMAL mode -- multiple panels
- this.iconsAbilitiesPanel = CardIconsPanelFactory.createAbilitiesPanel();
- this.iconsPanels.add(this.iconsAbilitiesPanel);
- this.iconsPlayablePanel = CardIconsPanelFactory.createPlayablePanel();
- this.iconsPanels.add(this.iconsPlayablePanel);
+ 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));