Netsyms/SyMAT
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

New splash screen is dope

Browse Source
This commit is contained in:
skylarmt 2015-04-01 21:42:08 -06:00
parent adab034091
commit f285b67fe7
4 changed files with 30 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nbproject/project.properties
View File

@ -4,7 +4,7 @@ annotation.processing.processors.list=
annotation.processing.run.all.processors=true
annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
application.homepage=https://symatapp.com/
application.splash=C:\\Users\\Skylar\\Documents\\Apocalypse Labs\\apps\\SyMAT\\SyMAT\\src\\net\\apocalypselabs\\symat\\images\\symat-hex-logo.png
application.splash=C:\\Users\\Skylar\\Documents\\Apocalypse Labs\\appmedia\\SyMAT\\SyMAT-splash-2-preload.png
application.title=SyMAT
application.vendor=Apocalypse Laboratories
auxiliary.org-netbeans-spi-editor-hints-projects.perProjectHintSettingsFile=nbproject/cfg_hints.xml

42
src/net/apocalypselabs/symat/SplashScreen.form
View File

@ -5,14 +5,14 @@
<Property name="defaultCloseOperation" type="int" value="3"/>
<Property name="title" type="java.lang.String" value="SyMAT Starting"/>
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[702, 471]"/>
<Dimension value="[300, 300]"/>
</Property>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[702, 471]"/>
<Dimension value="[300, 300]"/>
</Property>
<Property name="undecorated" type="boolean" value="true"/>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[702, 471]"/>
<Dimension value="[300, 300]"/>
</Property>
<Property name="resizable" type="boolean" value="false"/>
</Properties>
@ -33,7 +33,7 @@
<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
<AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,-41,0,0,2,-66"/>
<AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,45,0,0,1,45"/>
</AuxValues>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
@ -57,9 +57,9 @@
<Component class="javax.swing.JLabel" name="dispLabel">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
<Connection code="net.apocalypselabs.symat.Main.ubuntuRegular.deriveFont(22.0F)" type="code"/>
<Connection code="net.apocalypselabs.symat.Main.ubuntuRegular.deriveFont(14.0F)" type="code"/>
</Property>
<Property name="horizontalAlignment" type="int" value="2"/>
<Property name="horizontalAlignment" type="int" value="0"/>
<Property name="text" type="java.lang.String" value="Loading..."/>
<Property name="horizontalTextPosition" type="int" value="2"/>
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
@ -68,7 +68,7 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="250" y="250" width="350" height="80"/>
<AbsoluteConstraints x="40" y="110" width="220" height="100"/>
</Constraint>
</Constraints>
</Component>
@ -79,7 +79,7 @@
</Property>
<Property name="horizontalAlignment" type="int" value="11"/>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
<Connection code="&quot;v. &quot;+net.apocalypselabs.symat.Main.VERSION_NAME" type="code"/>
<Connection code="net.apocalypselabs.symat.Main.VERSION_NAME" type="code"/>
</Property>
</Properties>
<AuxValues>
@ -87,19 +87,20 @@
</AuxValues>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="520" y="70" width="80" height="30"/>
<AbsoluteConstraints x="210" y="20" width="70" height="30"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JLabel" name="jLabel2">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/net/apocalypselabs/symat/images/symat-hex-logo.png"/>
<Image iconType="3" name="/net/apocalypselabs/symat/images/splash2.0.png"/>
</Property>
<Property name="verticalAlignment" type="int" value="1"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="0" y="0" width="700" height="470"/>
<AbsoluteConstraints x="0" y="0" width="-1" height="300"/>
</Constraint>
</Constraints>
</Component>
@ -116,7 +117,7 @@
</AuxValues>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="50" y="420" width="120" height="40"/>
<AbsoluteConstraints x="10" y="250" width="100" height="40"/>
</Constraint>
</Constraints>
</Component>
@ -133,22 +134,7 @@
</AuxValues>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="370" y="430" width="110" height="-1"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JLabel" name="logoOverlay">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/net/apocalypselabs/symat/images/logo-overlay.png"/>
</Property>
</Properties>
<AuxValues>
<AuxValue name="JLayeredPane.layer" type="java.lang.Integer" value="300"/>
</AuxValues>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="184" y="85" width="380" height="140"/>
<AbsoluteConstraints x="180" y="260" width="110" height="30"/>
</Constraint>
</Constraints>
</Component>

44
src/net/apocalypselabs/symat/SplashScreen.java
View File

