From 3219d526ed90771b49dc48a9b99f8fe823179251 Mon Sep 17 00:00:00 2001 From: skylarmt Date: Sat, 3 Jan 2015 01:18:14 -0700 Subject: [PATCH] Add "S" watermark to main screen to liven it up --- src/net/apocalypselabs/symat/Graph.form | 3 ++ src/net/apocalypselabs/symat/Graph.java | 1 + src/net/apocalypselabs/symat/MainGUI.form | 25 +++++++++++++--- src/net/apocalypselabs/symat/MainGUI.java | 27 +++++++++++++----- .../apocalypselabs/symat/images/watermark.png | Bin 0 -> 3946 bytes 5 files changed, 45 insertions(+), 11 deletions(-) create mode 100644 src/net/apocalypselabs/symat/images/watermark.png diff --git a/src/net/apocalypselabs/symat/Graph.form b/src/net/apocalypselabs/symat/Graph.form index d905813..8b4bd0f 100644 --- a/src/net/apocalypselabs/symat/Graph.form +++ b/src/net/apocalypselabs/symat/Graph.form @@ -170,6 +170,9 @@ + + + diff --git a/src/net/apocalypselabs/symat/Graph.java b/src/net/apocalypselabs/symat/Graph.java index 401184e..268cf7e 100644 --- a/src/net/apocalypselabs/symat/Graph.java +++ b/src/net/apocalypselabs/symat/Graph.java @@ -160,6 +160,7 @@ public class Graph extends javax.swing.JInternalFrame { gLbl.setBackground(new java.awt.Color(255, 255, 255)); gLbl.setHorizontalAlignment(javax.swing.SwingConstants.CENTER); + gLbl.setToolTipText(""); gLbl.setMaximumSize(new java.awt.Dimension(300, 300)); gLbl.setMinimumSize(new java.awt.Dimension(300, 300)); gLbl.setOpaque(true); diff --git a/src/net/apocalypselabs/symat/MainGUI.form b/src/net/apocalypselabs/symat/MainGUI.form index 88e66ed..7ebd808 100644 --- a/src/net/apocalypselabs/symat/MainGUI.form +++ b/src/net/apocalypselabs/symat/MainGUI.form @@ -1,13 +1,13 @@ -
+ - + @@ -330,15 +330,32 @@ - + + + + + - + + + + + + + + + + + + + + diff --git a/src/net/apocalypselabs/symat/MainGUI.java b/src/net/apocalypselabs/symat/MainGUI.java index 2e57357..ed1c8c0 100644 --- a/src/net/apocalypselabs/symat/MainGUI.java +++ b/src/net/apocalypselabs/symat/MainGUI.java @@ -42,14 +42,16 @@ import javax.swing.ImageIcon; import javax.swing.JInternalFrame; /** + * This class is like the Force: A light theme, a dark theme, and it binds the + * app together. Also like duct tape, but that's not as cool. * * @author Skylar */ public class MainGUI extends javax.swing.JFrame { - - public static final String APP_NAME = "SyMAT 0.9"; - public static final double APP_CODE = 10; - public static final String VERSION_NAME = "0.9"; + // TODO: Add more code comments and stuff in case anybody else reads this + public static final String APP_NAME = "SyMAT 0.9.1"; + public static final double APP_CODE = 11; + public static final String VERSION_NAME = "0.9.1"; public static final String API_URL = "https://apis.symatapp.com/"; public static String argfile = ""; public static boolean skipPython = false; // Skip python init on start? @@ -217,10 +219,11 @@ public class MainGUI extends javax.swing.JFrame { } } ; + jLabel2 = new javax.swing.JLabel(); setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE); setTitle(APP_NAME); - setMinimumSize(new java.awt.Dimension(300, 400)); + setMinimumSize(new java.awt.Dimension(640, 540)); addComponentListener(new java.awt.event.ComponentAdapter() { public void componentShown(java.awt.event.ComponentEvent evt) { formComponentShown(evt); @@ -397,16 +400,25 @@ public class MainGUI extends javax.swing.JFrame { mainPane.setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR)); mainPane.setOpaque(false); + jLabel2.setIcon(new javax.swing.ImageIcon(getClass().getResource("/net/apocalypselabs/symat/images/watermark.png"))); // NOI18N + javax.swing.GroupLayout mainPaneLayout = new javax.swing.GroupLayout(mainPane); mainPane.setLayout(mainPaneLayout); mainPaneLayout.setHorizontalGroup( mainPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 0, Short.MAX_VALUE) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, mainPaneLayout.createSequentialGroup() + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, 125, javax.swing.GroupLayout.PREFERRED_SIZE) + .addContainerGap()) ); mainPaneLayout.setVerticalGroup( mainPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 481, Short.MAX_VALUE) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, mainPaneLayout.createSequentialGroup() + .addContainerGap(295, Short.MAX_VALUE) + .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, 175, javax.swing.GroupLayout.PREFERRED_SIZE) + .addContainerGap()) ); + mainPane.setLayer(jLabel2, javax.swing.JLayeredPane.DEFAULT_LAYER); javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); getContentPane().setLayout(layout); @@ -600,6 +612,7 @@ public class MainGUI extends javax.swing.JFrame { public static javax.swing.JButton graphBtn; public static javax.swing.JButton helpBtn; public static javax.swing.JLabel jLabel1; + public static javax.swing.JLabel jLabel2; public static javax.swing.JLabel jLabel3; public static javax.swing.JPanel jPanel2; public static javax.swing.JPanel jPanel4; diff --git a/src/net/apocalypselabs/symat/images/watermark.png b/src/net/apocalypselabs/symat/images/watermark.png new file mode 100644 index 0000000000000000000000000000000000000000..2f7cb4924f5ba47443f244c7fb9ddfcb58afef7e GIT binary patch literal 3946 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 Ef