LegacyConsoleArchive/jpexs-decompiler
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-09-27 13:50:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Issue #458 Saving font settings to preserve font panel selection after program restart: individual behavior for each file

Browse Source
This commit is contained in:
Honfika
2014-01-01 21:12:27 +01:00
parent 3f30c5247a
commit 9b15a255c6
25 changed files with 295 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
trunk/src/com/jpexs/decompiler/flash/gui/FontPanel.java
+9 -5
View File
@@ -34,6 +34,7 @@ import java.awt.event.ComponentEvent;
import java.awt.event.ComponentListener;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.io.File;
import java.util.Set;
import java.util.TreeSet;
import javax.swing.Box;
@@ -192,7 +193,7 @@ public class FontPanel extends JPanel implements ActionListener {
SWF swf = f.getSwf();
String selectedSystemFont = (String) fontSelection.getSelectedItem();
swf.sourceFontsMap.put(f.getFontId(), selectedSystemFont);
Configuration.addFontPair(f.getFontName(swf.tags), selectedSystemFont);
Configuration.addFontPair(swf.getShortFileName(), f.getFontId(), f.getFontName(), selectedSystemFont);
}
}
});
@@ -290,7 +291,7 @@ public class FontPanel extends JPanel implements ActionListener {
}
}
fontNameLabel.setText(ft.getFontName(swf.tags));
fontNameLabel.setText(ft.getFontName());
if (fontNameTag != null) {
fontDisplayNameLabel.setText(fontNameTag.fontName);
fontCopyrightLabel.setText(fontNameTag.fontCopyright);
@@ -303,12 +304,15 @@ public class FontPanel extends JPanel implements ActionListener {
fontLeadingLabel.setText(ft.getLeading() == -1 ? translate("value.unknown") : "" + ft.getLeading());
String chars = ft.getCharacters(swf.tags);
fontCharactersTextArea.setText(chars);
String key = swf.getShortFileName() + "_" + ft.getFontId() + "_" + ft.getFontName();
if (swf.sourceFontsMap.containsKey(ft.getFontId())) {
fontSelection.setSelectedItem(swf.sourceFontsMap.get(ft.getFontId()));
} else if (Configuration.getFontPairs().containsKey(ft.getFontName(swf.tags))) {
fontSelection.setSelectedItem(Configuration.getFontPairs().get(ft.getFontName(swf.tags)));
} else if (Configuration.getFontPairs().containsKey(key)) {
fontSelection.setSelectedItem(Configuration.getFontPairs().get(key));
} else if (Configuration.getFontPairs().containsKey(ft.getFontName())) {
fontSelection.setSelectedItem(Configuration.getFontPairs().get(ft.getFontName()));
} else {
fontSelection.setSelectedItem(FontTag.findInstalledFontName(ft.getFontName(swf.tags)));
fontSelection.setSelectedItem(FontTag.findInstalledFontName(ft.getFontName()));
}
fontChangeList.componentResized(null);
}