diff --git a/src/net/apocalypselabs/symat/Debug.java b/src/net/apocalypselabs/symat/Debug.java index b85ce8b..c54f8cb 100644 --- a/src/net/apocalypselabs/symat/Debug.java +++ b/src/net/apocalypselabs/symat/Debug.java @@ -30,7 +30,7 @@ package net.apocalypselabs.symat; /** - * This class handles DEBUG logging, so it's easy to disable. + * This class handles debug logging, so it's easy to disable. * * @author Skylar */ diff --git a/src/net/apocalypselabs/symat/MainGUI.form b/src/net/apocalypselabs/symat/MainGUI.form index f766132..a6fdb70 100644 --- a/src/net/apocalypselabs/symat/MainGUI.form +++ b/src/net/apocalypselabs/symat/MainGUI.form @@ -80,8 +80,8 @@ - - + + diff --git a/src/net/apocalypselabs/symat/MainGUI.java b/src/net/apocalypselabs/symat/MainGUI.java index 7491e4d..706543f 100644 --- a/src/net/apocalypselabs/symat/MainGUI.java +++ b/src/net/apocalypselabs/symat/MainGUI.java @@ -403,8 +403,8 @@ public class MainGUI extends javax.swing.JFrame { .addComponent(graphBtn) .addGap(11, 11, 11) .addComponent(helpBtn) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(jLabel1, javax.swing.GroupLayout.DEFAULT_SIZE, 414, Short.MAX_VALUE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 124, Short.MAX_VALUE) + .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, 300, javax.swing.GroupLayout.PREFERRED_SIZE)) ); jPanel4Layout.setVerticalGroup( jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -792,11 +792,14 @@ public class MainGUI extends javax.swing.JFrame { try { // Ubuntu font for prettifying - ubuntuRegular = Font.createFont(Font.TRUETYPE_FONT, - new File(MainGUI.class. - getResource("resources/Ubuntu-R.ttf").toURI())); - } catch (URISyntaxException | FontFormatException | IOException ex) { + ubuntuRegular = Font.createFont(Font.TRUETYPE_FONT,MainGUI.class. + getResourceAsStream("/ubuntu.ttf")); + } catch (FontFormatException | IOException ex) { + ubuntuRegular = Font.getFont(Font.SANS_SERIF); + System.err.println("Error loading fonts: " + ex.getMessage()); + } catch (Exception ex) { ubuntuRegular = Font.getFont(Font.SANS_SERIF); + System.err.println("Error loading fonts: " + ex.getMessage()); } // Command line args diff --git a/src/net/apocalypselabs/symat/Notepad.form b/src/net/apocalypselabs/symat/Notepad.form new file mode 100644 index 0000000..f54b41e --- /dev/null +++ b/src/net/apocalypselabs/symat/Notepad.form @@ -0,0 +1,109 @@ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/src/net/apocalypselabs/symat/Notepad.java b/src/net/apocalypselabs/symat/Notepad.java new file mode 100644 index 0000000..b477a6b --- /dev/null +++ b/src/net/apocalypselabs/symat/Notepad.java @@ -0,0 +1,132 @@ +/* + * Apocalypse Laboratories + * Open Source License + * + * Source code can be used for any purpose, as long as: + * - Compiled binaries are rebranded and trademarks are not + * visible by the end user at any time, except to give + * credit to Apocalypse Laboratories, such as by showing + * "Based on by Apocalypse Laboratories" or a + * similar notice; + * - You do not use the code for evil; + * - Rebranded compiled applications have significant + * differences in functionality; + * - and you provide your modified source code for download, + * under the terms of the GNU LGPL v3 or a comparable + * license. + * + * Compiled binaries cannot be redistributed or mirrored, + * unless: + * - You have written permission from Apocalypse Laboratories; + * - Downloads are not available from Apocalypse Laboratories, + * not even behind a paywall or other blocking mechanism; + * - or you have received a multi-computer license, in which + * case you should take measures to prevent unauthorized + * downloads, such as preventing download access from the + * Internet. + */ +package net.apocalypselabs.symat; + +/** + * + * @author Skylar + */ +public class Notepad extends javax.swing.JInternalFrame { + + /** + * Creates new form Notepad + */ + public Notepad() { + initComponents(); + page1.setText(PrefStorage.getSetting("notepad1", "")); + page2.setText(PrefStorage.getSetting("notepad2", "")); + page3.setText(PrefStorage.getSetting("notepad3", "")); + } + + /** + * This method is called from within the constructor to initialize the form. + * WARNING: Do NOT modify this code. The content of this method is always + * regenerated by the Form Editor. + */ + @SuppressWarnings("unchecked") + // //GEN-BEGIN:initComponents + private void initComponents() { + + jTabbedPane1 = new javax.swing.JTabbedPane(); + jScrollPane1 = new javax.swing.JScrollPane(); + page1 = new javax.swing.JEditorPane(); + jScrollPane2 = new javax.swing.JScrollPane(); + page2 = new javax.swing.JEditorPane(); + jScrollPane3 = new javax.swing.JScrollPane(); + page3 = new javax.swing.JEditorPane(); + + setClosable(true); + setIconifiable(true); + setMaximizable(true); + setResizable(true); + setTitle("Notepad"); + + page1.addKeyListener(new java.awt.event.KeyAdapter() { + public void keyPressed(java.awt.event.KeyEvent evt) { + page1KeyPressed(evt); + } + }); + jScrollPane1.setViewportView(page1); + + jTabbedPane1.addTab("Page 1", jScrollPane1); + + page2.addKeyListener(new java.awt.event.KeyAdapter() { + public void keyPressed(java.awt.event.KeyEvent evt) { + page2KeyPressed(evt); + } + }); + jScrollPane2.setViewportView(page2); + + jTabbedPane1.addTab("Page 2", jScrollPane2); + + page3.addKeyListener(new java.awt.event.KeyAdapter() { + public void keyPressed(java.awt.event.KeyEvent evt) { + page3KeyPressed(evt); + } + }); + jScrollPane3.setViewportView(page3); + + jTabbedPane1.addTab("Page 3", jScrollPane3); + + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); + getContentPane().setLayout(layout); + layout.setHorizontalGroup( + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(jTabbedPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 394, Short.MAX_VALUE) + ); + layout.setVerticalGroup( + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(jTabbedPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 290, Short.MAX_VALUE) + ); + + pack(); + }// //GEN-END:initComponents + + private void page1KeyPressed(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_page1KeyPressed + PrefStorage.saveSetting("notepad1", page1.getText()); + }//GEN-LAST:event_page1KeyPressed + + private void page2KeyPressed(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_page2KeyPressed + PrefStorage.saveSetting("notepad2", page2.getText()); + }//GEN-LAST:event_page2KeyPressed + + private void page3KeyPressed(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_page3KeyPressed + PrefStorage.saveSetting("notepad3", page3.getText()); + }//GEN-LAST:event_page3KeyPressed + + + // Variables declaration - do not modify//GEN-BEGIN:variables + private javax.swing.JScrollPane jScrollPane1; + private javax.swing.JScrollPane jScrollPane2; + private javax.swing.JScrollPane jScrollPane3; + private javax.swing.JTabbedPane jTabbedPane1; + private javax.swing.JEditorPane page1; + private javax.swing.JEditorPane page2; + private javax.swing.JEditorPane page3; + // End of variables declaration//GEN-END:variables +} diff --git a/src/net/apocalypselabs/symat/SplashScreen.form b/src/net/apocalypselabs/symat/SplashScreen.form index 2722761..8198ff0 100644 --- a/src/net/apocalypselabs/symat/SplashScreen.form +++ b/src/net/apocalypselabs/symat/SplashScreen.form @@ -54,6 +54,9 @@ + + + diff --git a/src/net/apocalypselabs/symat/SplashScreen.java b/src/net/apocalypselabs/symat/SplashScreen.java index f1cc88e..a71906c 100644 --- a/src/net/apocalypselabs/symat/SplashScreen.java +++ b/src/net/apocalypselabs/symat/SplashScreen.java @@ -88,6 +88,7 @@ public class SplashScreen extends javax.swing.JFrame { dispLabel.setIcon(new javax.swing.ImageIcon(getClass().getResource("/net/apocalypselabs/symat/splash.gif"))); // NOI18N dispLabel.setText("

   "); dispLabel.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER); + dispLabel.setMaximumSize(new java.awt.Dimension(400, 320)); getContentPane().add(dispLabel); dispLabel.setBounds(0, 0, 400, 320); diff --git a/src/net/apocalypselabs/symat/resources/Ubuntu-R.ttf b/src/ubuntu.ttf similarity index 100% rename from src/net/apocalypselabs/symat/resources/Ubuntu-R.ttf rename to src/ubuntu.ttf