From 4c129706ca96f73e56da8b9a158398d446716049 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Mon, 1 Jul 2013 08:27:33 +0200 Subject: [PATCH] Cleanup layout of preferences dialog. --- .../mage/client/dialog/PreferencesDialog.form | 315 +++++++----- .../mage/client/dialog/PreferencesDialog.java | 458 ++++++++++-------- 2 files changed, 434 insertions(+), 339 deletions(-) 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 139f891215..b794ca0afd 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.form +++ b/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.form @@ -24,7 +24,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -49,11 +49,11 @@ - + - + @@ -68,8 +68,8 @@ - - + + @@ -79,16 +79,16 @@ - + - - + + - + @@ -110,7 +110,7 @@ - + @@ -120,7 +120,7 @@ - + @@ -145,7 +145,7 @@ - + @@ -164,7 +164,7 @@ - + @@ -194,7 +194,7 @@ - + @@ -262,7 +262,7 @@ - + @@ -334,7 +334,7 @@ - + @@ -420,7 +420,7 @@ - + @@ -432,11 +432,11 @@ - + - - - + + + @@ -447,9 +447,9 @@ - + - + @@ -472,27 +472,22 @@ + - - + + + + + + - - - + + - - - - - - - - - @@ -510,7 +505,7 @@ - + @@ -569,31 +564,18 @@ - + - - - - - - - - - - - - - - - - - - + + + + + @@ -602,6 +584,13 @@ + + + + + + + @@ -609,7 +598,7 @@ - + @@ -627,7 +616,6 @@ - @@ -697,7 +685,7 @@ - + @@ -709,86 +697,159 @@ - - + + - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - + + + + - + - + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -827,7 +888,7 @@ - + @@ -902,7 +963,7 @@ - + @@ -998,7 +1059,7 @@ - + @@ -1010,12 +1071,12 @@ - + - + @@ -1073,7 +1134,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 f031ad93ae..c68e2cb341 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java +++ b/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java @@ -200,14 +200,14 @@ public class PreferencesDialog extends javax.swing.JDialog { // //GEN-BEGIN:initComponents private void initComponents() { - jTabbedPane1 = new javax.swing.JTabbedPane(); - jPanel1 = new javax.swing.JPanel(); - jPanel3 = new javax.swing.JPanel(); + tabsPanel = new javax.swing.JTabbedPane(); + tabMain = new javax.swing.JPanel(); + main_hand = new javax.swing.JPanel(); showToolTipsInAnyZone = new javax.swing.JCheckBox(); displayBigCardsInHand = new javax.swing.JCheckBox(); - jPanel7 = new javax.swing.JPanel(); + main_battlefield = new javax.swing.JPanel(); nonLandPermanentsInOnePile = new javax.swing.JCheckBox(); - jPanel2 = new javax.swing.JPanel(); + tabPhases = new javax.swing.JPanel(); jLabel1 = new javax.swing.JLabel(); jLabel2 = new javax.swing.JLabel(); jLabel3 = new javax.swing.JLabel(); @@ -232,7 +232,7 @@ public class PreferencesDialog extends javax.swing.JDialog { checkBoxEndOfCOthers = new javax.swing.JCheckBox(); checkBoxMain2Others = new javax.swing.JCheckBox(); checkBoxEndTurnOthers = new javax.swing.JCheckBox(); - jPanel4 = new javax.swing.JPanel(); + tabImages = new javax.swing.JPanel(); jPanel5 = new javax.swing.JPanel(); useDefaultImageFolder = new javax.swing.JCheckBox(); imageFolderPath = new javax.swing.JTextField(); @@ -249,13 +249,15 @@ public class PreferencesDialog extends javax.swing.JDialog { useRandomBattleImage = new javax.swing.JCheckBox(); jLabel14 = new javax.swing.JLabel(); jLabel15 = new javax.swing.JLabel(); - jPanel22 = new javax.swing.JPanel(); + tabSounds = new javax.swing.JPanel(); + sounds_clips = new javax.swing.JPanel(); jEnableSounds = new javax.swing.JCheckBox(); + sounds_backgroundMusic = new javax.swing.JPanel(); jEnableMusics = new javax.swing.JCheckBox(); - BattlefieldIBGMPath = new javax.swing.JTextField(); BattlefieldBGMButton = new javax.swing.JButton(); - MusicPath = new java.awt.Label(); - jPanel6 = new javax.swing.JPanel(); + BattlefieldIBGMPath = new javax.swing.JTextField(); + jLabel16 = new javax.swing.JLabel(); + tabConnection = new javax.swing.JPanel(); lblProxyType = new javax.swing.JLabel(); cbProxyType = new javax.swing.JComboBox(); pnlProxySettings = new javax.swing.JPanel(); @@ -270,7 +272,7 @@ public class PreferencesDialog extends javax.swing.JDialog { txtPasswordField = new javax.swing.JPasswordField(); rememberPswd = new javax.swing.JCheckBox(); jLabel11 = new javax.swing.JLabel(); - jPanel8 = new javax.swing.JPanel(); + tabAvatars = new javax.swing.JPanel(); jScrollPane1 = new javax.swing.JScrollPane(); jPanel9 = new javax.swing.JPanel(); jPanel10 = new javax.swing.JPanel(); @@ -293,7 +295,7 @@ public class PreferencesDialog extends javax.swing.JDialog { setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); setTitle("Preferences"); - jPanel3.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createEtchedBorder(), "Hand")); + main_hand.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createEtchedBorder(), "Hand")); showToolTipsInAnyZone.setSelected(true); showToolTipsInAnyZone.setText("Show tooltips"); @@ -310,27 +312,27 @@ public class PreferencesDialog extends javax.swing.JDialog { } }); - javax.swing.GroupLayout jPanel3Layout = new javax.swing.GroupLayout(jPanel3); - jPanel3.setLayout(jPanel3Layout); - jPanel3Layout.setHorizontalGroup( - jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel3Layout.createSequentialGroup() + javax.swing.GroupLayout main_handLayout = new javax.swing.GroupLayout(main_hand); + main_hand.setLayout(main_handLayout); + main_handLayout.setHorizontalGroup( + main_handLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(main_handLayout.createSequentialGroup() .addContainerGap() - .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(main_handLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(showToolTipsInAnyZone) .addComponent(displayBigCardsInHand)) - .addContainerGap(164, Short.MAX_VALUE)) + .addContainerGap(180, Short.MAX_VALUE)) ); - jPanel3Layout.setVerticalGroup( - jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel3Layout.createSequentialGroup() + main_handLayout.setVerticalGroup( + main_handLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(main_handLayout.createSequentialGroup() .addComponent(showToolTipsInAnyZone) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(displayBigCardsInHand) - .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addContainerGap(59, Short.MAX_VALUE)) ); - jPanel7.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createEtchedBorder(), "Battlefield")); + main_battlefield.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createEtchedBorder(), "Battlefield")); nonLandPermanentsInOnePile.setSelected(true); nonLandPermanentsInOnePile.setLabel("Put non-land permanents in one pile"); @@ -340,46 +342,46 @@ public class PreferencesDialog extends javax.swing.JDialog { } }); - javax.swing.GroupLayout jPanel7Layout = new javax.swing.GroupLayout(jPanel7); - jPanel7.setLayout(jPanel7Layout); - jPanel7Layout.setHorizontalGroup( - jPanel7Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel7Layout.createSequentialGroup() + javax.swing.GroupLayout main_battlefieldLayout = new javax.swing.GroupLayout(main_battlefield); + main_battlefield.setLayout(main_battlefieldLayout); + main_battlefieldLayout.setHorizontalGroup( + main_battlefieldLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(main_battlefieldLayout.createSequentialGroup() .addContainerGap() .addComponent(nonLandPermanentsInOnePile) - .addContainerGap(202, Short.MAX_VALUE)) + .addContainerGap(226, Short.MAX_VALUE)) ); - jPanel7Layout.setVerticalGroup( - jPanel7Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel7Layout.createSequentialGroup() + main_battlefieldLayout.setVerticalGroup( + main_battlefieldLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(main_battlefieldLayout.createSequentialGroup() .addComponent(nonLandPermanentsInOnePile) .addContainerGap(30, Short.MAX_VALUE)) ); nonLandPermanentsInOnePile.getAccessibleContext().setAccessibleName("nonLandPermanentsInOnePile"); - javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1); - jPanel1.setLayout(jPanel1Layout); - jPanel1Layout.setHorizontalGroup( - jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel1Layout.createSequentialGroup() + javax.swing.GroupLayout tabMainLayout = new javax.swing.GroupLayout(tabMain); + tabMain.setLayout(tabMainLayout); + tabMainLayout.setHorizontalGroup( + tabMainLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, tabMainLayout.createSequentialGroup() .addContainerGap() - .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(jPanel7, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(jPanel3, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addGroup(tabMainLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) + .addComponent(main_battlefield, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(main_hand, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addContainerGap()) ); - jPanel1Layout.setVerticalGroup( - jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel1Layout.createSequentialGroup() + tabMainLayout.setVerticalGroup( + tabMainLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(tabMainLayout.createSequentialGroup() .addContainerGap() - .addComponent(jPanel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(main_hand, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(jPanel7, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addContainerGap(230, Short.MAX_VALUE)) + .addComponent(main_battlefield, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addContainerGap(162, Short.MAX_VALUE)) ); - jTabbedPane1.addTab("Main", jPanel1); + tabsPanel.addTab("Main", tabMain); jLabel1.setText("Choose phases MAGE will stop on:"); @@ -401,32 +403,32 @@ public class PreferencesDialog extends javax.swing.JDialog { jLabel10.setText("Opponent(s) turn"); - javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout(jPanel2); - jPanel2.setLayout(jPanel2Layout); - jPanel2Layout.setHorizontalGroup( - jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel2Layout.createSequentialGroup() - .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel2Layout.createSequentialGroup() + javax.swing.GroupLayout tabPhasesLayout = new javax.swing.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() .addGap(20, 20, 20) - .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel2Layout.createSequentialGroup() - .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(tabPhasesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(tabPhasesLayout.createSequentialGroup() + .addGroup(tabPhasesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(jLabel2) .addComponent(jLabel5) .addComponent(jLabel6) .addComponent(jLabel7) .addComponent(jLabel8)) .addGap(77, 77, 77) - .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel2Layout.createSequentialGroup() + .addGroup(tabPhasesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(tabPhasesLayout.createSequentialGroup() .addGap(2, 2, 2) .addComponent(jLabel9) .addGap(32, 32, 32) .addComponent(jLabel10)) - .addGroup(jPanel2Layout.createSequentialGroup() + .addGroup(tabPhasesLayout.createSequentialGroup() .addGap(13, 13, 13) - .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) + .addGroup(tabPhasesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) .addComponent(checkBoxDrawYou) .addComponent(checkBoxUpkeepYou) .addComponent(checkBoxMainYou) @@ -435,7 +437,7 @@ public class PreferencesDialog extends javax.swing.JDialog { .addComponent(checkBoxMain2You) .addComponent(checkBoxEndTurnYou)) .addGap(78, 78, 78) - .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) + .addGroup(tabPhasesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) .addComponent(checkBoxUpkeepOthers) .addComponent(checkBoxBeforeCOthers) .addComponent(checkBoxMainOthers) @@ -443,71 +445,71 @@ public class PreferencesDialog extends javax.swing.JDialog { .addComponent(checkBoxDrawOthers) .addComponent(checkBoxMain2Others) .addComponent(checkBoxEndTurnOthers))))) - .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false) + .addGroup(tabPhasesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false) .addComponent(jLabel4, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(jLabel3, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))) - .addGroup(jPanel2Layout.createSequentialGroup() + .addGroup(tabPhasesLayout.createSequentialGroup() .addContainerGap() .addComponent(jLabel1))) - .addContainerGap(103, Short.MAX_VALUE)) + .addContainerGap(135, Short.MAX_VALUE)) ); - jPanel2Layout.setVerticalGroup( - jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel2Layout.createSequentialGroup() + tabPhasesLayout.setVerticalGroup( + tabPhasesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(tabPhasesLayout.createSequentialGroup() .addContainerGap() - .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addGroup(jPanel2Layout.createSequentialGroup() + .addGroup(tabPhasesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) + .addGroup(tabPhasesLayout.createSequentialGroup() .addComponent(jLabel10) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addComponent(checkBoxUpkeepOthers)) - .addGroup(jPanel2Layout.createSequentialGroup() - .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addGroup(jPanel2Layout.createSequentialGroup() + .addGroup(tabPhasesLayout.createSequentialGroup() + .addGroup(tabPhasesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) + .addGroup(tabPhasesLayout.createSequentialGroup() .addComponent(jLabel1) .addGap(20, 20, 20)) .addComponent(jLabel9)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) + .addGroup(tabPhasesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) .addComponent(checkBoxUpkeepYou) .addComponent(jLabel2)))) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) + .addGroup(tabPhasesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) .addComponent(jLabel3) .addComponent(checkBoxDrawYou) .addComponent(checkBoxDrawOthers)) .addGap(4, 4, 4) - .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) + .addGroup(tabPhasesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) .addComponent(jLabel4) .addComponent(checkBoxMainYou) .addComponent(checkBoxMainOthers)) - .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel2Layout.createSequentialGroup() + .addGroup(tabPhasesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(tabPhasesLayout.createSequentialGroup() .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(tabPhasesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(jLabel5, javax.swing.GroupLayout.Alignment.TRAILING) .addComponent(checkBoxBeforeCYou, javax.swing.GroupLayout.Alignment.TRAILING))) - .addGroup(jPanel2Layout.createSequentialGroup() + .addGroup(tabPhasesLayout.createSequentialGroup() .addGap(6, 6, 6) .addComponent(checkBoxBeforeCOthers))) .addGap(7, 7, 7) - .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) + .addGroup(tabPhasesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) .addComponent(jLabel6) .addComponent(checkBoxEndOfCYou) .addComponent(checkBoxEndOfCOthers)) .addGap(9, 9, 9) - .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) + .addGroup(tabPhasesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) .addComponent(jLabel7) .addComponent(checkBoxMain2You) .addComponent(checkBoxMain2Others)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) + .addGroup(tabPhasesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) .addComponent(checkBoxEndTurnYou) .addComponent(jLabel8) .addComponent(checkBoxEndTurnOthers)) - .addContainerGap(162, Short.MAX_VALUE)) + .addContainerGap(120, Short.MAX_VALUE)) ); - jTabbedPane1.addTab("Phases", jPanel2); + tabsPanel.addTab("Phases", tabPhases); jPanel5.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createEtchedBorder(), "Card images location:")); @@ -544,22 +546,18 @@ public class PreferencesDialog extends javax.swing.JDialog { jPanel5Layout.setHorizontalGroup( jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(jPanel5Layout.createSequentialGroup() + .addContainerGap() .addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(jPanel5Layout.createSequentialGroup() - .addContainerGap() - .addComponent(useDefaultImageFolder)) + .addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(useDefaultImageFolder) + .addComponent(checkForNewImages) + .addComponent(saveToZipFiles)) + .addContainerGap(242, Short.MAX_VALUE)) .addGroup(jPanel5Layout.createSequentialGroup() - .addGap(19, 19, 19) - .addComponent(imageFolderPath, javax.swing.GroupLayout.PREFERRED_SIZE, 284, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(browseButton)) - .addGroup(jPanel5Layout.createSequentialGroup() - .addContainerGap() - .addComponent(checkForNewImages)) - .addGroup(jPanel5Layout.createSequentialGroup() - .addContainerGap() - .addComponent(saveToZipFiles))) - .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addComponent(imageFolderPath) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(browseButton)))) ); jPanel5Layout.setVerticalGroup( jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -574,7 +572,7 @@ public class PreferencesDialog extends javax.swing.JDialog { .addComponent(checkForNewImages) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(saveToZipFiles) - .addContainerGap(22, Short.MAX_VALUE)) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); jPanel23.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createEtchedBorder(), "Background images setting:")); @@ -641,26 +639,22 @@ public class PreferencesDialog extends javax.swing.JDialog { .addComponent(useDefaultBackground) .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel23Layout.createSequentialGroup() - .addGroup(jPanel23Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addGroup(jPanel23Layout.createSequentialGroup() - .addGap(0, 0, Short.MAX_VALUE) - .addComponent(jLabel14) - .addGap(18, 18, 18) - .addComponent(BackgroundImagePath, javax.swing.GroupLayout.PREFERRED_SIZE, 210, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(BackgroundBrowseButton)) - .addGroup(jPanel23Layout.createSequentialGroup() - .addComponent(jLabel15) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(BattlefieldImagePath, javax.swing.GroupLayout.PREFERRED_SIZE, 212, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(BattlefieldBrowseButton))) - .addGap(18, 18, 18)) + .addComponent(jLabel15) + .addGap(18, 18, 18) + .addComponent(BattlefieldImagePath) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(BattlefieldBrowseButton)) .addGroup(jPanel23Layout.createSequentialGroup() .addGroup(jPanel23Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(useDefaultBattleImage) .addComponent(useRandomBattleImage)) - .addGap(0, 0, Short.MAX_VALUE)))) + .addGap(0, 0, Short.MAX_VALUE)) + .addGroup(jPanel23Layout.createSequentialGroup() + .addComponent(jLabel14) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(BackgroundImagePath) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(BackgroundBrowseButton)))) ); jPanel23Layout.setVerticalGroup( jPanel23Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -680,53 +674,66 @@ public class PreferencesDialog extends javax.swing.JDialog { .addGroup(jPanel23Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(BattlefieldImagePath, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(BattlefieldBrowseButton) - .addComponent(jLabel15)) - .addContainerGap(21, Short.MAX_VALUE)) + .addComponent(jLabel15))) ); - javax.swing.GroupLayout jPanel4Layout = new javax.swing.GroupLayout(jPanel4); - jPanel4.setLayout(jPanel4Layout); - jPanel4Layout.setHorizontalGroup( - jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel4Layout.createSequentialGroup() + javax.swing.GroupLayout tabImagesLayout = new javax.swing.GroupLayout(tabImages); + tabImages.setLayout(tabImagesLayout); + tabImagesLayout.setHorizontalGroup( + tabImagesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(tabImagesLayout.createSequentialGroup() .addContainerGap() - .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(jPanel23, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(jPanel5, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addGroup(tabImagesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(jPanel5, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(jPanel23, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addContainerGap()) ); - jPanel4Layout.setVerticalGroup( - jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel4Layout.createSequentialGroup() + tabImagesLayout.setVerticalGroup( + tabImagesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(tabImagesLayout.createSequentialGroup() .addContainerGap() .addComponent(jPanel5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(jPanel23, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addContainerGap(39, Short.MAX_VALUE)) + .addContainerGap(36, Short.MAX_VALUE)) ); - jTabbedPane1.addTab("Images", jPanel4); + tabsPanel.addTab("Images", tabImages); - jEnableSounds.setText("enable sounds"); + sounds_clips.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createEtchedBorder(), "Clips")); + + jEnableSounds.setLabel("Enable"); jEnableSounds.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { jEnableSoundsActionPerformed(evt); } }); - jEnableMusics.setText("enable BGM"); + javax.swing.GroupLayout sounds_clipsLayout = new javax.swing.GroupLayout(sounds_clips); + sounds_clips.setLayout(sounds_clipsLayout); + sounds_clipsLayout.setHorizontalGroup( + sounds_clipsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(sounds_clipsLayout.createSequentialGroup() + .addContainerGap() + .addComponent(jEnableSounds) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + ); + sounds_clipsLayout.setVerticalGroup( + sounds_clipsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(jEnableSounds) + ); + + sounds_backgroundMusic.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createEtchedBorder(), "Background music during matches")); + + jEnableMusics.setToolTipText(""); + jEnableMusics.setActionCommand("Play automatically during matches"); + jEnableMusics.setLabel("Enable"); jEnableMusics.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { jEnableMusicsActionPerformed(evt); } }); - BattlefieldIBGMPath.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - BattlefieldIBGMPathActionPerformed(evt); - } - }); - BattlefieldBGMButton.setText("Browse..."); BattlefieldBGMButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -734,45 +741,70 @@ public class PreferencesDialog extends javax.swing.JDialog { } }); - MusicPath.setText("BGM Path:"); + BattlefieldIBGMPath.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + BattlefieldIBGMPathActionPerformed(evt); + } + }); - javax.swing.GroupLayout jPanel22Layout = new javax.swing.GroupLayout(jPanel22); - jPanel22.setLayout(jPanel22Layout); - jPanel22Layout.setHorizontalGroup( - jPanel22Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel22Layout.createSequentialGroup() - .addGap(19, 19, 19) - .addGroup(jPanel22Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel22Layout.createSequentialGroup() - .addComponent(MusicPath, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 18, Short.MAX_VALUE) - .addComponent(BattlefieldIBGMPath, javax.swing.GroupLayout.PREFERRED_SIZE, 218, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(BattlefieldBGMButton) - .addGap(32, 32, 32)) - .addGroup(jPanel22Layout.createSequentialGroup() - .addGroup(jPanel22Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jEnableSounds) - .addComponent(jEnableMusics)) + jLabel16.setText("Playing from folder:"); + jLabel16.setToolTipText(""); + + javax.swing.GroupLayout sounds_backgroundMusicLayout = new javax.swing.GroupLayout(sounds_backgroundMusic); + sounds_backgroundMusic.setLayout(sounds_backgroundMusicLayout); + sounds_backgroundMusicLayout.setHorizontalGroup( + sounds_backgroundMusicLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(sounds_backgroundMusicLayout.createSequentialGroup() + .addContainerGap() + .addGroup(sounds_backgroundMusicLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(sounds_backgroundMusicLayout.createSequentialGroup() + .addComponent(jLabel16) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(BattlefieldIBGMPath, javax.swing.GroupLayout.DEFAULT_SIZE, 245, Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(BattlefieldBGMButton)) + .addGroup(sounds_backgroundMusicLayout.createSequentialGroup() + .addComponent(jEnableMusics) .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))) ); - jPanel22Layout.setVerticalGroup( - jPanel22Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel22Layout.createSequentialGroup() - .addGap(24, 24, 24) - .addComponent(jEnableSounds) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + sounds_backgroundMusicLayout.setVerticalGroup( + sounds_backgroundMusicLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(sounds_backgroundMusicLayout.createSequentialGroup() .addComponent(jEnableMusics) - .addGap(18, 18, 18) - .addGroup(jPanel22Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel22Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(BattlefieldIBGMPath, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(BattlefieldBGMButton)) - .addComponent(MusicPath, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addContainerGap(291, Short.MAX_VALUE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(sounds_backgroundMusicLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(BattlefieldIBGMPath, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(BattlefieldBGMButton) + .addComponent(jLabel16))) ); - jTabbedPane1.addTab("Sounds", jPanel22); + jLabel16.getAccessibleContext().setAccessibleName("Playing from folder:"); + + javax.swing.GroupLayout tabSoundsLayout = new javax.swing.GroupLayout(tabSounds); + tabSounds.setLayout(tabSoundsLayout); + tabSoundsLayout.setHorizontalGroup( + tabSoundsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(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)) + .addContainerGap()) + ); + tabSoundsLayout.setVerticalGroup( + tabSoundsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(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(254, Short.MAX_VALUE)) + ); + + sounds_clips.getAccessibleContext().setAccessibleName("Clips"); + sounds_clips.getAccessibleContext().setAccessibleDescription(""); + + tabsPanel.addTab("Sounds", tabSounds); lblProxyType.setText("Proxy:"); @@ -837,7 +869,7 @@ public class PreferencesDialog extends javax.swing.JDialog { .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, javax.swing.GroupLayout.DEFAULT_SIZE, 298, Short.MAX_VALUE)) + .addComponent(txtProxyServer, javax.swing.GroupLayout.DEFAULT_SIZE, 342, Short.MAX_VALUE)) .addContainerGap()) ); pnlProxyLayout.setVerticalGroup( @@ -882,37 +914,37 @@ public class PreferencesDialog extends javax.swing.JDialog { .addContainerGap()) ); - javax.swing.GroupLayout jPanel6Layout = new javax.swing.GroupLayout(jPanel6); - jPanel6.setLayout(jPanel6Layout); - jPanel6Layout.setHorizontalGroup( - jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel6Layout.createSequentialGroup() - .addGroup(jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel6Layout.createSequentialGroup() + javax.swing.GroupLayout tabConnectionLayout = new javax.swing.GroupLayout(tabConnection); + tabConnection.setLayout(tabConnectionLayout); + tabConnectionLayout.setHorizontalGroup( + tabConnectionLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(tabConnectionLayout.createSequentialGroup() + .addGroup(tabConnectionLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(tabConnectionLayout.createSequentialGroup() .addGap(40, 40, 40) .addComponent(lblProxyType) .addGap(18, 18, 18) .addComponent(cbProxyType, javax.swing.GroupLayout.PREFERRED_SIZE, 126, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addGroup(jPanel6Layout.createSequentialGroup() + .addGroup(tabConnectionLayout.createSequentialGroup() .addContainerGap() .addComponent(pnlProxySettings, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))) .addContainerGap()) ); - jPanel6Layout.setVerticalGroup( - jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel6Layout.createSequentialGroup() + tabConnectionLayout.setVerticalGroup( + tabConnectionLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(tabConnectionLayout.createSequentialGroup() .addContainerGap() - .addGroup(jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addGroup(tabConnectionLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(lblProxyType) .addComponent(cbProxyType, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(pnlProxySettings, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addContainerGap(178, Short.MAX_VALUE)) + .addContainerGap(157, Short.MAX_VALUE)) ); pnlProxySettings.getAccessibleContext().setAccessibleDescription(""); - jTabbedPane1.addTab("Connection", jPanel6); + tabsPanel.addTab("Connection", tabConnection); jPanel10.setBorder(new javax.swing.border.LineBorder(new java.awt.Color(204, 204, 204), 1, true)); @@ -1113,7 +1145,7 @@ public class PreferencesDialog extends javax.swing.JDialog { .addComponent(jPanel21, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(jPanel15, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(jPanel11, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))) - .addContainerGap(29, Short.MAX_VALUE)) + .addContainerGap(79, Short.MAX_VALUE)) ); jPanel9Layout.setVerticalGroup( jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -1148,18 +1180,18 @@ public class PreferencesDialog extends javax.swing.JDialog { jScrollPane1.setViewportView(jPanel9); - javax.swing.GroupLayout jPanel8Layout = new javax.swing.GroupLayout(jPanel8); - jPanel8.setLayout(jPanel8Layout); - jPanel8Layout.setHorizontalGroup( - jPanel8Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 437, Short.MAX_VALUE) + javax.swing.GroupLayout tabAvatarsLayout = new javax.swing.GroupLayout(tabAvatars); + tabAvatars.setLayout(tabAvatarsLayout); + tabAvatarsLayout.setHorizontalGroup( + tabAvatarsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 505, Short.MAX_VALUE) ); - jPanel8Layout.setVerticalGroup( - jPanel8Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 402, Short.MAX_VALUE) + tabAvatarsLayout.setVerticalGroup( + tabAvatarsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 400, Short.MAX_VALUE) ); - jTabbedPane1.addTab("Avatars", jPanel8); + tabsPanel.addTab("Avatars", tabAvatars); saveButton.setLabel("Save"); saveButton.addActionListener(new java.awt.event.ActionListener() { @@ -1179,7 +1211,7 @@ public class PreferencesDialog extends javax.swing.JDialog { getContentPane().setLayout(layout); layout.setHorizontalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jTabbedPane1) + .addComponent(tabsPanel) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(saveButton) @@ -1190,7 +1222,7 @@ public class PreferencesDialog extends javax.swing.JDialog { layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() - .addComponent(jTabbedPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 430, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(tabsPanel, javax.swing.GroupLayout.PREFERRED_SIZE, 430, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(exitButton) @@ -1640,7 +1672,7 @@ public class PreferencesDialog extends javax.swing.JDialog { private static void openTab(int index) { try { if (index > 0) { - dialog.jTabbedPane1.setSelectedIndex(3); + dialog.tabsPanel.setSelectedIndex(3); } } catch (Exception e) { e.printStackTrace(); @@ -1723,7 +1755,7 @@ public class PreferencesDialog extends javax.swing.JDialog { } public void reset() { - jTabbedPane1.setSelectedIndex(0); + tabsPanel.setSelectedIndex(0); } public static String getCachedValue(String key, String def) { @@ -1825,7 +1857,6 @@ public class PreferencesDialog extends javax.swing.JDialog { private javax.swing.JButton BattlefieldBrowseButton; private javax.swing.JTextField BattlefieldIBGMPath; private javax.swing.JTextField BattlefieldImagePath; - private java.awt.Label MusicPath; private javax.swing.JButton browseButton; private javax.swing.JComboBox cbProxyType; private javax.swing.JCheckBox checkBoxBeforeCOthers; @@ -1855,6 +1886,7 @@ public class PreferencesDialog extends javax.swing.JDialog { private javax.swing.JLabel jLabel13; private javax.swing.JLabel jLabel14; private javax.swing.JLabel jLabel15; + private javax.swing.JLabel jLabel16; private javax.swing.JLabel jLabel2; private javax.swing.JLabel jLabel3; private javax.swing.JLabel jLabel4; @@ -1863,7 +1895,6 @@ public class PreferencesDialog extends javax.swing.JDialog { private javax.swing.JLabel jLabel7; private javax.swing.JLabel jLabel8; private javax.swing.JLabel jLabel9; - private javax.swing.JPanel jPanel1; private javax.swing.JPanel jPanel10; private javax.swing.JPanel jPanel11; private javax.swing.JPanel jPanel12; @@ -1874,25 +1905,19 @@ public class PreferencesDialog extends javax.swing.JDialog { private javax.swing.JPanel jPanel17; private javax.swing.JPanel jPanel18; private javax.swing.JPanel jPanel19; - private javax.swing.JPanel jPanel2; private javax.swing.JPanel jPanel20; private javax.swing.JPanel jPanel21; - private javax.swing.JPanel jPanel22; private javax.swing.JPanel jPanel23; - private javax.swing.JPanel jPanel3; - private javax.swing.JPanel jPanel4; private javax.swing.JPanel jPanel5; - private javax.swing.JPanel jPanel6; - private javax.swing.JPanel jPanel7; - private javax.swing.JPanel jPanel8; private javax.swing.JPanel jPanel9; private javax.swing.JScrollPane jScrollPane1; - private javax.swing.JTabbedPane jTabbedPane1; private javax.swing.JLabel lblProxyPassword; private javax.swing.JLabel lblProxyPort; private javax.swing.JLabel lblProxyServer; private javax.swing.JLabel lblProxyType; private javax.swing.JLabel lblProxyUserName; + private javax.swing.JPanel main_battlefield; + private javax.swing.JPanel main_hand; private javax.swing.JCheckBox nonLandPermanentsInOnePile; private javax.swing.JPanel pnlProxy; private javax.swing.JPanel pnlProxySettings; @@ -1900,6 +1925,15 @@ public class PreferencesDialog extends javax.swing.JDialog { private javax.swing.JButton saveButton; private javax.swing.JCheckBox saveToZipFiles; private javax.swing.JCheckBox showToolTipsInAnyZone; + private javax.swing.JPanel sounds_backgroundMusic; + private javax.swing.JPanel sounds_clips; + private javax.swing.JPanel tabAvatars; + private javax.swing.JPanel tabConnection; + private javax.swing.JPanel tabImages; + private javax.swing.JPanel tabMain; + private javax.swing.JPanel tabPhases; + private javax.swing.JPanel tabSounds; + private javax.swing.JTabbedPane tabsPanel; private javax.swing.JPasswordField txtPasswordField; private javax.swing.JTextField txtProxyPort; private javax.swing.JTextField txtProxyServer;