@ -69,7 +69,6 @@ public class SplashScreen extends javax.swing.JFrame {
setBackground(new Color(255, 255, 255, 0));
setIconImages(Main.symatlogo);
setLocationRelativeTo(null);
logoOverlay.setSize(0, 140);
}
/**
@ -87,14 +86,13 @@ public class SplashScreen extends javax.swing.JFrame {
jLabel2 = new javax.swing.JLabel();
jLabel3 = new javax.swing.JLabel();
jLabel4 = new javax.swing.JLabel();
logoOverlay = new javax.swing.JLabel();
setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
setTitle("SyMAT Starting");
setMaximumSize(new java.awt.Dimension(702, 471));
setMinimumSize(new java.awt.Dimension(702, 471));
setMaximumSize(new java.awt.Dimension(300, 300));
setMinimumSize(new java.awt.Dimension(300, 300));
setUndecorated(true);
setPreferredSize(new java.awt.Dimension(702, 471));
setPreferredSize(new java.awt.Dimension(300, 300));
setResizable(false);
addComponentListener(new java.awt.event.ComponentAdapter() {
public void componentShown(java.awt.event.ComponentEvent evt) {
@ -104,44 +102,40 @@ public class SplashScreen extends javax.swing.JFrame {
jLayeredPane1.setBackground(new java.awt.Color(255, 255, 255));
dispLabel.setFont(net.apocalypselabs.symat.Main.ubuntuRegular.deriveFont(22.0F));
dispLabel.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
dispLabel.setFont(net.apocalypselabs.symat.Main.ubuntuRegular.deriveFont(14.0F));
dispLabel.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
dispLabel.setText("Loading...");
dispLabel.setHorizontalTextPosition(javax.swing.SwingConstants.LEFT);
dispLabel.setMaximumSize(new java.awt.Dimension(400, 320));
jLayeredPane1.add(dispLabel);
dispLabel.setBounds(250, 250, 350, 80);
dispLabel.setBounds(40, 110, 220, 100);
jLabel1.setFont(net.apocalypselabs.symat.Main.ubuntuRegular.deriveFont(20.0F));
jLabel1.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
jLabel1.setText("v. "+net.apocalypselabs.symat.Main.VERSION_NAME);
jLabel1.setText(net.apocalypselabs.symat.Main.VERSION_NAME);
jLayeredPane1.add(jLabel1);
jLabel1.setBounds(520, 70, 80, 30);
jLabel1.setBounds(210, 20, 70, 30);
jLayeredPane1.setLayer(jLabel1, javax.swing.JLayeredPane.POPUP_LAYER);
jLabel2.setIcon(new javax.swing.ImageIcon(getClass().getResource("/net/apocalypselabs/symat/images/symat-hex-logo.png"))); // NOI18N
jLabel2.setIcon(new javax.swing.ImageIcon(getClass().getResource("/net/apocalypselabs/symat/images/splash2.0.png"))); // NOI18N
jLabel2.setVerticalAlignment(javax.swing.SwingConstants.TOP);
jLayeredPane1.add(jLabel2);
jLabel2.setBounds(0, 0, 700, 470);
jLabel2.setBounds(0, 0, 300, 300);
jLabel3.setFont(net.apocalypselabs.symat.Main.ubuntuRegular.deriveFont(12.0F));
jLabel3.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
jLabel3.setText("<html><div style=\"text-align: center;\">Apocalypse<br>Laboratories</div>");
jLayeredPane1.add(jLabel3);
jLabel3.setBounds(50, 420, 120, 40);
jLabel3.setBounds(10, 250, 100, 40);
jLayeredPane1.setLayer(jLabel3, javax.swing.JLayeredPane.POPUP_LAYER);
jLabel4.setFont(net.apocalypselabs.symat.Main.ubuntuRegular.deriveFont(12.0F));
jLabel4.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
jLabel4.setText("symatapp.com");
jLayeredPane1.add(jLabel4);
jLabel4.setBounds(370, 430, 110, 14);
jLabel4.setBounds(180, 260, 110, 30);
jLayeredPane1.setLayer(jLabel4, javax.swing.JLayeredPane.POPUP_LAYER);
logoOverlay.setIcon(new javax.swing.ImageIcon(getClass().getResource("/net/apocalypselabs/symat/images/logo-overlay.png"))); // NOI18N
jLayeredPane1.add(logoOverlay);
logoOverlay.setBounds(184, 85, 380, 140);
jLayeredPane1.setLayer(logoOverlay, javax.swing.JLayeredPane.POPUP_LAYER);
getContentPane().add(jLayeredPane1, java.awt.BorderLayout.CENTER);
pack();
@ -163,7 +157,6 @@ public class SplashScreen extends javax.swing.JFrame {
Main.skipPython = true;
Main.skipEditor = true;
}
logoOverlay.setSize(100, 140);
if (!Main.skipPython) {
// Python laggggsss when used for first time, this fixes the wait later.
System.out.println("Warming up Python engine, to skip run with argument 'skippython'");
@ -173,26 +166,21 @@ public class SplashScreen extends javax.swing.JFrame {
} catch (Exception ex) {
// Ignore
}
logoOverlay.setSize(130, 140);
}
if (!Main.skipEditor) {
System.out.println("Preparing editor, to skip run with argument 'skipeditor'");
setProgress("Preparing editor...");
logoOverlay.setSize(152, 140);
// Get editor going too
Editor edit = new Editor();
logoOverlay.setSize(205, 140);
}
logoOverlay.setSize(235, 140);
if (!PrefStorage.getSetting("skipupdates").equals("yes")) {
setProgress("Checking for updates...");
checkUpdates();
}
logoOverlay.setSize(300, 140);
logoOverlay.setSize(380, 140);
setProgress("Loading main interface...");
Main main = new Main();
setProgress("Done!");
@ -210,7 +198,6 @@ public class SplashScreen extends javax.swing.JFrame {
String line = br.readLine();
br.close();
is.close();
logoOverlay.setSize(280, 140);
double version = Double.parseDouble(line.split("\\|")[0]);
if (version > APP_CODE) {
if (PrefStorage.getSetting("update-ignore")
@ -253,6 +240,5 @@ public class SplashScreen extends javax.swing.JFrame {
private javax.swing.JLabel jLabel3;
private javax.swing.JLabel jLabel4;
private javax.swing.JLayeredPane jLayeredPane1;
private javax.swing.JLabel logoOverlay;
// End of variables declaration//GEN-END:variables
}

BIN
src/net/apocalypselabs/symat/images/splash2.0.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 146 KiB