External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 04:52:07 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Deck editor - Some minor changes to deck editor design.

Browse source
This commit is contained in:
LevelX2 2014-05-07 22:52:32 +02:00
parent 89aa727e05
commit dff2c9ab73
4 changed files with 72 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Mage.Client/src/main/java/mage/client/cards/CardsList.form
View file

@ -30,7 +30,7 @@
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<Component id="panelCardArea" alignment="0" max="32767" attributes="0"/>
<Component id="panelControl" pref="910" max="32767" attributes="0"/>
<Component id="panelControl" pref="674" max="32767" attributes="0"/>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
@ -38,7 +38,7 @@
<Group type="102" alignment="0" attributes="0">
<Component id="panelControl" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="0" max="-2" attributes="0"/>
<Component id="panelCardArea" pref="50" max="32767" attributes="0"/>
<Component id="panelCardArea" pref="69" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>

4
Mage.Client/src/main/java/mage/client/cards/CardsList.java
View file

@ -497,14 +497,14 @@ public class CardsList extends javax.swing.JPanel implements MouseListener, ICar
layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(panelCardArea)
.addComponent(panelControl, javax.swing.GroupLayout.DEFAULT_SIZE, 910, Short.MAX_VALUE)
.addComponent(panelControl, javax.swing.GroupLayout.DEFAULT_SIZE, 674, Short.MAX_VALUE)
);
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.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))
.addComponent(panelCardArea, javax.swing.GroupLayout.DEFAULT_SIZE, 69, Short.MAX_VALUE))
);
}// </editor-fold>//GEN-END:initComponents

64
Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.form
View file

@ -29,7 +29,7 @@
<EmptySpace min="-2" pref="0" max="-2" attributes="0"/>
<Component id="tbTypes" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="0" max="-2" attributes="0"/>
<Component id="cardSelectorScrollPane" pref="220" max="32767" attributes="0"/>
<Component id="cardSelectorScrollPane" pref="215" max="32767" attributes="0"/>
<EmptySpace min="0" pref="0" max="-2" attributes="0"/>
<Component id="cardSelectorBottomPanel" min="-2" max="-2" attributes="0"/>
</Group>
@ -307,20 +307,20 @@
<Properties>
<Property name="selected" type="boolean" value="true"/>
<Property name="text" type="java.lang.String" value="ListView"/>
<Property name="borderPainted" type="boolean" value="false"/>
<Property name="focusable" type="boolean" value="false"/>
<Property name="horizontalAlignment" type="int" value="10"/>
<Property name="horizontalTextPosition" type="int" value="0"/>
<Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
<Insets value="[2, 4, 2, 4]"/>
<Insets value="[2, 2, 2, 2]"/>
</Property>
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[51, 21]"/>
<Dimension value="[70, 23]"/>
</Property>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[51, 21]"/>
<Dimension value="[70, 23]"/>
</Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[51, 21]"/>
<Dimension value="[70, 23]"/>
</Property>
<Property name="verticalTextPosition" type="int" value="3"/>
</Properties>
@ -331,9 +331,21 @@
<Component class="javax.swing.JToggleButton" name="jToggleCardView">
<Properties>
<Property name="text" type="java.lang.String" value="CardView"/>
<Property name="borderPainted" type="boolean" value="false"/>
<Property name="focusable" type="boolean" value="false"/>
<Property name="horizontalAlignment" type="int" value="10"/>
<Property name="horizontalTextPosition" type="int" value="0"/>
<Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
<Insets value="[2, 2, 2, 2]"/>
</Property>
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[70, 23]"/>
</Property>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[70, 23]"/>
</Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[70, 23]"/>
</Property>
<Property name="verticalTextPosition" type="int" value="3"/>
</Properties>
<Events>
@ -350,7 +362,7 @@
<Properties>
<Property name="opaque" type="boolean" value="false"/>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[897, 35]"/>
<Dimension value="[897, 40]"/>
</Property>
</Properties>
@ -384,10 +396,9 @@
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="4" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="jButtonAddToMain" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="jButtonRemoveFromMain" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="jButtonAddToSideboard" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="jButtonRemoveFromSideboard" alignment="3" min="-2" max="-2" attributes="0"/>
@ -397,6 +408,7 @@
<Component id="jButtonClean" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="cardCountLabel" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="cardCount" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="jButtonAddToMain" alignment="3" max="-2" attributes="0"/>
</Group>
<EmptySpace max="32767" attributes="0"/>
</Group>
@ -409,16 +421,16 @@
<Property name="text" type="java.lang.String" value="+"/>
<Property name="toolTipText" type="java.lang.String" value="Add selected card to deck"/>
<Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
<Insets value="[2, 10, 2, 10]"/>
<Insets value="null"/>
</Property>
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[36, 23]"/>
<Dimension value="[42, 23]"/>
</Property>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[36, 23]"/>
<Dimension value="[42, 23]"/>
</Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[36, 23]"/>
<Dimension value="[42, 30]"/>
</Property>
</Properties>
<Events>
@ -430,16 +442,16 @@
<Property name="text" type="java.lang.String" value="+S"/>
<Property name="toolTipText" type="java.lang.String" value="Add to Sideboard"/>
<Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
<Insets value="[2, 4, 2, 4]"/>
<Insets value="[2, 0, 2, 0]"/>
</Property>
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[36, 23]"/>
<Dimension value="[100, 30]"/>
</Property>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[36, 23]"/>
<Dimension value="[10, 30]"/>
</Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[36, 23]"/>
<Dimension value="[50, 30]"/>
</Property>
</Properties>
<Events>
@ -490,16 +502,16 @@
<Property name="text" type="java.lang.String" value="-"/>
<Property name="toolTipText" type="java.lang.String" value="Remove selected card from deck"/>
<Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
<Insets value="[2, 10, 2, 10]"/>
<Insets value="null"/>
</Property>
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[36, 23]"/>
<Dimension value="[42, 23]"/>
</Property>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[36, 23]"/>
<Dimension value="[42, 23]"/>
</Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[36, 23]"/>
<Dimension value="[42, 30]"/>
</Property>
</Properties>
<Events>
@ -511,16 +523,16 @@
<Property name="text" type="java.lang.String" value="-S"/>
<Property name="toolTipText" type="java.lang.String" value="Remove from Sideboard"/>
<Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
<Insets value="[2, 4, 2, 4]"/>
<Insets value="[2, 0, 2, 0]"/>
</Property>
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[36, 23]"/>
<Dimension value="[10, 30]"/>
</Property>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[36, 23]"/>
<Dimension value="[100, 30]"/>
</Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[36, 23]"/>
<Dimension value="[50, 30]"/>
</Property>
</Properties>
<Events>

