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 b15bbcdd6aa..8008ce940d9 100644
--- a/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.form
+++ b/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.form
@@ -25,13 +25,13 @@
-
+
-
+
@@ -69,8 +69,11 @@
-
+
+
+
+
@@ -200,18 +203,18 @@
-
-
+
-
-
-
+
+
+
+
-
+
@@ -335,9 +338,9 @@
-
-
-
+
+
+
@@ -528,7 +531,7 @@
-
+
@@ -730,11 +733,11 @@
-
+
-
-
+
+
@@ -769,29 +772,34 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
-
+
@@ -899,36 +907,37 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1206,120 +1215,54 @@
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
@@ -1329,41 +1272,26 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
-
+
@@ -1377,17 +1305,26 @@
+
+
+
+
+
+
+
+
+
-
+
-
+
@@ -1401,17 +1338,59 @@
+
+
+
+
+
+
+
+
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1425,17 +1404,26 @@
+
+
+
+
+
+
+
+
+
-
+
-
+
@@ -1449,29 +1437,30 @@
+
+
+
+
+
+
+
+
+
-
+
-
+
-
-
-
-
-
-
-
-
@@ -1481,17 +1470,26 @@
+
+
+
+
+
+
+
+
+
-
+
-
+
@@ -1505,17 +1503,26 @@
+
+
+
+
+
+
+
+
+
-
+
-
+
@@ -1529,17 +1536,26 @@
+
+
+
+
+
+
+
+
+
-
+
-
+
@@ -1553,17 +1569,26 @@
+
+
+
+
+
+
+
+
+
-
+
-
+
@@ -1577,17 +1602,26 @@
+
+
+
+
+
+
+
+
+
-
+
-
+
@@ -1601,17 +1635,419 @@
+
+
+
+
+
+
+
+
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1634,19 +2070,18 @@
-
+
-
-
+
+
+
-
-
-
+
-
+
@@ -1662,7 +2097,7 @@
-
+
@@ -1859,7 +2294,7 @@
-
+
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 d655432110c..dde646aff4d 100644
--- a/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java
+++ b/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java
@@ -42,9 +42,7 @@ import java.awt.event.MouseEvent;
import java.awt.image.BufferedImage;
import java.io.File;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Map;
-import java.util.Set;
import java.util.prefs.BackingStoreException;
import java.util.prefs.Preferences;
import javax.swing.BorderFactory;
@@ -264,29 +262,15 @@ public class PreferencesDialog extends javax.swing.JDialog {
public static String PHASE_ON = "on";
public static String PHASE_OFF = "off";
- public static final int DEFAULT_AVATAR_ID = 51;
- private static int selectedAvatarId = DEFAULT_AVATAR_ID;
- private static final Set available_avatars = new HashSet<>();
+ public static final int MIN_AVATAR_ID = 10;
+ public static final int MAX_AVATAR_ID = 32;
+ public static final int DEFAULT_AVATAR_ID = 10;
private static final Map panels = new HashMap<>();
private static final Border GREEN_BORDER = BorderFactory.createLineBorder(Color.GREEN, 3);
private static final Border BLACK_BORDER = BorderFactory.createLineBorder(Color.BLACK, 3);
- static {
- available_avatars.add(51);
- available_avatars.add(13);
- available_avatars.add(9);
- available_avatars.add(53);
- available_avatars.add(10);
- available_avatars.add(39);
- available_avatars.add(19);
- available_avatars.add(30);
- available_avatars.add(25);
-
- available_avatars.add(22);
- available_avatars.add(77);
- available_avatars.add(62);
- }
+ private static int selectedAvatarId = DEFAULT_AVATAR_ID;
private final JFileChooser fc = new JFileChooser();
@@ -433,20 +417,30 @@ public class PreferencesDialog extends javax.swing.JDialog {
tabAvatars = new javax.swing.JPanel();
avatarPane = new javax.swing.JScrollPane();
avatarPanel = new javax.swing.JPanel();
- jLabel12 = new javax.swing.JLabel();
jPanel10 = new javax.swing.JPanel();
- jPanel13 = new javax.swing.JPanel();
jPanel11 = new javax.swing.JPanel();
jPanel12 = new javax.swing.JPanel();
+ jPanel13 = new javax.swing.JPanel();
jPanel14 = new javax.swing.JPanel();
jPanel15 = new javax.swing.JPanel();
- jLabel13 = new javax.swing.JLabel();
jPanel16 = new javax.swing.JPanel();
jPanel17 = new javax.swing.JPanel();
jPanel18 = new javax.swing.JPanel();
jPanel19 = new javax.swing.JPanel();
jPanel20 = new javax.swing.JPanel();
jPanel21 = new javax.swing.JPanel();
+ jPanel22 = new javax.swing.JPanel();
+ jPanel23 = new javax.swing.JPanel();
+ jPanel24 = new javax.swing.JPanel();
+ jPanel25 = new javax.swing.JPanel();
+ jPanel26 = new javax.swing.JPanel();
+ jPanel27 = new javax.swing.JPanel();
+ jPanel28 = new javax.swing.JPanel();
+ jPanel29 = new javax.swing.JPanel();
+ jPanel30 = new javax.swing.JPanel();
+ jPanel31 = new javax.swing.JPanel();
+ jPanel32 = new javax.swing.JPanel();
+ jPanel33 = new javax.swing.JPanel();
tabConnection = new javax.swing.JPanel();
lblProxyType = new javax.swing.JLabel();
cbProxyType = new javax.swing.JComboBox();
@@ -608,16 +602,16 @@ public class PreferencesDialog extends javax.swing.JDialog {
main_gameLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(main_gameLayout.createSequentialGroup()
.addContainerGap()
- .addGroup(main_gameLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(cbAllowRequestToShowHandCards, javax.swing.GroupLayout.PREFERRED_SIZE, 546, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addGroup(main_gameLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
.addGroup(main_gameLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false)
.addComponent(showPlayerNamesPermanently, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(nonLandPermanentsInOnePile, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(showAbilityPickerForced, javax.swing.GroupLayout.Alignment.LEADING))
- .addComponent(cbShowStormCounter, javax.swing.GroupLayout.PREFERRED_SIZE, 546, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(cbConfirmEmptyManaPool, javax.swing.GroupLayout.PREFERRED_SIZE, 546, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(cbAskMoveToGraveOrder, javax.swing.GroupLayout.PREFERRED_SIZE, 546, javax.swing.GroupLayout.PREFERRED_SIZE))
- .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addComponent(cbConfirmEmptyManaPool, javax.swing.GroupLayout.DEFAULT_SIZE, 485, Short.MAX_VALUE)
+ .addComponent(cbAllowRequestToShowHandCards, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(cbShowStormCounter, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(cbAskMoveToGraveOrder, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addContainerGap(7, Short.MAX_VALUE))
);
main_gameLayout.setVerticalGroup(
main_gameLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -666,9 +660,9 @@ public class PreferencesDialog extends javax.swing.JDialog {
main_gamelogLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(main_gamelogLayout.createSequentialGroup()
.addContainerGap()
- .addGroup(main_gamelogLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(cbGameLogAutoSave, javax.swing.GroupLayout.PREFERRED_SIZE, 528, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(cbDraftLogAutoSave, javax.swing.GroupLayout.PREFERRED_SIZE, 528, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addGroup(main_gamelogLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+ .addComponent(cbDraftLogAutoSave, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(cbGameLogAutoSave, javax.swing.GroupLayout.DEFAULT_SIZE, 473, Short.MAX_VALUE))
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
main_gamelogLayout.setVerticalGroup(
@@ -687,8 +681,10 @@ public class PreferencesDialog extends javax.swing.JDialog {
.addContainerGap()
.addGroup(tabMainLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(main_card, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(main_game, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(main_gamelog, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addComponent(main_gamelog, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addGroup(tabMainLayout.createSequentialGroup()
+ .addComponent(main_game, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addGap(0, 0, Short.MAX_VALUE)))
.addContainerGap())
);
tabMainLayout.setVerticalGroup(
@@ -915,7 +911,7 @@ public class PreferencesDialog extends javax.swing.JDialog {
.addComponent(jLabelEndOfTurn)
.addComponent(checkBoxEndTurnOthers))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
- .addComponent(phases_stopSettings, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(phases_stopSettings, javax.swing.GroupLayout.DEFAULT_SIZE, 183, Short.MAX_VALUE)
.addContainerGap())
);
@@ -962,24 +958,27 @@ public class PreferencesDialog extends javax.swing.JDialog {
panelCardImages.setLayout(panelCardImagesLayout);
panelCardImagesLayout.setHorizontalGroup(
panelCardImagesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(panelCardImagesLayout.createSequentialGroup()
- .addGap(24, 24, 24)
- .addComponent(txtImageFolderPath)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(btnBrowseImageLocation))
.addGroup(panelCardImagesLayout.createSequentialGroup()
.addGroup(panelCardImagesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(cbUseDefaultImageFolder)
- .addComponent(cbCheckForNewImages)
.addGroup(panelCardImagesLayout.createSequentialGroup()
- .addGroup(panelCardImagesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false)
- .addGroup(javax.swing.GroupLayout.Alignment.LEADING, panelCardImagesLayout.createSequentialGroup()
- .addContainerGap()
- .addComponent(labelPreferedImageLanguage))
- .addComponent(cbSaveToZipFiles, javax.swing.GroupLayout.Alignment.LEADING))
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
- .addComponent(cbPreferedImageLanguage, javax.swing.GroupLayout.PREFERRED_SIZE, 153, javax.swing.GroupLayout.PREFERRED_SIZE)))
- .addGap(0, 0, Short.MAX_VALUE))
+ .addGroup(panelCardImagesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(cbUseDefaultImageFolder)
+ .addComponent(cbCheckForNewImages)
+ .addGroup(panelCardImagesLayout.createSequentialGroup()
+ .addGroup(panelCardImagesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false)
+ .addGroup(javax.swing.GroupLayout.Alignment.LEADING, panelCardImagesLayout.createSequentialGroup()
+ .addContainerGap()
+ .addComponent(labelPreferedImageLanguage))
+ .addComponent(cbSaveToZipFiles, javax.swing.GroupLayout.Alignment.LEADING))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+ .addComponent(cbPreferedImageLanguage, javax.swing.GroupLayout.PREFERRED_SIZE, 153, javax.swing.GroupLayout.PREFERRED_SIZE)))
+ .addGap(0, 190, Short.MAX_VALUE))
+ .addGroup(panelCardImagesLayout.createSequentialGroup()
+ .addGap(24, 24, 24)
+ .addComponent(txtImageFolderPath)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(btnBrowseImageLocation)))
+ .addContainerGap())
);
panelCardImagesLayout.setVerticalGroup(
panelCardImagesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -1061,32 +1060,29 @@ public class PreferencesDialog extends javax.swing.JDialog {
.addGroup(panelBackgroundImagesLayout.createSequentialGroup()
.addGroup(panelBackgroundImagesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(panelBackgroundImagesLayout.createSequentialGroup()
- .addGap(19, 19, 19)
- .addComponent(jLabel14))
- .addGroup(panelBackgroundImagesLayout.createSequentialGroup()
- .addGap(25, 25, 25)
- .addComponent(jLabel15)))
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addGroup(panelBackgroundImagesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(panelBackgroundImagesLayout.createSequentialGroup()
- .addComponent(txtBattlefieldImagePath, javax.swing.GroupLayout.PREFERRED_SIZE, 336, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addGroup(panelBackgroundImagesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(panelBackgroundImagesLayout.createSequentialGroup()
+ .addGap(19, 19, 19)
+ .addComponent(jLabel14))
+ .addGroup(panelBackgroundImagesLayout.createSequentialGroup()
+ .addGap(25, 25, 25)
+ .addComponent(jLabel15)))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(btnBrowseBattlefieldImage))
- .addGroup(panelBackgroundImagesLayout.createSequentialGroup()
- .addComponent(txtBackgroundImagePath, javax.swing.GroupLayout.PREFERRED_SIZE, 332, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addGroup(panelBackgroundImagesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(txtBackgroundImagePath)
+ .addComponent(txtBattlefieldImagePath))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(btnBrowseBackgroundImage)))
- .addGap(0, 0, Short.MAX_VALUE))
- .addGroup(panelBackgroundImagesLayout.createSequentialGroup()
- .addGroup(panelBackgroundImagesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(cbUseRandomBattleImage)
- .addComponent(cbUseDefaultBattleImage)
- .addComponent(cbUseDefaultBackground))
- .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addGroup(panelBackgroundImagesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(btnBrowseBackgroundImage, javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(btnBrowseBattlefieldImage, javax.swing.GroupLayout.Alignment.TRAILING)))
+ .addGroup(panelBackgroundImagesLayout.createSequentialGroup()
+ .addGroup(panelBackgroundImagesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(cbUseRandomBattleImage)
+ .addComponent(cbUseDefaultBattleImage)
+ .addComponent(cbUseDefaultBackground))
+ .addGap(0, 0, Short.MAX_VALUE)))
+ .addContainerGap())
);
-
- panelBackgroundImagesLayout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {txtBackgroundImagePath, txtBattlefieldImagePath});
-
panelBackgroundImagesLayout.setVerticalGroup(
panelBackgroundImagesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(panelBackgroundImagesLayout.createSequentialGroup()
@@ -1115,8 +1111,8 @@ public class PreferencesDialog extends javax.swing.JDialog {
.addGroup(tabImagesLayout.createSequentialGroup()
.addContainerGap()
.addGroup(tabImagesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(panelCardImages, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(panelBackgroundImages, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addComponent(panelCardImages, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(panelBackgroundImages, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addContainerGap())
);
tabImagesLayout.setVerticalGroup(
@@ -1248,249 +1244,459 @@ public class PreferencesDialog extends javax.swing.JDialog {
tabsPanel.addTab("Sounds", tabSounds);
- jLabel12.setFont(new java.awt.Font("Tahoma", 1, 11)); // NOI18N
- jLabel12.setText("Choose your avatar:");
+ avatarPane.setMaximumSize(new java.awt.Dimension(508, 772));
+ avatarPane.setMinimumSize(new java.awt.Dimension(508, 772));
+ avatarPane.setPreferredSize(new java.awt.Dimension(508, 772));
+
+ avatarPanel.setMaximumSize(new java.awt.Dimension(508, 772));
+ avatarPanel.setMinimumSize(new java.awt.Dimension(508, 772));
+ avatarPanel.setPreferredSize(new java.awt.Dimension(508, 772));
+ avatarPanel.setLayout(new java.awt.GridLayout(6, 4, 20, 20));
jPanel10.setBorder(new javax.swing.border.LineBorder(new java.awt.Color(204, 204, 204), 1, true));
+ jPanel10.setMaximumSize(new java.awt.Dimension(102, 102));
+ jPanel10.setMinimumSize(new java.awt.Dimension(102, 102));
+ jPanel10.setPreferredSize(new java.awt.Dimension(102, 102));
javax.swing.GroupLayout jPanel10Layout = new javax.swing.GroupLayout(jPanel10);
jPanel10.setLayout(jPanel10Layout);
jPanel10Layout.setHorizontalGroup(
jPanel10Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGap(0, 100, Short.MAX_VALUE)
+ .addGap(0, 110, Short.MAX_VALUE)
);
jPanel10Layout.setVerticalGroup(
jPanel10Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGap(0, 100, Short.MAX_VALUE)
+ .addGap(0, 110, Short.MAX_VALUE)
);
- jPanel13.setBorder(new javax.swing.border.LineBorder(new java.awt.Color(204, 204, 204), 1, true));
-
- javax.swing.GroupLayout jPanel13Layout = new javax.swing.GroupLayout(jPanel13);
- jPanel13.setLayout(jPanel13Layout);
- jPanel13Layout.setHorizontalGroup(
- jPanel13Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGap(0, 100, Short.MAX_VALUE)
- );
- jPanel13Layout.setVerticalGroup(
- jPanel13Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGap(0, 100, Short.MAX_VALUE)
- );
+ avatarPanel.add(jPanel10);
jPanel11.setBorder(new javax.swing.border.LineBorder(new java.awt.Color(204, 204, 204), 1, true));
+ jPanel11.setMaximumSize(new java.awt.Dimension(102, 102));
+ jPanel11.setMinimumSize(new java.awt.Dimension(102, 102));
+ jPanel11.setPreferredSize(new java.awt.Dimension(102, 102));
javax.swing.GroupLayout jPanel11Layout = new javax.swing.GroupLayout(jPanel11);
jPanel11.setLayout(jPanel11Layout);
jPanel11Layout.setHorizontalGroup(
jPanel11Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGap(0, 100, Short.MAX_VALUE)
+ .addGap(0, 110, Short.MAX_VALUE)
);
jPanel11Layout.setVerticalGroup(
jPanel11Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGap(0, 100, Short.MAX_VALUE)
+ .addGap(0, 110, Short.MAX_VALUE)
);
+ avatarPanel.add(jPanel11);
+
jPanel12.setBorder(new javax.swing.border.LineBorder(new java.awt.Color(204, 204, 204), 1, true));
+ jPanel12.setMaximumSize(new java.awt.Dimension(102, 102));
+ jPanel12.setMinimumSize(new java.awt.Dimension(102, 102));
+ jPanel12.setPreferredSize(new java.awt.Dimension(102, 102));
javax.swing.GroupLayout jPanel12Layout = new javax.swing.GroupLayout(jPanel12);
jPanel12.setLayout(jPanel12Layout);
jPanel12Layout.setHorizontalGroup(
jPanel12Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGap(0, 100, Short.MAX_VALUE)
+ .addGap(0, 110, Short.MAX_VALUE)
);
jPanel12Layout.setVerticalGroup(
jPanel12Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGap(0, 100, Short.MAX_VALUE)
+ .addGap(0, 110, Short.MAX_VALUE)
);
+ avatarPanel.add(jPanel12);
+
+ jPanel13.setBorder(new javax.swing.border.LineBorder(new java.awt.Color(204, 204, 204), 1, true));
+ jPanel13.setMaximumSize(new java.awt.Dimension(102, 102));
+ jPanel13.setMinimumSize(new java.awt.Dimension(102, 102));
+ jPanel13.setPreferredSize(new java.awt.Dimension(102, 102));
+
+ javax.swing.GroupLayout jPanel13Layout = new javax.swing.GroupLayout(jPanel13);
+ jPanel13.setLayout(jPanel13Layout);
+ jPanel13Layout.setHorizontalGroup(
+ jPanel13Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGap(0, 110, Short.MAX_VALUE)
+ );
+ jPanel13Layout.setVerticalGroup(
+ jPanel13Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGap(0, 0, Short.MAX_VALUE)
+ );
+
+ avatarPanel.add(jPanel13);
+
jPanel14.setBorder(new javax.swing.border.LineBorder(new java.awt.Color(204, 204, 204), 1, true));
+ jPanel14.setMaximumSize(new java.awt.Dimension(102, 102));
+ jPanel14.setMinimumSize(new java.awt.Dimension(102, 102));
+ jPanel14.setPreferredSize(new java.awt.Dimension(102, 102));
javax.swing.GroupLayout jPanel14Layout = new javax.swing.GroupLayout(jPanel14);
jPanel14.setLayout(jPanel14Layout);
jPanel14Layout.setHorizontalGroup(
jPanel14Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGap(0, 100, Short.MAX_VALUE)
+ .addGap(0, 110, Short.MAX_VALUE)
);
jPanel14Layout.setVerticalGroup(
jPanel14Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGap(0, 100, Short.MAX_VALUE)
+ .addGap(0, 110, Short.MAX_VALUE)
);
+ avatarPanel.add(jPanel14);
+
jPanel15.setBorder(new javax.swing.border.LineBorder(new java.awt.Color(204, 204, 204), 1, true));
+ jPanel15.setMaximumSize(new java.awt.Dimension(102, 102));
+ jPanel15.setMinimumSize(new java.awt.Dimension(102, 102));
+ jPanel15.setPreferredSize(new java.awt.Dimension(102, 102));
javax.swing.GroupLayout jPanel15Layout = new javax.swing.GroupLayout(jPanel15);
jPanel15.setLayout(jPanel15Layout);
jPanel15Layout.setHorizontalGroup(
jPanel15Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGap(0, 100, Short.MAX_VALUE)
+ .addGap(0, 110, Short.MAX_VALUE)
);
jPanel15Layout.setVerticalGroup(
jPanel15Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGap(0, 100, Short.MAX_VALUE)
+ .addGap(0, 110, Short.MAX_VALUE)
);
- jLabel13.setFont(new java.awt.Font("Tahoma", 1, 11)); // NOI18N
- jLabel13.setText("New avatars:");
+ avatarPanel.add(jPanel15);
jPanel16.setBorder(new javax.swing.border.LineBorder(new java.awt.Color(204, 204, 204), 1, true));
+ jPanel16.setMaximumSize(new java.awt.Dimension(102, 102));
+ jPanel16.setMinimumSize(new java.awt.Dimension(102, 102));
+ jPanel16.setPreferredSize(new java.awt.Dimension(102, 102));
javax.swing.GroupLayout jPanel16Layout = new javax.swing.GroupLayout(jPanel16);
jPanel16.setLayout(jPanel16Layout);
jPanel16Layout.setHorizontalGroup(
jPanel16Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGap(0, 100, Short.MAX_VALUE)
+ .addGap(0, 110, Short.MAX_VALUE)
);
jPanel16Layout.setVerticalGroup(
jPanel16Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGap(0, 100, Short.MAX_VALUE)
+ .addGap(0, 110, Short.MAX_VALUE)
);
+ avatarPanel.add(jPanel16);
+
jPanel17.setBorder(new javax.swing.border.LineBorder(new java.awt.Color(204, 204, 204), 1, true));
+ jPanel17.setMaximumSize(new java.awt.Dimension(102, 102));
+ jPanel17.setMinimumSize(new java.awt.Dimension(102, 102));
+ jPanel17.setPreferredSize(new java.awt.Dimension(102, 102));
javax.swing.GroupLayout jPanel17Layout = new javax.swing.GroupLayout(jPanel17);
jPanel17.setLayout(jPanel17Layout);
jPanel17Layout.setHorizontalGroup(
jPanel17Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGap(0, 100, Short.MAX_VALUE)
+ .addGap(0, 110, Short.MAX_VALUE)
);
jPanel17Layout.setVerticalGroup(
jPanel17Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGap(0, 100, Short.MAX_VALUE)
+ .addGap(0, 110, Short.MAX_VALUE)
);
+ avatarPanel.add(jPanel17);
+
jPanel18.setBorder(new javax.swing.border.LineBorder(new java.awt.Color(204, 204, 204), 1, true));
+ jPanel18.setMaximumSize(new java.awt.Dimension(102, 102));
+ jPanel18.setMinimumSize(new java.awt.Dimension(102, 102));
+ jPanel18.setPreferredSize(new java.awt.Dimension(102, 102));
javax.swing.GroupLayout jPanel18Layout = new javax.swing.GroupLayout(jPanel18);
jPanel18.setLayout(jPanel18Layout);
jPanel18Layout.setHorizontalGroup(
jPanel18Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGap(0, 100, Short.MAX_VALUE)
+ .addGap(0, 110, Short.MAX_VALUE)
);
jPanel18Layout.setVerticalGroup(
jPanel18Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGap(0, 100, Short.MAX_VALUE)
+ .addGap(0, 110, Short.MAX_VALUE)
);
+ avatarPanel.add(jPanel18);
+
jPanel19.setBorder(new javax.swing.border.LineBorder(new java.awt.Color(204, 204, 204), 1, true));
+ jPanel19.setMaximumSize(new java.awt.Dimension(102, 102));
+ jPanel19.setMinimumSize(new java.awt.Dimension(102, 102));
+ jPanel19.setPreferredSize(new java.awt.Dimension(102, 102));
javax.swing.GroupLayout jPanel19Layout = new javax.swing.GroupLayout(jPanel19);
jPanel19.setLayout(jPanel19Layout);
jPanel19Layout.setHorizontalGroup(
jPanel19Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGap(0, 100, Short.MAX_VALUE)
+ .addGap(0, 110, Short.MAX_VALUE)
);
jPanel19Layout.setVerticalGroup(
jPanel19Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGap(0, 100, Short.MAX_VALUE)
+ .addGap(0, 110, Short.MAX_VALUE)
);
+ avatarPanel.add(jPanel19);
+
jPanel20.setBorder(new javax.swing.border.LineBorder(new java.awt.Color(204, 204, 204), 1, true));
+ jPanel20.setMaximumSize(new java.awt.Dimension(102, 102));
+ jPanel20.setMinimumSize(new java.awt.Dimension(102, 102));
+ jPanel20.setPreferredSize(new java.awt.Dimension(102, 102));
javax.swing.GroupLayout jPanel20Layout = new javax.swing.GroupLayout(jPanel20);
jPanel20.setLayout(jPanel20Layout);
jPanel20Layout.setHorizontalGroup(
jPanel20Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGap(0, 100, Short.MAX_VALUE)
+ .addGap(0, 110, Short.MAX_VALUE)
);
jPanel20Layout.setVerticalGroup(
jPanel20Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGap(0, 100, Short.MAX_VALUE)
+ .addGap(0, 110, Short.MAX_VALUE)
);
+ avatarPanel.add(jPanel20);
+
jPanel21.setBorder(new javax.swing.border.LineBorder(new java.awt.Color(204, 204, 204), 1, true));
+ jPanel21.setMaximumSize(new java.awt.Dimension(102, 102));
+ jPanel21.setMinimumSize(new java.awt.Dimension(102, 102));
+ jPanel21.setPreferredSize(new java.awt.Dimension(102, 102));
javax.swing.GroupLayout jPanel21Layout = new javax.swing.GroupLayout(jPanel21);
jPanel21.setLayout(jPanel21Layout);
jPanel21Layout.setHorizontalGroup(
jPanel21Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGap(0, 100, Short.MAX_VALUE)
+ .addGap(0, 110, Short.MAX_VALUE)
);
jPanel21Layout.setVerticalGroup(
jPanel21Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGap(0, 100, Short.MAX_VALUE)
+ .addGap(0, 110, Short.MAX_VALUE)
);
- javax.swing.GroupLayout avatarPanelLayout = new javax.swing.GroupLayout(avatarPanel);
- avatarPanel.setLayout(avatarPanelLayout);
- avatarPanelLayout.setHorizontalGroup(
- avatarPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(avatarPanelLayout.createSequentialGroup()
- .addGroup(avatarPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(avatarPanelLayout.createSequentialGroup()
- .addContainerGap()
- .addComponent(jLabel12))
- .addGroup(avatarPanelLayout.createSequentialGroup()
- .addGroup(avatarPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(avatarPanelLayout.createSequentialGroup()
- .addGap(30, 30, 30)
- .addGroup(avatarPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
- .addComponent(jPanel12, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(jPanel10, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(jPanel19, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
- .addGap(33, 33, 33)
- .addGroup(avatarPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(jPanel13, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(jPanel14, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(jPanel20, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
- .addGroup(avatarPanelLayout.createSequentialGroup()
- .addContainerGap()
- .addGroup(avatarPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(avatarPanelLayout.createSequentialGroup()
- .addGap(20, 20, 20)
- .addComponent(jPanel16, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addGap(33, 33, 33)
- .addComponent(jPanel17, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
- .addComponent(jLabel13))))
- .addGap(32, 32, 32)
- .addGroup(avatarPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(jPanel18, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(jPanel21, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(jPanel15, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(jPanel11, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))))
- .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ avatarPanel.add(jPanel21);
+
+ jPanel22.setBorder(new javax.swing.border.LineBorder(new java.awt.Color(204, 204, 204), 1, true));
+ jPanel22.setMaximumSize(new java.awt.Dimension(102, 102));
+ jPanel22.setMinimumSize(new java.awt.Dimension(102, 102));
+ jPanel22.setPreferredSize(new java.awt.Dimension(102, 102));
+
+ javax.swing.GroupLayout jPanel22Layout = new javax.swing.GroupLayout(jPanel22);
+ jPanel22.setLayout(jPanel22Layout);
+ jPanel22Layout.setHorizontalGroup(
+ jPanel22Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGap(0, 110, Short.MAX_VALUE)
);
- avatarPanelLayout.setVerticalGroup(
- avatarPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(avatarPanelLayout.createSequentialGroup()
- .addContainerGap()
- .addComponent(jLabel12)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
- .addGroup(avatarPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(jPanel11, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(jPanel13, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(jPanel10, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
- .addGap(26, 26, 26)
- .addGroup(avatarPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(jPanel15, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(jPanel12, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(jPanel14, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
- .addGap(23, 23, 23)
- .addGroup(avatarPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
- .addComponent(jPanel19, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(jPanel20, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(jPanel21, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
- .addGap(18, 18, 18)
- .addGroup(avatarPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
- .addGroup(avatarPanelLayout.createSequentialGroup()
- .addComponent(jLabel13)
- .addGap(18, 18, 18)
- .addComponent(jPanel16, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
- .addComponent(jPanel17, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(jPanel18, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
- .addGap(25, 25, 25))
+ jPanel22Layout.setVerticalGroup(
+ jPanel22Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGap(0, 110, Short.MAX_VALUE)
);
+ avatarPanel.add(jPanel22);
+
+ jPanel23.setBorder(new javax.swing.border.LineBorder(new java.awt.Color(204, 204, 204), 1, true));
+ jPanel23.setMaximumSize(new java.awt.Dimension(102, 102));
+ jPanel23.setMinimumSize(new java.awt.Dimension(102, 102));
+ jPanel23.setPreferredSize(new java.awt.Dimension(102, 102));
+
+ javax.swing.GroupLayout jPanel23Layout = new javax.swing.GroupLayout(jPanel23);
+ jPanel23.setLayout(jPanel23Layout);
+ jPanel23Layout.setHorizontalGroup(
+ jPanel23Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGap(0, 110, Short.MAX_VALUE)
+ );
+ jPanel23Layout.setVerticalGroup(
+ jPanel23Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGap(0, 110, Short.MAX_VALUE)
+ );
+
+ avatarPanel.add(jPanel23);
+
+ jPanel24.setBorder(new javax.swing.border.LineBorder(new java.awt.Color(204, 204, 204), 1, true));
+ jPanel24.setMaximumSize(new java.awt.Dimension(102, 102));
+ jPanel24.setMinimumSize(new java.awt.Dimension(102, 102));
+ jPanel24.setPreferredSize(new java.awt.Dimension(102, 102));
+
+ javax.swing.GroupLayout jPanel24Layout = new javax.swing.GroupLayout(jPanel24);
+ jPanel24.setLayout(jPanel24Layout);
+ jPanel24Layout.setHorizontalGroup(
+ jPanel24Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGap(0, 110, Short.MAX_VALUE)
+ );
+ jPanel24Layout.setVerticalGroup(
+ jPanel24Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGap(0, 110, Short.MAX_VALUE)
+ );
+
+ avatarPanel.add(jPanel24);
+
+ jPanel25.setBorder(new javax.swing.border.LineBorder(new java.awt.Color(204, 204, 204), 1, true));
+ jPanel25.setMaximumSize(new java.awt.Dimension(102, 102));
+ jPanel25.setMinimumSize(new java.awt.Dimension(102, 102));
+ jPanel25.setPreferredSize(new java.awt.Dimension(102, 102));
+
+ javax.swing.GroupLayout jPanel25Layout = new javax.swing.GroupLayout(jPanel25);
+ jPanel25.setLayout(jPanel25Layout);
+ jPanel25Layout.setHorizontalGroup(
+ jPanel25Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGap(0, 110, Short.MAX_VALUE)
+ );
+ jPanel25Layout.setVerticalGroup(
+ jPanel25Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGap(0, 110, Short.MAX_VALUE)
+ );
+
+ avatarPanel.add(jPanel25);
+
+ jPanel26.setBorder(new javax.swing.border.LineBorder(new java.awt.Color(204, 204, 204), 1, true));
+ jPanel26.setMaximumSize(new java.awt.Dimension(102, 102));
+ jPanel26.setMinimumSize(new java.awt.Dimension(102, 102));
+ jPanel26.setPreferredSize(new java.awt.Dimension(102, 102));
+
+ javax.swing.GroupLayout jPanel26Layout = new javax.swing.GroupLayout(jPanel26);
+ jPanel26.setLayout(jPanel26Layout);
+ jPanel26Layout.setHorizontalGroup(
+ jPanel26Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGap(0, 110, Short.MAX_VALUE)
+ );
+ jPanel26Layout.setVerticalGroup(
+ jPanel26Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGap(0, 110, Short.MAX_VALUE)
+ );
+
+ avatarPanel.add(jPanel26);
+
+ jPanel27.setBorder(new javax.swing.border.LineBorder(new java.awt.Color(204, 204, 204), 1, true));
+ jPanel27.setMaximumSize(new java.awt.Dimension(102, 102));
+ jPanel27.setMinimumSize(new java.awt.Dimension(102, 102));
+ jPanel27.setPreferredSize(new java.awt.Dimension(102, 102));
+
+ javax.swing.GroupLayout jPanel27Layout = new javax.swing.GroupLayout(jPanel27);
+ jPanel27.setLayout(jPanel27Layout);
+ jPanel27Layout.setHorizontalGroup(
+ jPanel27Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGap(0, 110, Short.MAX_VALUE)
+ );
+ jPanel27Layout.setVerticalGroup(
+ jPanel27Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGap(0, 110, Short.MAX_VALUE)
+ );
+
+ avatarPanel.add(jPanel27);
+
+ jPanel28.setBorder(new javax.swing.border.LineBorder(new java.awt.Color(204, 204, 204), 1, true));
+ jPanel28.setMaximumSize(new java.awt.Dimension(102, 102));
+ jPanel28.setMinimumSize(new java.awt.Dimension(102, 102));
+ jPanel28.setPreferredSize(new java.awt.Dimension(102, 102));
+
+ javax.swing.GroupLayout jPanel28Layout = new javax.swing.GroupLayout(jPanel28);
+ jPanel28.setLayout(jPanel28Layout);
+ jPanel28Layout.setHorizontalGroup(
+ jPanel28Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGap(0, 110, Short.MAX_VALUE)
+ );
+ jPanel28Layout.setVerticalGroup(
+ jPanel28Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGap(0, 110, Short.MAX_VALUE)
+ );
+
+ avatarPanel.add(jPanel28);
+
+ jPanel29.setBorder(new javax.swing.border.LineBorder(new java.awt.Color(204, 204, 204), 1, true));
+ jPanel29.setMaximumSize(new java.awt.Dimension(102, 102));
+ jPanel29.setMinimumSize(new java.awt.Dimension(102, 102));
+ jPanel29.setPreferredSize(new java.awt.Dimension(102, 102));
+
+ javax.swing.GroupLayout jPanel29Layout = new javax.swing.GroupLayout(jPanel29);
+ jPanel29.setLayout(jPanel29Layout);
+ jPanel29Layout.setHorizontalGroup(
+ jPanel29Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGap(0, 110, Short.MAX_VALUE)
+ );
+ jPanel29Layout.setVerticalGroup(
+ jPanel29Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGap(0, 110, Short.MAX_VALUE)
+ );
+
+ avatarPanel.add(jPanel29);
+
+ jPanel30.setBorder(new javax.swing.border.LineBorder(new java.awt.Color(204, 204, 204), 1, true));
+ jPanel30.setMaximumSize(new java.awt.Dimension(102, 102));
+ jPanel30.setMinimumSize(new java.awt.Dimension(102, 102));
+ jPanel30.setPreferredSize(new java.awt.Dimension(102, 102));
+
+ javax.swing.GroupLayout jPanel30Layout = new javax.swing.GroupLayout(jPanel30);
+ jPanel30.setLayout(jPanel30Layout);
+ jPanel30Layout.setHorizontalGroup(
+ jPanel30Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGap(0, 110, Short.MAX_VALUE)
+ );
+ jPanel30Layout.setVerticalGroup(
+ jPanel30Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGap(0, 110, Short.MAX_VALUE)
+ );
+
+ avatarPanel.add(jPanel30);
+
+ jPanel31.setBorder(new javax.swing.border.LineBorder(new java.awt.Color(204, 204, 204), 1, true));
+ jPanel31.setMaximumSize(new java.awt.Dimension(102, 102));
+ jPanel31.setMinimumSize(new java.awt.Dimension(102, 102));
+ jPanel31.setPreferredSize(new java.awt.Dimension(102, 102));
+
+ javax.swing.GroupLayout jPanel31Layout = new javax.swing.GroupLayout(jPanel31);
+ jPanel31.setLayout(jPanel31Layout);
+ jPanel31Layout.setHorizontalGroup(
+ jPanel31Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGap(0, 110, Short.MAX_VALUE)
+ );
+ jPanel31Layout.setVerticalGroup(
+ jPanel31Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGap(0, 110, Short.MAX_VALUE)
+ );
+
+ avatarPanel.add(jPanel31);
+
+ jPanel32.setBorder(new javax.swing.border.LineBorder(new java.awt.Color(204, 204, 204), 1, true));
+ jPanel32.setMaximumSize(new java.awt.Dimension(102, 102));
+ jPanel32.setMinimumSize(new java.awt.Dimension(102, 102));
+ jPanel32.setPreferredSize(new java.awt.Dimension(102, 102));
+
+ javax.swing.GroupLayout jPanel32Layout = new javax.swing.GroupLayout(jPanel32);
+ jPanel32.setLayout(jPanel32Layout);
+ jPanel32Layout.setHorizontalGroup(
+ jPanel32Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGap(0, 110, Short.MAX_VALUE)
+ );
+ jPanel32Layout.setVerticalGroup(
+ jPanel32Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGap(0, 110, Short.MAX_VALUE)
+ );
+
+ avatarPanel.add(jPanel32);
+
+ jPanel33.setBorder(new javax.swing.border.LineBorder(new java.awt.Color(204, 204, 204), 1, true));
+ jPanel33.setMaximumSize(new java.awt.Dimension(102, 102));
+ jPanel33.setMinimumSize(new java.awt.Dimension(102, 102));
+
+ javax.swing.GroupLayout jPanel33Layout = new javax.swing.GroupLayout(jPanel33);
+ jPanel33.setLayout(jPanel33Layout);
+ jPanel33Layout.setHorizontalGroup(
+ jPanel33Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGap(0, 110, Short.MAX_VALUE)
+ );
+ jPanel33Layout.setVerticalGroup(
+ jPanel33Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGap(0, 110, Short.MAX_VALUE)
+ );
+
+ avatarPanel.add(jPanel33);
+
avatarPane.setViewportView(avatarPanel);
javax.swing.GroupLayout tabAvatarsLayout = new javax.swing.GroupLayout(tabAvatars);
tabAvatars.setLayout(tabAvatarsLayout);
tabAvatarsLayout.setHorizontalGroup(
tabAvatarsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(avatarPane, javax.swing.GroupLayout.DEFAULT_SIZE, 590, Short.MAX_VALUE)
+ .addGroup(tabAvatarsLayout.createSequentialGroup()
+ .addComponent(avatarPane, javax.swing.GroupLayout.PREFERRED_SIZE, 527, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addGap(0, 0, Short.MAX_VALUE))
);
tabAvatarsLayout.setVerticalGroup(
tabAvatarsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(avatarPane, javax.swing.GroupLayout.DEFAULT_SIZE, 432, Short.MAX_VALUE)
+ .addComponent(avatarPane, javax.swing.GroupLayout.PREFERRED_SIZE, 418, Short.MAX_VALUE)
);
tabsPanel.addTab("Avatars", tabAvatars);
@@ -1629,7 +1835,7 @@ public class PreferencesDialog extends javax.swing.JDialog {
.addContainerGap()
.addComponent(lblURLServerList, javax.swing.GroupLayout.PREFERRED_SIZE, 96, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(txtURLServerList, javax.swing.GroupLayout.PREFERRED_SIZE, 421, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addComponent(txtURLServerList, javax.swing.GroupLayout.PREFERRED_SIZE, 370, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGroup(connection_serversLayout.createSequentialGroup()
.addGap(141, 141, 141)
.addComponent(jLabel17)))
@@ -1651,15 +1857,14 @@ public class PreferencesDialog extends javax.swing.JDialog {
tabConnectionLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(tabConnectionLayout.createSequentialGroup()
.addContainerGap()
- .addGroup(tabConnectionLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(tabConnectionLayout.createSequentialGroup()
+ .addGroup(tabConnectionLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false)
+ .addComponent(pnlProxySettings, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addGroup(javax.swing.GroupLayout.Alignment.LEADING, tabConnectionLayout.createSequentialGroup()
.addComponent(lblProxyType)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
- .addComponent(cbProxyType, javax.swing.GroupLayout.PREFERRED_SIZE, 126, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addGap(0, 0, Short.MAX_VALUE))
- .addComponent(pnlProxySettings, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(cbProxyType, javax.swing.GroupLayout.PREFERRED_SIZE, 126, javax.swing.GroupLayout.PREFERRED_SIZE))
.addComponent(connection_servers, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
- .addContainerGap())
+ .addContainerGap(16, Short.MAX_VALUE))
);
tabConnectionLayout.setVerticalGroup(
tabConnectionLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -1672,7 +1877,7 @@ public class PreferencesDialog extends javax.swing.JDialog {
.addComponent(cbProxyType, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGap(18, 18, 18)
.addComponent(pnlProxySettings, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addContainerGap(90, Short.MAX_VALUE))
+ .addContainerGap(107, Short.MAX_VALUE))
);
pnlProxySettings.getAccessibleContext().setAccessibleDescription("");
@@ -1700,12 +1905,12 @@ public class PreferencesDialog extends javax.swing.JDialog {
layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
- .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addContainerGap(405, Short.MAX_VALUE)
.addComponent(saveButton)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(exitButton, javax.swing.GroupLayout.PREFERRED_SIZE, 55, javax.swing.GroupLayout.PREFERRED_SIZE)
.addContainerGap())
- .addComponent(tabsPanel)
+ .addComponent(tabsPanel, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE)
);
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -1795,10 +2000,11 @@ public class PreferencesDialog extends javax.swing.JDialog {
save(prefs, dialog.txtURLServerList, KEY_CONNECTION_URL_SERVER_LIST);
// Avatar
- if (available_avatars.contains(selectedAvatarId)) {
- prefs.put(KEY_AVATAR, String.valueOf(selectedAvatarId));
- updateCache(KEY_AVATAR, String.valueOf(selectedAvatarId));
+ if (selectedAvatarId < MIN_AVATAR_ID || selectedAvatarId > MAX_AVATAR_ID) {
+ selectedAvatarId = DEFAULT_AVATAR_ID;
}
+ prefs.put(KEY_AVATAR, String.valueOf(selectedAvatarId));
+ updateCache(KEY_AVATAR, String.valueOf(selectedAvatarId));
try {
MageFrame.getSession().updatePreferencesForServer(getUserData());
@@ -2275,7 +2481,7 @@ public class PreferencesDialog extends javax.swing.JDialog {
} catch (NumberFormatException n) {
selectedAvatarId = DEFAULT_AVATAR_ID;
} finally {
- if (!available_avatars.contains(selectedAvatarId)) {
+ if (selectedAvatarId < MIN_AVATAR_ID || selectedAvatarId > MAX_AVATAR_ID) {
selectedAvatarId = DEFAULT_AVATAR_ID;
}
}
@@ -2441,26 +2647,37 @@ public class PreferencesDialog extends javax.swing.JDialog {
private void addAvatars() {
try {
- addAvatar(jPanel10, 51, true, false);
+ addAvatar(jPanel10, 10, true, false);
+ addAvatar(jPanel11, 11, false, false);
+ addAvatar(jPanel12, 12, false, false);
addAvatar(jPanel13, 13, false, false);
- addAvatar(jPanel11, 9, false, false);
- addAvatar(jPanel12, 53, false, false);
- addAvatar(jPanel14, 10, false, false);
- addAvatar(jPanel15, 39, false, false);
+ addAvatar(jPanel14, 14, false, false);
+ addAvatar(jPanel15, 15, false, false);
+ addAvatar(jPanel16, 16, false, false);
+ addAvatar(jPanel17, 17, false, false);
+ addAvatar(jPanel18, 18, false, false);
addAvatar(jPanel19, 19, false, false);
- addAvatar(jPanel20, 30, false, false);
- addAvatar(jPanel21, 25, false, false);
+ addAvatar(jPanel20, 20, false, false);
+ addAvatar(jPanel21, 21, false, false);
+ addAvatar(jPanel22, 22, false, false);
+ addAvatar(jPanel23, 23, false, false);
+ addAvatar(jPanel24, 24, false, false);
+ addAvatar(jPanel25, 25, false, false);
+ addAvatar(jPanel26, 26, false, false);
+ addAvatar(jPanel27, 27, false, false);
+ addAvatar(jPanel28, 28, false, false);
+ addAvatar(jPanel29, 29, false, false);
+ addAvatar(jPanel30, 30, false, false);
+ addAvatar(jPanel31, 31, false, false);
+ addAvatar(jPanel32, 32, false, false);
- addAvatar(jPanel16, 22, false, false);
- addAvatar(jPanel17, 77, false, false);
- addAvatar(jPanel18, 62, false, false);
} catch (Exception e) {
log.error(e, e);
}
}
public void setSelectedId(int id) {
- if (available_avatars.contains(id)) {
+ if (id >= MIN_AVATAR_ID && id <= MAX_AVATAR_ID) {
for (JPanel panel : panels.values()) {
panel.setBorder(BLACK_BORDER);
}
@@ -2473,7 +2690,8 @@ public class PreferencesDialog extends javax.swing.JDialog {
String path = "/avatars/" + String.valueOf(id) + ".jpg";
panels.put(id, jPanel);
Image image = ImageHelper.getImageFromResources(path);
- Rectangle r = new Rectangle(90, 90);
+
+ Rectangle r = new Rectangle(jPanel.getWidth() - 5, jPanel.getHeight() - 5);
BufferedImage bufferedImage;
if (!locked) {
bufferedImage = BufferedImageBuilder.bufferImage(image, BufferedImage.TYPE_INT_ARGB);
@@ -2571,8 +2789,6 @@ public class PreferencesDialog extends javax.swing.JDialog {
private javax.swing.JCheckBox displayBigCardsInHand;
private javax.swing.JButton exitButton;
private javax.swing.JLabel jLabel11;
- private javax.swing.JLabel jLabel12;
- private javax.swing.JLabel jLabel13;
private javax.swing.JLabel jLabel14;
private javax.swing.JLabel jLabel15;
private javax.swing.JLabel jLabel16;
@@ -2599,6 +2815,18 @@ public class PreferencesDialog extends javax.swing.JDialog {
private javax.swing.JPanel jPanel19;
private javax.swing.JPanel jPanel20;
private javax.swing.JPanel jPanel21;
+ private javax.swing.JPanel jPanel22;
+ private javax.swing.JPanel jPanel23;
+ private javax.swing.JPanel jPanel24;
+ private javax.swing.JPanel jPanel25;
+ private javax.swing.JPanel jPanel26;
+ private javax.swing.JPanel jPanel27;
+ private javax.swing.JPanel jPanel28;
+ private javax.swing.JPanel jPanel29;
+ private javax.swing.JPanel jPanel30;
+ private javax.swing.JPanel jPanel31;
+ private javax.swing.JPanel jPanel32;
+ private javax.swing.JPanel jPanel33;
private javax.swing.JLabel labelPreferedImageLanguage;
private javax.swing.JLabel lblProxyPassword;
private javax.swing.JLabel lblProxyPort;
diff --git a/Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java b/Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java
index 01ffad75880..31416d85e6e 100644
--- a/Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java
+++ b/Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java
@@ -63,6 +63,7 @@ import mage.client.components.HoverButton;
import mage.client.components.MageRoundPane;
import mage.client.components.ext.dlg.DialogManager;
import mage.client.dialog.PreferencesDialog;
+import static mage.client.dialog.PreferencesDialog.DEFAULT_AVATAR_ID;
import mage.client.util.CardsViewUtil;
import mage.client.util.Command;
import mage.client.util.ImageHelper;
@@ -92,7 +93,7 @@ public class PlayerPanelExt extends javax.swing.JPanel {
private static final int AVATAR_COUNT = 77;
- private static final String DEFAULT_AVATAR_PATH = "/avatars/51.jpg";
+ private static final String DEFAULT_AVATAR_PATH = "/avatars/" + DEFAULT_AVATAR_ID + ".jpg";
private static final int PANEL_WIDTH = 94;
private static final int PANEL_HEIGHT = 242;
diff --git a/Mage.Client/src/main/resources/avatars/10.jpg b/Mage.Client/src/main/resources/avatars/10.jpg
index fb5b2744649..7ce97fc81e3 100644
Binary files a/Mage.Client/src/main/resources/avatars/10.jpg and b/Mage.Client/src/main/resources/avatars/10.jpg differ
diff --git a/Mage.Client/src/main/resources/avatars/11.jpg b/Mage.Client/src/main/resources/avatars/11.jpg
new file mode 100644
index 00000000000..2b665f235a2
Binary files /dev/null and b/Mage.Client/src/main/resources/avatars/11.jpg differ
diff --git a/Mage.Client/src/main/resources/avatars/12.jpg b/Mage.Client/src/main/resources/avatars/12.jpg
new file mode 100644
index 00000000000..d57f3963ee1
Binary files /dev/null and b/Mage.Client/src/main/resources/avatars/12.jpg differ
diff --git a/Mage.Client/src/main/resources/avatars/13.jpg b/Mage.Client/src/main/resources/avatars/13.jpg
index 2b665f235a2..b08ae1c24ab 100644
Binary files a/Mage.Client/src/main/resources/avatars/13.jpg and b/Mage.Client/src/main/resources/avatars/13.jpg differ
diff --git a/Mage.Client/src/main/resources/avatars/14.jpg b/Mage.Client/src/main/resources/avatars/14.jpg
index d57f3963ee1..e45b888a9ea 100644
Binary files a/Mage.Client/src/main/resources/avatars/14.jpg and b/Mage.Client/src/main/resources/avatars/14.jpg differ
diff --git a/Mage.Client/src/main/resources/avatars/15.jpg b/Mage.Client/src/main/resources/avatars/15.jpg
new file mode 100644
index 00000000000..d7fcc94512b
Binary files /dev/null and b/Mage.Client/src/main/resources/avatars/15.jpg differ
diff --git a/Mage.Client/src/main/resources/avatars/16.jpg b/Mage.Client/src/main/resources/avatars/16.jpg
new file mode 100644
index 00000000000..75b41b0ce63
Binary files /dev/null and b/Mage.Client/src/main/resources/avatars/16.jpg differ
diff --git a/Mage.Client/src/main/resources/avatars/17.jpg b/Mage.Client/src/main/resources/avatars/17.jpg
new file mode 100644
index 00000000000..12905b63ec3
Binary files /dev/null and b/Mage.Client/src/main/resources/avatars/17.jpg differ
diff --git a/Mage.Client/src/main/resources/avatars/18.jpg b/Mage.Client/src/main/resources/avatars/18.jpg
new file mode 100644
index 00000000000..d02ccd4c29d
Binary files /dev/null and b/Mage.Client/src/main/resources/avatars/18.jpg differ
diff --git a/Mage.Client/src/main/resources/avatars/19.jpg b/Mage.Client/src/main/resources/avatars/19.jpg
index b08ae1c24ab..bbffc049eea 100644
Binary files a/Mage.Client/src/main/resources/avatars/19.jpg and b/Mage.Client/src/main/resources/avatars/19.jpg differ
diff --git a/Mage.Client/src/main/resources/avatars/48.jpg b/Mage.Client/src/main/resources/avatars/20.jpg
similarity index 100%
rename from Mage.Client/src/main/resources/avatars/48.jpg
rename to Mage.Client/src/main/resources/avatars/20.jpg
diff --git a/Mage.Client/src/main/resources/avatars/21.jpg b/Mage.Client/src/main/resources/avatars/21.jpg
new file mode 100644
index 00000000000..fb5b2744649
Binary files /dev/null and b/Mage.Client/src/main/resources/avatars/21.jpg differ
diff --git a/Mage.Client/src/main/resources/avatars/22.jpg b/Mage.Client/src/main/resources/avatars/22.jpg
index e45b888a9ea..12c2a87b7bf 100644
Binary files a/Mage.Client/src/main/resources/avatars/22.jpg and b/Mage.Client/src/main/resources/avatars/22.jpg differ
diff --git a/Mage.Client/src/main/resources/avatars/23.jpg b/Mage.Client/src/main/resources/avatars/23.jpg
index d7fcc94512b..64459f61716 100644
Binary files a/Mage.Client/src/main/resources/avatars/23.jpg and b/Mage.Client/src/main/resources/avatars/23.jpg differ
diff --git a/Mage.Client/src/main/resources/avatars/57.jpg b/Mage.Client/src/main/resources/avatars/24.jpg
similarity index 100%
rename from Mage.Client/src/main/resources/avatars/57.jpg
rename to Mage.Client/src/main/resources/avatars/24.jpg
diff --git a/Mage.Client/src/main/resources/avatars/25.jpg b/Mage.Client/src/main/resources/avatars/25.jpg
index 75b41b0ce63..68b2b338648 100644
Binary files a/Mage.Client/src/main/resources/avatars/25.jpg and b/Mage.Client/src/main/resources/avatars/25.jpg differ
diff --git a/Mage.Client/src/main/resources/avatars/62.jpg b/Mage.Client/src/main/resources/avatars/26.jpg
similarity index 100%
rename from Mage.Client/src/main/resources/avatars/62.jpg
rename to Mage.Client/src/main/resources/avatars/26.jpg
diff --git a/Mage.Client/src/main/resources/avatars/66.jpg b/Mage.Client/src/main/resources/avatars/27.jpg
similarity index 100%
rename from Mage.Client/src/main/resources/avatars/66.jpg
rename to Mage.Client/src/main/resources/avatars/27.jpg
diff --git a/Mage.Client/src/main/resources/avatars/71.jpg b/Mage.Client/src/main/resources/avatars/28.jpg
similarity index 100%
rename from Mage.Client/src/main/resources/avatars/71.jpg
rename to Mage.Client/src/main/resources/avatars/28.jpg
diff --git a/Mage.Client/src/main/resources/avatars/29.jpg b/Mage.Client/src/main/resources/avatars/29.jpg
index 12905b63ec3..ee79324b94d 100644
Binary files a/Mage.Client/src/main/resources/avatars/29.jpg and b/Mage.Client/src/main/resources/avatars/29.jpg differ
diff --git a/Mage.Client/src/main/resources/avatars/30.jpg b/Mage.Client/src/main/resources/avatars/30.jpg
index d02ccd4c29d..cf70d9b85e8 100644
Binary files a/Mage.Client/src/main/resources/avatars/30.jpg and b/Mage.Client/src/main/resources/avatars/30.jpg differ
diff --git a/Mage.Client/src/main/resources/avatars/77.jpg b/Mage.Client/src/main/resources/avatars/31.jpg
similarity index 100%
rename from Mage.Client/src/main/resources/avatars/77.jpg
rename to Mage.Client/src/main/resources/avatars/31.jpg
diff --git a/Mage.Client/src/main/resources/avatars/9.jpg b/Mage.Client/src/main/resources/avatars/32.jpg
similarity index 100%
rename from Mage.Client/src/main/resources/avatars/9.jpg
rename to Mage.Client/src/main/resources/avatars/32.jpg
diff --git a/Mage.Client/src/main/resources/avatars/39.jpg b/Mage.Client/src/main/resources/avatars/39.jpg
deleted file mode 100644
index bbffc049eea..00000000000
Binary files a/Mage.Client/src/main/resources/avatars/39.jpg and /dev/null differ
diff --git a/Mage.Client/src/main/resources/avatars/51.jpg b/Mage.Client/src/main/resources/avatars/51.jpg
deleted file mode 100644
index 7ce97fc81e3..00000000000
Binary files a/Mage.Client/src/main/resources/avatars/51.jpg and /dev/null differ
diff --git a/Mage.Client/src/main/resources/avatars/52.jpg b/Mage.Client/src/main/resources/avatars/52.jpg
deleted file mode 100644
index 12c2a87b7bf..00000000000
Binary files a/Mage.Client/src/main/resources/avatars/52.jpg and /dev/null differ
diff --git a/Mage.Client/src/main/resources/avatars/53.jpg b/Mage.Client/src/main/resources/avatars/53.jpg
deleted file mode 100644
index 64459f61716..00000000000
Binary files a/Mage.Client/src/main/resources/avatars/53.jpg and /dev/null differ
diff --git a/Mage.Client/src/main/resources/avatars/6.jpg b/Mage.Client/src/main/resources/avatars/6.jpg
deleted file mode 100644
index 68b2b338648..00000000000
Binary files a/Mage.Client/src/main/resources/avatars/6.jpg and /dev/null differ
diff --git a/Mage.Client/src/main/resources/avatars/72.jpg b/Mage.Client/src/main/resources/avatars/72.jpg
deleted file mode 100644
index ee79324b94d..00000000000
Binary files a/Mage.Client/src/main/resources/avatars/72.jpg and /dev/null differ
diff --git a/Mage.Client/src/main/resources/avatars/75.jpg b/Mage.Client/src/main/resources/avatars/75.jpg
deleted file mode 100644
index cf70d9b85e8..00000000000
Binary files a/Mage.Client/src/main/resources/avatars/75.jpg and /dev/null differ
diff --git a/Mage.Server/src/main/java/mage/server/Session.java b/Mage.Server/src/main/java/mage/server/Session.java
index 08ece0677a6..ad5c8c0a913 100644
--- a/Mage.Server/src/main/java/mage/server/Session.java
+++ b/Mage.Server/src/main/java/mage/server/Session.java
@@ -157,7 +157,7 @@ public class Session {
} else {
user.getUserData().update(userData);
}
- if (user.getUserData().getAvatarId() == 51) {
+ if (user.getUserData().getAvatarId() == 11) {
user.getUserData().setAvatarId(updateAvatar(user.getName()));
}
return true;