master
skylarmt 9 years ago
parent 35090c3806
commit 69a7cfc9ea

@ -72,11 +72,13 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javafx.application.Platform;
import javafx.embed.swing.JFXPanel;
import javax.swing.ImageIcon;
import javax.swing.JFileChooser;
import javax.swing.JInternalFrame;
import javax.swing.JOptionPane;
import javax.swing.ListModel;
import javax.swing.SwingUtilities;
import javax.swing.UIManager;
import javax.swing.filechooser.FileFilter;
import javax.swing.filechooser.FileNameExtensionFilter;
@ -1086,7 +1088,19 @@ public class Main extends JRibbonFrame {
Debug.stacktrace(ex);
}
Platform.setImplicitExit(false);
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
new JFXPanel(); // this will prepare JavaFX toolkit and environment
Platform.runLater(new Runnable() {
@Override
public void run() {
Platform.setImplicitExit(false);
}
});
}
});
/* Create and display the form */
java.awt.EventQueue.invokeLater(() -> {

@ -85,7 +85,7 @@
</Property>
<Property name="horizontalAlignment" type="int" value="0"/>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
<Connection code="&quot;&lt;html&gt;&quot;+net.apocalypselabs.symat.Main.SYMAT+&quot; &lt;span style=\&quot;color: #666666;\&quot;&gt;&quot;+net.apocalypselabs.symat.Main.VERSION_NAME+&quot;&lt;/span&gt;&quot;" type="code"/>
<Connection code="&quot;&lt;html&gt;&quot;+net.apocalypselabs.symat.Main.SYMAT+&quot; &lt;span style=\&quot;color: #555555;\&quot;&gt;&quot;+net.apocalypselabs.symat.Main.VERSION_NAME+&quot;&lt;/span&gt;&quot;" type="code"/>
</Property>
</Properties>
<AuxValues>

@ -118,7 +118,7 @@ public class SplashScreen extends javax.swing.JFrame {
jLabel1.setFont(net.apocalypselabs.symat.Main.ubuntuRegular.deriveFont(36.0F));
jLabel1.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
jLabel1.setText("<html>"+net.apocalypselabs.symat.Main.SYMAT+" <span style=\"color: #666666;\">"+net.apocalypselabs.symat.Main.VERSION_NAME+"</span>");
jLabel1.setText("<html>"+net.apocalypselabs.symat.Main.SYMAT+" <span style=\"color: #555555;\">"+net.apocalypselabs.symat.Main.VERSION_NAME+"</span>");
jLayeredPane1.add(jLabel1);
jLabel1.setBounds(100, 220, 300, 50);
jLayeredPane1.setLayer(jLabel1, javax.swing.JLayeredPane.POPUP_LAYER);

@ -51,8 +51,7 @@ you permission, that decision is considered final and binding.
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<style>
.main {
margin-left: auto;
margin-right: auto;
text-align: center;
font-family: ubuntu, arial, sans-serif;
}
@ -74,8 +73,8 @@ you permission, that decision is considered final and binding.
<body>
<div class="main">
<h1>SyMAT</h1>
<p><a href="http://symatapp.com">Home</a>
<a href="http://wiki.symatapp.com/doku.php">Wiki</a>
<p><a href="http://symatapp.com">Home</a> |
<a href="http://wiki.symatapp.com/doku.php">Wiki</a> |
<a href="http://forum.symatapp.com">Forums</a></p>
</div>
</body>

Loading…
Cancel
Save