56
Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java
View file

@ -643,13 +643,13 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
jToggleListView.setSelected(true);
jToggleListView.setText("ListView");
jToggleListView.setBorderPainted(false);
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.setMargin(new java.awt.Insets(2, 2, 2, 2));
jToggleListView.setMaximumSize(new java.awt.Dimension(70, 23));
jToggleListView.setMinimumSize(new java.awt.Dimension(70, 23));
jToggleListView.setPreferredSize(new java.awt.Dimension(70, 23));
jToggleListView.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
jToggleListView.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
@ -659,9 +659,13 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
tbTypes.add(jToggleListView);
jToggleCardView.setText("CardView");
jToggleCardView.setBorderPainted(false);
jToggleCardView.setFocusable(false);
jToggleCardView.setHorizontalAlignment(javax.swing.SwingConstants.LEADING);
jToggleCardView.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
jToggleCardView.setMargin(new java.awt.Insets(2, 2, 2, 2));
jToggleCardView.setMaximumSize(new java.awt.Dimension(70, 23));
jToggleCardView.setMinimumSize(new java.awt.Dimension(70, 23));
jToggleCardView.setPreferredSize(new java.awt.Dimension(70, 23));
jToggleCardView.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
jToggleCardView.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
@ -671,14 +675,14 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
tbTypes.add(jToggleCardView);
cardSelectorBottomPanel.setOpaque(false);
cardSelectorBottomPanel.setPreferredSize(new java.awt.Dimension(897, 35));
cardSelectorBottomPanel.setPreferredSize(new java.awt.Dimension(897, 40));
jButtonAddToMain.setText("+");
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.setMargin(null);
jButtonAddToMain.setMaximumSize(new java.awt.Dimension(42, 23));
jButtonAddToMain.setMinimumSize(new java.awt.Dimension(42, 23));
jButtonAddToMain.setPreferredSize(new java.awt.Dimension(42, 30));
jButtonAddToMain.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
jButtonAddToMainActionPerformed(evt);
@ -687,10 +691,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.setMargin(new java.awt.Insets(2, 0, 2, 0));
jButtonAddToSideboard.setMaximumSize(new java.awt.Dimension(100, 30));
jButtonAddToSideboard.setMinimumSize(new java.awt.Dimension(10, 30));
jButtonAddToSideboard.setPreferredSize(new java.awt.Dimension(50, 30));
jButtonAddToSideboard.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
jButtonAddToSideboardActionPerformed(evt);
@ -719,10 +723,10 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
jButtonRemoveFromMain.setText("-");
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.setMargin(null);
jButtonRemoveFromMain.setMaximumSize(new java.awt.Dimension(42, 23));
jButtonRemoveFromMain.setMinimumSize(new java.awt.Dimension(42, 23));
jButtonRemoveFromMain.setPreferredSize(new java.awt.Dimension(42, 30));
jButtonRemoveFromMain.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
jButtonRemoveFromMainActionPerformed(evt);
@ -731,10 +735,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.setMargin(new java.awt.Insets(2, 0, 2, 0));
jButtonRemoveFromSideboard.setMaximumSize(new java.awt.Dimension(10, 30));
jButtonRemoveFromSideboard.setMinimumSize(new java.awt.Dimension(100, 30));
jButtonRemoveFromSideboard.setPreferredSize(new java.awt.Dimension(50, 30));
jButtonRemoveFromSideboard.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
jButtonRemoveFromSideboardActionPerformed(evt);
@ -773,7 +777,6 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
.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)
@ -782,7 +785,8 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
.addComponent(jButtonSearch)
.addComponent(jButtonClean)
.addComponent(cardCountLabel)
.addComponent(cardCount))
.addComponent(cardCount)
.addComponent(jButtonAddToMain, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
@ -805,7 +809,7 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
.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)
.addComponent(cardSelectorScrollPane, javax.swing.GroupLayout.DEFAULT_SIZE, 215, Short.MAX_VALUE)
.addGap(0, 0, 0)
.addComponent(cardSelectorBottomPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
);