-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
-
+
@@ -66,16 +60,10 @@
-
-
-
-
+
-
-
-
-
-
+
+
@@ -100,7 +88,7 @@
-
+
@@ -136,69 +124,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -207,13 +132,5 @@
-
-
-
-
-
-
-
-
diff --git a/src/net/apocalypselabs/symat/Display.java b/src/net/apocalypselabs/symat/Display.java
index d82fc8f..188ef5f 100644
--- a/src/net/apocalypselabs/symat/Display.java
+++ b/src/net/apocalypselabs/symat/Display.java
@@ -55,19 +55,15 @@ public class Display extends javax.swing.JInternalFrame {
jPanel1 = new javax.swing.JPanel();
themeLight = new javax.swing.JRadioButton();
themeDark = new javax.swing.JRadioButton();
- jPanel2 = new javax.swing.JPanel();
- fontSizeBox = new javax.swing.JComboBox();
- jLabel1 = new javax.swing.JLabel();
saveBtn = new javax.swing.JButton();
- cancelBtn = new javax.swing.JButton();
setClosable(true);
setIconifiable(true);
- setTitle("Display Settings");
+ setTitle("Theme");
setFrameIcon(new javax.swing.ImageIcon(getClass().getResource("/net/apocalypselabs/symat/icons/settings.png"))); // NOI18N
- setMaximumSize(new java.awt.Dimension(250, 200));
- setMinimumSize(new java.awt.Dimension(250, 200));
- setPreferredSize(new java.awt.Dimension(250, 200));
+ setMaximumSize(new java.awt.Dimension(170, 190));
+ setMinimumSize(new java.awt.Dimension(170, 190));
+ setPreferredSize(new java.awt.Dimension(170, 190));
addComponentListener(new java.awt.event.ComponentAdapter() {
public void componentShown(java.awt.event.ComponentEvent evt) {
formComponentShown(evt);
@@ -93,7 +89,7 @@ public class Display extends javax.swing.JInternalFrame {
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(themeLight)
.addComponent(themeDark))
- .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addContainerGap(67, Short.MAX_VALUE))
);
jPanel1Layout.setVerticalGroup(
jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -105,35 +101,6 @@ public class Display extends javax.swing.JInternalFrame {
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
- jPanel2.setBorder(javax.swing.BorderFactory.createTitledBorder("Font"));
- jPanel2.setToolTipText("Change the default font for the editor and shell.");
-
- fontSizeBox.setEditable(true);
- fontSizeBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "8", "9", "10", "11", "12", "14", "16", "18", "20", "22", "24" }));
-
- jLabel1.setText("Font Size (pt): ");
-
- javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout(jPanel2);
- jPanel2.setLayout(jPanel2Layout);
- jPanel2Layout.setHorizontalGroup(
- jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(jPanel2Layout.createSequentialGroup()
- .addContainerGap()
- .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
- .addComponent(jLabel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(fontSizeBox, 0, 0, Short.MAX_VALUE))
- .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
- );
- jPanel2Layout.setVerticalGroup(
- jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(jPanel2Layout.createSequentialGroup()
- .addContainerGap()
- .addComponent(jLabel1)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(fontSizeBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addContainerGap())
- );
-
saveBtn.setText("Save");
saveBtn.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -141,56 +108,33 @@ public class Display extends javax.swing.JInternalFrame {
}
});
- cancelBtn.setText("Cancel");
- cancelBtn.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- cancelBtnActionPerformed(evt);
- }
- });
-
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
getContentPane().setLayout(layout);
layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
- .addGroup(layout.createSequentialGroup()
- .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(cancelBtn)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(saveBtn, javax.swing.GroupLayout.PREFERRED_SIZE, 81, javax.swing.GroupLayout.PREFERRED_SIZE))
- .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
- .addContainerGap()
- .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
- .addComponent(jPanel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
- .addContainerGap(37, Short.MAX_VALUE))
+ .addContainerGap()
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
+ .addGap(0, 0, Short.MAX_VALUE)
+ .addComponent(saveBtn, javax.swing.GroupLayout.PREFERRED_SIZE, 73, javax.swing.GroupLayout.PREFERRED_SIZE)))
+ .addContainerGap())
);
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addContainerGap()
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
- .addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(jPanel2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
- .addComponent(saveBtn)
- .addComponent(cancelBtn))
- .addContainerGap(39, Short.MAX_VALUE))
+ .addComponent(saveBtn)
+ .addContainerGap(29, Short.MAX_VALUE))
);
pack();
}// //GEN-END:initComponents
- private void cancelBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cancelBtnActionPerformed
- dispose();
- }//GEN-LAST:event_cancelBtnActionPerformed
-
private void formComponentShown(java.awt.event.ComponentEvent evt) {//GEN-FIRST:event_formComponentShown
- if (PrefStorage.isset("editfont")) {
- fontSizeBox.setSelectedItem(PrefStorage.getSetting("editfont"));
- }
if (PrefStorage.isset("theme")) {
switch (PrefStorage.getSetting("theme")) {
case "dark":
@@ -205,7 +149,6 @@ public class Display extends javax.swing.JInternalFrame {
}//GEN-LAST:event_formComponentShown
private void saveBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_saveBtnActionPerformed
- PrefStorage.saveSetting("editfont", fontSizeBox.getSelectedItem().toString());
if (themeDark.isSelected()) {
PrefStorage.saveSetting("theme", "dark");
} else {
@@ -223,11 +166,7 @@ public class Display extends javax.swing.JInternalFrame {
}//GEN-LAST:event_saveBtnActionPerformed
// Variables declaration - do not modify//GEN-BEGIN:variables
- private javax.swing.JButton cancelBtn;
- private javax.swing.JComboBox fontSizeBox;
- private javax.swing.JLabel jLabel1;
private javax.swing.JPanel jPanel1;
- private javax.swing.JPanel jPanel2;
private javax.swing.JButton saveBtn;
private javax.swing.JRadioButton themeDark;
private javax.swing.ButtonGroup themeGroup;
diff --git a/src/net/apocalypselabs/symat/Help.java b/src/net/apocalypselabs/symat/Help.java
index 342be6d..9733c50 100644
--- a/src/net/apocalypselabs/symat/Help.java
+++ b/src/net/apocalypselabs/symat/Help.java
@@ -56,7 +56,7 @@ public class Help extends javax.swing.JInternalFrame {
*/
public Help(boolean about) {
initComponents();
- setSize(450,352);
+ setSize(450, 352);
jSplitPane1.setDividerSize(0);
jSplitPane1.setDividerLocation(0.0);
jSplitPane1.setResizeWeight(0.0);
@@ -82,7 +82,7 @@ public class Help extends javax.swing.JInternalFrame {
+ ""
+ "About
"
+ "This is SyMAT version "
- + MainGUI.VERSION_NAME + " (" + (int)MainGUI.APP_CODE + ")."
+ + MainGUI.VERSION_NAME + " (" + (int) MainGUI.APP_CODE + ")."
+ "
"
+ "SyMAT is copyright © "
+ Calendar.getInstance().get(Calendar.YEAR)
diff --git a/src/net/apocalypselabs/symat/MainGUI.form b/src/net/apocalypselabs/symat/MainGUI.form
index d37da50..863534a 100644
--- a/src/net/apocalypselabs/symat/MainGUI.form
+++ b/src/net/apocalypselabs/symat/MainGUI.form
@@ -52,36 +52,14 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -95,28 +73,39 @@
-
+
-
+
-
+
-
-
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
@@ -191,45 +180,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -250,6 +200,50 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -299,54 +293,12 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/src/net/apocalypselabs/symat/MainGUI.java b/src/net/apocalypselabs/symat/MainGUI.java
index ce09ad0..52f404c 100644
--- a/src/net/apocalypselabs/symat/MainGUI.java
+++ b/src/net/apocalypselabs/symat/MainGUI.java
@@ -45,9 +45,9 @@ import javax.swing.JInternalFrame;
*/
public class MainGUI extends javax.swing.JFrame {
- public static final String APP_NAME = "SyMAT 0.8.2";
- public static final double APP_CODE = 9;
- public static final String VERSION_NAME = "0.8.2";
+ public static final String APP_NAME = "SyMAT 0.9";
+ public static final double APP_CODE = 10;
+ public static final String VERSION_NAME = "0.9";
public static String argfile = "";
public static boolean skipPython = false; // Skip python init on start?
public static boolean skipEditor = false; // Skip editor init on start?
@@ -110,9 +110,8 @@ public class MainGUI extends javax.swing.JFrame {
editorBtn.setMnemonic(KeyEvent.VK_D);
graphBtn.setMnemonic(KeyEvent.VK_G);
helpBtn.setMnemonic(KeyEvent.VK_M);
- tabs.setMnemonicAt(1, KeyEvent.VK_A);
- tabs.setMnemonicAt(2, KeyEvent.VK_T);
- tabs.setMnemonicAt(3, KeyEvent.VK_E);
+ tabs.setMnemonicAt(0, KeyEvent.VK_A);
+ tabs.setMnemonicAt(1, KeyEvent.VK_V);
}
/**
@@ -156,18 +155,15 @@ public class MainGUI extends javax.swing.JFrame {
tabs = new javax.swing.JTabbedPane();
jPanel4 = new javax.swing.JPanel();
- jPanel1 = new javax.swing.JPanel();
shellBtn = new javax.swing.JButton();
editorBtn = new javax.swing.JButton();
graphBtn = new javax.swing.JButton();
jLabel1 = new javax.swing.JLabel();
- jPanel2 = new javax.swing.JPanel();
helpBtn = new javax.swing.JButton();
+ jPanel2 = new javax.swing.JPanel();
jLabel3 = new javax.swing.JLabel();
arrangeWindowsBtn = new javax.swing.JButton();
closeAllBtn = new javax.swing.JButton();
- jPanel3 = new javax.swing.JPanel();
- jLabel4 = new javax.swing.JLabel();
displaySettingsBtn = new javax.swing.JButton();
mainPane = mainPane = new javax.swing.JDesktopPane() {
@Override
@@ -194,17 +190,9 @@ public class MainGUI extends javax.swing.JFrame {
tabs.setBackground(new Color(240,240,240));
tabs.setOpaque(true);
- tabs.addChangeListener(new javax.swing.event.ChangeListener() {
- public void stateChanged(javax.swing.event.ChangeEvent evt) {
- tabsStateChanged(evt);
- }
- });
jPanel4.setFocusable(false);
- jPanel4.setLayout(null);
- tabs.addTab("", new javax.swing.ImageIcon(getClass().getResource("/net/apocalypselabs/symat/icon16.png")), jPanel4); // NOI18N
-
- jPanel1.setOpaque(false);
+ jPanel4.setOpaque(false);
shellBtn.setIcon(new javax.swing.ImageIcon(getClass().getResource("/net/apocalypselabs/symat/images/shell.png"))); // NOI18N
shellBtn.setText("Shell");
@@ -249,35 +237,6 @@ public class MainGUI extends javax.swing.JFrame {
jLabel1.setText(namemark());
jLabel1.setFocusable(false);
- javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1);
- jPanel1.setLayout(jPanel1Layout);
- jPanel1Layout.setHorizontalGroup(
- jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(jPanel1Layout.createSequentialGroup()
- .addContainerGap()
- .addComponent(shellBtn)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(editorBtn)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(graphBtn)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(jLabel1, javax.swing.GroupLayout.DEFAULT_SIZE, 498, Short.MAX_VALUE))
- );
- jPanel1Layout.setVerticalGroup(
- jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(jPanel1Layout.createSequentialGroup()
- .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false)
- .addComponent(jLabel1, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(shellBtn, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(editorBtn, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(graphBtn, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
- .addGap(0, 0, 0))
- );
-
- tabs.addTab("Apps", jPanel1);
-
- jPanel2.setOpaque(false);
-
helpBtn.setIcon(new javax.swing.ImageIcon(getClass().getResource("/net/apocalypselabs/symat/images/help.png"))); // NOI18N
helpBtn.setText("Manual");
helpBtn.setBorder(javax.swing.BorderFactory.createEmptyBorder(5, 5, 5, 5));
@@ -291,6 +250,43 @@ public class MainGUI extends javax.swing.JFrame {
}
});
+ javax.swing.GroupLayout jPanel4Layout = new javax.swing.GroupLayout(jPanel4);
+ jPanel4.setLayout(jPanel4Layout);
+ jPanel4Layout.setHorizontalGroup(
+ jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(jPanel4Layout.createSequentialGroup()
+ .addContainerGap()
+ .addComponent(shellBtn)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+ .addComponent(editorBtn)
+ .addGap(12, 12, 12)
+ .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))
+ );
+ jPanel4Layout.setVerticalGroup(
+ jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(jPanel4Layout.createSequentialGroup()
+ .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(shellBtn)
+ .addComponent(editorBtn)
+ .addComponent(graphBtn))
+ .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addGroup(jPanel4Layout.createSequentialGroup()
+ .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(jLabel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel4Layout.createSequentialGroup()
+ .addComponent(helpBtn)
+ .addGap(0, 0, Short.MAX_VALUE)))
+ .addContainerGap())
+ );
+
+ tabs.addTab("Apps", jPanel4);
+
+ jPanel2.setOpaque(false);
+
jLabel3.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
jLabel3.setText(namemark());
jLabel3.setFocusable(false);
@@ -321,38 +317,8 @@ public class MainGUI extends javax.swing.JFrame {
}
});
- javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout(jPanel2);
- jPanel2.setLayout(jPanel2Layout);
- jPanel2Layout.setHorizontalGroup(
- jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(jPanel2Layout.createSequentialGroup()
- .addContainerGap()
- .addComponent(helpBtn)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(arrangeWindowsBtn)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(closeAllBtn)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
- .addComponent(jLabel3, javax.swing.GroupLayout.DEFAULT_SIZE, 492, Short.MAX_VALUE))
- );
- jPanel2Layout.setVerticalGroup(
- jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(helpBtn)
- .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, 65, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(arrangeWindowsBtn)
- .addComponent(closeAllBtn)
- );
-
- tabs.addTab("Tools", jPanel2);
-
- jPanel3.setOpaque(false);
-
- jLabel4.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
- jLabel4.setText(namemark());
- jLabel4.setFocusable(false);
-
displaySettingsBtn.setIcon(new javax.swing.ImageIcon(getClass().getResource("/net/apocalypselabs/symat/images/display.png"))); // NOI18N
- displaySettingsBtn.setText("Display");
+ displaySettingsBtn.setText("Theme");
displaySettingsBtn.setBorder(javax.swing.BorderFactory.createEmptyBorder(5, 5, 5, 5));
displaySettingsBtn.setFocusable(false);
displaySettingsBtn.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
@@ -364,25 +330,32 @@ public class MainGUI extends javax.swing.JFrame {
}
});
- javax.swing.GroupLayout jPanel3Layout = new javax.swing.GroupLayout(jPanel3);
- jPanel3.setLayout(jPanel3Layout);
- jPanel3Layout.setHorizontalGroup(
- jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel3Layout.createSequentialGroup()
+ javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout(jPanel2);
+ jPanel2.setLayout(jPanel2Layout);
+ jPanel2Layout.setHorizontalGroup(
+ jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(jPanel2Layout.createSequentialGroup()
.addContainerGap()
.addComponent(displaySettingsBtn)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 54, Short.MAX_VALUE)
- .addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, 574, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+ .addComponent(arrangeWindowsBtn)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+ .addComponent(closeAllBtn)
+ .addGap(94, 94, 94)
+ .addComponent(jLabel3, javax.swing.GroupLayout.DEFAULT_SIZE, 400, Short.MAX_VALUE))
);
- jPanel3Layout.setVerticalGroup(
- jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, 65, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(displaySettingsBtn)
+ jPanel2Layout.setVerticalGroup(
+ jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(jPanel2Layout.createSequentialGroup()
+ .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, 65, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(arrangeWindowsBtn)
+ .addComponent(closeAllBtn)
+ .addComponent(displaySettingsBtn))
+ .addContainerGap())
);
- tabs.addTab("Settings", jPanel3);
-
- tabs.setSelectedIndex(1);
+ tabs.addTab("View", jPanel2);
mainPane.setBackground(new java.awt.Color(204, 204, 204));
mainPane.setAutoscrolls(true);
@@ -418,33 +391,13 @@ public class MainGUI extends javax.swing.JFrame {
pack();
}// //GEN-END:initComponents
- /*
- This section has all the buttons!
- */
-
- private void shellBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_shellBtnActionPerformed
- loadFrame(new Interpreter());
- }//GEN-LAST:event_shellBtnActionPerformed
-
- private void editorBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_editorBtnActionPerformed
- loadFrame(new CodeEditor());
- }//GEN-LAST:event_editorBtnActionPerformed
-
- private void graphBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_graphBtnActionPerformed
- loadFrame(new Graph());
- }//GEN-LAST:event_graphBtnActionPerformed
-
private void formComponentShown(java.awt.event.ComponentEvent evt) {//GEN-FIRST:event_formComponentShown
setLocationRelativeTo(null);
}//GEN-LAST:event_formComponentShown
- private void helpBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_helpBtnActionPerformed
- loadFrame(new Help());
- }//GEN-LAST:event_helpBtnActionPerformed
-
- private void arrangeWindowsBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_arrangeWindowsBtnActionPerformed
- cascade();
- }//GEN-LAST:event_arrangeWindowsBtnActionPerformed
+ /*
+ This section has all the buttons!
+ */
private void displaySettingsBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_displaySettingsBtnActionPerformed
loadFrame(new Display());
@@ -460,16 +413,25 @@ public class MainGUI extends javax.swing.JFrame {
}
}//GEN-LAST:event_closeAllBtnActionPerformed
- private void tabsStateChanged(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_tabsStateChanged
- if (tabs.getSelectedIndex() == 0) {
- try {
- tabs.setSelectedIndex(1);
- } catch (Exception ex) {
+ private void arrangeWindowsBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_arrangeWindowsBtnActionPerformed
+ cascade();
+ }//GEN-LAST:event_arrangeWindowsBtnActionPerformed
- }
- loadFrame(new Help(true));
- }
- }//GEN-LAST:event_tabsStateChanged
+ private void helpBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_helpBtnActionPerformed
+ loadFrame(new Help());
+ }//GEN-LAST:event_helpBtnActionPerformed
+
+ private void graphBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_graphBtnActionPerformed
+ loadFrame(new Graph());
+ }//GEN-LAST:event_graphBtnActionPerformed
+
+ private void editorBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_editorBtnActionPerformed
+ loadFrame(new CodeEditor());
+ }//GEN-LAST:event_editorBtnActionPerformed
+
+ private void shellBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_shellBtnActionPerformed
+ loadFrame(new Interpreter());
+ }//GEN-LAST:event_shellBtnActionPerformed
/*
End the button handlers.
@@ -601,10 +563,7 @@ public class MainGUI extends javax.swing.JFrame {
public static javax.swing.JButton helpBtn;
public static javax.swing.JLabel jLabel1;
public static javax.swing.JLabel jLabel3;
- public static javax.swing.JLabel jLabel4;
- public static javax.swing.JPanel jPanel1;
public static javax.swing.JPanel jPanel2;
- public static javax.swing.JPanel jPanel3;
public static javax.swing.JPanel jPanel4;
public static javax.swing.JDesktopPane mainPane;
public static javax.swing.JButton shellBtn;
diff --git a/src/net/apocalypselabs/symat/SplashScreen.form b/src/net/apocalypselabs/symat/SplashScreen.form
index ec48870..d163e47 100644
--- a/src/net/apocalypselabs/symat/SplashScreen.form
+++ b/src/net/apocalypselabs/symat/SplashScreen.form
@@ -7,11 +7,12 @@
-
+
-
+
+
@@ -70,7 +71,7 @@
-
+
diff --git a/src/net/apocalypselabs/symat/SplashScreen.java b/src/net/apocalypselabs/symat/SplashScreen.java
index dfe317c..005f27f 100644
--- a/src/net/apocalypselabs/symat/SplashScreen.java
+++ b/src/net/apocalypselabs/symat/SplashScreen.java
@@ -59,8 +59,9 @@ public class SplashScreen extends javax.swing.JFrame {
setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
setTitle(MainGUI.APP_NAME);
- setMaximumSize(new java.awt.Dimension(320, 260));
- setMinimumSize(new java.awt.Dimension(320, 260));
+ setMaximumSize(new java.awt.Dimension(204, 260));
+ setMinimumSize(new java.awt.Dimension(204, 260));
+ setUndecorated(true);
setResizable(false);
addComponentListener(new java.awt.event.ComponentAdapter() {
public void componentShown(java.awt.event.ComponentEvent evt) {
@@ -75,7 +76,7 @@ public class SplashScreen extends javax.swing.JFrame {
progBar.setString("");
progBar.setStringPainted(true);
- jLabel5.setIcon(new javax.swing.ImageIcon(getClass().getResource("/net/apocalypselabs/symat/splash0.8.png"))); // NOI18N
+ jLabel5.setIcon(new javax.swing.ImageIcon(getClass().getResource("/net/apocalypselabs/symat/anim-splash.gif"))); // NOI18N
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
getContentPane().setLayout(layout);
diff --git a/src/net/apocalypselabs/symat/Update.form b/src/net/apocalypselabs/symat/Update.form
index 87e99b6..480f25b 100644
--- a/src/net/apocalypselabs/symat/Update.form
+++ b/src/net/apocalypselabs/symat/Update.form
@@ -33,15 +33,16 @@
-
-
-
+
+
+
-
+
-
+
+
@@ -58,15 +59,13 @@
+
-
-
-
-
+
diff --git a/src/net/apocalypselabs/symat/Update.java b/src/net/apocalypselabs/symat/Update.java
index 1dd3a3f..05d740e 100644
--- a/src/net/apocalypselabs/symat/Update.java
+++ b/src/net/apocalypselabs/symat/Update.java
@@ -111,14 +111,15 @@ public class Update extends javax.swing.JInternalFrame {
.addComponent(jLabel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(jLabel2, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
- .addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, 180, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 50, Short.MAX_VALUE)
- .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, 180, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addComponent(jLabel4, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, 229, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
- .addGap(99, 99, 99)
+ .addContainerGap(120, Short.MAX_VALUE)
.addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE, 212, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addGap(65, 65, 65)
- .addComponent(jLabel5))
+ .addGap(81, 81, 81)
+ .addComponent(jLabel5)
+ .addContainerGap())
);
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -132,12 +133,11 @@ public class Update extends javax.swing.JInternalFrame {
.addComponent(jLabel3, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(jButton1, javax.swing.GroupLayout.DEFAULT_SIZE, 70, Short.MAX_VALUE)
.addGroup(layout.createSequentialGroup()
- .addComponent(jButton1, javax.swing.GroupLayout.DEFAULT_SIZE, 66, Short.MAX_VALUE)
- .addContainerGap())
- .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
.addGap(0, 0, Short.MAX_VALUE)
- .addComponent(jLabel5))))
+ .addComponent(jLabel5)))
+ .addContainerGap())
);
pack();
diff --git a/src/net/apocalypselabs/symat/anim-splash.gif b/src/net/apocalypselabs/symat/anim-splash.gif
new file mode 100644
index 0000000..6ff0b35
Binary files /dev/null and b/src/net/apocalypselabs/symat/anim-splash.gif differ
diff --git a/src/net/apocalypselabs/symat/images/cascade.png b/src/net/apocalypselabs/symat/images/cascade.png
index 84019f8..6ea0b3d 100644
Binary files a/src/net/apocalypselabs/symat/images/cascade.png and b/src/net/apocalypselabs/symat/images/cascade.png differ
diff --git a/src/net/apocalypselabs/symat/images/closeall.png b/src/net/apocalypselabs/symat/images/closeall.png
index 8dbe367..90dd6b0 100644
Binary files a/src/net/apocalypselabs/symat/images/closeall.png and b/src/net/apocalypselabs/symat/images/closeall.png differ
diff --git a/src/net/apocalypselabs/symat/images/display.png b/src/net/apocalypselabs/symat/images/display.png
index 64371f0..ab4354a 100644
Binary files a/src/net/apocalypselabs/symat/images/display.png and b/src/net/apocalypselabs/symat/images/display.png differ
diff --git a/src/net/apocalypselabs/symat/images/editor.png b/src/net/apocalypselabs/symat/images/editor.png
index 8cc1900..409000d 100644
Binary files a/src/net/apocalypselabs/symat/images/editor.png and b/src/net/apocalypselabs/symat/images/editor.png differ
diff --git a/src/net/apocalypselabs/symat/images/graph.png b/src/net/apocalypselabs/symat/images/graph.png
index cd01708..bb01743 100644
Binary files a/src/net/apocalypselabs/symat/images/graph.png and b/src/net/apocalypselabs/symat/images/graph.png differ
diff --git a/src/net/apocalypselabs/symat/images/help.png b/src/net/apocalypselabs/symat/images/help.png
index 6ed6bbe..0667cf4 100644
Binary files a/src/net/apocalypselabs/symat/images/help.png and b/src/net/apocalypselabs/symat/images/help.png differ
diff --git a/src/net/apocalypselabs/symat/images/shell.png b/src/net/apocalypselabs/symat/images/shell.png
index 161cbc0..77c8386 100644
Binary files a/src/net/apocalypselabs/symat/images/shell.png and b/src/net/apocalypselabs/symat/images/shell.png differ
diff --git a/src/net/apocalypselabs/symat/splash0.8.png b/src/net/apocalypselabs/symat/splash0.8.png
deleted file mode 100644
index 128dcee..0000000
Binary files a/src/net/apocalypselabs/symat/splash0.8.png and /dev/null differ