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

#390 Reload list of fonts to import

Browse Source
This commit is contained in:
Honfika
2013-12-28 20:34:18 +01:00
parent b179dc6f8e
commit be58b498e8
4 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
trunk/src/com/jpexs/decompiler/flash/gui/Main.java
+3
View File
@@ -27,6 +27,7 @@ import com.jpexs.decompiler.flash.console.CommandLineArgumentParser;
import com.jpexs.decompiler.flash.console.ContextMenuTools;
import com.jpexs.decompiler.flash.gui.player.FlashPlayerPanel;
import com.jpexs.decompiler.flash.gui.proxy.ProxyFrame;
import com.jpexs.decompiler.flash.tags.base.FontTag;
import com.jpexs.helpers.Cache;
import com.jpexs.helpers.CancellableWorker;
import com.jpexs.helpers.Helper;
@@ -401,6 +402,8 @@ public class Main {
mainFrame.setVisible(false);
mainFrame = null;
}
FontTag.reload();
Cache.clearAll();
initGui();
reloadSWFs();
}
trunk/src/com/jpexs/decompiler/flash/gui/MainFrameClassicMenu.java
+1 -1
View File
@@ -366,7 +366,7 @@ public class MainFrameClassicMenu implements MainFrameMenu, ActionListener {
switch (e.getActionCommand()) {
case ACTION_RELOAD:
if (View.showConfirmDialog(null, translate("message.confirm.reload"), translate("message.warning"), JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE) == JOptionPane.YES_OPTION) {
Main.reloadSWFs();
Main.reloadApp();
}
break;
case ACTION_ADVANCED_SETTINGS:
trunk/src/com/jpexs/decompiler/flash/gui/MainFrameRibbonMenu.java
+1 -1
View File
@@ -504,7 +504,7 @@ public class MainFrameRibbonMenu implements MainFrameMenu, ActionListener {
switch (e.getActionCommand()) {
case ACTION_RELOAD:
if (View.showConfirmDialog(null, translate("message.confirm.reload"), translate("message.warning"), JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE) == JOptionPane.YES_OPTION) {
Main.reloadSWFs();
Main.reloadApp();
}
break;
case ACTION_ADVANCED_SETTINGS:
trunk/src/com/jpexs/decompiler/flash/tags/base/FontTag.java
+13 -5
View File
@@ -83,6 +83,16 @@ public abstract class FontTag extends CharacterTag implements AloneTag, Drawable
public abstract int getLeading();
public static String[] fontNamesArray;
public static List<String> fontNames;
public static String defaultFontName;
static {
reload();
}
public boolean hasLayout() {
return false;
}
@@ -168,11 +178,9 @@ public abstract class FontTag extends CharacterTag implements AloneTag, Drawable
return gm.getAdvanceX();
}
public static final String[] fontNamesArray = GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames();
public static final List<String> fontNames = Arrays.asList(fontNamesArray);
public static final String defaultFontName;
static {
public static void reload() {
fontNamesArray = GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames();
fontNames = Arrays.asList(fontNamesArray);
if (fontNames.contains("Times New Roman")) {
defaultFontName = "Times New Roman";
} else if (fontNames.contains("Arial")) {