diff --git a/Mage.Client/src/main/java/mage/client/cards/CardsList.form b/Mage.Client/src/main/java/mage/client/cards/CardsList.form
index b719ecf1337..160cb38f9df 100644
--- a/Mage.Client/src/main/java/mage/client/cards/CardsList.form
+++ b/Mage.Client/src/main/java/mage/client/cards/CardsList.form
@@ -7,6 +7,9 @@
+
+
+
@@ -26,50 +29,55 @@
-
-
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
-
+
-
-
-
+
+
+
+
@@ -88,21 +96,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -118,6 +111,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -146,7 +173,6 @@
-
@@ -155,14 +181,25 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Mage.Client/src/main/java/mage/client/cards/CardsList.java b/Mage.Client/src/main/java/mage/client/cards/CardsList.java
index 0687af43f40..d19d2f67ac5 100644
--- a/Mage.Client/src/main/java/mage/client/cards/CardsList.java
+++ b/Mage.Client/src/main/java/mage/client/cards/CardsList.java
@@ -113,10 +113,12 @@ public class CardsList extends javax.swing.JPanel implements MouseListener, ICar
}
private void makeTransparent() {
- jScrollPane1.setOpaque(false);
+ panelCardArea.setOpaque(false);
cardArea.setOpaque(false);
- jScrollPane1.getViewport().setOpaque(false);
- cbSortBy.setModel(new DefaultComboBoxModel(SortBy.values()));
+ panelCardArea.getViewport().setOpaque(false);
+ panelControl.setBackground(new Color(250, 250, 250, 150));
+ panelControl.setOpaque(true);
+ cbSortBy.setModel(new DefaultComboBoxModel<>(SortBy.values()));
}
private void initListViewComponents() {
@@ -140,7 +142,7 @@ public class CardsList extends javax.swing.JPanel implements MouseListener, ICar
mainTable.getColumnModel().getColumn(7).setPreferredWidth(15);
if (PreferencesDialog.getCachedValue(PreferencesDialog.KEY_DRAFT_VIEW, "cardView").equals("listView")) {
- jScrollPane1.setViewportView(mainTable);
+ panelCardArea.setViewportView(mainTable);
currentView = mainModel;
cbSortBy.setEnabled(false);
chkPiles.setEnabled(false);
@@ -148,7 +150,7 @@ public class CardsList extends javax.swing.JPanel implements MouseListener, ICar
jToggleCardView.setSelected(true);
jToggleListView.setSelected(false);
currentView = this;
- jScrollPane1.setViewportView(cardArea);
+ panelCardArea.setViewportView(cardArea);
cbSortBy.setEnabled(true);
chkPiles.setEnabled(true);
}
@@ -386,28 +388,26 @@ public class CardsList extends javax.swing.JPanel implements MouseListener, ICar
// //GEN-BEGIN:initComponents
private void initComponents() {
- jScrollPane1 = new javax.swing.JScrollPane();
- cardArea = new javax.swing.JLayeredPane();
- jPanel1 = new javax.swing.JPanel();
- cbSortBy = new javax.swing.JComboBox();
+ panelControl = new javax.swing.JPanel();
lblCount = new javax.swing.JLabel();
lblCreatureCount = new javax.swing.JLabel();
lblLandCount = new javax.swing.JLabel();
+ chkPiles = new javax.swing.JCheckBox();
+ cbSortBy = new javax.swing.JComboBox();
jToggleListView = new javax.swing.JToggleButton();
jToggleCardView = new javax.swing.JToggleButton();
- chkPiles = new javax.swing.JCheckBox();
+ panelCardArea = new javax.swing.JScrollPane();
+ cardArea = new javax.swing.JLayeredPane();
setBorder(javax.swing.BorderFactory.createLineBorder(new java.awt.Color(0, 0, 0)));
+ setMinimumSize(new java.awt.Dimension(30, 30));
setPreferredSize((!Beans.isDesignTime())?(new Dimension(Config.dimensions.frameWidth, Config.dimensions.frameHeight)):(new Dimension(100, 100)));
- jScrollPane1.setViewportView(cardArea);
-
- cbSortBy.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
- cbSortBy.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- cbSortByActionPerformed(evt);
- }
- });
+ panelControl.setMaximumSize(new java.awt.Dimension(32767, 23));
+ panelControl.setMinimumSize(new java.awt.Dimension(616, 23));
+ panelControl.setName(""); // NOI18N
+ panelControl.setPreferredSize(new java.awt.Dimension(616, 23));
+ panelControl.setRequestFocusEnabled(false);
lblCount.setText("Card Count");
@@ -415,6 +415,25 @@ public class CardsList extends javax.swing.JPanel implements MouseListener, ICar
lblLandCount.setText("Land Count");
+ chkPiles.setText("Piles");
+ chkPiles.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ chkPilesActionPerformed(evt);
+ }
+ });
+
+ cbSortBy.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "SortBy" }));
+ cbSortBy.setToolTipText("Sort the cards if card view is active.");
+ cbSortBy.setMaximumSize(new java.awt.Dimension(80, 20));
+ cbSortBy.setMinimumSize(new java.awt.Dimension(80, 20));
+ cbSortBy.setName("SortBy"); // NOI18N
+ cbSortBy.setPreferredSize(new java.awt.Dimension(80, 20));
+ cbSortBy.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ cbSortByActionPerformed(evt);
+ }
+ });
+
jToggleListView.setSelected(true);
jToggleListView.setText("ListView");
jToggleListView.setFocusable(false);
@@ -430,7 +449,6 @@ public class CardsList extends javax.swing.JPanel implements MouseListener, ICar
jToggleCardView.setText("CardView");
jToggleCardView.setMaximumSize(new java.awt.Dimension(77, 21));
jToggleCardView.setMinimumSize(new java.awt.Dimension(77, 21));
- jToggleCardView.setOpaque(true);
jToggleCardView.setPreferredSize(new java.awt.Dimension(77, 21));
jToggleCardView.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -438,35 +456,30 @@ public class CardsList extends javax.swing.JPanel implements MouseListener, ICar
}
});
- chkPiles.setText("Piles");
- chkPiles.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- chkPilesActionPerformed(evt);
- }
- });
-
- 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()
- .addComponent(lblCount, javax.swing.GroupLayout.PREFERRED_SIZE, 81, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+ javax.swing.GroupLayout panelControlLayout = new javax.swing.GroupLayout(panelControl);
+ panelControl.setLayout(panelControlLayout);
+ panelControlLayout.setHorizontalGroup(
+ panelControlLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelControlLayout.createSequentialGroup()
+ .addContainerGap()
+ .addComponent(lblCount, javax.swing.GroupLayout.PREFERRED_SIZE, 75, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(lblCreatureCount, javax.swing.GroupLayout.PREFERRED_SIZE, 100, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(lblLandCount, javax.swing.GroupLayout.PREFERRED_SIZE, 75, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(chkPiles)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
- .addComponent(cbSortBy, 0, 1, Short.MAX_VALUE)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+ .addComponent(cbSortBy, javax.swing.GroupLayout.PREFERRED_SIZE, 120, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(jToggleListView, javax.swing.GroupLayout.PREFERRED_SIZE, 76, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(jToggleCardView, javax.swing.GroupLayout.PREFERRED_SIZE, 85, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addComponent(jToggleCardView, javax.swing.GroupLayout.PREFERRED_SIZE, 85, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addGap(92, 92, 92))
);
- jPanel1Layout.setVerticalGroup(
- jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ panelControlLayout.setVerticalGroup(
+ panelControlLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(panelControlLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(cbSortBy, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(lblCount)
.addComponent(lblCreatureCount)
@@ -476,22 +489,45 @@ public class CardsList extends javax.swing.JPanel implements MouseListener, ICar
.addComponent(jToggleListView, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
);
+ panelCardArea.setBorder(javax.swing.BorderFactory.createBevelBorder(javax.swing.border.BevelBorder.LOWERED));
+ panelCardArea.setViewportView(cardArea);
+
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
this.setLayout(layout);
layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 959, Short.MAX_VALUE)
+ .addComponent(panelCardArea)
+ .addComponent(panelControl, javax.swing.GroupLayout.DEFAULT_SIZE, 910, Short.MAX_VALUE)
);
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
- .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 233, Short.MAX_VALUE))
+ .addComponent(panelControl, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addGap(0, 0, 0)
+ .addComponent(panelCardArea, javax.swing.GroupLayout.DEFAULT_SIZE, 50, Short.MAX_VALUE))
);
}// //GEN-END:initComponents
+ private void jToggleCardViewActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jToggleCardViewActionPerformed
+ jToggleListView.setSelected(false);
+ currentView = this;
+ panelCardArea.setViewportView(cardArea);
+ cbSortBy.setEnabled(true);
+ chkPiles.setEnabled(true);
+ redrawCards();
+ PreferencesDialog.saveValue(PreferencesDialog.KEY_DRAFT_VIEW, "cardView");
+ }//GEN-LAST:event_jToggleCardViewActionPerformed
+
+ private void jToggleListViewActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jToggleListViewActionPerformed
+ jToggleCardView.setSelected(false);
+ currentView = mainModel;
+ panelCardArea.setViewportView(mainTable);
+ cbSortBy.setEnabled(false);
+ chkPiles.setEnabled(false);
+ redrawCards();
+ PreferencesDialog.saveValue(PreferencesDialog.KEY_DRAFT_VIEW, "listView");
+ }//GEN-LAST:event_jToggleListViewActionPerformed
+
private void cbSortByActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cbSortByActionPerformed
sortSetting.setSortBy((SortBy) cbSortBy.getSelectedItem());
drawCards(sortSetting);
@@ -502,37 +538,17 @@ public class CardsList extends javax.swing.JPanel implements MouseListener, ICar
drawCards(sortSetting);
}//GEN-LAST:event_chkPilesActionPerformed
- private void jToggleListViewActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jToggleListViewActionPerformed
- jToggleCardView.setSelected(false);
- currentView = mainModel;
- jScrollPane1.setViewportView(mainTable);
- cbSortBy.setEnabled(false);
- chkPiles.setEnabled(false);
- redrawCards();
- PreferencesDialog.saveValue(PreferencesDialog.KEY_DRAFT_VIEW, "listView");
- }//GEN-LAST:event_jToggleListViewActionPerformed
-
- private void jToggleCardViewActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jToggleCardViewActionPerformed
- jToggleListView.setSelected(false);
- currentView = this;
- jScrollPane1.setViewportView(cardArea);
- cbSortBy.setEnabled(true);
- chkPiles.setEnabled(true);
- redrawCards();
- PreferencesDialog.saveValue(PreferencesDialog.KEY_DRAFT_VIEW, "cardView");
- }//GEN-LAST:event_jToggleCardViewActionPerformed
-
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JLayeredPane cardArea;
- private javax.swing.JComboBox cbSortBy;
+ private javax.swing.JComboBox cbSortBy;
private javax.swing.JCheckBox chkPiles;
- private javax.swing.JPanel jPanel1;
- private javax.swing.JScrollPane jScrollPane1;
private javax.swing.JToggleButton jToggleCardView;
private javax.swing.JToggleButton jToggleListView;
private javax.swing.JLabel lblCount;
private javax.swing.JLabel lblCreatureCount;
private javax.swing.JLabel lblLandCount;
+ private javax.swing.JScrollPane panelCardArea;
+ private javax.swing.JPanel panelControl;
// End of variables declaration//GEN-END:variables
@Override
diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.form b/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.form
index b72dede43cb..5d4345934fe 100644
--- a/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.form
+++ b/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.form
@@ -16,25 +16,21 @@
-
-
-
-
-
-
-
-
+
+
+
+
-
+
-
-
-
-
+
+
+
+
@@ -45,6 +41,8 @@
+
+
@@ -131,10 +129,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -164,6 +174,9 @@
+
+
+
@@ -273,17 +286,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -294,6 +332,7 @@
+
@@ -319,42 +358,47 @@
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -363,7 +407,19 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -373,6 +429,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -420,7 +488,19 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -430,6 +510,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java b/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java
index c38e264f42d..4aaa9aaff9a 100644
--- a/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java
+++ b/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java
@@ -112,7 +112,7 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
cardGrid.setOpaque(false);
cardSelectorScrollPane.setOpaque(false);
cardSelectorScrollPane.getViewport().setOpaque(false);
- cbSortBy.setModel(new DefaultComboBoxModel(SortBy.values()));
+ cbSortBy.setModel(new DefaultComboBoxModel<>(SortBy.values()));
cbSortBy.setSelectedItem(sortSetting.getSortBy());
jTextFieldSearch.addActionListener(searchAction);
// make the components more readable
@@ -120,6 +120,8 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
tbColor.setOpaque(true); // false = transparent
tbTypes.setBackground(new Color(250, 250, 250, 150));
tbTypes.setOpaque(true); // false = transparent
+ cardSelectorBottomPanel.setBackground(new Color(250, 250, 250, 150));
+ cardSelectorBottomPanel.setOpaque(true); // false = transparent
}
private void initListViewComponents() {
@@ -205,7 +207,7 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
this.btnBooster.setVisible(true);
this.btnClear.setVisible(true);
this.cbExpansionSet.setVisible(true);
- cbExpansionSet.setModel(new DefaultComboBoxModel(ConstructedFormats.getTypes()));
+ cbExpansionSet.setModel(new DefaultComboBoxModel<>(ConstructedFormats.getTypes()));
// Action event on Expansion set triggers loadCards method
cbExpansionSet.setSelectedIndex(0);
}
@@ -217,7 +219,7 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
filter.add(new CardTextPredicate(name));
if (limited) {
- ArrayList> predicates = new ArrayList>();
+ ArrayList> predicates = new ArrayList<>();
if (this.rdoGreen.isSelected()) {
predicates.add(new ColorPredicate(ObjectColor.GREEN));
@@ -267,7 +269,7 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
if (this.cbExpansionSet.isVisible()) {
String expansionSelection = this.cbExpansionSet.getSelectedItem().toString();
if (!expansionSelection.equals("- All Sets")) {
- ArrayList> expansionPredicates = new ArrayList>();
+ ArrayList> expansionPredicates = new ArrayList<>();
for (String setCode : ConstructedFormats.getSetsByFormat(expansionSelection)) {
expansionPredicates.add(new ExpansionSetPredicate(setCode));
}
@@ -324,7 +326,7 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
private void filterCards() {
FilterCard filter = buildFilter();
try {
- List filteredCards = new ArrayList();
+ List filteredCards = new ArrayList<>();
setCursor(new Cursor(Cursor.WAIT_CURSOR));
if (limited) {
for (Card card: cards) {
@@ -358,7 +360,7 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
}
public List getCardGridComponents() {
- List components = new ArrayList();
+ List components = new ArrayList<>();
components.add(mainModel);
components.add(cardGrid);
return components;
@@ -391,7 +393,7 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
rdoBlack = new javax.swing.JRadioButton();
rdoWhite = new javax.swing.JRadioButton();
rdoColorless = new javax.swing.JRadioButton();
- cbExpansionSet = new javax.swing.JComboBox();
+ cbExpansionSet = new javax.swing.JComboBox();
btnBooster = new javax.swing.JButton();
btnClear = new javax.swing.JButton();
tbTypes = new javax.swing.JToolBar();
@@ -403,7 +405,7 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
rdoSorceries = new javax.swing.JRadioButton();
rdoPlaneswalkers = new javax.swing.JRadioButton();
chkPiles = new javax.swing.JCheckBox();
- cbSortBy = new javax.swing.JComboBox();
+ cbSortBy = new javax.swing.JComboBox();
jToggleListView = new javax.swing.JToggleButton();
jToggleCardView = new javax.swing.JToggleButton();
cardSelectorScrollPane = new javax.swing.JScrollPane();
@@ -421,6 +423,8 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
tbColor.setFloatable(false);
tbColor.setRollover(true);
+ tbColor.setBorderPainted(false);
+ tbColor.setName(""); // NOI18N
rdoRed.setSelected(true);
rdoRed.setText("Red ");
@@ -495,6 +499,9 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
tbColor.add(rdoColorless);
cbExpansionSet.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
+ cbExpansionSet.setMaximumSize(new java.awt.Dimension(250, 25));
+ cbExpansionSet.setMinimumSize(new java.awt.Dimension(250, 25));
+ cbExpansionSet.setPreferredSize(new java.awt.Dimension(250, 25));
cbExpansionSet.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
cbExpansionSetActionPerformed(evt);
@@ -526,6 +533,7 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
tbTypes.setFloatable(false);
tbTypes.setRollover(true);
+ tbTypes.setPreferredSize(new java.awt.Dimension(732, 27));
rdoLand.setSelected(true);
rdoLand.setFocusable(false);
@@ -623,6 +631,9 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
tbTypes.add(chkPiles);
cbSortBy.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
+ cbSortBy.setMaximumSize(new java.awt.Dimension(120, 20));
+ cbSortBy.setMinimumSize(new java.awt.Dimension(120, 20));
+ cbSortBy.setPreferredSize(new java.awt.Dimension(120, 20));
cbSortBy.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
cbSortByActionPerformed(evt);
@@ -633,7 +644,12 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
jToggleListView.setSelected(true);
jToggleListView.setText("ListView");
jToggleListView.setFocusable(false);
+ jToggleListView.setHorizontalAlignment(javax.swing.SwingConstants.LEADING);
jToggleListView.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+ jToggleListView.setMargin(new java.awt.Insets(2, 4, 2, 4));
+ jToggleListView.setMaximumSize(new java.awt.Dimension(51, 21));
+ jToggleListView.setMinimumSize(new java.awt.Dimension(51, 21));
+ jToggleListView.setPreferredSize(new java.awt.Dimension(51, 21));
jToggleListView.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
jToggleListView.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -644,6 +660,7 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
jToggleCardView.setText("CardView");
jToggleCardView.setFocusable(false);
+ jToggleCardView.setHorizontalAlignment(javax.swing.SwingConstants.LEADING);
jToggleCardView.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
jToggleCardView.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
jToggleCardView.addActionListener(new java.awt.event.ActionListener() {
@@ -657,7 +674,11 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
cardSelectorBottomPanel.setPreferredSize(new java.awt.Dimension(897, 35));
jButtonAddToMain.setText("+");
- jButtonAddToMain.setToolTipText("Add to Main");
+ jButtonAddToMain.setToolTipText("Add selected card to deck");
+ jButtonAddToMain.setMargin(new java.awt.Insets(2, 10, 2, 10));
+ jButtonAddToMain.setMaximumSize(new java.awt.Dimension(36, 23));
+ jButtonAddToMain.setMinimumSize(new java.awt.Dimension(36, 23));
+ jButtonAddToMain.setPreferredSize(new java.awt.Dimension(36, 23));
jButtonAddToMain.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
jButtonAddToMainActionPerformed(evt);
@@ -666,6 +687,10 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
jButtonAddToSideboard.setText("+S");
jButtonAddToSideboard.setToolTipText("Add to Sideboard");
+ jButtonAddToSideboard.setMargin(new java.awt.Insets(2, 4, 2, 4));
+ jButtonAddToSideboard.setMaximumSize(new java.awt.Dimension(36, 23));
+ jButtonAddToSideboard.setMinimumSize(new java.awt.Dimension(36, 23));
+ jButtonAddToSideboard.setPreferredSize(new java.awt.Dimension(36, 23));
jButtonAddToSideboard.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
jButtonAddToSideboardActionPerformed(evt);
@@ -693,7 +718,11 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
cardCount.setText("0");
jButtonRemoveFromMain.setText("-");
- jButtonRemoveFromMain.setToolTipText("Remove from Main");
+ jButtonRemoveFromMain.setToolTipText("Remove selected card from deck");
+ jButtonRemoveFromMain.setMargin(new java.awt.Insets(2, 10, 2, 10));
+ jButtonRemoveFromMain.setMaximumSize(new java.awt.Dimension(36, 23));
+ jButtonRemoveFromMain.setMinimumSize(new java.awt.Dimension(36, 23));
+ jButtonRemoveFromMain.setPreferredSize(new java.awt.Dimension(36, 23));
jButtonRemoveFromMain.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
jButtonRemoveFromMainActionPerformed(evt);
@@ -702,6 +731,10 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
jButtonRemoveFromSideboard.setText("-S");
jButtonRemoveFromSideboard.setToolTipText("Remove from Sideboard");
+ jButtonRemoveFromSideboard.setMargin(new java.awt.Insets(2, 4, 2, 4));
+ jButtonRemoveFromSideboard.setMaximumSize(new java.awt.Dimension(36, 23));
+ jButtonRemoveFromSideboard.setMinimumSize(new java.awt.Dimension(36, 23));
+ jButtonRemoveFromSideboard.setPreferredSize(new java.awt.Dimension(36, 23));
jButtonRemoveFromSideboard.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
jButtonRemoveFromSideboardActionPerformed(evt);
@@ -713,40 +746,44 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
cardSelectorBottomPanelLayout.setHorizontalGroup(
cardSelectorBottomPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(cardSelectorBottomPanelLayout.createSequentialGroup()
- .addComponent(jButtonAddToMain)
+ .addGap(6, 6, 6)
+ .addComponent(jButtonAddToMain, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(jButtonRemoveFromMain, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(jButtonAddToSideboard, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(jButtonRemoveFromSideboard, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(jButtonRemoveFromMain)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
- .addComponent(jButtonAddToSideboard)
- .addGap(5, 5, 5)
- .addComponent(jButtonRemoveFromSideboard)
- .addGap(18, 18, 18)
.addComponent(jLabel1)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
- .addComponent(jTextFieldSearch, javax.swing.GroupLayout.PREFERRED_SIZE, 112, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(jTextFieldSearch, javax.swing.GroupLayout.PREFERRED_SIZE, 135, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addGap(2, 2, 2)
.addComponent(jButtonSearch)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(jButtonClean)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(cardCountLabel)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(cardCount, javax.swing.GroupLayout.PREFERRED_SIZE, 48, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addContainerGap(121, Short.MAX_VALUE))
+ .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
cardSelectorBottomPanelLayout.setVerticalGroup(
cardSelectorBottomPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(cardSelectorBottomPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
- .addComponent(jButtonAddToMain)
- .addComponent(jLabel1)
- .addComponent(jTextFieldSearch, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(jButtonSearch)
- .addComponent(jButtonClean)
- .addComponent(cardCountLabel)
- .addComponent(cardCount)
- .addComponent(jButtonRemoveFromMain)
- .addComponent(jButtonAddToSideboard)
- .addComponent(jButtonRemoveFromSideboard))
+ .addGroup(cardSelectorBottomPanelLayout.createSequentialGroup()
+ .addGap(4, 4, 4)
+ .addGroup(cardSelectorBottomPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(jButtonAddToMain, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(jButtonRemoveFromMain, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(jButtonAddToSideboard, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(jButtonRemoveFromSideboard, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(jLabel1)
+ .addComponent(jTextFieldSearch, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(jButtonSearch)
+ .addComponent(jButtonClean)
+ .addComponent(cardCountLabel)
+ .addComponent(cardCount))
+ .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
cardCountLabel.getAccessibleContext().setAccessibleName("cardCountLabel");
@@ -756,23 +793,20 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
this.setLayout(layout);
layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(tbColor, javax.swing.GroupLayout.DEFAULT_SIZE, 917, Short.MAX_VALUE)
- .addComponent(tbTypes, javax.swing.GroupLayout.DEFAULT_SIZE, 917, Short.MAX_VALUE)
- .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
- .addContainerGap()
- .addComponent(cardSelectorBottomPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addContainerGap())
- .addComponent(cardSelectorScrollPane, javax.swing.GroupLayout.DEFAULT_SIZE, 917, Short.MAX_VALUE)
+ .addComponent(tbColor, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(tbTypes, javax.swing.GroupLayout.DEFAULT_SIZE, 897, Short.MAX_VALUE)
+ .addComponent(cardSelectorScrollPane)
+ .addComponent(cardSelectorBottomPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
);
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
- .addComponent(tbColor, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(tbColor, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addGap(0, 0, 0)
+ .addComponent(tbTypes, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addGap(0, 0, 0)
+ .addComponent(cardSelectorScrollPane, javax.swing.GroupLayout.DEFAULT_SIZE, 220, Short.MAX_VALUE)
.addGap(0, 0, 0)
- .addComponent(tbTypes, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(cardSelectorScrollPane, javax.swing.GroupLayout.DEFAULT_SIZE, 273, Short.MAX_VALUE)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(cardSelectorBottomPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
);
}// //GEN-END:initComponents
@@ -970,7 +1004,7 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
}
public List asList(final int[] is) {
- List list = new ArrayList();
+ List list = new ArrayList<>();
for (int i : is) {
list.add(i);
}
@@ -997,8 +1031,8 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
private javax.swing.JLabel cardCountLabel;
private javax.swing.JPanel cardSelectorBottomPanel;
private javax.swing.JScrollPane cardSelectorScrollPane;
- private javax.swing.JComboBox cbExpansionSet;
- private javax.swing.JComboBox cbSortBy;
+ private javax.swing.JComboBox cbExpansionSet;
+ private javax.swing.JComboBox cbSortBy;
private javax.swing.JCheckBox chkPiles;
private javax.swing.JButton jButtonAddToMain;
private javax.swing.JButton jButtonAddToSideboard;
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 b1784da0c16..b6b1c9212b1 100644
--- a/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.form
+++ b/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.form
@@ -112,6 +112,7 @@
+
@@ -228,6 +229,7 @@
+
@@ -579,6 +581,9 @@
+
+
+
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 240e4ecedd7..d6421d5c109 100644
--- a/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java
+++ b/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java
@@ -383,6 +383,7 @@ public class PreferencesDialog extends javax.swing.JDialog {
main_card.setLayout(new java.awt.BorderLayout());
displayBigCardsInHand.setText("Use big images (for high resolution screens)");
+ displayBigCardsInHand.setToolTipText("Changes the size of the cards shown in hand. Switch this option off if you have a small screen size.");
displayBigCardsInHand.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
displayBigCardsInHand.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -442,6 +443,7 @@ public class PreferencesDialog extends javax.swing.JDialog {
cbGameLogAutoSave.setSelected(true);
cbGameLogAutoSave.setText("Auto save game logs (to \"../Mage.Client/gamelogs/\" directory)");
+ cbGameLogAutoSave.setToolTipText("The logs of all your games will be saved to the mentioned folder if this option is switched on.");
cbGameLogAutoSave.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
cbGameLogAutoSaveActionPerformed(evt);
@@ -614,6 +616,8 @@ public class PreferencesDialog extends javax.swing.JDialog {
}
});
+ txtImageFolderPath.setToolTipText("The selected image will be used as background picture. You have to restart MAGE to view a changed background image.");
+
btnBrowseImageLocation.setText("Browse...");
btnBrowseImageLocation.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {