Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enables add/update buttons on state type change #3875

Merged
merged 2 commits into from
Mar 28, 2023
Merged

Enables add/update buttons on state type change #3875

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a508c0b
Enables add/update buttons on state type change
emmebi Mar 17, 2023
8c6bed4
Merge branch 'develop' into issue-1711-new-state-creation
cwisniew Mar 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 7 additions & 39 deletions src/main/java/net/rptools/maptool/client/ui/campaignproperties/TokenStatesController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,62 +14,28 @@
*/
package net.rptools.maptool.client.ui.campaignproperties;

import java.awt.Color;
import java.awt.Component;
import java.awt.Graphics2D;
import java.awt.Rectangle;
import java.awt.Shape;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.io.File;
import java.io.IOException;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.*;
import java.util.List;
import java.util.Map;
import java.util.Set;
import javax.swing.*;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import javax.swing.event.*;
import javax.swing.filechooser.FileFilter;
import net.rptools.lib.MD5Key;
import net.rptools.maptool.client.AppConstants;
import net.rptools.maptool.client.AppPreferences;
import net.rptools.maptool.client.swing.AbeillePanel;
import net.rptools.maptool.client.swing.ColorWell;
import net.rptools.maptool.client.ui.PreviewPanelFileChooser;
import net.rptools.maptool.client.ui.token.AbstractTokenOverlay;
import net.rptools.maptool.client.ui.token.BooleanTokenOverlay;
import net.rptools.maptool.client.ui.token.ColorDotTokenOverlay;
import net.rptools.maptool.client.ui.token.CornerImageTokenOverlay;
import net.rptools.maptool.client.ui.token.CrossTokenOverlay;
import net.rptools.maptool.client.ui.token.DiamondTokenOverlay;
import net.rptools.maptool.client.ui.token.FlowColorDotTokenOverlay;
import net.rptools.maptool.client.ui.token.FlowColorSquareTokenOverlay;
import net.rptools.maptool.client.ui.token.FlowDiamondTokenOverlay;
import net.rptools.maptool.client.ui.token.FlowImageTokenOverlay;
import net.rptools.maptool.client.ui.token.FlowTriangleTokenOverlay;
import net.rptools.maptool.client.ui.token.FlowYieldTokenOverlay;
import net.rptools.maptool.client.ui.token.ImageTokenOverlay;
import net.rptools.maptool.client.ui.token.OTokenOverlay;
import net.rptools.maptool.client.ui.token.ShadedTokenOverlay;
import net.rptools.maptool.client.ui.token.TriangleTokenOverlay;
import net.rptools.maptool.client.ui.token.XTokenOverlay;
import net.rptools.maptool.client.ui.token.YieldTokenOverlay;
import net.rptools.maptool.client.ui.token.*;
import net.rptools.maptool.language.I18N;
import net.rptools.maptool.model.Asset;
import net.rptools.maptool.model.AssetManager;
import net.rptools.maptool.model.Campaign;
import net.rptools.maptool.model.CampaignProperties;
import net.rptools.maptool.model.Token;
import net.rptools.maptool.model.*;
import net.rptools.maptool.model.drawing.AbstractTemplate.Quadrant;
import net.rptools.maptool.util.StringUtil;

Expand Down Expand Up @@ -382,6 +348,7 @@ public void actionPerformed(ActionEvent e) {
// Change the enabled data components.
} else if (TYPE.equals(name)) {
enableDataComponents();
changedUpdate(null);

// Update the selected overlay
} else if (UPDATE.equals(name)) {
Expand Down Expand Up @@ -597,6 +564,7 @@ public void valueChanged(ListSelectionEvent e) {
// Set the type and change components
formPanel.getComboBox(TYPE).setSelectedIndex(type.ordinal());
enableDataComponents();
changedUpdate(null);
}
}

Expand Down