Update branding

nbproject/project.properties

@@ -55,6 +55,7 @@ file.reference.js.jar=lib/js.jar
 file.reference.json-simple-1.1.1.jar=lib/json-simple-1.1.1.jar
 file.reference.jython-standalone-2.7.0.jar=lib/jython-standalone-2.7.0.jar
 file.reference.log4j-1.2.11.jar=lib/log4j-1.2.11.jar
+file.reference.org.eclipse.jgit-4.0.3.201509231615-r.jar=lib\\org.eclipse.jgit-4.0.3.201509231615-r.jar
 file.reference.rsyntaxtextarea-2.5.6.jar=lib/rsyntaxtextarea-2.5.6.jar
 file.reference.seaglasslookandfeel-0.2.jar=lib/seaglasslookandfeel-0.2.jar
 file.reference.SyMAT-src=src
@@ -92,7 +93,8 @@ javac.classpath=\
     ${file.reference.jna-4.1.0.jar}:\
     ${file.reference.jna-platform-4.1.0.jar}:\
     ${file.reference.jython-standalone-2.7.0.jar}:\
-    ${file.reference.bsh-2.0b5.jar}
+    ${file.reference.bsh-2.0b5.jar}:\
+    ${file.reference.org.eclipse.jgit-4.0.3.201509231615-r.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
@@ -113,6 +115,7 @@ javadoc.nonavbar=false
 javadoc.notree=false
 javadoc.private=false
 javadoc.reference.flamingo-6.3.jar=lib/flamingo-6.3-javadoc.jar
+javadoc.reference.org.eclipse.jgit-4.0.3.201509231615-r.jar=lib/org.eclipse.jgit-4.0.3.201509231615-r-javadoc.jar
 javadoc.reference.ujmp-complete-0.2.5.jar=lib\\ujmp-complete-0.2.5-javadoc.zip!/0.2.5/ujmp-core/apidocs/
 javadoc.splitindex=true
 javadoc.use=true

src/net/apocalypselabs/symat/License.java

@@ -348,10 +348,14 @@ public class License extends javax.swing.JInternalFrame {
                 System.out.println("Checking license...");
                 URL url = new URL(API_URL + "liccheck.php?email=" + email);
                 String line;
+                //String line2 = "";
+                //boolean line2ok = false;
                 try (InputStream is = url.openStream();
                         BufferedReader br
                         = new BufferedReader(new InputStreamReader(is))) {
                     line = br.readLine();
+                    // line2 = br.readLine();
+                    // line2ok = true;
                 }
 
                 switch (line) {
@@ -367,7 +371,12 @@ public class License extends javax.swing.JInternalFrame {
                     default:
                         fail();
                 }
-            } catch (IOException e) {
+                /*if (line2ok) {
+                 if (line2.equals("pro")) {
+                        
+                 }
+                 }*/
+            } catch (Exception e) {
                 Debug.printerr("License check failed.");
                 Debug.stacktrace(e);
                 ioerror();
@@ -425,7 +434,9 @@ public class License extends javax.swing.JInternalFrame {
             JOptionPane.showMessageDialog(Main.mainPane,
                     "An error occured while verifying your license.  "
                     + "Ensure you have an Internet connection and "
-                    + "try again later.",
+                    + "try again later.  If the problem persists, "
+                    + "contact Netsyms Technologies Licensing at "
+                    + "software@netsyms.com.",
                     "Error",
                     JOptionPane.ERROR_MESSAGE);
         }

src/net/apocalypselabs/symat/Main.java

@@ -323,7 +323,7 @@ public class Main extends JRibbonFrame {
      */
     private void loadRibbon() {
         ResizableIcon appico = ImageWrapperResizableIcon.getIcon(
-                Main.class.getResource("icon32.png"),
+                Main.class.getResource("32x32.png"),
                 new Dimension(32, 32));
         setApplicationIcon(appico);
         int tries = 0; // no infinite loops for us!

src/net/apocalypselabs/symat/SplashScreen.form

@@ -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,-112,0,0,1,-12"/>
+    <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,64,0,0,1,-84"/>
   </AuxValues>
 
   <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
@@ -68,18 +68,18 @@
           </Properties>
           <Constraints>
             <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-              <AbsoluteConstraints x="140" y="280" width="220" height="70"/>
+              <AbsoluteConstraints x="100" y="200" width="220" height="70"/>
             </Constraint>
           </Constraints>
         </Component>
         <Component class="javax.swing.JLabel" name="jLabel1">
           <Properties>
             <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
-              <Connection code="net.apocalypselabs.symat.Main.ubuntuRegular.deriveFont(36.0F)" type="code"/>
+              <Connection code="net.apocalypselabs.symat.Main.ubuntuRegular.deriveFont(24.0F)" type="code"/>
             </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: #555555;\&quot;&gt;&quot;+net.apocalypselabs.symat.Main.VERSION_NAME+&quot;&lt;/span&gt;&quot;" type="code"/>
+              <Connection code="&quot;&lt;html&gt;&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>
@@ -87,20 +87,20 @@
           </AuxValues>
           <Constraints>
             <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-              <AbsoluteConstraints x="100" y="220" width="300" height="50"/>
+              <AbsoluteConstraints x="290" y="140" width="140" height="50"/>
             </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/splashscreen.png"/>
+              <Image iconType="3" name="/net/apocalypselabs/symat/images/splash.animated.gif"/>
             </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="500" height="400"/>
+              <AbsoluteConstraints x="0" y="0" width="-1" height="320"/>
             </Constraint>
           </Constraints>
         </Component>
@@ -117,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="10" y="370" width="250" height="30"/>
+              <AbsoluteConstraints x="10" y="290" width="250" height="30"/>
             </Constraint>
           </Constraints>
         </Component>
@@ -143,7 +143,7 @@
           </AuxValues>
           <Constraints>
             <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-              <AbsoluteConstraints x="380" y="370" width="110" height="30"/>
+              <AbsoluteConstraints x="310" y="290" width="110" height="30"/>
             </Constraint>
           </Constraints>
         </Component>

src/net/apocalypselabs/symat/SplashScreen.java

@@ -124,25 +124,25 @@ public class SplashScreen extends javax.swing.JFrame {
         dispLabel.setHorizontalTextPosition(javax.swing.SwingConstants.LEFT);
         dispLabel.setMaximumSize(new java.awt.Dimension(400, 320));
         jLayeredPane1.add(dispLabel);
-        dispLabel.setBounds(140, 280, 220, 70);
+        dispLabel.setBounds(100, 200, 220, 70);
 
-        jLabel1.setFont(net.apocalypselabs.symat.Main.ubuntuRegular.deriveFont(36.0F));
+        jLabel1.setFont(net.apocalypselabs.symat.Main.ubuntuRegular.deriveFont(24.0F));
         jLabel1.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
-        jLabel1.setText("<html>"+net.apocalypselabs.symat.Main.SYMAT+" <span style=\"color: #555555;\">"+net.apocalypselabs.symat.Main.VERSION_NAME+"</span>");
+        jLabel1.setText("<html><span style=\"color: #555555;\">"+net.apocalypselabs.symat.Main.VERSION_NAME+"</span>");
         jLayeredPane1.add(jLabel1);
-        jLabel1.setBounds(100, 220, 300, 50);
+        jLabel1.setBounds(290, 140, 140, 50);
         jLayeredPane1.setLayer(jLabel1, javax.swing.JLayeredPane.POPUP_LAYER);
 
-        jLabel2.setIcon(new javax.swing.ImageIcon(getClass().getResource("/net/apocalypselabs/symat/images/splashscreen.png"))); // NOI18N
+        jLabel2.setIcon(new javax.swing.ImageIcon(getClass().getResource("/net/apocalypselabs/symat/images/splash.animated.gif"))); // NOI18N
         jLabel2.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLayeredPane1.add(jLabel2);
-        jLabel2.setBounds(0, 0, 500, 400);
+        jLabel2.setBounds(0, 0, 427, 320);
 
         jLabel3.setFont(net.apocalypselabs.symat.Main.ubuntuRegular.deriveFont(12.0F));
         jLabel3.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
         jLabel3.setText("Netsyms Technologies");
         jLayeredPane1.add(jLabel3);
-        jLabel3.setBounds(10, 370, 250, 30);
+        jLabel3.setBounds(10, 290, 250, 30);
         jLayeredPane1.setLayer(jLabel3, javax.swing.JLayeredPane.POPUP_LAYER);
 
         jLabel4.setFont(net.apocalypselabs.symat.Main.ubuntuRegular.deriveFont(12.0F));
@@ -152,7 +152,7 @@ public class SplashScreen extends javax.swing.JFrame {
         jLabel4.setMinimumSize(new java.awt.Dimension(118, 14));
         jLabel4.setPreferredSize(new java.awt.Dimension(118, 14));
         jLayeredPane1.add(jLabel4);
-        jLabel4.setBounds(380, 370, 110, 30);
+        jLabel4.setBounds(310, 290, 110, 30);
         jLayeredPane1.setLayer(jLabel4, javax.swing.JLayeredPane.POPUP_LAYER);
 
         getContentPane().add(jLayeredPane1, java.awt.BorderLayout.CENTER);