diff --git a/lib/org.eclipse.jgit-4.0.3.201509231615-r-javadoc.jar b/lib/org.eclipse.jgit-4.0.3.201509231615-r-javadoc.jar
new file mode 100644
index 0000000..021b45f
Binary files /dev/null and b/lib/org.eclipse.jgit-4.0.3.201509231615-r-javadoc.jar differ
diff --git a/lib/org.eclipse.jgit-4.0.3.201509231615-r.jar b/lib/org.eclipse.jgit-4.0.3.201509231615-r.jar
new file mode 100644
index 0000000..cff30ba
Binary files /dev/null and b/lib/org.eclipse.jgit-4.0.3.201509231615-r.jar differ
diff --git a/nbproject/project.properties b/nbproject/project.properties
index 1269492..5541b6d 100644
--- a/nbproject/project.properties
+++ b/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
diff --git a/src/net/apocalypselabs/symat/128x128.png b/src/net/apocalypselabs/symat/128x128.png
index 25d08f4..c4136e5 100644
Binary files a/src/net/apocalypselabs/symat/128x128.png and b/src/net/apocalypselabs/symat/128x128.png differ
diff --git a/src/net/apocalypselabs/symat/16x16.png b/src/net/apocalypselabs/symat/16x16.png
index 7cd6973..7b5343c 100644
Binary files a/src/net/apocalypselabs/symat/16x16.png and b/src/net/apocalypselabs/symat/16x16.png differ
diff --git a/src/net/apocalypselabs/symat/24x24.png b/src/net/apocalypselabs/symat/24x24.png
index 3f3ea0c..caa8c40 100644
Binary files a/src/net/apocalypselabs/symat/24x24.png and b/src/net/apocalypselabs/symat/24x24.png differ
diff --git a/src/net/apocalypselabs/symat/256x256.png b/src/net/apocalypselabs/symat/256x256.png
index 0a745d8..c5af31a 100644
Binary files a/src/net/apocalypselabs/symat/256x256.png and b/src/net/apocalypselabs/symat/256x256.png differ
diff --git a/src/net/apocalypselabs/symat/32x32.png b/src/net/apocalypselabs/symat/32x32.png
index 7a06566..b0b68cf 100644
Binary files a/src/net/apocalypselabs/symat/32x32.png and b/src/net/apocalypselabs/symat/32x32.png differ
diff --git a/src/net/apocalypselabs/symat/48x48.png b/src/net/apocalypselabs/symat/48x48.png
index f81e7d4..4c41529 100644
Binary files a/src/net/apocalypselabs/symat/48x48.png and b/src/net/apocalypselabs/symat/48x48.png differ
diff --git a/src/net/apocalypselabs/symat/512x512.png b/src/net/apocalypselabs/symat/512x512.png
index b8cedf3..2c4d3df 100644
Binary files a/src/net/apocalypselabs/symat/512x512.png and b/src/net/apocalypselabs/symat/512x512.png differ
diff --git a/src/net/apocalypselabs/symat/64x64.png b/src/net/apocalypselabs/symat/64x64.png
index 73ba28b..46c6311 100644
Binary files a/src/net/apocalypselabs/symat/64x64.png and b/src/net/apocalypselabs/symat/64x64.png differ
diff --git a/src/net/apocalypselabs/symat/96x96.png b/src/net/apocalypselabs/symat/96x96.png
index 3623fd1..3979dac 100644
Binary files a/src/net/apocalypselabs/symat/96x96.png and b/src/net/apocalypselabs/symat/96x96.png differ
diff --git a/src/net/apocalypselabs/symat/License.java b/src/net/apocalypselabs/symat/License.java
index 96afd3a..480dbc2 100644
--- a/src/net/apocalypselabs/symat/License.java
+++ b/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);
}
diff --git a/src/net/apocalypselabs/symat/Main.java b/src/net/apocalypselabs/symat/Main.java
index 4f87778..897ca9d 100644
--- a/src/net/apocalypselabs/symat/Main.java
+++ b/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!
diff --git a/src/net/apocalypselabs/symat/SplashScreen.form b/src/net/apocalypselabs/symat/SplashScreen.form
index c0d8cd3..a5ab777 100644
--- a/src/net/apocalypselabs/symat/SplashScreen.form
+++ b/src/net/apocalypselabs/symat/SplashScreen.form
@@ -33,7 +33,7 @@
-
+
@@ -68,18 +68,18 @@
-
+
-
+
-
+
@@ -87,20 +87,20 @@
-
+
-
+
-
+
@@ -117,7 +117,7 @@
-
+
@@ -143,7 +143,7 @@
-
+
diff --git a/src/net/apocalypselabs/symat/SplashScreen.java b/src/net/apocalypselabs/symat/SplashScreen.java
index c829895..271b46c 100644
--- a/src/net/apocalypselabs/symat/SplashScreen.java
+++ b/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(""+net.apocalypselabs.symat.Main.SYMAT+" "+net.apocalypselabs.symat.Main.VERSION_NAME+"");
+ jLabel1.setText(""+net.apocalypselabs.symat.Main.VERSION_NAME+"");
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);
diff --git a/src/net/apocalypselabs/symat/images/splash.animated.gif b/src/net/apocalypselabs/symat/images/splash.animated.gif
new file mode 100644
index 0000000..de4fc03
Binary files /dev/null and b/src/net/apocalypselabs/symat/images/splash.animated.gif differ