From 1835671f3de34b48302fc27da963f7fb5be53bdd Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sun, 14 Feb 2016 13:41:43 +0100 Subject: [PATCH] Some more changes to GUI to better support high screen resolutions. --- .../src/main/java/mage/client/MageFrame.java | 167 ++- .../mage/client/dialog/PreferencesDialog.form | 295 +++- .../mage/client/dialog/PreferencesDialog.java | 1271 +++++++++-------- .../mage/client/dialog/UserRequestDialog.form | 52 +- .../mage/client/dialog/UserRequestDialog.java | 87 +- .../java/mage/client/draft/DraftPanel.java | 12 +- .../main/java/mage/client/game/GamePanel.java | 30 +- .../java/mage/client/game/PlayAreaPanel.java | 27 +- .../mage/client/table/PlayersChatPanel.java | 2 +- .../java/mage/client/table/TablesPanel.java | 18 +- .../client/tournament/TournamentPanel.java | 20 +- .../java/mage/client/util/ButtonColumn.java | 10 + .../java/mage/client/util/GUISizeHelper.java | 68 +- .../mage/client/util/gui/GuiDisplayUtil.java | 18 +- .../org/mage/card/arcane/ManaSymbols.java | 8 +- .../plugins/card/constants/Constants.java | 6 - .../plugins/card/info/CardInfoPaneImpl.java | 54 +- .../src/mage/view/UserRequestMessage.java | 57 +- Mage.Server/config/config.xml | 1 + .../mage/server/game/GameSessionPlayer.java | 4 +- .../java/mage/constants/PlayerAction.java | 12 + .../main/java/mage/players/PlayerImpl.java | 6 +- 22 files changed, 1366 insertions(+), 859 deletions(-) diff --git a/Mage.Client/src/main/java/mage/client/MageFrame.java b/Mage.Client/src/main/java/mage/client/MageFrame.java index c13db89bb19..6d779f3ace4 100644 --- a/Mage.Client/src/main/java/mage/client/MageFrame.java +++ b/Mage.Client/src/main/java/mage/client/MageFrame.java @@ -123,6 +123,7 @@ import mage.client.util.gui.ArrowBuilder; import mage.client.util.gui.countryBox.CountryUtil; import mage.client.util.stats.UpdateMemUsageTask; import mage.components.ImagePanel; +import mage.constants.PlayerAction; import mage.interfaces.MageClient; import mage.interfaces.callback.CallbackClient; import mage.interfaces.callback.ClientCallback; @@ -141,8 +142,8 @@ import net.java.truevfs.access.TConfig; import net.java.truevfs.kernel.spec.FsAccessOption; import org.apache.log4j.Logger; import org.mage.card.arcane.ManaSymbols; -import org.mage.plugins.card.constants.Constants; import org.mage.plugins.card.images.DownloadPictures; +import org.mage.plugins.card.info.CardInfoPaneImpl; import org.mage.plugins.card.utils.impl.ImageManagerImpl; /** @@ -186,6 +187,8 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { private final BalloonTip balloonTip; + private List missingCards; + /** * @return the session */ @@ -402,7 +405,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { if (cardInfoPane == null) { return; } - cardInfoPane.setSize(Constants.TOOLTIP_WIDTH_MIN, Constants.TOOLTIP_HEIGHT_MIN); +// cardInfoPane.setSize(Constants.TOOLTIP_WIDTH_MIN, Constants.TOOLTIP_HEIGHT_MIN); cardInfoPane.setLocation(40, 40); cardInfoPane.setBackground(new Color(0, 0, 0, 0)); @@ -411,15 +414,14 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { popupContainer.add(cardInfoPane); popupContainer.setVisible(false); - popupContainer.setBounds(0, 0, - Constants.TOOLTIP_WIDTH_MIN + Constants.TOOLTIP_BORDER_WIDTH, - Constants.TOOLTIP_HEIGHT_MIN + Constants.TOOLTIP_BORDER_WIDTH); +// popupContainer.setBounds(0, 0, +// Constants.TOOLTIP_WIDTH_MIN + Constants.TOOLTIP_BORDER_WIDTH, +// Constants.TOOLTIP_HEIGHT_MIN + Constants.TOOLTIP_BORDER_WIDTH); desktopPane.add(popupContainer, JLayeredPane.POPUP_LAYER); UI.addComponent(MageComponents.CARD_INFO_PANE, cardInfoPane); UI.addComponent(MageComponents.POPUP_CONTAINER, popupContainer); - // preview panel normal JPanel cardPreviewContainer = new JPanel(); cardPreviewContainer.setOpaque(false); @@ -530,7 +532,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { MagePane window = (MagePane) windows[i]; if (window.isVisible()) { menuItem = new MagePaneMenuItem(window); - menuItem.setFont(GUISizeHelper.getToolbarFont()); + menuItem.setFont(GUISizeHelper.menuFont); menuItem.setState(i == 0); menuItem.addActionListener(new ActionListener() { @Override @@ -566,28 +568,29 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { private void checkForNewImages() { long beforeCall = System.currentTimeMillis(); - List cards = CardRepository.instance.findCards(new CardCriteria()); + missingCards = CardRepository.instance.findCards(new CardCriteria()); LOGGER.info("Card pool load time: " + ((System.currentTimeMillis() - beforeCall) / 1000 + " seconds")); - beforeCall = System.currentTimeMillis(); - if (DownloadPictures.checkForNewCards(cards)) { + if (DownloadPictures.checkForNewCards(missingCards)) { LOGGER.info("Card images checking time: " + ((System.currentTimeMillis() - beforeCall) / 1000 + " seconds")); - if (JOptionPane.showConfirmDialog(this, "New cards are available. Do you want to download the images?", "New images available", JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) { - DownloadPictures.startDownload(null, cards); - } + UserRequestMessage message = new UserRequestMessage("New images available", "Card images are missing (" + missingCards.size() + "). Do you want to download the images?" + + "

You can deactivate the image download check on apllication start in the preferences."); + message.setButton1("No", null); + message.setButton2("Yes", PlayerAction.CLIENT_DOWNLOAD_CARD_IMAGES); + showUserRequestDialog(message); } } public void btnImagesActionPerformed(java.awt.event.ActionEvent evt) { List cards = CardRepository.instance.findCards(new CardCriteria()); - DownloadPictures.startDownload(null, cards); } public void btnSymbolsActionPerformed(java.awt.event.ActionEvent evt) { - if (JOptionPane.showConfirmDialog(this, "Do you want to download game symbols and additional image files?", "Download additional resources", JOptionPane.YES_NO_OPTION) == JOptionPane.OK_OPTION) { - Plugins.getInstance().downloadSymbols(); - } + UserRequestMessage message = new UserRequestMessage("Download additional resources", "Do you want to download game symbols and additional image files?"); + message.setButton1("No", null); + message.setButton2("Yes", PlayerAction.CLIENT_DOWNLOAD_SYMBOLS); + showUserRequestDialog(message); } public static void setActive(MagePane frame) { @@ -985,15 +988,14 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { private void btnConnectActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnConnectActionPerformed if (session.isConnected()) { - if (JOptionPane.showConfirmDialog(this, "Are you sure you want to disconnect?", "Confirm disconnect", JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) { - session.disconnect(false); - tablesPane.clearChat(); - showMessage("You have disconnected"); - } + UserRequestMessage message = new UserRequestMessage("Confirm disconnect", "Are you sure you want to disconnect?"); + message.setButton1("No", null); + message.setButton2("Yes", PlayerAction.CLIENT_DISCONNECT); + showUserRequestDialog(message); } else { connectDialog.showDialog(); + setWindowTitle(); } - setWindowTitle(); }//GEN-LAST:event_btnConnectActionPerformed public void btnAboutActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnAboutActionPerformed @@ -1027,18 +1029,16 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { public void exitApp() { if (session.isConnected()) { - if (JOptionPane.showConfirmDialog(this, "You are currently connected. Are you sure you want to disconnect?", "Confirm disconnect", JOptionPane.YES_NO_OPTION) != JOptionPane.YES_OPTION) { - return; - } - session.disconnect(false); - } else if (JOptionPane.showConfirmDialog(this, "Are you sure you want to exit?", "Confirm exit", JOptionPane.YES_NO_OPTION) != JOptionPane.YES_OPTION) { - return; + UserRequestMessage message = new UserRequestMessage("Confirm disconnect", "You are currently connected. Are you sure you want to disconnect?"); + message.setButton1("No", null); + message.setButton2("Yes", PlayerAction.CLIENT_EXIT); + MageFrame.getInstance().showUserRequestDialog(message); + } else { + UserRequestMessage message = new UserRequestMessage("Confirm exit", "Are you sure you want to exit?"); + message.setButton1("No", null); + message.setButton2("Yes", PlayerAction.CLIENT_EXIT); + MageFrame.getInstance().showUserRequestDialog(message); } - CardRepository.instance.closeDB(); - tablesPane.cleanUp(); - Plugins.getInstance().shutdown(); - dispose(); - System.exit(0); } public void enableButtons() { @@ -1068,9 +1068,11 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { if (setActive) { setActive(tablesPane); } else // if other panel was already shown, mamke sure it's topmost again - if (topPanebefore != null) { + { + if (topPanebefore != null) { setActive(topPanebefore); } + } } public void hideGames() { @@ -1356,20 +1358,23 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { disableButtons(); hideGames(); hideTables(); - if (errorCall && JOptionPane.showConfirmDialog(MageFrame.this, "The connection to server was lost. Reconnect?", "Warning", JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) { - if (performConnect()) { - enableButtons(); - } + if (errorCall) { + UserRequestMessage message = new UserRequestMessage("Connection lost", "The connection to server was lost. Reconnect?"); + message.setButton1("No", null); + message.setButton2("Yes", PlayerAction.CLIENT_RECONNECT); + showUserRequestDialog(message); } else { session.disconnect(false); } } - }); + } + ); } } @Override - public void showMessage(final String message) { + public void showMessage(final String message + ) { if (SwingUtilities.isEventDispatchThread()) { JOptionPane.showMessageDialog(desktopPane, message); } else { @@ -1383,7 +1388,8 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { } @Override - public void showError(final String message) { + public void showError(final String message + ) { if (SwingUtilities.isEventDispatchThread()) { JOptionPane.showMessageDialog(desktopPane, message, "Error", JOptionPane.ERROR_MESSAGE); } else { @@ -1397,10 +1403,71 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { } @Override - public void processCallback(ClientCallback callback) { + public void processCallback(ClientCallback callback + ) { callbackClient.processCallback(callback); } + public void sendUserReplay(PlayerAction playerAction, UserRequestMessage userRequestMessage) { + switch (playerAction) { + case CLIENT_DOWNLOAD_SYMBOLS: + Plugins.getInstance().downloadSymbols(); + break; + case CLIENT_DOWNLOAD_CARD_IMAGES: + DownloadPictures.startDownload(null, missingCards); + break; + case CLIENT_DISCONNECT: + session.disconnect(false); + tablesPane.clearChat(); + showMessage("You have disconnected"); + setWindowTitle(); + break; + case CLIENT_QUIT_TOURNAMENT: + MageFrame.getSession().quitTournament(userRequestMessage.getTournamentId()); + break; + case CLIENT_QUIT_DRAFT_TOURNAMENT: + MageFrame.getSession().quitDraft(userRequestMessage.getTournamentId()); + MageFrame.removeDraft(userRequestMessage.getTournamentId()); + break; + case CLIENT_CONCEDE_GAME: + MageFrame.getSession().sendPlayerAction(PlayerAction.CONCEDE, userRequestMessage.getGameId(), null); + break; + case CLIENT_CONCEDE_MATCH: + MageFrame.getSession().quitMatch(userRequestMessage.getGameId()); + break; + case CLIENT_STOP_WATCHING: + session.stopWatching(userRequestMessage.getGameId()); + removeGame(userRequestMessage.getGameId()); + break; + case CLIENT_EXIT: + if (session.isConnected()) { + session.disconnect(false); + } + CardRepository.instance.closeDB(); + tablesPane.cleanUp(); + Plugins.getInstance().shutdown(); + dispose(); + System.exit(0); + break; + case CLIENT_REMOVE_TABLE: + session.removeTable(userRequestMessage.getRoomId(), userRequestMessage.getTableId()); + break; + case CLIENT_RECONNECT: + if (performConnect()) { + enableButtons(); + } + break; + case CLIENT_REPLAY_ACTION: + session.stopReplay(userRequestMessage.getGameId()); + break; + default: + if (session != null && playerAction != null) { + session.sendPlayerAction(playerAction, userRequestMessage.getGameId(), userRequestMessage.getRelatedUserId()); + } + + } + } + public void changeGUISize() { setGUISize(); @@ -1416,12 +1483,22 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { for (ChatPanelBasic chatPanel : getChatPanels().values()) { chatPanel.changeGUISize(GUISizeHelper.chatFont); } + try { + CardInfoPaneImpl cardInfoPane = (CardInfoPaneImpl) UI.getComponent(MageComponents.CARD_INFO_PANE); + if (cardInfoPane != null) { + cardInfoPane.changeGUISize(); + } + + } catch (Exception ex) { + + } + this.revalidate(); this.repaint(); } private void setGUISize() { - Font font = GUISizeHelper.getToolbarFont(); + Font font = GUISizeHelper.menuFont; mageToolbar.setFont(font); int newHeight = font.getSize() + 6; Dimension mageToolbarDimension = mageToolbar.getPreferredSize(); @@ -1445,7 +1522,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { component.setMaximumSize(d); } } - balloonTip.setFont(GUISizeHelper.tooltipFont); + balloonTip.setFont(GUISizeHelper.balloonTooltipFont); } } 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 e45a5429377..63482a58084 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.form +++ b/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.form @@ -15,7 +15,7 @@ - + @@ -25,23 +25,23 @@ - - - - + + + + - + - + - + @@ -50,6 +50,11 @@ + + + + + @@ -70,10 +75,7 @@ - - - - + @@ -88,7 +90,7 @@ - + @@ -116,7 +118,7 @@ - + @@ -197,7 +199,7 @@ - + @@ -328,7 +330,7 @@ - + @@ -383,7 +385,10 @@ - + + + + @@ -392,8 +397,10 @@ - - + + + + @@ -451,6 +458,97 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -473,7 +571,7 @@ - + @@ -485,11 +583,49 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -514,10 +650,10 @@ - + - + @@ -680,7 +816,7 @@ - + @@ -939,7 +1075,7 @@ - + @@ -1364,7 +1500,7 @@ - + @@ -1372,7 +1508,10 @@ - + + + + @@ -1435,12 +1574,12 @@ - + - + @@ -1468,12 +1607,12 @@ - + - + @@ -1501,12 +1640,12 @@ - + - + @@ -1534,7 +1673,7 @@ - + @@ -1567,12 +1706,12 @@ - + - + @@ -1600,12 +1739,12 @@ - + - + @@ -1633,12 +1772,12 @@ - + - + @@ -1666,12 +1805,12 @@ - + - + @@ -1699,12 +1838,12 @@ - + - + @@ -1732,12 +1871,12 @@ - + - + @@ -1765,12 +1904,12 @@ - + - + @@ -1798,12 +1937,12 @@ - + - + @@ -1831,12 +1970,12 @@ - + - + @@ -1864,12 +2003,12 @@ - + - + @@ -1897,12 +2036,12 @@ - + - + @@ -1930,12 +2069,12 @@ - + - + @@ -1963,12 +2102,12 @@ - + - + @@ -1996,12 +2135,12 @@ - + - + @@ -2029,12 +2168,12 @@ - + - + @@ -2062,12 +2201,12 @@ - + - + @@ -2095,12 +2234,12 @@ - + - + @@ -2128,12 +2267,12 @@ - + - + @@ -2161,12 +2300,12 @@ - + - + @@ -2191,12 +2330,12 @@ - + - + @@ -2246,7 +2385,7 @@ - + @@ -2361,7 +2500,7 @@ - + @@ -2459,7 +2598,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 9f8118844b3..f887340a0cc 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java +++ b/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java @@ -95,6 +95,9 @@ public class PreferencesDialog extends javax.swing.JDialog { public static final String KEY_GUI_TABLE_FONT_SIZE = "guiTableFontSize"; public static final String KEY_GUI_CHAT_FONT_SIZE = "guiChatFontSize"; public static final String KEY_GUI_CARD_HAND_SIZE = "guiCardHandSize"; + public static final String KEY_GUI_SYMBOL_SIZE = "guiSymbolSize"; + public static final String KEY_GUI_TOOLTIP_SIZE = "guiTooltipSize"; + public static final String KEY_GUI_DIALOG_FONT_SIZE = "guiDialogFontSize"; public static final String KEY_GAME_LOG_AUTO_SAVE = "gameLogAutoSave"; public static final String KEY_DRAFT_LOG_AUTO_SAVE = "draftLogAutoSave"; @@ -363,10 +366,17 @@ public class PreferencesDialog extends javax.swing.JDialog { guiSize_font = new javax.swing.JPanel(); sliderFontSize = new javax.swing.JSlider(); fontSizeLabel = new javax.swing.JLabel(); - sliderCardSizeHand = new javax.swing.JSlider(); - labelCardSizeHand = new javax.swing.JLabel(); sliderChatFontSize = new javax.swing.JSlider(); chatFontSizeLabel = new javax.swing.JLabel(); + sliderDialogFont = new javax.swing.JSlider(); + labelDialogFont = new javax.swing.JLabel(); + guiSize_font1 = new javax.swing.JPanel(); + sliderCardSizeHand = new javax.swing.JSlider(); + labelCardSizeHand = new javax.swing.JLabel(); + sliderTooltipSize = new javax.swing.JSlider(); + labelTooltipSize = new javax.swing.JLabel(); + sliderSymbolSize = new javax.swing.JSlider(); + labelSymbolSize = new javax.swing.JLabel(); tabPhases = new javax.swing.JPanel(); jLabelHeadLine = new javax.swing.JLabel(); jLabelYourTurn = new javax.swing.JLabel(); @@ -482,6 +492,8 @@ public class PreferencesDialog extends javax.swing.JDialog { setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); setTitle("Preferences"); + tabsPanel.setMinimumSize(new java.awt.Dimension(532, 451)); + main_card.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createEtchedBorder(), "Card")); showCardName.setSelected(true); @@ -508,28 +520,28 @@ public class PreferencesDialog extends javax.swing.JDialog { tooltipDelay.setToolTipText("The time the appearance of the tooltip window for a card is delayed.
\nIf set to zero, the tooltip window won't be shown at all."); tooltipDelay.setValue(300); - javax.swing.GroupLayout main_cardLayout = new javax.swing.GroupLayout(main_card); + org.jdesktop.layout.GroupLayout main_cardLayout = new org.jdesktop.layout.GroupLayout(main_card); main_card.setLayout(main_cardLayout); main_cardLayout.setHorizontalGroup( - main_cardLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(main_cardLayout.createSequentialGroup() - .addGap(6, 6, 6) - .addGroup(main_cardLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(tooltipDelayLabel, javax.swing.GroupLayout.DEFAULT_SIZE, 481, Short.MAX_VALUE) - .addComponent(tooltipDelay, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addGroup(main_cardLayout.createSequentialGroup() - .addComponent(showCardName) - .addGap(0, 0, 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(tooltipDelayLabel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .add(org.jdesktop.layout.GroupLayout.TRAILING, tooltipDelay, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .add(main_cardLayout.createSequentialGroup() + .add(showCardName) + .add(0, 0, Short.MAX_VALUE))) .addContainerGap()) ); main_cardLayout.setVerticalGroup( - main_cardLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(main_cardLayout.createSequentialGroup() - .addComponent(showCardName) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(tooltipDelayLabel) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(tooltipDelay, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + main_cardLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(main_cardLayout.createSequentialGroup() + .add(showCardName) + .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")); @@ -602,38 +614,38 @@ public class PreferencesDialog extends javax.swing.JDialog { } }); - javax.swing.GroupLayout main_gameLayout = new javax.swing.GroupLayout(main_game); + org.jdesktop.layout.GroupLayout main_gameLayout = new org.jdesktop.layout.GroupLayout(main_game); main_game.setLayout(main_gameLayout); main_gameLayout.setHorizontalGroup( - main_gameLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(main_gameLayout.createSequentialGroup() + main_gameLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(main_gameLayout.createSequentialGroup() .addContainerGap() - .addGroup(main_gameLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) - .addComponent(showPlayerNamesPermanently, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(nonLandPermanentsInOnePile, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(showAbilityPickerForced) - .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(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .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(showAbilityPickerForced) + .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)) + .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); main_gameLayout.setVerticalGroup( - main_gameLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(main_gameLayout.createSequentialGroup() - .addComponent(nonLandPermanentsInOnePile) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(showPlayerNamesPermanently) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(showAbilityPickerForced) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(cbAllowRequestToShowHandCards) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(cbShowStormCounter) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(cbConfirmEmptyManaPool) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(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(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) .addContainerGap()) ); @@ -659,49 +671,47 @@ public class PreferencesDialog extends javax.swing.JDialog { } }); - javax.swing.GroupLayout main_gamelogLayout = new javax.swing.GroupLayout(main_gamelog); + org.jdesktop.layout.GroupLayout main_gamelogLayout = new org.jdesktop.layout.GroupLayout(main_gamelog); main_gamelog.setLayout(main_gamelogLayout); main_gamelogLayout.setHorizontalGroup( - main_gamelogLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(main_gamelogLayout.createSequentialGroup() + main_gamelogLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(main_gamelogLayout.createSequentialGroup() .addContainerGap() - .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)) + .add(main_gamelogLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false) + .add(cbDraftLogAutoSave, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .add(cbGameLogAutoSave, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); main_gamelogLayout.setVerticalGroup( - main_gamelogLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(main_gamelogLayout.createSequentialGroup() - .addComponent(cbGameLogAutoSave) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(cbDraftLogAutoSave)) + main_gamelogLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(main_gamelogLayout.createSequentialGroup() + .add(cbGameLogAutoSave) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) + .add(cbDraftLogAutoSave)) ); - javax.swing.GroupLayout tabMainLayout = new javax.swing.GroupLayout(tabMain); + org.jdesktop.layout.GroupLayout tabMainLayout = new org.jdesktop.layout.GroupLayout(tabMain); tabMain.setLayout(tabMainLayout); tabMainLayout.setHorizontalGroup( - tabMainLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(tabMainLayout.createSequentialGroup() + tabMainLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(tabMainLayout.createSequentialGroup() .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_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.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addGap(0, 0, Short.MAX_VALUE))) + .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)) .addContainerGap()) ); tabMainLayout.setVerticalGroup( - tabMainLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(tabMainLayout.createSequentialGroup() + tabMainLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(tabMainLayout.createSequentialGroup() .addContainerGap() - .addComponent(main_card, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(main_game, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(main_gamelog, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addContainerGap(45, Short.MAX_VALUE)) + .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) + .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); main_card.getAccessibleContext().setAccessibleName("Game panel"); @@ -736,35 +746,6 @@ public class PreferencesDialog extends javax.swing.JDialog { gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH; guiSize_font.add(fontSizeLabel, gridBagConstraints); - sliderCardSizeHand.setMajorTickSpacing(5); - sliderCardSizeHand.setMaximum(50); - sliderCardSizeHand.setMinimum(10); - sliderCardSizeHand.setMinorTickSpacing(1); - sliderCardSizeHand.setPaintLabels(true); - sliderCardSizeHand.setPaintTicks(true); - sliderCardSizeHand.setSnapToTicks(true); - sliderCardSizeHand.setToolTipText("Size of the font."); - sliderCardSizeHand.setValue(14); - sliderCardSizeHand.setBorder(javax.swing.BorderFactory.createEtchedBorder()); - sliderCardSizeHand.setMinimumSize(new java.awt.Dimension(150, 40)); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 3; - gridBagConstraints.gridy = 0; - gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH; - gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); - guiSize_font.add(sliderCardSizeHand, gridBagConstraints); - - labelCardSizeHand.setHorizontalAlignment(javax.swing.SwingConstants.CENTER); - labelCardSizeHand.setText("Size of hand cards"); - labelCardSizeHand.setToolTipText("The size of the hand cards"); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 3; - gridBagConstraints.gridy = 1; - gridBagConstraints.ipadx = 3; - gridBagConstraints.ipady = 3; - gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH; - guiSize_font.add(labelCardSizeHand, gridBagConstraints); - sliderChatFontSize.setMajorTickSpacing(5); sliderChatFontSize.setMaximum(50); sliderChatFontSize.setMinimum(10); @@ -772,7 +753,7 @@ public class PreferencesDialog extends javax.swing.JDialog { sliderChatFontSize.setPaintLabels(true); sliderChatFontSize.setPaintTicks(true); sliderChatFontSize.setSnapToTicks(true); - sliderChatFontSize.setToolTipText("Size of the font."); + sliderChatFontSize.setToolTipText("Size of the chat font."); sliderChatFontSize.setBorder(javax.swing.BorderFactory.createEtchedBorder()); sliderChatFontSize.setMinimumSize(new java.awt.Dimension(150, 40)); gridBagConstraints = new java.awt.GridBagConstraints(); @@ -791,21 +772,137 @@ public class PreferencesDialog extends javax.swing.JDialog { gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH; guiSize_font.add(chatFontSizeLabel, gridBagConstraints); - javax.swing.GroupLayout tabGuiSizeLayout = new javax.swing.GroupLayout(tabGuiSize); + sliderDialogFont.setMajorTickSpacing(5); + sliderDialogFont.setMaximum(50); + sliderDialogFont.setMinimum(10); + sliderDialogFont.setMinorTickSpacing(1); + sliderDialogFont.setPaintLabels(true); + sliderDialogFont.setPaintTicks(true); + sliderDialogFont.setSnapToTicks(true); + sliderDialogFont.setToolTipText("Size of the font."); + sliderDialogFont.setBorder(javax.swing.BorderFactory.createEtchedBorder()); + sliderDialogFont.setMinimumSize(new java.awt.Dimension(150, 40)); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH; + gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); + guiSize_font.add(sliderDialogFont, gridBagConstraints); + + labelDialogFont.setHorizontalAlignment(javax.swing.SwingConstants.CENTER); + labelDialogFont.setText("Size of dialog font"); + labelDialogFont.setToolTipText("The size of the font used to display table text."); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 1; + gridBagConstraints.ipadx = 3; + gridBagConstraints.ipady = 3; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH; + guiSize_font.add(labelDialogFont, gridBagConstraints); + + guiSize_font1.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createEtchedBorder(), "Size game elements")); + guiSize_font1.setLayout(new java.awt.GridBagLayout()); + + sliderCardSizeHand.setMajorTickSpacing(5); + sliderCardSizeHand.setMaximum(50); + sliderCardSizeHand.setMinimum(10); + sliderCardSizeHand.setMinorTickSpacing(1); + sliderCardSizeHand.setPaintLabels(true); + sliderCardSizeHand.setPaintTicks(true); + sliderCardSizeHand.setSnapToTicks(true); + sliderCardSizeHand.setToolTipText("Size of the font."); + sliderCardSizeHand.setValue(14); + sliderCardSizeHand.setBorder(javax.swing.BorderFactory.createEtchedBorder()); + sliderCardSizeHand.setMinimumSize(new java.awt.Dimension(150, 40)); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 0; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH; + gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); + guiSize_font1.add(sliderCardSizeHand, gridBagConstraints); + + labelCardSizeHand.setHorizontalAlignment(javax.swing.SwingConstants.CENTER); + labelCardSizeHand.setText("Size of hand cards"); + labelCardSizeHand.setToolTipText("The size of the hand cards"); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 1; + gridBagConstraints.ipadx = 3; + gridBagConstraints.ipady = 3; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH; + guiSize_font1.add(labelCardSizeHand, gridBagConstraints); + + sliderTooltipSize.setMajorTickSpacing(5); + sliderTooltipSize.setMaximum(50); + sliderTooltipSize.setMinimum(10); + sliderTooltipSize.setMinorTickSpacing(1); + sliderTooltipSize.setPaintLabels(true); + sliderTooltipSize.setPaintTicks(true); + sliderTooltipSize.setSnapToTicks(true); + sliderTooltipSize.setToolTipText("Size of the font."); + sliderTooltipSize.setValue(14); + sliderTooltipSize.setBorder(javax.swing.BorderFactory.createEtchedBorder()); + sliderTooltipSize.setMinimumSize(new java.awt.Dimension(150, 40)); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 2; + gridBagConstraints.gridy = 0; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH; + gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); + guiSize_font1.add(sliderTooltipSize, gridBagConstraints); + + labelTooltipSize.setHorizontalAlignment(javax.swing.SwingConstants.CENTER); + labelTooltipSize.setText("Tooltip size"); + labelTooltipSize.setToolTipText("The size of the hand cards"); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 2; + gridBagConstraints.gridy = 1; + gridBagConstraints.ipadx = 3; + gridBagConstraints.ipady = 3; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH; + guiSize_font1.add(labelTooltipSize, gridBagConstraints); + + sliderSymbolSize.setMajorTickSpacing(5); + sliderSymbolSize.setMaximum(50); + sliderSymbolSize.setMinimum(10); + sliderSymbolSize.setMinorTickSpacing(1); + sliderSymbolSize.setPaintLabels(true); + sliderSymbolSize.setPaintTicks(true); + sliderSymbolSize.setSnapToTicks(true); + sliderSymbolSize.setToolTipText("Size of the font."); + sliderSymbolSize.setBorder(javax.swing.BorderFactory.createEtchedBorder()); + sliderSymbolSize.setMinimumSize(new java.awt.Dimension(150, 40)); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridy = 3; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH; + gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); + guiSize_font1.add(sliderSymbolSize, gridBagConstraints); + + labelSymbolSize.setHorizontalAlignment(javax.swing.SwingConstants.CENTER); + labelSymbolSize.setText("Symbol size"); + labelSymbolSize.setToolTipText("The size of the font used to display the chat text"); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.ipadx = 3; + gridBagConstraints.ipady = 3; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH; + guiSize_font1.add(labelSymbolSize, gridBagConstraints); + + org.jdesktop.layout.GroupLayout tabGuiSizeLayout = new org.jdesktop.layout.GroupLayout(tabGuiSize); tabGuiSize.setLayout(tabGuiSizeLayout); tabGuiSizeLayout.setHorizontalGroup( - tabGuiSizeLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(tabGuiSizeLayout.createSequentialGroup() + tabGuiSizeLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(tabGuiSizeLayout.createSequentialGroup() .addContainerGap() - .addComponent(guiSize_font, javax.swing.GroupLayout.DEFAULT_SIZE, 506, Short.MAX_VALUE) + .add(tabGuiSizeLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(guiSize_font, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 507, Short.MAX_VALUE) + .add(guiSize_font1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addContainerGap()) ); tabGuiSizeLayout.setVerticalGroup( - tabGuiSizeLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(tabGuiSizeLayout.createSequentialGroup() + tabGuiSizeLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(tabGuiSizeLayout.createSequentialGroup() .addContainerGap() - .addComponent(guiSize_font, javax.swing.GroupLayout.PREFERRED_SIZE, 216, javax.swing.GroupLayout.PREFERRED_SIZE) - .addContainerGap(211, Short.MAX_VALUE)) + .add(guiSize_font, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .add(14, 14, 14) + .add(guiSize_font1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .addContainerGap(66, Short.MAX_VALUE)) ); tabsPanel.addTab("GUI Size", tabGuiSize); @@ -908,117 +1005,117 @@ public class PreferencesDialog extends javax.swing.JDialog { }); phases_stopSettings.add(cbAutoOrderTrigger); - javax.swing.GroupLayout tabPhasesLayout = new javax.swing.GroupLayout(tabPhases); + org.jdesktop.layout.GroupLayout tabPhasesLayout = new org.jdesktop.layout.GroupLayout(tabPhases); tabPhases.setLayout(tabPhasesLayout); tabPhasesLayout.setHorizontalGroup( - tabPhasesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(tabPhasesLayout.createSequentialGroup() - .addGroup(tabPhasesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(tabPhasesLayout.createSequentialGroup() - .addGroup(tabPhasesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(tabPhasesLayout.createSequentialGroup() - .addGap(20, 20, 20) - .addGroup(tabPhasesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(tabPhasesLayout.createSequentialGroup() - .addGroup(tabPhasesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jLabelUpkeep) - .addComponent(jLabelBeforeCombat) - .addComponent(jLabelEndofCombat) - .addComponent(jLabelMain2) - .addComponent(jLabelEndOfTurn)) - .addGap(77, 77, 77) - .addGroup(tabPhasesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(tabPhasesLayout.createSequentialGroup() - .addGap(2, 2, 2) - .addComponent(jLabelYourTurn) - .addGap(32, 32, 32) - .addComponent(jLabelOpponentsTurn)) - .addGroup(tabPhasesLayout.createSequentialGroup() - .addGap(13, 13, 13) - .addGroup(tabPhasesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(checkBoxDrawYou) - .addComponent(checkBoxUpkeepYou) - .addComponent(checkBoxMainYou) - .addComponent(checkBoxBeforeCYou) - .addComponent(checkBoxEndOfCYou) - .addComponent(checkBoxMain2You) - .addComponent(checkBoxEndTurnYou)) - .addGap(78, 78, 78) - .addGroup(tabPhasesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(checkBoxUpkeepOthers) - .addComponent(checkBoxBeforeCOthers) - .addComponent(checkBoxMainOthers) - .addComponent(checkBoxEndOfCOthers) - .addComponent(checkBoxDrawOthers) - .addComponent(checkBoxMain2Others) - .addComponent(checkBoxEndTurnOthers))))) - .addGroup(tabPhasesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false) - .addComponent(jLabelMain1, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(jLabelDraw, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))) - .addGroup(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(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() - .addComponent(jLabelHeadLine))) - .addGap(0, 0, Short.MAX_VALUE)) - .addGroup(tabPhasesLayout.createSequentialGroup() + .add(jLabelHeadLine))) + .add(0, 0, Short.MAX_VALUE)) + .add(tabPhasesLayout.createSequentialGroup() .addContainerGap() - .addComponent(phases_stopSettings, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))) + .add(phases_stopSettings, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))) .addContainerGap()) ); tabPhasesLayout.setVerticalGroup( - tabPhasesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(tabPhasesLayout.createSequentialGroup() + tabPhasesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(tabPhasesLayout.createSequentialGroup() .addContainerGap() - .addGroup(tabPhasesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addGroup(tabPhasesLayout.createSequentialGroup() - .addComponent(jLabelOpponentsTurn) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(checkBoxUpkeepOthers)) - .addGroup(tabPhasesLayout.createSequentialGroup() - .addGroup(tabPhasesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addGroup(tabPhasesLayout.createSequentialGroup() - .addComponent(jLabelHeadLine) - .addGap(20, 20, 20)) - .addComponent(jLabelYourTurn)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addGroup(tabPhasesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(checkBoxUpkeepYou) - .addComponent(jLabelUpkeep)))) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(tabPhasesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(jLabelDraw) - .addComponent(checkBoxDrawYou) - .addComponent(checkBoxDrawOthers)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(tabPhasesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(jLabelMain1) - .addComponent(checkBoxMainYou) - .addComponent(checkBoxMainOthers)) - .addGroup(tabPhasesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(tabPhasesLayout.createSequentialGroup() - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(tabPhasesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jLabelBeforeCombat, javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(checkBoxBeforeCYou, javax.swing.GroupLayout.Alignment.TRAILING))) - .addGroup(tabPhasesLayout.createSequentialGroup() - .addGap(6, 6, 6) - .addComponent(checkBoxBeforeCOthers))) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(tabPhasesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(jLabelEndofCombat) - .addComponent(checkBoxEndOfCYou) - .addComponent(checkBoxEndOfCOthers)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(tabPhasesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(jLabelMain2) - .addComponent(checkBoxMain2You) - .addComponent(checkBoxMain2Others)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(tabPhasesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(checkBoxEndTurnYou) - .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) + .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.DEFAULT_SIZE, 188, Short.MAX_VALUE) .addContainerGap()) ); @@ -1061,50 +1158,50 @@ public class PreferencesDialog extends javax.swing.JDialog { labelPreferedImageLanguage.setText("Prefered image language:"); labelPreferedImageLanguage.setFocusable(false); - javax.swing.GroupLayout panelCardImagesLayout = new javax.swing.GroupLayout(panelCardImages); + org.jdesktop.layout.GroupLayout panelCardImagesLayout = new org.jdesktop.layout.GroupLayout(panelCardImages); panelCardImages.setLayout(panelCardImagesLayout); panelCardImagesLayout.setHorizontalGroup( - panelCardImagesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(panelCardImagesLayout.createSequentialGroup() - .addGroup(panelCardImagesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .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() + panelCardImagesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(panelCardImagesLayout.createSequentialGroup() + .add(panelCardImagesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(panelCardImagesLayout.createSequentialGroup() + .add(panelCardImagesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(cbUseDefaultImageFolder) + .add(cbCheckForNewImages) + .add(panelCardImagesLayout.createSequentialGroup() + .add(panelCardImagesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING, false) + .add(org.jdesktop.layout.GroupLayout.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, 188, Short.MAX_VALUE)) - .addGroup(panelCardImagesLayout.createSequentialGroup() - .addGap(24, 24, 24) - .addComponent(txtImageFolderPath) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(btnBrowseImageLocation))) + .add(labelPreferedImageLanguage)) + .add(org.jdesktop.layout.GroupLayout.LEADING, cbSaveToZipFiles)) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED) + .add(cbPreferedImageLanguage, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 153, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))) + .add(0, 0, Short.MAX_VALUE)) + .add(panelCardImagesLayout.createSequentialGroup() + .add(24, 24, 24) + .add(txtImageFolderPath) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) + .add(btnBrowseImageLocation))) .addContainerGap()) ); panelCardImagesLayout.setVerticalGroup( - panelCardImagesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(panelCardImagesLayout.createSequentialGroup() + panelCardImagesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(panelCardImagesLayout.createSequentialGroup() .addContainerGap() - .addComponent(cbUseDefaultImageFolder) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addGroup(panelCardImagesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(txtImageFolderPath, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(btnBrowseImageLocation)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(cbCheckForNewImages) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(cbSaveToZipFiles) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(panelCardImagesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(cbPreferedImageLanguage, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(labelPreferedImageLanguage)) - .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .add(cbUseDefaultImageFolder) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED) + .add(panelCardImagesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE) + .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(cbCheckForNewImages) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) + .add(cbSaveToZipFiles) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) + .add(panelCardImagesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE) + .add(cbPreferedImageLanguage, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .add(labelPreferedImageLanguage)) + .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); panelBackgroundImages.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createEtchedBorder(), "Background images setting:")); @@ -1160,76 +1257,76 @@ public class PreferencesDialog extends javax.swing.JDialog { jLabel15.setText("Battlefield:"); - javax.swing.GroupLayout panelBackgroundImagesLayout = new javax.swing.GroupLayout(panelBackgroundImages); + org.jdesktop.layout.GroupLayout panelBackgroundImagesLayout = new org.jdesktop.layout.GroupLayout(panelBackgroundImages); panelBackgroundImages.setLayout(panelBackgroundImagesLayout); panelBackgroundImagesLayout.setHorizontalGroup( - panelBackgroundImagesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(panelBackgroundImagesLayout.createSequentialGroup() - .addGroup(panelBackgroundImagesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .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) - .addComponent(txtBackgroundImagePath) - .addComponent(txtBattlefieldImagePath)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .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))) + panelBackgroundImagesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(panelBackgroundImagesLayout.createSequentialGroup() + .add(panelBackgroundImagesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(panelBackgroundImagesLayout.createSequentialGroup() + .add(panelBackgroundImagesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(panelBackgroundImagesLayout.createSequentialGroup() + .add(19, 19, 19) + .add(jLabel14)) + .add(panelBackgroundImagesLayout.createSequentialGroup() + .add(25, 25, 25) + .add(jLabel15))) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) + .add(panelBackgroundImagesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(txtBackgroundImagePath) + .add(txtBattlefieldImagePath)) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) + .add(panelBackgroundImagesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(org.jdesktop.layout.GroupLayout.TRAILING, btnBrowseBackgroundImage) + .add(org.jdesktop.layout.GroupLayout.TRAILING, btnBrowseBattlefieldImage))) + .add(panelBackgroundImagesLayout.createSequentialGroup() + .add(panelBackgroundImagesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(cbUseRandomBattleImage) + .add(cbUseDefaultBattleImage) + .add(cbUseDefaultBackground)) + .add(0, 0, Short.MAX_VALUE))) .addContainerGap()) ); panelBackgroundImagesLayout.setVerticalGroup( - panelBackgroundImagesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(panelBackgroundImagesLayout.createSequentialGroup() + panelBackgroundImagesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(panelBackgroundImagesLayout.createSequentialGroup() .addContainerGap() - .addComponent(cbUseDefaultBackground) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(panelBackgroundImagesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(txtBackgroundImagePath, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(btnBrowseBackgroundImage) - .addComponent(jLabel14)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(cbUseDefaultBattleImage) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(cbUseRandomBattleImage) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addGroup(panelBackgroundImagesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(txtBattlefieldImagePath, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(btnBrowseBattlefieldImage) - .addComponent(jLabel15))) + .add(cbUseDefaultBackground) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) + .add(panelBackgroundImagesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE) + .add(txtBackgroundImagePath, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .add(btnBrowseBackgroundImage) + .add(jLabel14)) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED) + .add(cbUseDefaultBattleImage) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED) + .add(cbUseRandomBattleImage) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED) + .add(panelBackgroundImagesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE) + .add(txtBattlefieldImagePath, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .add(btnBrowseBattlefieldImage) + .add(jLabel15))) ); - javax.swing.GroupLayout tabImagesLayout = new javax.swing.GroupLayout(tabImages); + org.jdesktop.layout.GroupLayout tabImagesLayout = new org.jdesktop.layout.GroupLayout(tabImages); tabImages.setLayout(tabImagesLayout); tabImagesLayout.setHorizontalGroup( - tabImagesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(tabImagesLayout.createSequentialGroup() + tabImagesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(tabImagesLayout.createSequentialGroup() .addContainerGap() - .addGroup(tabImagesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .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)) + .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(panelBackgroundImages, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addContainerGap()) ); tabImagesLayout.setVerticalGroup( - tabImagesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(tabImagesLayout.createSequentialGroup() + tabImagesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(tabImagesLayout.createSequentialGroup() .addContainerGap() - .addComponent(panelCardImages, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(panelBackgroundImages, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .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)) ); tabsPanel.addTab("Images", tabImages); @@ -1300,51 +1397,51 @@ public class PreferencesDialog extends javax.swing.JDialog { } }); - javax.swing.GroupLayout sounds_backgroundMusicLayout = new javax.swing.GroupLayout(sounds_backgroundMusic); + org.jdesktop.layout.GroupLayout sounds_backgroundMusicLayout = new org.jdesktop.layout.GroupLayout(sounds_backgroundMusic); sounds_backgroundMusic.setLayout(sounds_backgroundMusicLayout); sounds_backgroundMusicLayout.setHorizontalGroup( - sounds_backgroundMusicLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(sounds_backgroundMusicLayout.createSequentialGroup() + sounds_backgroundMusicLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(sounds_backgroundMusicLayout.createSequentialGroup() .addContainerGap() - .addComponent(jLabel16) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(txtBattlefieldIBGMPath) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(btnBattlefieldBGMBrowse)) - .addGroup(sounds_backgroundMusicLayout.createSequentialGroup() - .addComponent(cbEnableBattlefieldBGM) - .addGap(0, 0, Short.MAX_VALUE)) + .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(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(sounds_backgroundMusicLayout.createSequentialGroup() - .addComponent(cbEnableBattlefieldBGM) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(sounds_backgroundMusicLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(txtBattlefieldIBGMPath, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(btnBattlefieldBGMBrowse) - .addComponent(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))) ); - javax.swing.GroupLayout tabSoundsLayout = new javax.swing.GroupLayout(tabSounds); + org.jdesktop.layout.GroupLayout tabSoundsLayout = new org.jdesktop.layout.GroupLayout(tabSounds); tabSounds.setLayout(tabSoundsLayout); tabSoundsLayout.setHorizontalGroup( - tabSoundsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(tabSoundsLayout.createSequentialGroup() + tabSoundsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(tabSoundsLayout.createSequentialGroup() .addContainerGap() - .addGroup(tabSoundsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(sounds_clips, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(sounds_backgroundMusic, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .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(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(tabSoundsLayout.createSequentialGroup() + tabSoundsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(tabSoundsLayout.createSequentialGroup() .addContainerGap() - .addComponent(sounds_clips, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(sounds_backgroundMusic, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .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(""); @@ -1365,15 +1462,15 @@ public class PreferencesDialog extends javax.swing.JDialog { 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); + org.jdesktop.layout.GroupLayout jPanel10Layout = new org.jdesktop.layout.GroupLayout(jPanel10); jPanel10.setLayout(jPanel10Layout); jPanel10Layout.setHorizontalGroup( - jPanel10Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 110, Short.MAX_VALUE) + jPanel10Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(0, 0, Short.MAX_VALUE) ); jPanel10Layout.setVerticalGroup( - jPanel10Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 110, Short.MAX_VALUE) + jPanel10Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(0, 0, Short.MAX_VALUE) ); avatarPanel.add(jPanel10); @@ -1383,15 +1480,15 @@ public class PreferencesDialog extends javax.swing.JDialog { 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); + org.jdesktop.layout.GroupLayout jPanel11Layout = new org.jdesktop.layout.GroupLayout(jPanel11); jPanel11.setLayout(jPanel11Layout); jPanel11Layout.setHorizontalGroup( - jPanel11Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 110, Short.MAX_VALUE) + jPanel11Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(0, 0, Short.MAX_VALUE) ); jPanel11Layout.setVerticalGroup( - jPanel11Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 110, Short.MAX_VALUE) + jPanel11Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(0, 0, Short.MAX_VALUE) ); avatarPanel.add(jPanel11); @@ -1401,15 +1498,15 @@ public class PreferencesDialog extends javax.swing.JDialog { 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); + org.jdesktop.layout.GroupLayout jPanel12Layout = new org.jdesktop.layout.GroupLayout(jPanel12); jPanel12.setLayout(jPanel12Layout); jPanel12Layout.setHorizontalGroup( - jPanel12Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 110, Short.MAX_VALUE) + jPanel12Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(0, 0, Short.MAX_VALUE) ); jPanel12Layout.setVerticalGroup( - jPanel12Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 110, Short.MAX_VALUE) + jPanel12Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(0, 0, Short.MAX_VALUE) ); avatarPanel.add(jPanel12); @@ -1419,15 +1516,15 @@ public class PreferencesDialog extends javax.swing.JDialog { 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); + org.jdesktop.layout.GroupLayout jPanel13Layout = new org.jdesktop.layout.GroupLayout(jPanel13); jPanel13.setLayout(jPanel13Layout); jPanel13Layout.setHorizontalGroup( - jPanel13Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 110, Short.MAX_VALUE) + jPanel13Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(0, 0, Short.MAX_VALUE) ); jPanel13Layout.setVerticalGroup( - jPanel13Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 0, Short.MAX_VALUE) + jPanel13Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(0, 0, Short.MAX_VALUE) ); avatarPanel.add(jPanel13); @@ -1437,15 +1534,15 @@ public class PreferencesDialog extends javax.swing.JDialog { 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); + org.jdesktop.layout.GroupLayout jPanel14Layout = new org.jdesktop.layout.GroupLayout(jPanel14); jPanel14.setLayout(jPanel14Layout); jPanel14Layout.setHorizontalGroup( - jPanel14Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 110, Short.MAX_VALUE) + jPanel14Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(0, 0, Short.MAX_VALUE) ); jPanel14Layout.setVerticalGroup( - jPanel14Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 110, Short.MAX_VALUE) + jPanel14Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(0, 0, Short.MAX_VALUE) ); avatarPanel.add(jPanel14); @@ -1455,15 +1552,15 @@ public class PreferencesDialog extends javax.swing.JDialog { 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); + org.jdesktop.layout.GroupLayout jPanel15Layout = new org.jdesktop.layout.GroupLayout(jPanel15); jPanel15.setLayout(jPanel15Layout); jPanel15Layout.setHorizontalGroup( - jPanel15Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 110, Short.MAX_VALUE) + jPanel15Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(0, 0, Short.MAX_VALUE) ); jPanel15Layout.setVerticalGroup( - jPanel15Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 110, Short.MAX_VALUE) + jPanel15Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(0, 0, Short.MAX_VALUE) ); avatarPanel.add(jPanel15); @@ -1473,15 +1570,15 @@ public class PreferencesDialog extends javax.swing.JDialog { 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); + org.jdesktop.layout.GroupLayout jPanel16Layout = new org.jdesktop.layout.GroupLayout(jPanel16); jPanel16.setLayout(jPanel16Layout); jPanel16Layout.setHorizontalGroup( - jPanel16Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 110, Short.MAX_VALUE) + jPanel16Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(0, 0, Short.MAX_VALUE) ); jPanel16Layout.setVerticalGroup( - jPanel16Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 110, Short.MAX_VALUE) + jPanel16Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(0, 0, Short.MAX_VALUE) ); avatarPanel.add(jPanel16); @@ -1491,15 +1588,15 @@ public class PreferencesDialog extends javax.swing.JDialog { 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); + org.jdesktop.layout.GroupLayout jPanel17Layout = new org.jdesktop.layout.GroupLayout(jPanel17); jPanel17.setLayout(jPanel17Layout); jPanel17Layout.setHorizontalGroup( - jPanel17Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 110, Short.MAX_VALUE) + jPanel17Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(0, 0, Short.MAX_VALUE) ); jPanel17Layout.setVerticalGroup( - jPanel17Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 110, Short.MAX_VALUE) + jPanel17Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(0, 0, Short.MAX_VALUE) ); avatarPanel.add(jPanel17); @@ -1509,15 +1606,15 @@ public class PreferencesDialog extends javax.swing.JDialog { 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); + org.jdesktop.layout.GroupLayout jPanel18Layout = new org.jdesktop.layout.GroupLayout(jPanel18); jPanel18.setLayout(jPanel18Layout); jPanel18Layout.setHorizontalGroup( - jPanel18Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 110, Short.MAX_VALUE) + jPanel18Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(0, 0, Short.MAX_VALUE) ); jPanel18Layout.setVerticalGroup( - jPanel18Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 110, Short.MAX_VALUE) + jPanel18Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(0, 0, Short.MAX_VALUE) ); avatarPanel.add(jPanel18); @@ -1527,15 +1624,15 @@ public class PreferencesDialog extends javax.swing.JDialog { 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); + org.jdesktop.layout.GroupLayout jPanel19Layout = new org.jdesktop.layout.GroupLayout(jPanel19); jPanel19.setLayout(jPanel19Layout); jPanel19Layout.setHorizontalGroup( - jPanel19Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 110, Short.MAX_VALUE) + jPanel19Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(0, 0, Short.MAX_VALUE) ); jPanel19Layout.setVerticalGroup( - jPanel19Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 110, Short.MAX_VALUE) + jPanel19Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(0, 0, Short.MAX_VALUE) ); avatarPanel.add(jPanel19); @@ -1545,15 +1642,15 @@ public class PreferencesDialog extends javax.swing.JDialog { 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); + org.jdesktop.layout.GroupLayout jPanel20Layout = new org.jdesktop.layout.GroupLayout(jPanel20); jPanel20.setLayout(jPanel20Layout); jPanel20Layout.setHorizontalGroup( - jPanel20Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 110, Short.MAX_VALUE) + jPanel20Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(0, 0, Short.MAX_VALUE) ); jPanel20Layout.setVerticalGroup( - jPanel20Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 110, Short.MAX_VALUE) + jPanel20Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(0, 0, Short.MAX_VALUE) ); avatarPanel.add(jPanel20); @@ -1563,15 +1660,15 @@ public class PreferencesDialog extends javax.swing.JDialog { 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); + org.jdesktop.layout.GroupLayout jPanel21Layout = new org.jdesktop.layout.GroupLayout(jPanel21); jPanel21.setLayout(jPanel21Layout); jPanel21Layout.setHorizontalGroup( - jPanel21Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 110, Short.MAX_VALUE) + jPanel21Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(0, 0, Short.MAX_VALUE) ); jPanel21Layout.setVerticalGroup( - jPanel21Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 110, Short.MAX_VALUE) + jPanel21Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(0, 0, Short.MAX_VALUE) ); avatarPanel.add(jPanel21); @@ -1581,15 +1678,15 @@ public class PreferencesDialog extends javax.swing.JDialog { 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); + org.jdesktop.layout.GroupLayout jPanel22Layout = new org.jdesktop.layout.GroupLayout(jPanel22); jPanel22.setLayout(jPanel22Layout); jPanel22Layout.setHorizontalGroup( - jPanel22Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 110, Short.MAX_VALUE) + jPanel22Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(0, 0, Short.MAX_VALUE) ); jPanel22Layout.setVerticalGroup( - jPanel22Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 110, Short.MAX_VALUE) + jPanel22Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(0, 0, Short.MAX_VALUE) ); avatarPanel.add(jPanel22); @@ -1599,15 +1696,15 @@ public class PreferencesDialog extends javax.swing.JDialog { 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); + org.jdesktop.layout.GroupLayout jPanel23Layout = new org.jdesktop.layout.GroupLayout(jPanel23); jPanel23.setLayout(jPanel23Layout); jPanel23Layout.setHorizontalGroup( - jPanel23Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 110, Short.MAX_VALUE) + jPanel23Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(0, 0, Short.MAX_VALUE) ); jPanel23Layout.setVerticalGroup( - jPanel23Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 110, Short.MAX_VALUE) + jPanel23Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(0, 0, Short.MAX_VALUE) ); avatarPanel.add(jPanel23); @@ -1617,15 +1714,15 @@ public class PreferencesDialog extends javax.swing.JDialog { 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); + org.jdesktop.layout.GroupLayout jPanel24Layout = new org.jdesktop.layout.GroupLayout(jPanel24); jPanel24.setLayout(jPanel24Layout); jPanel24Layout.setHorizontalGroup( - jPanel24Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 110, Short.MAX_VALUE) + jPanel24Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(0, 0, Short.MAX_VALUE) ); jPanel24Layout.setVerticalGroup( - jPanel24Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 110, Short.MAX_VALUE) + jPanel24Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(0, 0, Short.MAX_VALUE) ); avatarPanel.add(jPanel24); @@ -1635,15 +1732,15 @@ public class PreferencesDialog extends javax.swing.JDialog { 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); + org.jdesktop.layout.GroupLayout jPanel25Layout = new org.jdesktop.layout.GroupLayout(jPanel25); jPanel25.setLayout(jPanel25Layout); jPanel25Layout.setHorizontalGroup( - jPanel25Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 110, Short.MAX_VALUE) + jPanel25Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(0, 0, Short.MAX_VALUE) ); jPanel25Layout.setVerticalGroup( - jPanel25Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 110, Short.MAX_VALUE) + jPanel25Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(0, 0, Short.MAX_VALUE) ); avatarPanel.add(jPanel25); @@ -1653,15 +1750,15 @@ public class PreferencesDialog extends javax.swing.JDialog { 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); + org.jdesktop.layout.GroupLayout jPanel26Layout = new org.jdesktop.layout.GroupLayout(jPanel26); jPanel26.setLayout(jPanel26Layout); jPanel26Layout.setHorizontalGroup( - jPanel26Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 110, Short.MAX_VALUE) + jPanel26Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(0, 0, Short.MAX_VALUE) ); jPanel26Layout.setVerticalGroup( - jPanel26Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 110, Short.MAX_VALUE) + jPanel26Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(0, 0, Short.MAX_VALUE) ); avatarPanel.add(jPanel26); @@ -1671,15 +1768,15 @@ public class PreferencesDialog extends javax.swing.JDialog { 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); + org.jdesktop.layout.GroupLayout jPanel27Layout = new org.jdesktop.layout.GroupLayout(jPanel27); jPanel27.setLayout(jPanel27Layout); jPanel27Layout.setHorizontalGroup( - jPanel27Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 110, Short.MAX_VALUE) + jPanel27Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(0, 0, Short.MAX_VALUE) ); jPanel27Layout.setVerticalGroup( - jPanel27Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 110, Short.MAX_VALUE) + jPanel27Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(0, 0, Short.MAX_VALUE) ); avatarPanel.add(jPanel27); @@ -1689,15 +1786,15 @@ public class PreferencesDialog extends javax.swing.JDialog { 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); + org.jdesktop.layout.GroupLayout jPanel28Layout = new org.jdesktop.layout.GroupLayout(jPanel28); jPanel28.setLayout(jPanel28Layout); jPanel28Layout.setHorizontalGroup( - jPanel28Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 110, Short.MAX_VALUE) + jPanel28Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(0, 0, Short.MAX_VALUE) ); jPanel28Layout.setVerticalGroup( - jPanel28Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 110, Short.MAX_VALUE) + jPanel28Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(0, 0, Short.MAX_VALUE) ); avatarPanel.add(jPanel28); @@ -1707,15 +1804,15 @@ public class PreferencesDialog extends javax.swing.JDialog { 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); + org.jdesktop.layout.GroupLayout jPanel29Layout = new org.jdesktop.layout.GroupLayout(jPanel29); jPanel29.setLayout(jPanel29Layout); jPanel29Layout.setHorizontalGroup( - jPanel29Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 110, Short.MAX_VALUE) + jPanel29Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(0, 0, Short.MAX_VALUE) ); jPanel29Layout.setVerticalGroup( - jPanel29Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 110, Short.MAX_VALUE) + jPanel29Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(0, 0, Short.MAX_VALUE) ); avatarPanel.add(jPanel29); @@ -1725,15 +1822,15 @@ public class PreferencesDialog extends javax.swing.JDialog { 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); + org.jdesktop.layout.GroupLayout jPanel30Layout = new org.jdesktop.layout.GroupLayout(jPanel30); jPanel30.setLayout(jPanel30Layout); jPanel30Layout.setHorizontalGroup( - jPanel30Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 110, Short.MAX_VALUE) + jPanel30Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(0, 0, Short.MAX_VALUE) ); jPanel30Layout.setVerticalGroup( - jPanel30Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 110, Short.MAX_VALUE) + jPanel30Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(0, 0, Short.MAX_VALUE) ); avatarPanel.add(jPanel30); @@ -1743,15 +1840,15 @@ public class PreferencesDialog extends javax.swing.JDialog { 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); + org.jdesktop.layout.GroupLayout jPanel31Layout = new org.jdesktop.layout.GroupLayout(jPanel31); jPanel31.setLayout(jPanel31Layout); jPanel31Layout.setHorizontalGroup( - jPanel31Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 110, Short.MAX_VALUE) + jPanel31Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(0, 0, Short.MAX_VALUE) ); jPanel31Layout.setVerticalGroup( - jPanel31Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 110, Short.MAX_VALUE) + jPanel31Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(0, 0, Short.MAX_VALUE) ); avatarPanel.add(jPanel31); @@ -1761,15 +1858,15 @@ public class PreferencesDialog extends javax.swing.JDialog { 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); + org.jdesktop.layout.GroupLayout jPanel32Layout = new org.jdesktop.layout.GroupLayout(jPanel32); jPanel32.setLayout(jPanel32Layout); jPanel32Layout.setHorizontalGroup( - jPanel32Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 110, Short.MAX_VALUE) + jPanel32Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(0, 0, Short.MAX_VALUE) ); jPanel32Layout.setVerticalGroup( - jPanel32Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 110, Short.MAX_VALUE) + jPanel32Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(0, 0, Short.MAX_VALUE) ); avatarPanel.add(jPanel32); @@ -1778,32 +1875,34 @@ public class PreferencesDialog extends javax.swing.JDialog { 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); + org.jdesktop.layout.GroupLayout jPanel33Layout = new org.jdesktop.layout.GroupLayout(jPanel33); jPanel33.setLayout(jPanel33Layout); jPanel33Layout.setHorizontalGroup( - jPanel33Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 110, Short.MAX_VALUE) + jPanel33Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(0, 0, Short.MAX_VALUE) ); jPanel33Layout.setVerticalGroup( - jPanel33Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 110, Short.MAX_VALUE) + jPanel33Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(0, 0, Short.MAX_VALUE) ); avatarPanel.add(jPanel33); avatarPane.setViewportView(avatarPanel); - javax.swing.GroupLayout tabAvatarsLayout = new javax.swing.GroupLayout(tabAvatars); + org.jdesktop.layout.GroupLayout tabAvatarsLayout = new org.jdesktop.layout.GroupLayout(tabAvatars); tabAvatars.setLayout(tabAvatarsLayout); tabAvatarsLayout.setHorizontalGroup( - tabAvatarsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(tabAvatarsLayout.createSequentialGroup() - .addComponent(avatarPane, javax.swing.GroupLayout.PREFERRED_SIZE, 527, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(0, 0, Short.MAX_VALUE)) + tabAvatarsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(org.jdesktop.layout.GroupLayout.TRAILING, tabAvatarsLayout.createSequentialGroup() + .add(avatarPane, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 527, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .add(0, 0, Short.MAX_VALUE)) ); tabAvatarsLayout.setVerticalGroup( - tabAvatarsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(avatarPane, javax.swing.GroupLayout.PREFERRED_SIZE, 438, Short.MAX_VALUE) + tabAvatarsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(org.jdesktop.layout.GroupLayout.TRAILING, tabAvatarsLayout.createSequentialGroup() + .add(avatarPane, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 423, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .add(0, 0, Short.MAX_VALUE)) ); tabsPanel.addTab("Avatars", tabAvatars); @@ -1848,72 +1947,72 @@ public class PreferencesDialog extends javax.swing.JDialog { jLabel11.setFont(new java.awt.Font("Tahoma", 2, 10)); // NOI18N jLabel11.setText("Note: password won't be encrypted!"); - javax.swing.GroupLayout pnlProxyLayout = new javax.swing.GroupLayout(pnlProxy); + org.jdesktop.layout.GroupLayout pnlProxyLayout = new org.jdesktop.layout.GroupLayout(pnlProxy); pnlProxy.setLayout(pnlProxyLayout); pnlProxyLayout.setHorizontalGroup( - pnlProxyLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(pnlProxyLayout.createSequentialGroup() + pnlProxyLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(pnlProxyLayout.createSequentialGroup() .addContainerGap() - .addGroup(pnlProxyLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(pnlProxyLayout.createSequentialGroup() - .addComponent(rememberPswd) - .addGap(47, 47, 47) - .addComponent(jLabel11) - .addGap(34, 34, 34)) - .addGroup(pnlProxyLayout.createSequentialGroup() - .addGroup(pnlProxyLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(lblProxyPort) - .addComponent(lblProxyPassword) - .addComponent(lblProxyServer) - .addComponent(lblProxyUserName)) - .addGap(19, 19, 19) - .addGroup(pnlProxyLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(txtProxyPort, javax.swing.GroupLayout.PREFERRED_SIZE, 58, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGroup(pnlProxyLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false) - .addComponent(txtPasswordField, javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(txtProxyUserName, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.PREFERRED_SIZE, 148, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addComponent(txtProxyServer)) + .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(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(pnlProxyLayout.createSequentialGroup() - .addGap(6, 6, 6) - .addGroup(pnlProxyLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(txtProxyServer, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(lblProxyServer)) - .addGap(8, 8, 8) - .addGroup(pnlProxyLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(lblProxyPort) - .addComponent(txtProxyPort, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(pnlProxyLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(txtProxyUserName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(lblProxyUserName)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(pnlProxyLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(txtPasswordField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(lblProxyPassword)) - .addGap(18, 18, 18) - .addGroup(pnlProxyLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(rememberPswd) - .addComponent(jLabel11)) - .addContainerGap(25, 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)) ); - javax.swing.GroupLayout pnlProxySettingsLayout = new javax.swing.GroupLayout(pnlProxySettings); + org.jdesktop.layout.GroupLayout pnlProxySettingsLayout = new org.jdesktop.layout.GroupLayout(pnlProxySettings); pnlProxySettings.setLayout(pnlProxySettingsLayout); pnlProxySettingsLayout.setHorizontalGroup( - pnlProxySettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(pnlProxySettingsLayout.createSequentialGroup() + pnlProxySettingsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(pnlProxySettingsLayout.createSequentialGroup() .addContainerGap() - .addComponent(pnlProxy, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .add(pnlProxy, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addContainerGap()) ); pnlProxySettingsLayout.setVerticalGroup( - pnlProxySettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(pnlProxySettingsLayout.createSequentialGroup() - .addComponent(pnlProxy, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + 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()) ); @@ -1932,59 +2031,59 @@ public class PreferencesDialog extends javax.swing.JDialog { jLabel17.setFont(new java.awt.Font("Tahoma", 2, 10)); // NOI18N jLabel17.setText("e.g.: http://XMage.de/files/server-list.txt"); - javax.swing.GroupLayout connection_serversLayout = new javax.swing.GroupLayout(connection_servers); + org.jdesktop.layout.GroupLayout connection_serversLayout = new org.jdesktop.layout.GroupLayout(connection_servers); connection_servers.setLayout(connection_serversLayout); connection_serversLayout.setHorizontalGroup( - connection_serversLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(connection_serversLayout.createSequentialGroup() - .addGroup(connection_serversLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(connection_serversLayout.createSequentialGroup() + 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() - .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, 370, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addGroup(connection_serversLayout.createSequentialGroup() - .addGap(141, 141, 141) - .addComponent(jLabel17))) - .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .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(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(connection_serversLayout.createSequentialGroup() - .addGroup(connection_serversLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) - .addComponent(lblURLServerList, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(txtURLServerList, javax.swing.GroupLayout.DEFAULT_SIZE, 28, Short.MAX_VALUE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(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, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) + .add(jLabel17)) ); - javax.swing.GroupLayout tabConnectionLayout = new javax.swing.GroupLayout(tabConnection); + org.jdesktop.layout.GroupLayout tabConnectionLayout = new org.jdesktop.layout.GroupLayout(tabConnection); tabConnection.setLayout(tabConnectionLayout); tabConnectionLayout.setHorizontalGroup( - tabConnectionLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(tabConnectionLayout.createSequentialGroup() + tabConnectionLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(tabConnectionLayout.createSequentialGroup() .addContainerGap() - .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)) - .addComponent(connection_servers, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .add(tabConnectionLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING, false) + .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(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); tabConnectionLayout.setVerticalGroup( - tabConnectionLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(tabConnectionLayout.createSequentialGroup() + tabConnectionLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(tabConnectionLayout.createSequentialGroup() .addContainerGap() - .addComponent(connection_servers, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(tabConnectionLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(lblProxyType) - .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(127, Short.MAX_VALUE)) + .add(connection_servers, 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(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(""); @@ -2007,26 +2106,26 @@ public class PreferencesDialog extends javax.swing.JDialog { } }); - javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); + org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(getContentPane()); getContentPane().setLayout(layout); layout.setHorizontalGroup( - layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() - .addContainerGap(403, 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, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE) + layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(org.jdesktop.layout.GroupLayout.TRAILING, layout.createSequentialGroup() + .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 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)) + .add(tabsPanel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) ); layout.setVerticalGroup( - layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addComponent(tabsPanel) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(exitButton) - .addComponent(saveButton)) + layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(layout.createSequentialGroup() + .add(tabsPanel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .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) + .add(exitButton)) .addContainerGap()) ); @@ -2055,7 +2154,7 @@ public class PreferencesDialog extends javax.swing.JDialog { save(prefs, dialog.sliderFontSize, KEY_GUI_TABLE_FONT_SIZE, "true", "false", UPDATE_CACHE_POLICY); sizeGUIChanged = true; } - if (getCachedValue(KEY_GUI_CHAT_FONT_SIZE, 14) != dialog.sliderFontSize.getValue()) { + if (getCachedValue(KEY_GUI_CHAT_FONT_SIZE, 14) != dialog.sliderChatFontSize.getValue()) { save(prefs, dialog.sliderChatFontSize, KEY_GUI_CHAT_FONT_SIZE, "true", "false", UPDATE_CACHE_POLICY); sizeGUIChanged = true; } @@ -2063,6 +2162,18 @@ public class PreferencesDialog extends javax.swing.JDialog { save(prefs, dialog.sliderCardSizeHand, KEY_GUI_CARD_HAND_SIZE, "true", "false", UPDATE_CACHE_POLICY); sizeGUIChanged = true; } + if (getCachedValue(KEY_GUI_SYMBOL_SIZE, 14) != dialog.sliderSymbolSize.getValue()) { + save(prefs, dialog.sliderSymbolSize, KEY_GUI_SYMBOL_SIZE, "true", "false", UPDATE_CACHE_POLICY); + sizeGUIChanged = true; + } + if (getCachedValue(KEY_GUI_TOOLTIP_SIZE, 14) != dialog.sliderTooltipSize.getValue()) { + save(prefs, dialog.sliderTooltipSize, KEY_GUI_TOOLTIP_SIZE, "true", "false", UPDATE_CACHE_POLICY); + sizeGUIChanged = true; + } + if (getCachedValue(KEY_GUI_DIALOG_FONT_SIZE, 14) != dialog.sliderDialogFont.getValue()) { + save(prefs, dialog.sliderDialogFont, KEY_GUI_DIALOG_FONT_SIZE, "true", "false", UPDATE_CACHE_POLICY); + sizeGUIChanged = true; + } if (sizeGUIChanged) { // do as worker job GUISizeHelper.changeGUISize(); @@ -2536,6 +2647,9 @@ public class PreferencesDialog extends javax.swing.JDialog { load(prefs, dialog.sliderFontSize, KEY_GUI_TABLE_FONT_SIZE, "14"); load(prefs, dialog.sliderChatFontSize, KEY_GUI_CHAT_FONT_SIZE, "14"); load(prefs, dialog.sliderCardSizeHand, KEY_GUI_CARD_HAND_SIZE, "14"); + load(prefs, dialog.sliderSymbolSize, KEY_GUI_SYMBOL_SIZE, "14"); + load(prefs, dialog.sliderDialogFont, KEY_GUI_DIALOG_FONT_SIZE, "14"); + load(prefs, dialog.sliderTooltipSize, KEY_GUI_TOOLTIP_SIZE, "14"); } private static void loadImagesSettings(Preferences prefs) { @@ -2975,6 +3089,7 @@ public class PreferencesDialog extends javax.swing.JDialog { private javax.swing.JButton exitButton; private javax.swing.JLabel fontSizeLabel; private javax.swing.JPanel guiSize_font; + private javax.swing.JPanel guiSize_font1; private javax.swing.JLabel jLabel11; private javax.swing.JLabel jLabel14; private javax.swing.JLabel jLabel15; @@ -3015,7 +3130,10 @@ public class PreferencesDialog extends javax.swing.JDialog { private javax.swing.JPanel jPanel32; private javax.swing.JPanel jPanel33; private javax.swing.JLabel labelCardSizeHand; + private javax.swing.JLabel labelDialogFont; private javax.swing.JLabel labelPreferedImageLanguage; + private javax.swing.JLabel labelSymbolSize; + private javax.swing.JLabel labelTooltipSize; private javax.swing.JLabel lblProxyPassword; private javax.swing.JLabel lblProxyPort; private javax.swing.JLabel lblProxyServer; @@ -3038,7 +3156,10 @@ public class PreferencesDialog extends javax.swing.JDialog { private javax.swing.JCheckBox showPlayerNamesPermanently; private javax.swing.JSlider sliderCardSizeHand; private javax.swing.JSlider sliderChatFontSize; + private javax.swing.JSlider sliderDialogFont; private javax.swing.JSlider sliderFontSize; + private javax.swing.JSlider sliderSymbolSize; + private javax.swing.JSlider sliderTooltipSize; private javax.swing.JPanel sounds_backgroundMusic; private javax.swing.JPanel sounds_clips; private javax.swing.JPanel tabAvatars; diff --git a/Mage.Client/src/main/java/mage/client/dialog/UserRequestDialog.form b/Mage.Client/src/main/java/mage/client/dialog/UserRequestDialog.form index 2308caa7dd5..8e965154ae5 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/UserRequestDialog.form +++ b/Mage.Client/src/main/java/mage/client/dialog/UserRequestDialog.form @@ -28,12 +28,12 @@ - - + + - + - + @@ -44,12 +44,12 @@ - + - - - + + + @@ -61,11 +61,29 @@ + + + + + + + + + + + + + + + + + + @@ -74,6 +92,15 @@ + + + + + + + + + @@ -82,6 +109,15 @@ + + + + + + + + + diff --git a/Mage.Client/src/main/java/mage/client/dialog/UserRequestDialog.java b/Mage.Client/src/main/java/mage/client/dialog/UserRequestDialog.java index 3ecb0f35252..ae57781f558 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/UserRequestDialog.java +++ b/Mage.Client/src/main/java/mage/client/dialog/UserRequestDialog.java @@ -24,20 +24,22 @@ * The views and conclusions contained in the software and documentation are those of the * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. -*/ - - -/* + */ + /* * ErrorDialog.java * * Created on Dec 23, 2009, 11:01:32 AM */ - package mage.client.dialog; +import java.awt.Dimension; +import java.awt.Font; +import javax.swing.JComponent; +import javax.swing.plaf.basic.BasicInternalFrameTitlePane; +import javax.swing.plaf.basic.BasicInternalFrameUI; import mage.client.MageFrame; +import mage.client.util.GUISizeHelper; import mage.constants.PlayerAction; -import mage.remote.Session; import mage.view.UserRequestMessage; /** @@ -48,15 +50,43 @@ public class UserRequestDialog extends MageDialog { private UserRequestMessage userRequestMessage; - /** Creates new form AskDialog */ + /** + * Creates new form AskDialog + */ public UserRequestDialog() { initComponents(); + setGUISize(); + } + + private void setGUISize() { + Font font = GUISizeHelper.gameRequestsFont; + lblText.setFont(font); + lblText.setMaximumSize(new Dimension(300 + font.getSize() * 15, 20 + font.getSize() * 5)); + lblText.setMinimumSize(new Dimension(300 + font.getSize() * 15, 20 + font.getSize() * 5)); + lblText.setPreferredSize(new Dimension(300 + font.getSize() * 15, 20 + font.getSize() * 5)); + btn1.setFont(font); + btn1.setMinimumSize(new Dimension(50 + 4 * font.getSize(), 2 * font.getSize() + 10)); + btn1.setMaximumSize(new Dimension(50 + 4 * font.getSize(), 2 * font.getSize() + 10)); + btn1.setPreferredSize(new Dimension(50 + 4 * font.getSize(), 2 * font.getSize() + 10)); + btn2.setFont(font); + btn2.setMinimumSize(new Dimension(50 + 4 * font.getSize(), 2 * font.getSize() + 10)); + btn2.setMaximumSize(new Dimension(50 + 4 * font.getSize(), 2 * font.getSize() + 10)); + btn2.setPreferredSize(new Dimension(50 + 4 * font.getSize(), 2 * font.getSize() + 10)); + btn3.setFont(font); + btn3.setMinimumSize(new Dimension(50 + 4 * font.getSize(), 2 * font.getSize() + 10)); + btn3.setMaximumSize(new Dimension(50 + 4 * font.getSize(), 2 * font.getSize() + 10)); + btn3.setPreferredSize(new Dimension(50 + 4 * font.getSize(), 2 * font.getSize() + 10)); + JComponent c = (BasicInternalFrameTitlePane) ((BasicInternalFrameUI) this.getUI()).getNorthPane(); + c.setMinimumSize(new Dimension(c.getMinimumSize().width, font.getSize() + 10)); + c.setMaximumSize(new Dimension(c.getMaximumSize().width, font.getSize() + 10)); + c.setPreferredSize(new Dimension(c.getPreferredSize().width, font.getSize() + 10)); + c.setFont(font); } public void showDialog(UserRequestMessage userRequestMessage) { this.userRequestMessage = userRequestMessage; this.setTitle(userRequestMessage.getTitel()); - String text = "

" + userRequestMessage.getMessage() + "

"; + String text = "

" + userRequestMessage.getMessage() + "

"; this.lblText.setText(text); if (userRequestMessage.getButton1Text() != null) { this.btn1.setText(userRequestMessage.getButton1Text()); @@ -80,10 +110,10 @@ public class UserRequestDialog extends MageDialog { this.setVisible(true); } - /** This method is called from within the constructor to - * initialize the form. - * WARNING: Do NOT modify this code. The content of this method is - * always regenerated by the Form Editor. + /** + * This method is called from within the constructor to initialize the form. + * WARNING: Do NOT modify this code. The content of this method is always + * regenerated by the Form Editor. */ @SuppressWarnings("unchecked") // //GEN-BEGIN:initComponents @@ -99,8 +129,14 @@ public class UserRequestDialog extends MageDialog { lblText.setHorizontalAlignment(javax.swing.SwingConstants.CENTER); lblText.setText("message to the user"); + lblText.setMaximumSize(new java.awt.Dimension(400, 60)); + lblText.setMinimumSize(new java.awt.Dimension(400, 60)); + lblText.setPreferredSize(new java.awt.Dimension(400, 60)); btn3.setText("btn3"); + btn3.setMaximumSize(new java.awt.Dimension(150, 50)); + btn3.setMinimumSize(new java.awt.Dimension(75, 25)); + btn3.setPreferredSize(new java.awt.Dimension(150, 50)); btn3.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { btn3ActionPerformed(evt); @@ -108,6 +144,9 @@ public class UserRequestDialog extends MageDialog { }); btn2.setText("btn2"); + btn2.setMaximumSize(new java.awt.Dimension(150, 50)); + btn2.setMinimumSize(new java.awt.Dimension(75, 25)); + btn2.setPreferredSize(new java.awt.Dimension(150, 50)); btn2.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { btn2ActionPerformed(evt); @@ -115,6 +154,9 @@ public class UserRequestDialog extends MageDialog { }); btn1.setText("btn1"); + btn1.setMaximumSize(new java.awt.Dimension(150, 50)); + btn1.setMinimumSize(new java.awt.Dimension(75, 25)); + btn1.setPreferredSize(new java.awt.Dimension(150, 50)); btn1.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { btn1ActionPerformed(evt); @@ -130,24 +172,24 @@ public class UserRequestDialog extends MageDialog { .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) .addComponent(lblText, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addGroup(layout.createSequentialGroup() - .addGap(0, 289, Short.MAX_VALUE) - .addComponent(btn3, javax.swing.GroupLayout.PREFERRED_SIZE, 100, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGap(0, 0, Short.MAX_VALUE) + .addComponent(btn3, javax.swing.GroupLayout.PREFERRED_SIZE, 1, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(btn2, javax.swing.GroupLayout.PREFERRED_SIZE, 100, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(btn2, javax.swing.GroupLayout.PREFERRED_SIZE, 1, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(btn1, javax.swing.GroupLayout.PREFERRED_SIZE, 100, javax.swing.GroupLayout.PREFERRED_SIZE))) + .addComponent(btn1, javax.swing.GroupLayout.PREFERRED_SIZE, 1, Short.MAX_VALUE))) .addContainerGap()) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() .addContainerGap() - .addComponent(lblText, javax.swing.GroupLayout.DEFAULT_SIZE, 96, Short.MAX_VALUE) + .addComponent(lblText, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(btn1) - .addComponent(btn2) - .addComponent(btn3)) + .addComponent(btn1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(btn2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(btn3, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addGap(12, 12, 12)) ); @@ -176,10 +218,7 @@ public class UserRequestDialog extends MageDialog { }//GEN-LAST:event_btn3ActionPerformed private void sendUserReplay(PlayerAction playerAction) { - Session session = MageFrame.getSession(); - if (session != null && playerAction != null) { - session.sendPlayerAction(playerAction, userRequestMessage.getGameId(), userRequestMessage.getRelatedUserId()); - } + MageFrame.getInstance().sendUserReplay(playerAction, userRequestMessage); } // Variables declaration - do not modify//GEN-BEGIN:variables diff --git a/Mage.Client/src/main/java/mage/client/draft/DraftPanel.java b/Mage.Client/src/main/java/mage/client/draft/DraftPanel.java index 7b1f9ca069f..468cf211e6e 100644 --- a/Mage.Client/src/main/java/mage/client/draft/DraftPanel.java +++ b/Mage.Client/src/main/java/mage/client/draft/DraftPanel.java @@ -57,7 +57,6 @@ import javax.swing.AbstractAction; import javax.swing.ImageIcon; import javax.swing.JComponent; import javax.swing.JMenuItem; -import javax.swing.JOptionPane; import javax.swing.JPopupMenu; import javax.swing.KeyStroke; import javax.swing.Timer; @@ -74,12 +73,14 @@ import mage.client.util.ImageHelper; import mage.client.util.Listener; import mage.client.util.audio.AudioManager; import mage.client.util.gui.BufferedImageBuilder; +import mage.constants.PlayerAction; import mage.remote.Session; import mage.view.CardsView; import mage.view.DraftPickView; import mage.view.DraftView; import mage.view.SimpleCardView; import mage.view.SimpleCardsView; +import mage.view.UserRequestMessage; import org.apache.log4j.Logger; /** @@ -910,10 +911,11 @@ public class DraftPanel extends javax.swing.JPanel { }// //GEN-END:initComponents private void btnQuitTournamentActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnQuitTournamentActionPerformed - if (JOptionPane.showConfirmDialog(this, "Are you sure you want to quit the tournament?", "Confirm quit tournament", JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) { - MageFrame.getSession().quitDraft(draftId); - MageFrame.removeDraft(draftId); - } + UserRequestMessage message = new UserRequestMessage("Confirm quit tournament", "Are you sure you want to quit the draft tournament?"); + message.setButton1("No", null); + message.setButton2("Yes", PlayerAction.CLIENT_QUIT_DRAFT_TOURNAMENT); + message.setTournamentId(draftId); + MageFrame.getInstance().showUserRequestDialog(message); }//GEN-LAST:event_btnQuitTournamentActionPerformed // Variables declaration - do not modify//GEN-BEGIN:variables diff --git a/Mage.Client/src/main/java/mage/client/game/GamePanel.java b/Mage.Client/src/main/java/mage/client/game/GamePanel.java index 87866fa518c..0c7f476d3a2 100644 --- a/Mage.Client/src/main/java/mage/client/game/GamePanel.java +++ b/Mage.Client/src/main/java/mage/client/game/GamePanel.java @@ -141,6 +141,7 @@ import mage.view.MatchView; import mage.view.PlayerView; import mage.view.RevealedView; import mage.view.SimpleCardsView; +import mage.view.UserRequestMessage; import org.apache.log4j.Logger; import org.mage.card.arcane.CardPanel; import org.mage.plugins.card.utils.impl.ImageManagerImpl; @@ -1051,10 +1052,6 @@ public final class GamePanel extends javax.swing.JPanel { ArrowBuilder.getBuilder().removeAllArrows(gameId); } - public int modalQuestion(String message, String title) { - return JOptionPane.showConfirmDialog(this, message, title, JOptionPane.YES_NO_OPTION); - } - public void select(String message, GameView gameView, int messageId, Map options) { updateGame(gameView, options); boolean controllingPlayer = false; @@ -1875,9 +1872,11 @@ public final class GamePanel extends javax.swing.JPanel { } private void btnConcedeActionPerformed(java.awt.event.ActionEvent evt) { - if (modalQuestion("Are you sure you want to concede?", "Confirm concede") == JOptionPane.YES_OPTION) { - session.sendPlayerAction(PlayerAction.CONCEDE, gameId, null); - } + UserRequestMessage message = new UserRequestMessage("Confirm concede", "Are you sure you want to concede?"); + message.setButton1("No", null); + message.setButton2("Yes", PlayerAction.CLIENT_CONCEDE_GAME); + message.setGameId(gameId); + MageFrame.getInstance().showUserRequestDialog(message); } private void btnEndTurnActionPerformed(java.awt.event.ActionEvent evt) { @@ -1941,17 +1940,22 @@ public final class GamePanel extends javax.swing.JPanel { } private void btnStopWatchingActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnStopWatchingActionPerformed - if (modalQuestion("Are you sure you want to stop watching?", "Stop watching") == JOptionPane.YES_OPTION) { - session.stopWatching(gameId); - this.removeGame(); - } + UserRequestMessage message = new UserRequestMessage("Stop watching", "Are you sure you want to stop watching?"); + message.setButton1("No", null); + message.setButton2("Yes", PlayerAction.CLIENT_STOP_WATCHING); + message.setGameId(gameId); + MageFrame.getInstance().showUserRequestDialog(message); }//GEN-LAST:event_btnStopWatchingActionPerformed private void btnStopReplayActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnStopReplayActionPerformed if (replayTask != null && !replayTask.isDone()) { replayTask.cancel(true); - } else if (modalQuestion("Are you sure you want to stop replay?", "Stop replay") == JOptionPane.YES_OPTION) { - session.stopReplay(gameId); + } else { + UserRequestMessage message = new UserRequestMessage("Stop replay", "Are you sure you want to stop replay?"); + message.setButton1("No", null); + message.setButton2("Yes", PlayerAction.CLIENT_REPLAY_ACTION); + message.setGameId(gameId); + MageFrame.getInstance().showUserRequestDialog(message); } }//GEN-LAST:event_btnStopReplayActionPerformed diff --git a/Mage.Client/src/main/java/mage/client/game/PlayAreaPanel.java b/Mage.Client/src/main/java/mage/client/game/PlayAreaPanel.java index ad43989cc61..2498a302abb 100644 --- a/Mage.Client/src/main/java/mage/client/game/PlayAreaPanel.java +++ b/Mage.Client/src/main/java/mage/client/game/PlayAreaPanel.java @@ -44,7 +44,6 @@ import javax.swing.GroupLayout.Alignment; import javax.swing.JCheckBoxMenuItem; import javax.swing.JMenu; import javax.swing.JMenuItem; -import javax.swing.JOptionPane; import javax.swing.JPopupMenu; import javax.swing.LayoutStyle.ComponentPlacement; import javax.swing.MenuSelectionManager; @@ -59,6 +58,7 @@ import static mage.client.dialog.PreferencesDialog.KEY_GAME_MANA_AUTOPAYMENT_ONL import mage.client.util.GUISizeHelper; import mage.constants.PlayerAction; import mage.view.PlayerView; +import mage.view.UserRequestMessage; /** * @@ -421,15 +421,19 @@ public class PlayAreaPanel extends javax.swing.JPanel { public void actionPerformed(ActionEvent e) { switch (e.getActionCommand()) { case "Game": { - if (JOptionPane.showConfirmDialog(PlayAreaPanel.this, "Are you sure you want to concede the game?", "Confirm concede game", JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) { - MageFrame.getSession().sendPlayerAction(PlayerAction.CONCEDE, gameId, null); - } + UserRequestMessage message = new UserRequestMessage("Confirm concede game", "Are you sure you want to concede the game?"); + message.setButton1("No", null); + message.setButton2("Yes", PlayerAction.CLIENT_CONCEDE_GAME); + message.setGameId(gameId); + MageFrame.getInstance().showUserRequestDialog(message); break; } case "Match": { - if (JOptionPane.showConfirmDialog(PlayAreaPanel.this, "Are you sure you want to concede the complete match?", "Confirm concede match", JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) { - MageFrame.getSession().quitMatch(gameId); - } + UserRequestMessage message = new UserRequestMessage("Confirm concede match", "Are you sure you want to concede the complete match?"); + message.setButton1("No", null); + message.setButton2("Yes", PlayerAction.CLIENT_CONCEDE_MATCH); + message.setGameId(gameId); + MageFrame.getInstance().showUserRequestDialog(message); break; } } @@ -483,10 +487,11 @@ public class PlayAreaPanel extends javax.swing.JPanel { menuItem.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - if (JOptionPane.showConfirmDialog(PlayAreaPanel.this, "Are you sure you want to stop watching the game?", "Confirm stop watching game", JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) { - gamePanel.getSession().stopWatching(gameId); - gamePanel.removeGame(); - } + UserRequestMessage message = new UserRequestMessage("Confirm stop watching game", "Are you sure you want to stop watching the game?"); + message.setButton1("No", null); + message.setButton2("Yes", PlayerAction.CLIENT_STOP_WATCHING); + message.setGameId(gameId); + MageFrame.getInstance().showUserRequestDialog(message); } }); diff --git a/Mage.Client/src/main/java/mage/client/table/PlayersChatPanel.java b/Mage.Client/src/main/java/mage/client/table/PlayersChatPanel.java index efbc491461e..4e11dd3faad 100644 --- a/Mage.Client/src/main/java/mage/client/table/PlayersChatPanel.java +++ b/Mage.Client/src/main/java/mage/client/table/PlayersChatPanel.java @@ -404,7 +404,7 @@ public class PlayersChatPanel extends javax.swing.JPanel { if (col != null) { MageFrame.getInstance().getBalloonTip().setAttachedComponent(header); JLabel content = new JLabel(tips.get(table.convertColumnIndexToModel(vColIndex))); - content.setFont(GUISizeHelper.tooltipFont); + content.setFont(GUISizeHelper.balloonTooltipFont); MageFrame.getInstance().getBalloonTip().setContents(content); ToolTipUtils.balloonToToolTip(MageFrame.getInstance().getBalloonTip(), 600, 10000); } else { diff --git a/Mage.Client/src/main/java/mage/client/table/TablesPanel.java b/Mage.Client/src/main/java/mage/client/table/TablesPanel.java index afc7fac2a6a..73febdc729d 100644 --- a/Mage.Client/src/main/java/mage/client/table/TablesPanel.java +++ b/Mage.Client/src/main/java/mage/client/table/TablesPanel.java @@ -86,6 +86,7 @@ import mage.client.util.gui.GuiDisplayUtil; import mage.client.util.gui.TableUtil; import mage.constants.MatchTimeLimit; import mage.constants.MultiplayerAttackOption; +import mage.constants.PlayerAction; import mage.constants.RangeOfInfluence; import mage.constants.SkillLevel; import mage.game.match.MatchOptions; @@ -94,6 +95,7 @@ import mage.remote.Session; import mage.view.MatchView; import mage.view.RoomUsersView; import mage.view.TableView; +import mage.view.UserRequestMessage; import org.apache.log4j.Logger; /** @@ -120,6 +122,9 @@ public class TablesPanel extends javax.swing.JPanel { private int currentMessage; private MageTableRowSorter activeTablesSorter; + private final ButtonColumn actionButton1; + private final ButtonColumn actionButton2; + JToggleButton[] filterButtons; /** @@ -216,9 +221,10 @@ public class TablesPanel extends javax.swing.JPanel { } break; case "Remove": - if (JOptionPane.showConfirmDialog(null, "Are you sure you want to remove table?", "Removing table", JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) { - session.removeTable(roomId, tableId); - } + UserRequestMessage message = new UserRequestMessage("Removing table", "Are you sure you want to remove table?"); + message.setButton1("No", null); + message.setButton2("Yes", PlayerAction.CLIENT_REMOVE_TABLE); + MageFrame.getInstance().showUserRequestDialog(message); break; case "Show": if (isTournament) { @@ -269,8 +275,8 @@ public class TablesPanel extends javax.swing.JPanel { }; // !!!! adds action buttons to the table panel (don't delete this) - new ButtonColumn(tableTables, openTableAction, tableTables.convertColumnIndexToView(TableTableModel.ACTION_COLUMN)); - new ButtonColumn(tableCompleted, closedTableAction, tableCompleted.convertColumnIndexToView(MatchesTableModel.ACTION_COLUMN)); + actionButton1 = new ButtonColumn(tableTables, openTableAction, tableTables.convertColumnIndexToView(TableTableModel.ACTION_COLUMN)); + actionButton2 = new ButtonColumn(tableCompleted, closedTableAction, tableCompleted.convertColumnIndexToView(MatchesTableModel.ACTION_COLUMN)); // !!!! } @@ -281,6 +287,8 @@ public class TablesPanel extends javax.swing.JPanel { public void changeGUISize() { chatPanelMain.changeGUISize(); + actionButton1.changeGUISize(); + actionButton2.changeGUISize(); setGUISize(); } diff --git a/Mage.Client/src/main/java/mage/client/tournament/TournamentPanel.java b/Mage.Client/src/main/java/mage/client/tournament/TournamentPanel.java index d44a6636933..133e50c375f 100644 --- a/Mage.Client/src/main/java/mage/client/tournament/TournamentPanel.java +++ b/Mage.Client/src/main/java/mage/client/tournament/TournamentPanel.java @@ -46,7 +46,6 @@ import java.util.concurrent.ExecutionException; import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.Icon; -import javax.swing.JOptionPane; import javax.swing.SwingWorker; import javax.swing.table.AbstractTableModel; import mage.client.MageFrame; @@ -61,11 +60,13 @@ import mage.client.util.Format; import mage.client.util.GUISizeHelper; import mage.client.util.gui.TableUtil; import mage.client.util.gui.countryBox.CountryCellRenderer; +import mage.constants.PlayerAction; import mage.remote.Session; import mage.view.RoundView; import mage.view.TournamentGameView; import mage.view.TournamentPlayerView; import mage.view.TournamentView; +import mage.view.UserRequestMessage; import org.apache.log4j.Logger; /** @@ -87,6 +88,8 @@ public class TournamentPanel extends javax.swing.JPanel { private UpdateTournamentTask updateTask; private final DateFormat df; + private final ButtonColumn actionButtonColumn1; + /** * Creates new form TournamentPanel */ @@ -107,8 +110,6 @@ public class TournamentPanel extends javax.swing.JPanel { tableMatches.createDefaultColumnsFromModel(); TableUtil.setColumnWidthAndOrder(tableMatches, DEFAULT_COLUMNS_WIDTH_MATCHES, KEY_TOURNAMENT_MATCH_COLUMNS_WIDTH, KEY_TOURNAMENT_MATCH_COLUMNS_ORDER); - setGUISize(); - chatPanel1.useExtendedView(ChatPanelBasic.VIEW_MODE.NONE); chatPanel1.setChatType(ChatPanelBasic.ChatType.TOURNAMENT); @@ -134,7 +135,8 @@ public class TournamentPanel extends javax.swing.JPanel { }; // action button, don't delete this - ButtonColumn buttonColumn = new ButtonColumn(tableMatches, action, tableMatches.convertColumnIndexToView(TournamentMatchesTableModel.ACTION_COLUMN)); + actionButtonColumn1 = new ButtonColumn(tableMatches, action, tableMatches.convertColumnIndexToView(TournamentMatchesTableModel.ACTION_COLUMN)); + setGUISize(); } @@ -167,6 +169,8 @@ public class TournamentPanel extends javax.swing.JPanel { jScrollPane1.getHorizontalScrollBar().setPreferredSize(new Dimension(0, GUISizeHelper.scrollBarSize)); jScrollPane2.getVerticalScrollBar().setPreferredSize(new Dimension(GUISizeHelper.scrollBarSize, 0)); jScrollPane2.getHorizontalScrollBar().setPreferredSize(new Dimension(0, GUISizeHelper.scrollBarSize)); + + actionButtonColumn1.changeGUISize(); } private void saveDividerLocations() { @@ -535,10 +539,10 @@ public class TournamentPanel extends javax.swing.JPanel { }//GEN-LAST:event_btnCloseWindowActionPerformed private void btnQuitTournamentActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnQuitTournamentActionPerformed - if (JOptionPane.showConfirmDialog(this, "Are you sure you want to quit the tournament?", "Confirm quit tournament", JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) { - MageFrame.getSession().quitTournament(tournamentId); - } - + UserRequestMessage message = new UserRequestMessage("Confirm quit tournament", "Are you sure you want to quit the tournament?"); + message.setButton1("No", null); + message.setButton2("Yes", PlayerAction.CLIENT_QUIT_TOURNAMENT); + MageFrame.getInstance().showUserRequestDialog(message); }//GEN-LAST:event_btnQuitTournamentActionPerformed private void txtNameActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_txtNameActionPerformed diff --git a/Mage.Client/src/main/java/mage/client/util/ButtonColumn.java b/Mage.Client/src/main/java/mage/client/util/ButtonColumn.java index baada9087a6..7815d8bfdcb 100644 --- a/Mage.Client/src/main/java/mage/client/util/ButtonColumn.java +++ b/Mage.Client/src/main/java/mage/client/util/ButtonColumn.java @@ -63,6 +63,7 @@ public class ButtonColumn extends AbstractCellEditor implements TableCellRendere editButton = new JButton(); editButton.setFocusPainted(false); editButton.addActionListener(this); + setGUISize(); TableColumnModel columnModel = table.getColumnModel(); columnModel.getColumn(column).setCellRenderer(this); @@ -70,6 +71,15 @@ public class ButtonColumn extends AbstractCellEditor implements TableCellRendere table.addMouseListener(this); } + public void changeGUISize() { + setGUISize(); + } + + private void setGUISize() { + renderButton.setFont(GUISizeHelper.tableFont); + editButton.setFont(GUISizeHelper.tableFont); + } + @Override public Object getCellEditorValue() { return text; 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 22d8b495bd2..fccec1bb83e 100644 --- a/Mage.Client/src/main/java/mage/client/util/GUISizeHelper.java +++ b/Mage.Client/src/main/java/mage/client/util/GUISizeHelper.java @@ -36,21 +36,19 @@ public class GUISizeHelper { public static int flagHeight; + public static int cardTooltipFontSize = 15; public static Font chatFont = new java.awt.Font("Arial", 0, 12); public static Font tableFont = new java.awt.Font("Arial", 0, 12); - public static Font tooltipFont = new java.awt.Font("Arial", 0, 12); + public static Font balloonTooltipFont = new java.awt.Font("Arial", 0, 12); public static Font menuFont = new java.awt.Font("Arial", 0, 12); + public static Font gameRequestsFont = new java.awt.Font("Arial", 0, 12); + public static Font gameDialogAreaFontBig = new java.awt.Font("Arial", 0, 12); public static Font gameDialogAreaFontSmall = new java.awt.Font("Arial", 0, 12); public static Dimension handCardDimension; - public static Font getToolbarFont() { - int fontSize = PreferencesDialog.getCachedValue(PreferencesDialog.KEY_GUI_TABLE_FONT_SIZE, 14); - return new java.awt.Font("Arial", 0, fontSize); - } - public static int getTableRowHeight() { int fontSize = PreferencesDialog.getCachedValue(PreferencesDialog.KEY_GUI_TABLE_FONT_SIZE, 14); return fontSize + 6; @@ -71,47 +69,49 @@ public class GUISizeHelper { tableFont = new java.awt.Font("Arial", 0, tableFontSize); tableRowHeight = tableFontSize + 4; tableHeaderHeight = tableFontSize + 10; - - tooltipFont = new java.awt.Font("Arial", 0, tableFontSize - 2); - // used for popup menus - menuFont = new java.awt.Font("Arial", 0, tableFontSize); - - int chatFontSize = PreferencesDialog.getCachedValue(PreferencesDialog.KEY_GUI_CHAT_FONT_SIZE, 14); - chatFont = new java.awt.Font("Arial", 0, chatFontSize); - - // Set basic symbol size - if (tableFontSize > 24) { - flagHeight = tableFontSize - 4; - } else { - flagHeight = 11; - } - if (tableFontSize < 25) { - basicSymbolSize = "small"; - } else if (tableFontSize < 45) { - basicSymbolSize = "medium"; - } else { - basicSymbolSize = "large"; - } + flagHeight = tableFontSize - 2; + balloonTooltipFont = new Font("Arial", 0, tableFontSize); if (tableFontSize > 15) { - symbolTooltipSize = tableFontSize - 5; symbolEditorSize = tableFontSize - 5; - symbolPaySize = tableFontSize - 5; - symbolCardSize = 15; dividerBarSize = 10 + (tableFontSize / 4); scrollBarSize = 14 + (tableFontSize / 4); } else { - symbolTooltipSize = tableFontSize; symbolEditorSize = tableFontSize; - symbolPaySize = tableFontSize; - symbolCardSize = 15; dividerBarSize = 10; scrollBarSize = 14; } + // used for popup menus + int dialogFontSize = PreferencesDialog.getCachedValue(PreferencesDialog.KEY_GUI_DIALOG_FONT_SIZE, 14); + menuFont = new Font("Arial", 0, dialogFontSize); + gameRequestsFont = new Font("Arial", 0, dialogFontSize); + + int chatFontSize = PreferencesDialog.getCachedValue(PreferencesDialog.KEY_GUI_CHAT_FONT_SIZE, 14); + chatFont = new java.awt.Font("Arial", 0, chatFontSize); + + int symbolSize = PreferencesDialog.getCachedValue(PreferencesDialog.KEY_GUI_SYMBOL_SIZE, 14); + // Set basic symbol size + if (symbolSize < 25) { + basicSymbolSize = "small"; + } else if (symbolSize < 45) { + basicSymbolSize = "medium"; + } else { + basicSymbolSize = "large"; + } + if (symbolSize < 16) { + symbolTooltipSize = 15; + symbolPaySize = 15; + symbolCardSize = 15; + } else { + symbolTooltipSize = symbolSize; + symbolPaySize = symbolSize; + symbolCardSize = symbolSize; + } + cardTooltipFontSize = PreferencesDialog.getCachedValue(PreferencesDialog.KEY_GUI_TOOLTIP_SIZE, 14); + int handCardSize = PreferencesDialog.getCachedValue(PreferencesDialog.KEY_GUI_CARD_HAND_SIZE, 14); int width = CARD_IMAGE_WIDTH * handCardSize / 42; int height = CARD_IMAGE_HEIGHT * handCardSize / 42; - handCardDimension = new Dimension(width, height); } } diff --git a/Mage.Client/src/main/java/mage/client/util/gui/GuiDisplayUtil.java b/Mage.Client/src/main/java/mage/client/util/gui/GuiDisplayUtil.java index 72c3eb98af4..430b4a09d18 100644 --- a/Mage.Client/src/main/java/mage/client/util/gui/GuiDisplayUtil.java +++ b/Mage.Client/src/main/java/mage/client/util/gui/GuiDisplayUtil.java @@ -13,6 +13,7 @@ import javax.swing.JButton; import javax.swing.JLabel; import javax.swing.SwingConstants; import mage.client.MageFrame; +import mage.client.util.GUISizeHelper; import mage.constants.CardType; import mage.constants.MageObjectType; import mage.constants.Rarity; @@ -157,10 +158,8 @@ public class GuiDisplayUtil { if (((PermanentView) card).getCounters() != null) { counters = new ArrayList<>(((PermanentView) card).getCounters()); } - } else { - if (card.getCounters() != null) { - counters = new ArrayList<>(card.getCounters()); - } + } else if (card.getCounters() != null) { + counters = new ArrayList<>(card.getCounters()); } if (!counters.isEmpty()) { StringBuilder sb = new StringBuilder(); @@ -204,15 +203,14 @@ public class GuiDisplayUtil { symbolCount++; } - int fontSize = 11; - String fontFamily = "tahoma"; + int fontSize = GUISizeHelper.cardTooltipFontSize; + /*if (prefs.fontFamily == CardFontFamily.arial) fontFamily = "arial"; else if (prefs.fontFamily == CardFontFamily.verdana) { fontFamily = "verdana"; }*/ - final StringBuilder buffer = new StringBuilder(512); buffer.append(""); if (!card.isSplitCard()) { buffer.append(castingCost); @@ -307,7 +305,7 @@ public class GuiDisplayUtil { rule.append(""); rule.append(card.getLeftSplitName()); rule.append(""); rule.append(card.getLeftSplitCosts().getText()); rule.append(""); @@ -320,7 +318,7 @@ public class GuiDisplayUtil { rule.append(""); rule.append(card.getRightSplitName()); rule.append(""); rule.append(card.getRightSplitCosts().getText()); rule.append(""); diff --git a/Mage.Client/src/main/java/org/mage/card/arcane/ManaSymbols.java b/Mage.Client/src/main/java/org/mage/card/arcane/ManaSymbols.java index 2f49b43d2e6..12e52eabd19 100644 --- a/Mage.Client/src/main/java/org/mage/card/arcane/ManaSymbols.java +++ b/Mage.Client/src/main/java/org/mage/card/arcane/ManaSymbols.java @@ -32,7 +32,7 @@ public class ManaSymbols { public static void loadImages() { String[] symbols = new String[]{"0", "1", "10", "11", "12", "15", "16", "2", "3", "4", "5", "6", "7", "8", "9", "B", "BG", "BR", "G", "GU", "GW", "R", "RG", "RW", "S", "T", "U", "UB", "UR", "W", "WB", "WU", - "WP", "UP", "BP", "RP", "GP", "X", "C" /*, "Y", "Z", "slash"*/}; + "WP", "UP", "BP", "RP", "GP", "X", "C"}; MANA_IMAGES.clear(); SET_IMAGES.clear(); @@ -185,7 +185,7 @@ public class ManaSymbols { continue; } g.drawImage(image, x, y, null); - x += symbol.length() > 2 ? 10 : 12; // slash.png is only 10 pixels wide. + x += GUISizeHelper.symbolPaySize; } } @@ -202,8 +202,8 @@ public class ManaSymbols { manaCost = manaCost.replace("\\", ""); StringTokenizer tok = new StringTokenizer(manaCost, " "); while (tok.hasMoreTokens()) { - String symbol = tok.nextToken().substring(0); - width += symbol.length() > 2 ? 10 : 12; // slash.png is only 10 pixels wide. + tok.nextToken(); + width += GUISizeHelper.symbolPaySize; } return width; } diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/constants/Constants.java b/Mage.Client/src/main/java/org/mage/plugins/card/constants/Constants.java index 89b51787748..93c42dde648 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/constants/Constants.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/constants/Constants.java @@ -16,12 +16,6 @@ public class Constants { public static final Rectangle CARD_SIZE_FULL = new Rectangle(101, 149); public static final Rectangle THUMBNAIL_SIZE_FULL = new Rectangle(102, 146); - public static final int TOOLTIP_WIDTH_MIN = 320; - public static final int TOOLTIP_HEIGHT_MIN = 201; - - public static final int TOOLTIP_HEIGHT_MAX = 401; - public static final int TOOLTIP_BORDER_WIDTH = 80; - public interface IO { String imageBaseDir = "plugins" + File.separator + "images"; diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/info/CardInfoPaneImpl.java b/Mage.Client/src/main/java/org/mage/plugins/card/info/CardInfoPaneImpl.java index e0e49edf085..bb9f9014be9 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/info/CardInfoPaneImpl.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/info/CardInfoPaneImpl.java @@ -1,10 +1,10 @@ package org.mage.plugins.card.info; - import java.awt.Color; import java.awt.Component; import javax.swing.JEditorPane; import javax.swing.SwingUtilities; +import mage.client.util.GUISizeHelper; import mage.client.util.gui.GuiDisplayUtil; import mage.client.util.gui.GuiDisplayUtil.TextLines; import mage.components.CardInfoPane; @@ -13,20 +13,43 @@ import mage.view.CardView; import org.mage.card.arcane.UI; /** - * Card info pane for displaying card rules. - * Supports drawing mana symbols. + * Card info pane for displaying card rules. Supports drawing mana symbols. * * @author nantuko */ public class CardInfoPaneImpl extends JEditorPane implements CardInfoPane { + public static final int TOOLTIP_WIDTH_MIN = 160; + + public static final int TOOLTIP_HEIGHT_MIN = 120; + public static final int TOOLTIP_HEIGHT_MAX = 300; + + public static final int TOOLTIP_BORDER_WIDTH = 80; + private CardView currentCard; private int type; + private int addWidth; + private int addHeight; + private boolean setSize = false; + public CardInfoPaneImpl() { UI.setHTMLEditorKit(this); setEditable(false); setBackground(Color.white); + setGUISize(); + } + + public void changeGUISize() { + setGUISize(); + this.revalidate(); + this.repaint(); + } + + private void setGUISize() { + addWidth = 20 * GUISizeHelper.cardTooltipFontSize; + addHeight = 12 * GUISizeHelper.cardTooltipFontSize; + setSize = true; } @Override @@ -42,8 +65,8 @@ public class CardInfoPaneImpl extends JEditorPane implements CardInfoPane { try { if (!card.equals(currentCard)) { return; - } - + } + SwingUtilities.invokeLater(new Runnable() { @Override public void run() { @@ -70,20 +93,29 @@ public class CardInfoPaneImpl extends JEditorPane implements CardInfoPane { return; } boolean makeBig = (rules > 5 || ruleLength > 350); + if (setSize) { + if (makeBig) { + type = 0; + } else { + type = 1; + } + } if (makeBig && type == 0) { type = 1; container.setSize( - org.mage.plugins.card.constants.Constants.TOOLTIP_WIDTH_MIN + org.mage.plugins.card.constants.Constants.TOOLTIP_BORDER_WIDTH, - org.mage.plugins.card.constants.Constants.TOOLTIP_HEIGHT_MAX + org.mage.plugins.card.constants.Constants.TOOLTIP_BORDER_WIDTH + addWidth + TOOLTIP_WIDTH_MIN + TOOLTIP_BORDER_WIDTH, + addHeight + TOOLTIP_HEIGHT_MAX + TOOLTIP_BORDER_WIDTH ); - this.setSize(org.mage.plugins.card.constants.Constants.TOOLTIP_WIDTH_MIN, org.mage.plugins.card.constants.Constants.TOOLTIP_HEIGHT_MAX); + this.setSize(addWidth + TOOLTIP_WIDTH_MIN, + addHeight + TOOLTIP_HEIGHT_MAX); } else if (!makeBig && type == 1) { type = 0; container.setSize( - org.mage.plugins.card.constants.Constants.TOOLTIP_WIDTH_MIN + org.mage.plugins.card.constants.Constants.TOOLTIP_BORDER_WIDTH, - org.mage.plugins.card.constants.Constants.TOOLTIP_HEIGHT_MIN + org.mage.plugins.card.constants.Constants.TOOLTIP_BORDER_WIDTH + addWidth + TOOLTIP_WIDTH_MIN + TOOLTIP_BORDER_WIDTH, + addHeight + TOOLTIP_HEIGHT_MIN + TOOLTIP_BORDER_WIDTH ); - this.setSize(org.mage.plugins.card.constants.Constants.TOOLTIP_WIDTH_MIN, org.mage.plugins.card.constants.Constants.TOOLTIP_HEIGHT_MIN); + this.setSize(addWidth + TOOLTIP_WIDTH_MIN, + addHeight + TOOLTIP_HEIGHT_MIN); } } diff --git a/Mage.Common/src/mage/view/UserRequestMessage.java b/Mage.Common/src/mage/view/UserRequestMessage.java index a72a55987f4..69b4f18804a 100644 --- a/Mage.Common/src/mage/view/UserRequestMessage.java +++ b/Mage.Common/src/mage/view/UserRequestMessage.java @@ -35,32 +35,32 @@ import mage.constants.PlayerAction; * * @author LevelX2 */ - public class UserRequestMessage implements Serializable { + private static final long serialVersionUID = 1L; - private final String titel; - private final String message; - private final PlayerAction requestAction; - private UUID relatedUserId; - private String relatedUserName; - private UUID matchId; - private UUID gameId; + private final String titel; + private final String message; + private UUID relatedUserId; + private String relatedUserName; + private UUID matchId; + private UUID tournamentId; + private UUID gameId; + private UUID roomId; + private UUID tableId; - private String button1Text; + private String button1Text; private PlayerAction button1Action; - private String button2Text; + private String button2Text; private PlayerAction button2Action; - private String button3Text; + private String button3Text; private PlayerAction button3Action; - - public UserRequestMessage(String titel, String message, PlayerAction requestAction) { + public UserRequestMessage(String titel, String message) { this.titel = titel; this.message = message; - this.requestAction = requestAction; this.button1Action = null; this.button2Action = null; this.button3Action = null; @@ -88,6 +88,7 @@ public class UserRequestMessage implements Serializable { this.button2Text = text; this.button2Action = buttonAction; } + public void setButton3(String text, PlayerAction buttonAction) { this.button3Text = text; this.button3Action = buttonAction; @@ -105,10 +106,6 @@ public class UserRequestMessage implements Serializable { return message; } - public PlayerAction getRequestAction() { - return requestAction; - } - public UUID getRelatedUserId() { return relatedUserId; } @@ -125,6 +122,30 @@ public class UserRequestMessage implements Serializable { return gameId; } + public UUID getTournamentId() { + return tournamentId; + } + + public void setTournamentId(UUID tournamentId) { + this.tournamentId = tournamentId; + } + + public UUID getRoomId() { + return roomId; + } + + public void setRoomId(UUID roomId) { + this.roomId = roomId; + } + + public UUID getTableId() { + return tableId; + } + + public void setTableId(UUID tableId) { + this.tableId = tableId; + } + public String getButton1Text() { return button1Text; } diff --git a/Mage.Server/config/config.xml b/Mage.Server/config/config.xml index 18c0364e689..21e2db8e3fe 100644 --- a/Mage.Server/config/config.xml +++ b/Mage.Server/config/config.xml @@ -19,6 +19,7 @@ userNamePattern - pattern for user name validity check maxAiOpponents - number of allowed AI opponents on the server saveGameActivated - allow game save and replay options (not working correctly yet) + authenticationActivated - "true" = user have to register to signon "false" = user need not to register * mail configs only needed if authentication is activated: * if mailUser = "" mailgun is used otherwise nativ mail server on the system diff --git a/Mage.Server/src/main/java/mage/server/game/GameSessionPlayer.java b/Mage.Server/src/main/java/mage/server/game/GameSessionPlayer.java index b0db946ee1b..e34bdab8db8 100644 --- a/Mage.Server/src/main/java/mage/server/game/GameSessionPlayer.java +++ b/Mage.Server/src/main/java/mage/server/game/GameSessionPlayer.java @@ -185,7 +185,7 @@ public class GameSessionPlayer extends GameSessionWatcher { message = "Allow to rollback " + numberTurns + " turns?"; } UserRequestMessage userRequestMessage = new UserRequestMessage( - "Request by " + requestedUser.getName(), message, PlayerAction.REQUEST_PERMISSION_TO_ROLLBACK_TURN); + "Request by " + requestedUser.getName(), message); userRequestMessage.setRelatedUser(requestingUserId, requestingUser.getName()); userRequestMessage.setGameId(game.getId()); userRequestMessage.setButton1("Accept", PlayerAction.ADD_PERMISSION_TO_ROLLBACK_TURN); @@ -203,7 +203,7 @@ public class GameSessionPlayer extends GameSessionWatcher { UserRequestMessage userRequestMessage = new UserRequestMessage( "User request", "Allow user " + watcher.getName() + " for this match to see your hand cards?
" - + "(You can revoke this every time using related popup menu item of your battlefield.)", PlayerAction.REQUEST_PERMISSION_TO_SEE_HAND_CARDS); + + "(You can revoke this every time using related popup menu item of your battlefield.)"); userRequestMessage.setRelatedUser(watcherId, watcher.getName()); userRequestMessage.setGameId(game.getId()); userRequestMessage.setButton1("Accept", PlayerAction.ADD_PERMISSION_TO_SEE_HAND_CARDS); diff --git a/Mage/src/main/java/mage/constants/PlayerAction.java b/Mage/src/main/java/mage/constants/PlayerAction.java index 746db8f13ad..baee51e5f1d 100644 --- a/Mage/src/main/java/mage/constants/PlayerAction.java +++ b/Mage/src/main/java/mage/constants/PlayerAction.java @@ -66,5 +66,17 @@ public enum PlayerAction { REQUEST_AUTO_ANSWER_TEXT_YES, REQUEST_AUTO_ANSWER_TEXT_NO, REQUEST_AUTO_ANSWER_RESET_ALL, + CLIENT_DOWNLOAD_SYMBOLS, + CLIENT_DISCONNECT, + CLIENT_QUIT_TOURNAMENT, + CLIENT_QUIT_DRAFT_TOURNAMENT, + CLIENT_CONCEDE_GAME, + CLIENT_CONCEDE_MATCH, + CLIENT_STOP_WATCHING, + CLIENT_EXIT, + CLIENT_REMOVE_TABLE, + CLIENT_DOWNLOAD_CARD_IMAGES, + CLIENT_RECONNECT, + CLIENT_REPLAY_ACTION, } diff --git a/Mage/src/main/java/mage/players/PlayerImpl.java b/Mage/src/main/java/mage/players/PlayerImpl.java index 97d6dd9a2cf..5439bf3189d 100644 --- a/Mage/src/main/java/mage/players/PlayerImpl.java +++ b/Mage/src/main/java/mage/players/PlayerImpl.java @@ -1944,11 +1944,15 @@ public abstract class PlayerImpl implements Player, Serializable { @Override public void resetPlayerPassedActions() { - this.passedAllTurns = false; + this.passed = false; this.passedTurn = false; this.passedUntilEndOfTurn = false; this.passedUntilNextMain = false; this.passedUntilStackResolved = false; + this.dateLastAddedToStack = null; + this.skippedAtLeastOnce = false; + this.passedAllTurns = false; + this.justActivatedType = null; } @Override