mirror of
https://github.com/OMGeeky/ATCS.git
synced 2025-12-26 23:57:25 +01:00
remove some commented out code from earlier
This commit is contained in:
@@ -168,61 +168,6 @@ public class DialogueEditor extends JSONElementEditor {
|
||||
messageField = addTranslatableTextArea(pane, "Message: ", dialogue.message, dialogue.writable, listener);
|
||||
switchToNpcBox = addNPCBox(pane, dialogue.getProject(), "Switch active NPC to: ", dialogue.switch_to_npc, dialogue.writable, listener);
|
||||
|
||||
/*
|
||||
CollapsiblePanel rewards = new CollapsiblePanel(titleRewards);
|
||||
rewards.setLayout(new JideBoxLayout(rewards, JideBoxLayout.PAGE_AXIS));
|
||||
rewardsList = new JList(rewardsListModel);
|
||||
rewardsList.setCellRenderer(cellRendererRewards);
|
||||
rewardsList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
|
||||
rewards.add(new JScrollPane(rewardsList), JideBoxLayout.FIX);
|
||||
final JPanel rewardsEditorPane = new JPanel();
|
||||
final JButton createReward = new JButton(new ImageIcon(DefaultIcons.getCreateIcon()));
|
||||
final JButton deleteReward = new JButton(new ImageIcon(DefaultIcons.getNullifyIcon()));
|
||||
deleteReward.setEnabled(false);
|
||||
rewardsList.addListSelectionListener(new ListSelectionListener() {
|
||||
@Override
|
||||
public void valueChanged(ListSelectionEvent e) {
|
||||
selectedReward = (Dialogue.Reward) rewardsList.getSelectedValue();
|
||||
if (selectedReward == null) {
|
||||
deleteReward.setEnabled(false);
|
||||
} else {
|
||||
deleteReward.setEnabled(true);
|
||||
}
|
||||
updateRewardsEditorPane(rewardsEditorPane, selectedReward, listener);
|
||||
}
|
||||
});
|
||||
if (dialogue.writable) {
|
||||
JPanel listButtonsPane = new JPanel();
|
||||
listButtonsPane.setLayout(new JideBoxLayout(listButtonsPane, JideBoxLayout.LINE_AXIS, 6));
|
||||
createReward.addActionListener(new ActionListener() {
|
||||
@Override
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
Dialogue.Reward reward = new Dialogue.Reward();
|
||||
rewardsListModel.addItem(reward);
|
||||
rewardsList.setSelectedValue(reward, true);
|
||||
listener.valueChanged(new JLabel(), null); //Item changed, but we took care of it, just do the usual notification and JSON update stuff.
|
||||
}
|
||||
});
|
||||
deleteReward.addActionListener(new ActionListener() {
|
||||
@Override
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
if (selectedReward != null) {
|
||||
rewardsListModel.removeItem(selectedReward);
|
||||
selectedReward = null;
|
||||
rewardsList.clearSelection();
|
||||
listener.valueChanged(new JLabel(), null); //Item changed, but we took care of it, just do the usual notification and JSON update stuff.
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
listButtonsPane.add(createReward, JideBoxLayout.FIX);
|
||||
listButtonsPane.add(deleteReward, JideBoxLayout.FIX);
|
||||
listButtonsPane.add(new JPanel(), JideBoxLayout.VARY);
|
||||
rewards.add(listButtonsPane, JideBoxLayout.FIX);
|
||||
}
|
||||
rewardsEditorPane.setLayout(new JideBoxLayout(rewardsEditorPane, JideBoxLayout.PAGE_AXIS));
|
||||
rewards.add(rewardsEditorPane, JideBoxLayout.FIX);
|
||||
*/
|
||||
RewardsCellRenderer cellRendererRewards = new RewardsCellRenderer();
|
||||
String titleRewards = "Reaching this phrase gives the following rewards: ";
|
||||
rewardsListModel = new RewardsListModel(dialogue);
|
||||
@@ -247,91 +192,6 @@ public class DialogueEditor extends JSONElementEditor {
|
||||
}
|
||||
pane.add(rewards, JideBoxLayout.FIX);
|
||||
|
||||
/*{
|
||||
CollapsiblePanel replies = new CollapsiblePanel(title);
|
||||
replies.setLayout(new JideBoxLayout(replies, JideBoxLayout.PAGE_AXIS));
|
||||
repliesListModel = new RepliesListModel(dialogue);
|
||||
repliesList = new JList(repliesListModel);
|
||||
repliesList.setCellRenderer(cellRenderer);
|
||||
repliesList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
|
||||
replies.add(new JScrollPane(repliesList), JideBoxLayout.FIX);
|
||||
final JPanel repliesEditorPane = new JPanel();
|
||||
final JButton createReply = new JButton(new ImageIcon(DefaultIcons.getCreateIcon()));
|
||||
final JButton deleteReply = new JButton(new ImageIcon(DefaultIcons.getNullifyIcon()));
|
||||
final JButton moveReplyUp = new JButton(new ImageIcon(DefaultIcons.getArrowUpIcon()));
|
||||
final JButton moveReplyDown = new JButton(new ImageIcon(DefaultIcons.getArrowDownIcon()));
|
||||
deleteReply.setEnabled(false);
|
||||
moveReplyUp.setEnabled(false);
|
||||
moveReplyDown.setEnabled(false);
|
||||
repliesList.addListSelectionListener(e -> {
|
||||
selectedReply = (Dialogue.Reply) repliesList.getSelectedValue();
|
||||
replyValueChanged(selectedReply);
|
||||
if (selectedReply != null) {
|
||||
deleteReply.setEnabled(true);
|
||||
moveReplyUp.setEnabled(repliesList.getSelectedIndex() > 0);
|
||||
moveReplyDown.setEnabled(repliesList.getSelectedIndex() < (repliesListModel.getSize() - 1));
|
||||
} else {
|
||||
deleteReply.setEnabled(false);
|
||||
moveReplyUp.setEnabled(false);
|
||||
moveReplyDown.setEnabled(false);
|
||||
}
|
||||
updateRepliesEditorPane(repliesEditorPane, selectedReply, listener);
|
||||
});
|
||||
if (dialogue.writable) {
|
||||
JPanel listButtonsPane = new JPanel();
|
||||
listButtonsPane.setLayout(new JideBoxLayout(listButtonsPane, JideBoxLayout.LINE_AXIS, 6));
|
||||
createReply.addActionListener(new ActionListener() {
|
||||
@Override
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
Dialogue.Reply reply = new Dialogue.Reply();
|
||||
repliesListModel.addItem(reply);
|
||||
repliesList.setSelectedValue(reply, true);
|
||||
listener.valueChanged(new JLabel(), null); //Item changed, but we took care of it, just do the usual notification and JSON update stuff.
|
||||
}
|
||||
});
|
||||
deleteReply.addActionListener(new ActionListener() {
|
||||
@Override
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
if (selectedReply != null) {
|
||||
repliesListModel.removeItem(selectedReply);
|
||||
selectedReply = null;
|
||||
repliesList.clearSelection();
|
||||
listener.valueChanged(new JLabel(), null); //Item changed, but we took care of it, just do the usual notification and JSON update stuff.
|
||||
}
|
||||
}
|
||||
});
|
||||
moveReplyUp.addActionListener(new ActionListener() {
|
||||
|
||||
@Override
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
if (selectedReply != null) {
|
||||
repliesListModel.moveUp(selectedReply);
|
||||
repliesList.setSelectedValue(selectedReply, true);
|
||||
listener.valueChanged(new JLabel(), null); //Item changed, but we took care of it, just do the usual notification and JSON update stuff.
|
||||
}
|
||||
}
|
||||
});
|
||||
moveReplyDown.addActionListener(new ActionListener() {
|
||||
|
||||
@Override
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
if (selectedReply != null) {
|
||||
repliesListModel.moveDown(selectedReply);
|
||||
repliesList.setSelectedValue(selectedReply, true);
|
||||
listener.valueChanged(new JLabel(), null); //Item changed, but we took care of it, just do the usual notification and JSON update stuff.
|
||||
}
|
||||
}
|
||||
});
|
||||
listButtonsPane.add(createReply, JideBoxLayout.FIX);
|
||||
listButtonsPane.add(deleteReply, JideBoxLayout.FIX);
|
||||
listButtonsPane.add(moveReplyUp, JideBoxLayout.FIX);
|
||||
listButtonsPane.add(moveReplyDown, JideBoxLayout.FIX);
|
||||
listButtonsPane.add(new JPanel(), JideBoxLayout.VARY);
|
||||
replies.add(listButtonsPane, JideBoxLayout.FIX);
|
||||
}
|
||||
repliesEditorPane.setLayout(new JideBoxLayout(repliesEditorPane, JideBoxLayout.PAGE_AXIS));
|
||||
replies.add(repliesEditorPane, JideBoxLayout.FIX);
|
||||
}*/
|
||||
RepliesCellRenderer cellRendererReplies = new RepliesCellRenderer();
|
||||
String titleReplies = "Replies / Next Phrase: ";
|
||||
repliesListModel = new RepliesListModel(dialogue);
|
||||
@@ -617,81 +477,6 @@ public class DialogueEditor extends JSONElementEditor {
|
||||
String titleRequirements = "Requirements the player must fulfill to select this reply: ";
|
||||
requirementsListModel = new ReplyRequirementsListModel(reply);
|
||||
ReplyRequirementsCellRenderer cellRendererRequirements = new ReplyRequirementsCellRenderer();
|
||||
/*
|
||||
CollapsiblePanel requirementsPane = new CollapsiblePanel(titleRequirements);
|
||||
requirementsPane.setLayout(new JideBoxLayout(requirementsPane, JideBoxLayout.PAGE_AXIS));
|
||||
requirementsList = new JList(requirementsListModel);
|
||||
requirementsList.setCellRenderer(cellRendererRequirements);
|
||||
requirementsList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
|
||||
requirementsPane.add(new JScrollPane(requirementsList), JideBoxLayout.FIX);
|
||||
final JPanel requirementsEditorPane = new JPanel();
|
||||
final JButton createReq = new JButton(new ImageIcon(DefaultIcons.getCreateIcon()));
|
||||
final JButton deleteReq = new JButton(new ImageIcon(DefaultIcons.getNullifyIcon()));
|
||||
deleteReq.setEnabled(false);
|
||||
requirementsList.addListSelectionListener(new ListSelectionListener() {
|
||||
@Override
|
||||
public void valueChanged(ListSelectionEvent e) {
|
||||
selectedRequirement = (Requirement) requirementsList.getSelectedValue();
|
||||
if (selectedRequirement != null) {
|
||||
deleteReq.setEnabled(true);
|
||||
} else {
|
||||
deleteReq.setEnabled(false);
|
||||
}
|
||||
updateRequirementsEditorPane(requirementsEditorPane, selectedRequirement, listener);
|
||||
}
|
||||
});
|
||||
requirementsList.addMouseListener(new MouseAdapter() {
|
||||
@Override
|
||||
public void mouseClicked(MouseEvent e) {
|
||||
if (e.getClickCount() == 2) {
|
||||
if (requirementsList.getSelectedValue() != null && ((Requirement)requirementsList.getSelectedValue()).required_obj != null) {
|
||||
ATContentStudio.frame.openEditor(((Requirement)requirementsList.getSelectedValue()).required_obj);
|
||||
ATContentStudio.frame.selectInTree(((Requirement)requirementsList.getSelectedValue()).required_obj);
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
requirementsList.addKeyListener(new KeyAdapter() {
|
||||
@Override
|
||||
public void keyReleased(KeyEvent e) {
|
||||
if (e.getKeyCode() == KeyEvent.VK_ENTER) {
|
||||
ATContentStudio.frame.openEditor(((Requirement)requirementsList.getSelectedValue()).required_obj);
|
||||
ATContentStudio.frame.selectInTree(((Requirement)requirementsList.getSelectedValue()).required_obj);
|
||||
}
|
||||
}
|
||||
});
|
||||
if (((Dialogue)target).writable) {
|
||||
JPanel listButtonsPane = new JPanel();
|
||||
listButtonsPane.setLayout(new JideBoxLayout(listButtonsPane, JideBoxLayout.LINE_AXIS, 6));
|
||||
createReq.addActionListener(new ActionListener() {
|
||||
@Override
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
Requirement req = new Requirement();
|
||||
requirementsListModel.addItem(req);
|
||||
requirementsList.setSelectedValue(req, true);
|
||||
listener.valueChanged(new JLabel(), null); //Item changed, but we took care of it, just do the usual notification and JSON update stuff.
|
||||
}
|
||||
});
|
||||
deleteReq.addActionListener(new ActionListener() {
|
||||
@Override
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
if (selectedRequirement != null) {
|
||||
requirementsListModel.removeItem(selectedRequirement);
|
||||
selectedRequirement = null;
|
||||
requirementsList.clearSelection();
|
||||
listener.valueChanged(new JLabel(), null); //Item changed, but we took care of it, just do the usual notification and JSON update stuff.
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
listButtonsPane.add(createReq, JideBoxLayout.FIX);
|
||||
listButtonsPane.add(deleteReq, JideBoxLayout.FIX);
|
||||
listButtonsPane.add(new JPanel(), JideBoxLayout.VARY);
|
||||
requirementsPane.add(listButtonsPane, JideBoxLayout.FIX);
|
||||
}
|
||||
requirementsEditorPane.setLayout(new JideBoxLayout(requirementsEditorPane, JideBoxLayout.PAGE_AXIS));
|
||||
requirementsPane.add(requirementsEditorPane, JideBoxLayout.FIX);*/
|
||||
|
||||
UiUtils.CollapsibleItemListCreation itemsPane = UiUtils.getCollapsibleItemList(
|
||||
listener,
|
||||
requirementsListModel,
|
||||
|
||||
Reference in New Issue
Block a user