Netsyms/SyMAT
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve Python support, add loading screen, add button to close all windows, fix Graph window resize bug

Browse Source
This commit is contained in:
skylarmt 2014-12-17 23:55:35 -07:00
parent 05b6677096
commit b5c4c9c205
11 changed files with 445 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/net/apocalypselabs/symat/CodeRunner.java
View File

@ -85,6 +85,16 @@ public class CodeRunner {
this(lang); this(lang);
isShell = shell; isShell = shell;
} }
/**
* Inits the Python engine.
* @param fakeInit Set it to true.
*/
public CodeRunner(boolean fakeInit) {
if (fakeInit) {
se = new ScriptEngineManager().getEngineByName("python");
}
}
private void initError(Exception ex) { private void initError(Exception ex) {
JOptionPane.showMessageDialog(null, "Error: " JOptionPane.showMessageDialog(null, "Error: "

2
src/net/apocalypselabs/symat/Graph.form
View File

@ -124,7 +124,7 @@
</Group> </Group>
<Component id="gLbl" alignment="0" min="-2" max="-2" attributes="0"/> <Component id="gLbl" alignment="0" min="-2" max="-2" attributes="0"/>
</Group> </Group>
<EmptySpace max="32767" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
</Group> </Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>

2
src/net/apocalypselabs/symat/Graph.java
View File

@ -226,7 +226,7 @@ public class Graph extends javax.swing.JInternalFrame {
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(jButton1)) .addComponent(jButton1))
.addComponent(gLbl, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addComponent(gLbl, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addContainerGap())
); );
layout.setVerticalGroup( layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)

56
src/net/apocalypselabs/symat/Interpreter.form
View File

@ -1,6 +1,59 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<Form version="1.3" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JInternalFrameFormInfo"> <Form version="1.3" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JInternalFrameFormInfo">
<NonVisualComponents>
<Component class="javax.swing.ButtonGroup" name="langGroup">
</Component>
<Menu class="javax.swing.JMenuBar" name="jMenuBar1">
<SubComponents>
<Menu class="javax.swing.JMenu" name="langMenu">
<Properties>
<Property name="text" type="java.lang.String" value="Language"/>
</Properties>
<SubComponents>
<Menu class="javax.swing.JMenu" name="jMenu1">
<Properties>
<Property name="text" type="java.lang.String" value="Switch"/>
</Properties>
<SubComponents>
<MenuItem class="javax.swing.JRadioButtonMenuItem" name="javascriptMenu">
<Properties>
<Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
<ComponentRef name="langGroup"/>
</Property>
<Property name="selected" type="boolean" value="true"/>
<Property name="text" type="java.lang.String" value="JavaScript"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="javascriptMenuActionPerformed"/>
</Events>
</MenuItem>
<MenuItem class="javax.swing.JRadioButtonMenuItem" name="pythonMenu">
<Properties>
<Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
<ComponentRef name="langGroup"/>
</Property>
<Property name="text" type="java.lang.String" value="Python"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="pythonMenuActionPerformed"/>
</Events>
</MenuItem>
</SubComponents>
</Menu>
<MenuItem class="javax.swing.JMenuItem" name="setDefaultLang">
<Properties>
<Property name="text" type="java.lang.String" value="Set as default"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="setDefaultLangActionPerformed"/>
</Events>
</MenuItem>
</SubComponents>
</Menu>
</SubComponents>
</Menu>
</NonVisualComponents>
<Properties> <Properties>
<Property name="closable" type="boolean" value="true"/> <Property name="closable" type="boolean" value="true"/>
<Property name="iconifiable" type="boolean" value="true"/> <Property name="iconifiable" type="boolean" value="true"/>
@ -12,6 +65,7 @@
</Property> </Property>
</Properties> </Properties>
<SyntheticProperties> <SyntheticProperties>
<SyntheticProperty name="menuBar" type="java.lang.String" value="jMenuBar1"/>
<SyntheticProperty name="formSizePolicy" type="int" value="1"/> <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
</SyntheticProperties> </SyntheticProperties>
<AuxValues> <AuxValues>
@ -42,7 +96,7 @@
<DimensionLayout dim="1"> <DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0"> <Group type="102" alignment="0" attributes="0">
<Component id="jScrollPane1" pref="256" max="32767" attributes="0"/> <Component id="jScrollPane1" pref="239" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Component id="runBtn" min="-2" pref="26" max="-2" attributes="0"/> <Component id="runBtn" min="-2" pref="26" max="-2" attributes="0"/>

107
src/net/apocalypselabs/symat/Interpreter.java
View File

@ -38,15 +38,34 @@ import javax.swing.text.DefaultCaret;
*/ */
public class Interpreter extends javax.swing.JInternalFrame { public class Interpreter extends javax.swing.JInternalFrame {
private final CodeRunner cr = new CodeRunner("javascript", true); private final CodeRunner cr;
private String[] history = new String[10]; // Command history buffer private String[] history = new String[10]; // Command history buffer
private int historyIndex = 0; // For going back in time and keeping things straight private int historyIndex = 0; // For going back in time and keeping things straight
private String lang = "javascript";
/** /**
* Creates new form Interpreter * Creates new form Interpreter
*
* @param useLang The script language to use. "javascript", "python", or
* "default".
*/ */
public Interpreter() { public Interpreter(String useLang) {
initComponents(); initComponents();
// Setup code runner
lang = useLang;
if (lang.equals("default")) {
lang = PrefStorage.getSetting("shellLang", "javascript");
}
cr = new CodeRunner(lang, true);
// Set selected lang menu
if (lang.equals("python")) {
javascriptMenu.setSelected(false);
pythonMenu.setSelected(true);
}
// Set font
int font_size = 12; int font_size = 12;
try { try {
font_size = Integer.valueOf(PrefStorage.getSetting("editfont")); font_size = Integer.valueOf(PrefStorage.getSetting("editfont"));
@ -54,6 +73,8 @@ public class Interpreter extends javax.swing.JInternalFrame {
} }
mainBox.setFont(new Font(Font.MONOSPACED, Font.PLAIN, font_size)); mainBox.setFont(new Font(Font.MONOSPACED, Font.PLAIN, font_size));
inputBox.setFont(new Font(Font.MONOSPACED, Font.PLAIN, font_size)); inputBox.setFont(new Font(Font.MONOSPACED, Font.PLAIN, font_size));
// Set theme
if (PrefStorage.getSetting("theme").equals("dark")) { if (PrefStorage.getSetting("theme").equals("dark")) {
mainBox.setBackground(Color.BLACK); mainBox.setBackground(Color.BLACK);
mainBox.setForeground(Color.WHITE); mainBox.setForeground(Color.WHITE);
@ -67,12 +88,18 @@ public class Interpreter extends javax.swing.JInternalFrame {
inputBox.setForeground(Color.BLACK); inputBox.setForeground(Color.BLACK);
setBackground(Color.LIGHT_GRAY); setBackground(Color.LIGHT_GRAY);
} }
// Misc. setup
mainBox.setLineWrap(true); mainBox.setLineWrap(true);
mainBox.setWrapStyleWord(true); mainBox.setWrapStyleWord(true);
mainBox.setText(">>"); mainBox.setText(">>");
inputBox.requestFocus(); inputBox.requestFocus();
} }
public Interpreter() {
this("default");
}
/** /**
* This method is called from within the constructor to initialize the form. * 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 * WARNING: Do NOT modify this code. The content of this method is always
@ -82,11 +109,18 @@ public class Interpreter extends javax.swing.JInternalFrame {
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
private void initComponents() { private void initComponents() {
langGroup = new javax.swing.ButtonGroup();
jScrollPane1 = new javax.swing.JScrollPane(); jScrollPane1 = new javax.swing.JScrollPane();
mainBox = new javax.swing.JTextArea(); mainBox = new javax.swing.JTextArea();
inputBox = new javax.swing.JTextField(); inputBox = new javax.swing.JTextField();
runBtn = new javax.swing.JButton(); runBtn = new javax.swing.JButton();
jLabel1 = new javax.swing.JLabel(); jLabel1 = new javax.swing.JLabel();
jMenuBar1 = new javax.swing.JMenuBar();
langMenu = new javax.swing.JMenu();
jMenu1 = new javax.swing.JMenu();
javascriptMenu = new javax.swing.JRadioButtonMenuItem();
pythonMenu = new javax.swing.JRadioButtonMenuItem();
setDefaultLang = new javax.swing.JMenuItem();
setClosable(true); setClosable(true);
setIconifiable(true); setIconifiable(true);
@ -123,6 +157,43 @@ public class Interpreter extends javax.swing.JInternalFrame {
jLabel1.setHorizontalAlignment(javax.swing.SwingConstants.CENTER); jLabel1.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
jLabel1.setText(">>"); jLabel1.setText(">>");
langMenu.setText("Language");
jMenu1.setText("Switch");
langGroup.add(javascriptMenu);
javascriptMenu.setSelected(true);
javascriptMenu.setText("JavaScript");
javascriptMenu.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
javascriptMenuActionPerformed(evt);
}
});
jMenu1.add(javascriptMenu);
langGroup.add(pythonMenu);
pythonMenu.setText("Python");
pythonMenu.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
pythonMenuActionPerformed(evt);
}
});
jMenu1.add(pythonMenu);
langMenu.add(jMenu1);
setDefaultLang.setText("Set as default");
setDefaultLang.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
setDefaultLangActionPerformed(evt);
}
});
langMenu.add(setDefaultLang);
jMenuBar1.add(langMenu);
setJMenuBar(jMenuBar1);
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
getContentPane().setLayout(layout); getContentPane().setLayout(layout);
layout.setHorizontalGroup( layout.setHorizontalGroup(
@ -138,7 +209,7 @@ public class Interpreter extends javax.swing.JInternalFrame {
layout.setVerticalGroup( layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup() .addGroup(layout.createSequentialGroup()
.addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 256, Short.MAX_VALUE) .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 239, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(runBtn, javax.swing.GroupLayout.PREFERRED_SIZE, 26, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(runBtn, javax.swing.GroupLayout.PREFERRED_SIZE, 26, javax.swing.GroupLayout.PREFERRED_SIZE)
@ -187,6 +258,29 @@ public class Interpreter extends javax.swing.JInternalFrame {
} }
}//GEN-LAST:event_inputBoxKeyPressed }//GEN-LAST:event_inputBoxKeyPressed
private void setDefaultLangActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_setDefaultLangActionPerformed
String pref = "javascript";
if (pythonMenu.isSelected()) {
pref = "python";
}
PrefStorage.saveSetting("shellLang", pref);
PrefStorage.save();
}//GEN-LAST:event_setDefaultLangActionPerformed
private void javascriptMenuActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_javascriptMenuActionPerformed
if (!lang.equals("javascript")) {
MainGUI.loadFrame(new Interpreter("javascript"));
dispose();
}
}//GEN-LAST:event_javascriptMenuActionPerformed
private void pythonMenuActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_pythonMenuActionPerformed
if (!lang.equals("python")) {
MainGUI.loadFrame(new Interpreter("python"));
dispose();
}
}//GEN-LAST:event_pythonMenuActionPerformed
private void doRunCode() { private void doRunCode() {
String code = inputBox.getText(); String code = inputBox.getText();
mainBox.append(" " + code + "\n"); mainBox.append(" " + code + "\n");
@ -207,8 +301,15 @@ public class Interpreter extends javax.swing.JInternalFrame {
// Variables declaration - do not modify//GEN-BEGIN:variables // Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JTextField inputBox; private javax.swing.JTextField inputBox;
private javax.swing.JLabel jLabel1; private javax.swing.JLabel jLabel1;
private javax.swing.JMenu jMenu1;
private javax.swing.JMenuBar jMenuBar1;
private javax.swing.JScrollPane jScrollPane1; private javax.swing.JScrollPane jScrollPane1;
private javax.swing.JRadioButtonMenuItem javascriptMenu;
private javax.swing.ButtonGroup langGroup;
private javax.swing.JMenu langMenu;
private javax.swing.JTextArea mainBox; private javax.swing.JTextArea mainBox;
private javax.swing.JRadioButtonMenuItem pythonMenu;
private javax.swing.JButton runBtn; private javax.swing.JButton runBtn;
private javax.swing.JMenuItem setDefaultLang;
// End of variables declaration//GEN-END:variables // End of variables declaration//GEN-END:variables
} }

34
src/net/apocalypselabs/symat/MainGUI.form
View File

@ -9,9 +9,6 @@
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[300, 400]"/> <Dimension value="[300, 400]"/>
</Property> </Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[700, 575]"/>
</Property>
</Properties> </Properties>
<SyntheticProperties> <SyntheticProperties>
<SyntheticProperty name="formSizePolicy" type="int" value="1"/> <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
@ -216,18 +213,19 @@
<Component id="helpBtn" min="-2" max="-2" attributes="0"/> <Component id="helpBtn" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="arrangeWindowsBtn" min="-2" max="-2" attributes="0"/> <Component id="arrangeWindowsBtn" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="closeAllBtn" min="-2" max="-2" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/> <EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="jLabel3" pref="555" max="32767" attributes="0"/> <Component id="jLabel3" pref="492" max="32767" attributes="0"/>
</Group> </Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
<DimensionLayout dim="1"> <DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Group type="103" groupAlignment="0" attributes="0"> <Component id="helpBtn" min="-2" max="-2" attributes="0"/>
<Component id="helpBtn" min="-2" max="-2" attributes="0"/> <Component id="jLabel3" min="-2" pref="65" max="-2" attributes="0"/>
<Component id="jLabel3" min="-2" pref="65" max="-2" attributes="0"/>
</Group>
<Component id="arrangeWindowsBtn" min="-2" max="-2" attributes="0"/> <Component id="arrangeWindowsBtn" min="-2" max="-2" attributes="0"/>
<Component id="closeAllBtn" alignment="0" min="-2" max="-2" attributes="0"/>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
</Layout> </Layout>
@ -281,6 +279,26 @@
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="arrangeWindowsBtnActionPerformed"/> <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="arrangeWindowsBtnActionPerformed"/>
</Events> </Events>
</Component> </Component>
<Component class="javax.swing.JButton" name="closeAllBtn">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/net/apocalypselabs/symat/closeall.png"/>
</Property>
<Property name="text" type="java.lang.String" value="Close All"/>
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
<Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">
<EmptyBorder bottom="5" left="5" right="5" top="5"/>
</Border>
</Property>
<Property name="focusable" type="boolean" value="false"/>
<Property name="horizontalTextPosition" type="int" value="0"/>
<Property name="opaque" type="boolean" value="false"/>
<Property name="verticalTextPosition" type="int" value="3"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="closeAllBtnActionPerformed"/>
</Events>
</Component>
</SubComponents> </SubComponents>
</Container> </Container>
<Container class="javax.swing.JPanel" name="jPanel3"> <Container class="javax.swing.JPanel" name="jPanel3">

69
src/net/apocalypselabs/symat/MainGUI.java
View File

@ -1,7 +1,7 @@
/* /*
* Apocalypse Laboratories * Apocalypse Laboratories
* Open Source License * Open Source License
* *
* Source code can be used for any purpose, as long as: * Source code can be used for any purpose, as long as:
* - Compiled binaries are rebranded and trademarks are not * - Compiled binaries are rebranded and trademarks are not
* visible by the end user at any time, except to give * visible by the end user at any time, except to give
@ -14,7 +14,7 @@
* - and you provide your modified source code for download, * - and you provide your modified source code for download,
* under the terms of the GNU LGPL v3 or a comparable * under the terms of the GNU LGPL v3 or a comparable
* license. * license.
* *
* Compiled binaries cannot be redistributed or mirrored, * Compiled binaries cannot be redistributed or mirrored,
* unless: * unless:
* - You have written permission from Apocalypse Laboratories; * - You have written permission from Apocalypse Laboratories;
@ -22,15 +22,14 @@
* not even behind a paywall or other blocking mechanism; * not even behind a paywall or other blocking mechanism;
* - or you have received a multi-computer license, in which * - or you have received a multi-computer license, in which
* case you should take measures to prevent unauthorized * case you should take measures to prevent unauthorized
* downloads, such as preventing download access from the * downloads, such as preventing download access from the
* Internet. * Internet.
*/ */
package net.apocalypselabs.symat; package net.apocalypselabs.symat;
import java.awt.Color; import java.awt.Color;
import java.awt.Component;
import java.awt.Font;
import java.awt.Graphics; import java.awt.Graphics;
import java.beans.PropertyVetoException;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
@ -45,9 +44,10 @@ import javax.swing.JInternalFrame;
*/ */
public class MainGUI extends javax.swing.JFrame { public class MainGUI extends javax.swing.JFrame {
public static final String APP_NAME = "SyMAT 0.6"; public static final String APP_NAME = "SyMAT 0.7";
public static final double APP_CODE = 0.6; public static final double APP_CODE = 0.7;
public static String argfile = ""; public static String argfile = "";
public static boolean skipPython = false; // Skip python init on start?
/** /**
* Creates new form MainGUI * Creates new form MainGUI
@ -122,7 +122,6 @@ public class MainGUI extends javax.swing.JFrame {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
private void initComponents() { private void initComponents() {
java.awt.GridBagConstraints gridBagConstraints;
tabs = new javax.swing.JTabbedPane(); tabs = new javax.swing.JTabbedPane();
jPanel4 = new javax.swing.JPanel(); jPanel4 = new javax.swing.JPanel();
@ -135,6 +134,7 @@ public class MainGUI extends javax.swing.JFrame {
helpBtn = new javax.swing.JButton(); helpBtn = new javax.swing.JButton();
jLabel3 = new javax.swing.JLabel(); jLabel3 = new javax.swing.JLabel();
arrangeWindowsBtn = new javax.swing.JButton(); arrangeWindowsBtn = new javax.swing.JButton();
closeAllBtn = new javax.swing.JButton();
jPanel3 = new javax.swing.JPanel(); jPanel3 = new javax.swing.JPanel();
jLabel4 = new javax.swing.JLabel(); jLabel4 = new javax.swing.JLabel();
displaySettingsBtn = new javax.swing.JButton(); displaySettingsBtn = new javax.swing.JButton();
@ -155,7 +155,6 @@ public class MainGUI extends javax.swing.JFrame {
setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE); setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
setTitle(APP_NAME); setTitle(APP_NAME);
setMinimumSize(new java.awt.Dimension(300, 400)); setMinimumSize(new java.awt.Dimension(300, 400));
setPreferredSize(new java.awt.Dimension(700, 575));
addComponentListener(new java.awt.event.ComponentAdapter() { addComponentListener(new java.awt.event.ComponentAdapter() {
public void componentShown(java.awt.event.ComponentEvent evt) { public void componentShown(java.awt.event.ComponentEvent evt) {
formComponentShown(evt); formComponentShown(evt);
@ -273,6 +272,19 @@ public class MainGUI extends javax.swing.JFrame {
} }
}); });
closeAllBtn.setIcon(new javax.swing.ImageIcon(getClass().getResource("/net/apocalypselabs/symat/closeall.png"))); // NOI18N
closeAllBtn.setText("Close All");
closeAllBtn.setBorder(javax.swing.BorderFactory.createEmptyBorder(5, 5, 5, 5));
closeAllBtn.setFocusable(false);
closeAllBtn.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
closeAllBtn.setOpaque(false);
closeAllBtn.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
closeAllBtn.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
closeAllBtnActionPerformed(evt);
}
});
javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout(jPanel2); javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout(jPanel2);
jPanel2.setLayout(jPanel2Layout); jPanel2.setLayout(jPanel2Layout);
jPanel2Layout.setHorizontalGroup( jPanel2Layout.setHorizontalGroup(
@ -282,15 +294,17 @@ public class MainGUI extends javax.swing.JFrame {
.addComponent(helpBtn) .addComponent(helpBtn)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(arrangeWindowsBtn) .addComponent(arrangeWindowsBtn)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(closeAllBtn)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(jLabel3, javax.swing.GroupLayout.DEFAULT_SIZE, 555, Short.MAX_VALUE)) .addComponent(jLabel3, javax.swing.GroupLayout.DEFAULT_SIZE, 492, Short.MAX_VALUE))
); );
jPanel2Layout.setVerticalGroup( jPanel2Layout.setVerticalGroup(
jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(helpBtn)
.addComponent(helpBtn) .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, 65, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, 65, javax.swing.GroupLayout.PREFERRED_SIZE))
.addComponent(arrangeWindowsBtn) .addComponent(arrangeWindowsBtn)
.addComponent(closeAllBtn)
); );
tabs.addTab("Tools", jPanel2); tabs.addTab("Tools", jPanel2);
@ -403,6 +417,16 @@ public class MainGUI extends javax.swing.JFrame {
loadFrame(d); loadFrame(d);
}//GEN-LAST:event_displaySettingsBtnActionPerformed }//GEN-LAST:event_displaySettingsBtnActionPerformed
private void closeAllBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_closeAllBtnActionPerformed
for (JInternalFrame ji : mainPane.getAllFrames()) {
try {
ji.setClosed(true);
} catch (PropertyVetoException ex) {
ji.dispose();
}
}
}//GEN-LAST:event_closeAllBtnActionPerformed
/** /**
* Adds the given JInternalFrame to the mainPane. Automatically does layout * Adds the given JInternalFrame to the mainPane. Automatically does layout
* and sets visible as well. * and sets visible as well.
@ -471,22 +495,27 @@ public class MainGUI extends javax.swing.JFrame {
//</editor-fold> //</editor-fold>
// Command line args
for (String arg : args) {
if (arg.equals("skippython")) {
skipPython = true;
} else {
argfile = args[0];
}
}
/* Create and display the form */ /* Create and display the form */
java.awt.EventQueue.invokeLater(new Runnable() { java.awt.EventQueue.invokeLater(new Runnable() {
@Override @Override
public void run() { public void run() {
new MainGUI().setVisible(true); new SplashScreen().setVisible(true);
} }
}); });
// Trigger open passed script file
if (args.length == 1) {
argfile = args[0];
}
} }
// Variables declaration - do not modify//GEN-BEGIN:variables // Variables declaration - do not modify//GEN-BEGIN:variables
public static javax.swing.JButton arrangeWindowsBtn; public static javax.swing.JButton arrangeWindowsBtn;
public static javax.swing.JButton closeAllBtn;
public static javax.swing.JButton displaySettingsBtn; public static javax.swing.JButton displaySettingsBtn;
public static javax.swing.JButton editorBtn; public static javax.swing.JButton editorBtn;
public static javax.swing.JButton graphBtn; public static javax.swing.JButton graphBtn;

76
src/net/apocalypselabs/symat/SplashScreen.form Normal file
View File

@ -0,0 +1,76 @@
<?xml version="1.0" encoding="UTF-8" ?>
<Form version="1.3" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JFrameFormInfo">
<Properties>
<Property name="defaultCloseOperation" type="int" value="2"/>
<Property name="title" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
<Connection code="MainGUI.APP_NAME" type="code"/>
</Property>
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[320, 260]"/>
</Property>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[320, 260]"/>
</Property>
<Property name="resizable" type="boolean" value="false"/>
</Properties>
<SyntheticProperties>
<SyntheticProperty name="formSizePolicy" type="int" value="1"/>
<SyntheticProperty name="generateCenter" type="boolean" value="false"/>
</SyntheticProperties>
<Events>
<EventHandler event="componentShown" listener="java.awt.event.ComponentListener" parameters="java.awt.event.ComponentEvent" handler="formComponentShown"/>
</Events>
<AuxValues>
<AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
<AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
<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"/>
</AuxValues>
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<Component id="jProgressBar1" max="32767" attributes="0"/>
<Component id="jLabel5" min="-2" max="-2" attributes="0"/>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<Component id="jLabel5" min="-2" max="-2" attributes="0"/>
<EmptySpace min="0" pref="0" max="-2" attributes="0"/>
<Component id="jProgressBar1" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
</Layout>
<SubComponents>
<Component class="javax.swing.JProgressBar" name="jProgressBar1">
<Properties>
<Property name="indeterminate" type="boolean" value="true"/>
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[32767, 20]"/>
</Property>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[10, 20]"/>
</Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[146, 20]"/>
</Property>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="jLabel5">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/net/apocalypselabs/symat/splash.png"/>
</Property>
</Properties>
</Component>
</SubComponents>
</Form>

123
src/net/apocalypselabs/symat/SplashScreen.java Normal file
View File

@ -0,0 +1,123 @@
/*
* 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 <product> 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;
import javax.swing.ImageIcon;
/**
*
* @author Skylar
*/
public class SplashScreen extends javax.swing.JFrame {
/**
* Creates new form SplashScreen
*/
public SplashScreen() {
initComponents();
setIconImage((new ImageIcon(getClass().getResource("icon.png"))).getImage());
setLocationRelativeTo(null);
}
/**
* 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")
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
private void initComponents() {
jProgressBar1 = new javax.swing.JProgressBar();
jLabel5 = new javax.swing.JLabel();
setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
setTitle(MainGUI.APP_NAME);
setMaximumSize(new java.awt.Dimension(320, 260));
setMinimumSize(new java.awt.Dimension(320, 260));
setResizable(false);
addComponentListener(new java.awt.event.ComponentAdapter() {
public void componentShown(java.awt.event.ComponentEvent evt) {
formComponentShown(evt);
}
});
jProgressBar1.setIndeterminate(true);
jProgressBar1.setMaximumSize(new java.awt.Dimension(32767, 20));
jProgressBar1.setMinimumSize(new java.awt.Dimension(10, 20));
jProgressBar1.setPreferredSize(new java.awt.Dimension(146, 20));
jLabel5.setIcon(new javax.swing.ImageIcon(getClass().getResource("/net/apocalypselabs/symat/splash.png"))); // NOI18N
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
getContentPane().setLayout(layout);
layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(jProgressBar1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(jLabel5)
);
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addComponent(jLabel5)
.addGap(0, 0, 0)
.addComponent(jProgressBar1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
);
pack();
}// </editor-fold>//GEN-END:initComponents
private void formComponentShown(java.awt.event.ComponentEvent evt) {//GEN-FIRST:event_formComponentShown
new Loader().start();
}//GEN-LAST:event_formComponentShown
/**
* Load things that take a while.
*/
private class Loader extends Thread {
@Override
public void run() {
if (!MainGUI.skipPython) {
// Python laggggsss when used for first time, this fixes the wait later.
System.out.println("Warming up Python engine, to skip run with argument 'skippython'");
try {
CodeRunner python = new CodeRunner(true);
} catch (Exception ex) {
// Ignore
}
}
new MainGUI().setVisible(true);
dispose();
}
}
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JLabel jLabel5;
private javax.swing.JProgressBar jProgressBar1;
// End of variables declaration//GEN-END:variables
}

BIN
src/net/apocalypselabs/symat/closeall.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
src/net/apocalypselabs/symat/splash.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 26 KiB