From 15c8a3276b036d17e18e37cecbf37f66218bc308 Mon Sep 17 00:00:00 2001 From: skylarmt Date: Thu, 18 Dec 2014 00:44:29 -0700 Subject: [PATCH] Fix graph window resize glitch for good, update internal help, tidy code --- src/net/apocalypselabs/symat/Graph.form | 14 ++++---- src/net/apocalypselabs/symat/Graph.java | 32 +++---------------- src/net/apocalypselabs/symat/Interpreter.form | 3 ++ src/net/apocalypselabs/symat/Interpreter.java | 6 ++-- .../apocalypselabs/symat/help/welcome.html | 4 +-- 5 files changed, 20 insertions(+), 39 deletions(-) diff --git a/src/net/apocalypselabs/symat/Graph.form b/src/net/apocalypselabs/symat/Graph.form index 9355961..6be9bbd 100644 --- a/src/net/apocalypselabs/symat/Graph.form +++ b/src/net/apocalypselabs/symat/Graph.form @@ -81,10 +81,13 @@ - + - + + + + @@ -92,9 +95,6 @@ - - - @@ -124,7 +124,7 @@ - + @@ -139,7 +139,7 @@ - + diff --git a/src/net/apocalypselabs/symat/Graph.java b/src/net/apocalypselabs/symat/Graph.java index 5a69dae..1d6756d 100644 --- a/src/net/apocalypselabs/symat/Graph.java +++ b/src/net/apocalypselabs/symat/Graph.java @@ -120,20 +120,10 @@ public class Graph extends javax.swing.JInternalFrame { setTitle("Graph"); setToolTipText(""); setFrameIcon(new javax.swing.ImageIcon(getClass().getResource("/net/apocalypselabs/symat/icons/graph.png"))); // NOI18N - setMaximumSize(new java.awt.Dimension(336, 406)); - setMinimumSize(new java.awt.Dimension(336, 406)); - addMouseMotionListener(new java.awt.event.MouseMotionAdapter() { - public void mouseDragged(java.awt.event.MouseEvent evt) { - formMouseDragged(evt); - } - public void mouseMoved(java.awt.event.MouseEvent evt) { - formMouseMoved(evt); - } - }); + setMaximumSize(new java.awt.Dimension(326, 402)); + setMinimumSize(new java.awt.Dimension(326, 402)); + setPreferredSize(new java.awt.Dimension(326, 402)); addComponentListener(new java.awt.event.ComponentAdapter() { - public void componentMoved(java.awt.event.ComponentEvent evt) { - formComponentMoved(evt); - } public void componentShown(java.awt.event.ComponentEvent evt) { formComponentShown(evt); } @@ -226,7 +216,7 @@ public class Graph extends javax.swing.JInternalFrame { .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(jButton1)) .addComponent(gLbl, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addContainerGap()) + .addGap(0, 0, 0)) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -238,7 +228,7 @@ public class Graph extends javax.swing.JInternalFrame { .addComponent(inBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(jLabel1) .addComponent(jButton1)) - .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addContainerGap()) ); pack(); @@ -335,18 +325,6 @@ public class Graph extends javax.swing.JInternalFrame { } }//GEN-LAST:event_inBoxKeyTyped - private void formComponentMoved(java.awt.event.ComponentEvent evt) {//GEN-FIRST:event_formComponentMoved - - }//GEN-LAST:event_formComponentMoved - - private void formMouseMoved(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_formMouseMoved - // TODO add your handling code here: - }//GEN-LAST:event_formMouseMoved - - private void formMouseDragged(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_formMouseDragged - - }//GEN-LAST:event_formMouseDragged - private void jMenuItem1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jMenuItem1ActionPerformed gpnl = new BufferedImage(300, 300, BufferedImage.TYPE_INT_ARGB); gg = gpnl.getGraphics(); diff --git a/src/net/apocalypselabs/symat/Interpreter.form b/src/net/apocalypselabs/symat/Interpreter.form index 3ea2caa..624e66c 100644 --- a/src/net/apocalypselabs/symat/Interpreter.form +++ b/src/net/apocalypselabs/symat/Interpreter.form @@ -125,8 +125,11 @@ + + + diff --git a/src/net/apocalypselabs/symat/Interpreter.java b/src/net/apocalypselabs/symat/Interpreter.java index ec25373..85de96f 100644 --- a/src/net/apocalypselabs/symat/Interpreter.java +++ b/src/net/apocalypselabs/symat/Interpreter.java @@ -90,8 +90,6 @@ public class Interpreter extends javax.swing.JInternalFrame { } // Misc. setup - mainBox.setLineWrap(true); - mainBox.setWrapStyleWord(true); mainBox.setText(">>"); inputBox.requestFocus(); } @@ -132,8 +130,11 @@ public class Interpreter extends javax.swing.JInternalFrame { mainBox.setEditable(false); mainBox.setColumns(20); mainBox.setFont(new java.awt.Font("Courier New", 0, 15)); // NOI18N + mainBox.setLineWrap(true); mainBox.setRows(5); mainBox.setTabSize(4); + mainBox.setToolTipText(""); + mainBox.setWrapStyleWord(true); DefaultCaret caret = (DefaultCaret)mainBox.getCaret(); caret.setUpdatePolicy(DefaultCaret.ALWAYS_UPDATE); jScrollPane1.setViewportView(mainBox); @@ -229,7 +230,6 @@ public class Interpreter extends javax.swing.JInternalFrame { private void inputBoxKeyTyped(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_inputBoxKeyTyped if (evt.getKeyChar() == '\n') { doRunCode(); - return; } }//GEN-LAST:event_inputBoxKeyTyped diff --git a/src/net/apocalypselabs/symat/help/welcome.html b/src/net/apocalypselabs/symat/help/welcome.html index f7871ec..f98fe2f 100644 --- a/src/net/apocalypselabs/symat/help/welcome.html +++ b/src/net/apocalypselabs/symat/help/welcome.html @@ -5,8 +5,8 @@

Welcome to SyMAT!

SyMAT is a Java-based algebra and calculus system. - Scripts and commands are in JavaScript.

+ Scripts and commands can be written in JavaScript or Python.

Copyright:
- SyMAT is copyright © 2014 Apocalypse Laboratories.

+ SyMAT is copyright © 2014 Apocalypse Laboratories. See Licenses for more information.