BDC/diy-layout-creator
2
0
Fork 0
mirror of https://github.com/bancika/diy-layout-creator synced 2026-11-11 01:32:08 +10:00
Code Issues Packages Projects Releases Wiki Activity

patch for mac-specific file handler

Browse Source
This commit is contained in:
bancika
2020-09-07 08:47:50 +02:00
parent 94d713182e
commit 5164501228
2 changed files with 46 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diylc/diylc-swing/.classpath
+1
View File
@@ -14,6 +14,7 @@
<classpathentry kind="lib" path="lib/balloontip-1.2.4.1.jar"/> <classpathentry kind="lib" path="lib/balloontip-1.2.4.1.jar"/>
<classpathentry kind="lib" path="lib/jep-2.4.1.jar"/> <classpathentry kind="lib" path="lib/jep-2.4.1.jar"/>
<classpathentry kind="lib" path="lib/poi-3.5-FINAL-20090928.jar"/> <classpathentry kind="lib" path="lib/poi-3.5-FINAL-20090928.jar"/>
<classpathentry kind="lib" path="lib/AppleJavaExtensions.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/diylc-core"/> <classpathentry combineaccessrules="false" kind="src" path="/diylc-core"/>
<classpathentry kind="lib" path="lib/xstream-1.4.3.jar"/> <classpathentry kind="lib" path="lib/xstream-1.4.3.jar"/>
<classpathentry kind="lib" path="lib/java-http-proxy.jar"/> <classpathentry kind="lib" path="lib/java-http-proxy.jar"/>
diylc/diylc-swing/src/org/diylc/DIYLCStarter.java
+14 -7
View File
@@ -35,6 +35,7 @@ import org.apache.log4j.Logger;
import org.apache.log4j.PropertyConfigurator; import org.apache.log4j.PropertyConfigurator;
import org.diylc.appframework.miscutils.ConfigurationManager; import org.diylc.appframework.miscutils.ConfigurationManager;
import org.diylc.appframework.miscutils.PropertyInjector; import org.diylc.appframework.miscutils.PropertyInjector;
import org.diylc.appframework.miscutils.Utils;
import org.diylc.common.IPlugInPort; import org.diylc.common.IPlugInPort;
import org.diylc.core.IView; import org.diylc.core.IView;
import org.diylc.lang.LangUtil; import org.diylc.lang.LangUtil;
@@ -119,7 +120,9 @@ public class DIYLCStarter {
for (int i = 0; i < fonts.length; i++) { for (int i = 0; i < fonts.length; i++) {
try { try {
LOG.info("Dynamically loading font: " + fonts[i].getName()); LOG.info("Dynamically loading font: " + fonts[i].getName());
Font customFont = Font.createFont(Font.TRUETYPE_FONT, new File(fonts[i].getAbsolutePath())).deriveFont(12f); Font customFont =
Font.createFont(Font.TRUETYPE_FONT, new File(fonts[i].getAbsolutePath()))
.deriveFont(12f);
GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment(); GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
// register the font // register the font
ge.registerFont(customFont); ge.registerFont(customFont);
@@ -141,11 +144,11 @@ public class DIYLCStarter {
String val = System.getProperty(SCRIPT_RUN); String val = System.getProperty(SCRIPT_RUN);
if (!"true".equals(val)) { if (!"true".equals(val)) {
int response = int response = JOptionPane.showConfirmDialog(null,
JOptionPane.showConfirmDialog(null, "It is not recommended to run DIYLC by clicking on the diylc.jar file.\n" "It is not recommended to run DIYLC by clicking on the diylc.jar file.\n"
+ "Please use diylc.exe on Windows or run.sh on OSX/Linux to ensure the best\n" + "Please use diylc.exe on Windows or run.sh on OSX/Linux to ensure the best\n"
+ "performance and reliability. Do you want to continue?", "DIYLC", JOptionPane.YES_NO_OPTION, + "performance and reliability. Do you want to continue?",
JOptionPane.WARNING_MESSAGE); "DIYLC", JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE);
if (response != JOptionPane.YES_OPTION) { if (response != JOptionPane.YES_OPTION) {
System.exit(0); System.exit(0);
} }
@@ -153,7 +156,7 @@ public class DIYLCStarter {
MainFrame mainFrame = new MainFrame(); MainFrame mainFrame = new MainFrame();
Presenter presenter = mainFrame.getPresenter(); Presenter presenter = mainFrame.getPresenter();
// mainFrame.setLocationRelativeTo(null); // mainFrame.setLocationRelativeTo(null);
if (splash == null) { if (splash == null) {
LOG.warn("Splash screen could not be initialized", splashException); LOG.warn("Splash screen could not be initialized", splashException);
@@ -164,6 +167,8 @@ public class DIYLCStarter {
mainFrame.setVisible(true); mainFrame.setVisible(true);
// assign open file handler for Mac
if (Utils.isMac()) {
SwingUtilities.invokeLater(() -> { SwingUtilities.invokeLater(() -> {
Application.getApplication().setOpenFileHandler((AppEvent.OpenFilesEvent ofe) -> { Application.getApplication().setOpenFileHandler((AppEvent.OpenFilesEvent ofe) -> {
List<File> files = ofe.getFiles(); List<File> files = ofe.getFiles();
@@ -175,11 +180,13 @@ public class DIYLCStarter {
} }
}); });
}); });
}
if (args.length > 0) { if (args.length > 0) {
presenter.loadProjectFromFile(args[0]); presenter.loadProjectFromFile(args[0]);
} else { } else {
boolean showTemplates = ConfigurationManager.getInstance().readBoolean(TemplateDialog.SHOW_TEMPLATES_KEY, false); boolean showTemplates =
ConfigurationManager.getInstance().readBoolean(TemplateDialog.SHOW_TEMPLATES_KEY, false);
if (showTemplates) { if (showTemplates) {
TemplateDialog templateDialog = new TemplateDialog(mainFrame, mainFrame.getPresenter()); TemplateDialog templateDialog = new TemplateDialog(mainFrame, mainFrame.getPresenter());
if (!templateDialog.getFiles().isEmpty()) { if (!templateDialog.getFiles().isEmpty()) {