LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-07-05 21:47:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

close confirmation fix

Browse Source
This commit is contained in:
honfika@gmail.com
2016-01-08 10:59:08 +01:00
parent 98207d708b
commit 7cdae099f0
5 changed files with 38 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/com/jpexs/decompiler/flash/gui/View.java
View File

@@ -474,22 +474,30 @@ public class View {
public static int showConfirmDialog(final Component parentComponent, String message, final String title, final int optionType, final int messageType, ConfigurationItem<Boolean> showAgainConfig, int defaultOption) {
JLabel warLabel = new JLabel("<html>" + message.replace("\r\n", "<br>") + "</html>");
final JPanel warPanel = new JPanel(new BorderLayout());
warPanel.add(warLabel, BorderLayout.CENTER);
JCheckBox donotShowAgainCheckBox = new JCheckBox(AppStrings.translate("message.confirm.donotshowagain"));
donotShowAgainCheckBox.setSelected(!showAgainConfig.get());
warPanel.add(donotShowAgainCheckBox, BorderLayout.SOUTH);
JCheckBox donotShowAgainCheckBox = null;
JPanel warPanel = null;
if (showAgainConfig != null) {
if (!showAgainConfig.get()) {
return defaultOption;
}
if (donotShowAgainCheckBox.isSelected()) {
return defaultOption;
JLabel warLabel = new JLabel("<html>" + message.replace("\r\n", "<br>") + "</html>");
warPanel = new JPanel(new BorderLayout());
warPanel.add(warLabel, BorderLayout.CENTER);
donotShowAgainCheckBox = new JCheckBox(AppStrings.translate("message.confirm.donotshowagain"));
warPanel.add(donotShowAgainCheckBox, BorderLayout.SOUTH);
}
final int ret[] = new int[1];
final Object messageObj = warPanel == null ? message : warPanel;
execInEventDispatch(() -> {
ret[0] = JOptionPane.showConfirmDialog(parentComponent, warPanel, title, optionType, messageType);
ret[0] = JOptionPane.showConfirmDialog(parentComponent, messageObj, title, optionType, messageType);
});
showAgainConfig.set(!donotShowAgainCheckBox.isSelected());
if (donotShowAgainCheckBox != null) {
showAgainConfig.set(!donotShowAgainCheckBox.isSelected());
}
return ret[0];
}
@@ -501,22 +509,23 @@ public class View {
execInEventDispatch(() -> {
Object msg = message;
JCheckBox donotShowAgainCheckBox = new JCheckBox(AppStrings.translate("message.confirm.donotshowagain"));
JCheckBox donotShowAgainCheckBox = null;
if (showAgainConfig != null) {
if (!showAgainConfig.get()) {
return;
}
JLabel warLabel = new JLabel("<html>" + message.replace("\r\n", "<br>") + "</html>");
final JPanel warPanel = new JPanel(new BorderLayout());
warPanel.add(warLabel, BorderLayout.CENTER);
donotShowAgainCheckBox.setSelected(!showAgainConfig.get());
donotShowAgainCheckBox = new JCheckBox(AppStrings.translate("message.confirm.donotshowagain"));
warPanel.add(donotShowAgainCheckBox, BorderLayout.SOUTH);
msg = warPanel;
if (donotShowAgainCheckBox.isSelected()) {
return;
}
}
final Object fmsg = msg;
JOptionPane.showMessageDialog(parentComponent, fmsg, title, messageType);
if (showAgainConfig != null) {
if (donotShowAgainCheckBox != null) {
showAgainConfig.set(!donotShowAgainCheckBox.isSelected());
}
});