From 48509cf537f60790388e6077d06cd3b14b6f6f9d Mon Sep 17 00:00:00 2001 From: skylarmt Date: Thu, 18 Dec 2014 23:57:32 -0700 Subject: [PATCH] Move ribbon icons into own package --- src/net/apocalypselabs/symat/CodeRunner.java | 3 +- src/net/apocalypselabs/symat/Display.form | 62 +++++++++++++--- src/net/apocalypselabs/symat/Display.java | 70 ++++++++++++------ src/net/apocalypselabs/symat/Interpreter.java | 10 +-- src/net/apocalypselabs/symat/MainGUI.form | 14 ++-- src/net/apocalypselabs/symat/MainGUI.java | 17 +++-- src/net/apocalypselabs/symat/PrefStorage.java | 4 +- .../symat/{ => images}/cascade.png | Bin .../symat/{ => images}/closeall.png | Bin .../symat/{ => images}/display.png | Bin .../symat/{ => images}/editor.png | Bin .../symat/{ => images}/graph.png | Bin .../symat/{ => images}/help.png | Bin .../symat/{ => images}/shell.png | Bin 14 files changed, 124 insertions(+), 56 deletions(-) rename src/net/apocalypselabs/symat/{ => images}/cascade.png (100%) rename src/net/apocalypselabs/symat/{ => images}/closeall.png (100%) rename src/net/apocalypselabs/symat/{ => images}/display.png (100%) rename src/net/apocalypselabs/symat/{ => images}/editor.png (100%) rename src/net/apocalypselabs/symat/{ => images}/graph.png (100%) rename src/net/apocalypselabs/symat/{ => images}/help.png (100%) rename src/net/apocalypselabs/symat/{ => images}/shell.png (100%) diff --git a/src/net/apocalypselabs/symat/CodeRunner.java b/src/net/apocalypselabs/symat/CodeRunner.java index b27922c..0fe238c 100644 --- a/src/net/apocalypselabs/symat/CodeRunner.java +++ b/src/net/apocalypselabs/symat/CodeRunner.java @@ -87,10 +87,9 @@ public class CodeRunner { this(lang); isShell = shell; } - + /** * Inits the Python engine. - * * @param fakeInit Set it to true. */ public CodeRunner(boolean fakeInit) { diff --git a/src/net/apocalypselabs/symat/Display.form b/src/net/apocalypselabs/symat/Display.form index 9251dd0..26e9338 100644 --- a/src/net/apocalypselabs/symat/Display.form +++ b/src/net/apocalypselabs/symat/Display.form @@ -34,23 +34,25 @@ - + + + - - - - - - - + + + + + + + - + @@ -61,13 +63,14 @@ + - + - + @@ -207,5 +210,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/net/apocalypselabs/symat/Display.java b/src/net/apocalypselabs/symat/Display.java index 5e55154..5909bb5 100644 --- a/src/net/apocalypselabs/symat/Display.java +++ b/src/net/apocalypselabs/symat/Display.java @@ -60,6 +60,8 @@ public class Display extends javax.swing.JInternalFrame { jLabel1 = new javax.swing.JLabel(); saveBtn = new javax.swing.JButton(); cancelBtn = new javax.swing.JButton(); + jPanel3 = new javax.swing.JPanel(); + advOptionsBox = new javax.swing.JCheckBox(); setClosable(true); setIconifiable(true); @@ -145,24 +147,47 @@ public class Display extends javax.swing.JInternalFrame { } }); + jPanel3.setBorder(javax.swing.BorderFactory.createTitledBorder("Editor")); + + advOptionsBox.setText("Advanced Options"); + + 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() + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(advOptionsBox) + .addContainerGap()) + ); + jPanel3Layout.setVerticalGroup( + jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel3Layout.createSequentialGroup() + .addContainerGap() + .addComponent(advOptionsBox) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + ); + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); getContentPane().setLayout(layout); layout.setHorizontalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(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) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .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) - .addGap(0, 0, Short.MAX_VALUE)) .addGroup(layout.createSequentialGroup() .addGap(0, 0, Short.MAX_VALUE) .addComponent(cancelBtn) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(saveBtn, javax.swing.GroupLayout.PREFERRED_SIZE, 81, javax.swing.GroupLayout.PREFERRED_SIZE))) - .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addComponent(saveBtn, javax.swing.GroupLayout.PREFERRED_SIZE, 81, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGroup(layout.createSequentialGroup() + .addComponent(jPanel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addComponent(jPanel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGap(0, 0, Short.MAX_VALUE))) + .addContainerGap()) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -170,12 +195,13 @@ public class Display extends javax.swing.JInternalFrame { .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)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 29, Short.MAX_VALUE) + .addComponent(jPanel2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(jPanel3, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addGap(21, 21, 21) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(saveBtn) .addComponent(cancelBtn)) - .addContainerGap()) + .addContainerGap(15, Short.MAX_VALUE)) ); pack(); @@ -200,9 +226,9 @@ public class Display extends javax.swing.JInternalFrame { themeDark.setSelected(false); } } -// if (PrefStorage.isset("advancedcontrols")) { -// advOptionsBox.setSelected(true); -// } + if (PrefStorage.isset("advancedcontrols")) { + advOptionsBox.setSelected(true); + } }//GEN-LAST:event_formComponentShown private void saveBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_saveBtnActionPerformed @@ -212,28 +238,30 @@ public class Display extends javax.swing.JInternalFrame { } else { PrefStorage.saveSetting("theme", "light"); } -// if (advOptionsBox.isSelected()) { -// PrefStorage.saveSetting("advancedcontrols", "true"); -// } else { -// PrefStorage.unset("advancedcontrols"); -// } + if (advOptionsBox.isSelected()) { + PrefStorage.saveSetting("advancedcontrols", "true"); + } else { + PrefStorage.unset("advancedcontrols"); + } if (!PrefStorage.save()) { // Something dun goofed... - JOptionPane.showInternalMessageDialog(this, + JOptionPane.showInternalMessageDialog(this, "Error: Problem occured while saving settings. " - + "This error is outside the control of " - + "the application."); + + "This error is outside the control of " + + "the application."); } MainGUI.updateDisplay(); dispose(); }//GEN-LAST:event_saveBtnActionPerformed // Variables declaration - do not modify//GEN-BEGIN:variables + private javax.swing.JCheckBox advOptionsBox; 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.JPanel jPanel3; private javax.swing.JButton saveBtn; private javax.swing.JRadioButton themeDark; private javax.swing.ButtonGroup themeGroup; diff --git a/src/net/apocalypselabs/symat/Interpreter.java b/src/net/apocalypselabs/symat/Interpreter.java index 7d44cf0..85de96f 100644 --- a/src/net/apocalypselabs/symat/Interpreter.java +++ b/src/net/apocalypselabs/symat/Interpreter.java @@ -51,20 +51,20 @@ public class Interpreter extends javax.swing.JInternalFrame { */ public Interpreter(String useLang) { 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; try { @@ -73,7 +73,7 @@ public class Interpreter extends javax.swing.JInternalFrame { } mainBox.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")) { mainBox.setBackground(Color.BLACK); @@ -88,7 +88,7 @@ public class Interpreter extends javax.swing.JInternalFrame { inputBox.setForeground(Color.BLACK); setBackground(Color.LIGHT_GRAY); } - + // Misc. setup mainBox.setText(">>"); inputBox.requestFocus(); diff --git a/src/net/apocalypselabs/symat/MainGUI.form b/src/net/apocalypselabs/symat/MainGUI.form index 56da12f..ee369c8 100644 --- a/src/net/apocalypselabs/symat/MainGUI.form +++ b/src/net/apocalypselabs/symat/MainGUI.form @@ -125,7 +125,7 @@ - + @@ -145,7 +145,7 @@ - + @@ -165,7 +165,7 @@ - + @@ -233,7 +233,7 @@ - + @@ -262,7 +262,7 @@ - + @@ -282,7 +282,7 @@ - + @@ -344,7 +344,7 @@ - + diff --git a/src/net/apocalypselabs/symat/MainGUI.java b/src/net/apocalypselabs/symat/MainGUI.java index c74f257..18f7449 100644 --- a/src/net/apocalypselabs/symat/MainGUI.java +++ b/src/net/apocalypselabs/symat/MainGUI.java @@ -170,7 +170,7 @@ public class MainGUI extends javax.swing.JFrame { jPanel1.setOpaque(false); - shellBtn.setIcon(new javax.swing.ImageIcon(getClass().getResource("/net/apocalypselabs/symat/shell.png"))); // NOI18N + shellBtn.setIcon(new javax.swing.ImageIcon(getClass().getResource("/net/apocalypselabs/symat/images/shell.png"))); // NOI18N shellBtn.setText("Shell"); shellBtn.setBorder(javax.swing.BorderFactory.createEmptyBorder(5, 5, 5, 5)); shellBtn.setFocusable(false); @@ -183,7 +183,7 @@ public class MainGUI extends javax.swing.JFrame { } }); - editorBtn.setIcon(new javax.swing.ImageIcon(getClass().getResource("/net/apocalypselabs/symat/editor.png"))); // NOI18N + editorBtn.setIcon(new javax.swing.ImageIcon(getClass().getResource("/net/apocalypselabs/symat/images/editor.png"))); // NOI18N editorBtn.setText("Editor"); editorBtn.setBorder(javax.swing.BorderFactory.createEmptyBorder(5, 5, 5, 5)); editorBtn.setFocusable(false); @@ -196,7 +196,7 @@ public class MainGUI extends javax.swing.JFrame { } }); - graphBtn.setIcon(new javax.swing.ImageIcon(getClass().getResource("/net/apocalypselabs/symat/graph.png"))); // NOI18N + graphBtn.setIcon(new javax.swing.ImageIcon(getClass().getResource("/net/apocalypselabs/symat/images/graph.png"))); // NOI18N graphBtn.setText("Graph"); graphBtn.setBorder(javax.swing.BorderFactory.createEmptyBorder(5, 5, 5, 5)); graphBtn.setFocusable(false); @@ -242,7 +242,7 @@ public class MainGUI extends javax.swing.JFrame { jPanel2.setOpaque(false); - helpBtn.setIcon(new javax.swing.ImageIcon(getClass().getResource("/net/apocalypselabs/symat/help.png"))); // NOI18N + 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)); helpBtn.setFocusable(false); @@ -259,7 +259,7 @@ public class MainGUI extends javax.swing.JFrame { jLabel3.setText(namemark()); jLabel3.setFocusable(false); - arrangeWindowsBtn.setIcon(new javax.swing.ImageIcon(getClass().getResource("/net/apocalypselabs/symat/cascade.png"))); // NOI18N + arrangeWindowsBtn.setIcon(new javax.swing.ImageIcon(getClass().getResource("/net/apocalypselabs/symat/images/cascade.png"))); // NOI18N arrangeWindowsBtn.setText("Cascade"); arrangeWindowsBtn.setBorder(javax.swing.BorderFactory.createEmptyBorder(5, 5, 5, 5)); arrangeWindowsBtn.setFocusable(false); @@ -272,7 +272,7 @@ public class MainGUI extends javax.swing.JFrame { } }); - closeAllBtn.setIcon(new javax.swing.ImageIcon(getClass().getResource("/net/apocalypselabs/symat/closeall.png"))); // NOI18N + closeAllBtn.setIcon(new javax.swing.ImageIcon(getClass().getResource("/net/apocalypselabs/symat/images/closeall.png"))); // NOI18N closeAllBtn.setText("Close All"); closeAllBtn.setBorder(javax.swing.BorderFactory.createEmptyBorder(5, 5, 5, 5)); closeAllBtn.setFocusable(false); @@ -315,7 +315,7 @@ public class MainGUI extends javax.swing.JFrame { jLabel4.setText(namemark()); jLabel4.setFocusable(false); - displaySettingsBtn.setIcon(new javax.swing.ImageIcon(getClass().getResource("/net/apocalypselabs/symat/display.png"))); // NOI18N + displaySettingsBtn.setIcon(new javax.swing.ImageIcon(getClass().getResource("/net/apocalypselabs/symat/images/display.png"))); // NOI18N displaySettingsBtn.setText("Display"); displaySettingsBtn.setBorder(javax.swing.BorderFactory.createEmptyBorder(5, 5, 5, 5)); displaySettingsBtn.setFocusable(false); @@ -494,6 +494,7 @@ public class MainGUI extends javax.swing.JFrame { // // + // Command line args for (String arg : args) { if (arg.equals("skippython")) { @@ -502,7 +503,7 @@ public class MainGUI extends javax.swing.JFrame { argfile = args[0]; } } - + /* Create and display the form */ java.awt.EventQueue.invokeLater(new Runnable() { @Override diff --git a/src/net/apocalypselabs/symat/PrefStorage.java b/src/net/apocalypselabs/symat/PrefStorage.java index 559abf6..e5af1ee 100644 --- a/src/net/apocalypselabs/symat/PrefStorage.java +++ b/src/net/apocalypselabs/symat/PrefStorage.java @@ -45,7 +45,7 @@ public class PrefStorage { public static boolean isset(String key) { return !getSetting(key, "NULL").equals("NULL"); } - + public static void unset(String key) { prefs.remove(key); } @@ -57,7 +57,7 @@ public class PrefStorage { public static String getSetting(String key, String emptyResponse) { return prefs.get(key, emptyResponse); } - + public static boolean save() { try { prefs.flush(); diff --git a/src/net/apocalypselabs/symat/cascade.png b/src/net/apocalypselabs/symat/images/cascade.png similarity index 100% rename from src/net/apocalypselabs/symat/cascade.png rename to src/net/apocalypselabs/symat/images/cascade.png diff --git a/src/net/apocalypselabs/symat/closeall.png b/src/net/apocalypselabs/symat/images/closeall.png similarity index 100% rename from src/net/apocalypselabs/symat/closeall.png rename to src/net/apocalypselabs/symat/images/closeall.png diff --git a/src/net/apocalypselabs/symat/display.png b/src/net/apocalypselabs/symat/images/display.png similarity index 100% rename from src/net/apocalypselabs/symat/display.png rename to src/net/apocalypselabs/symat/images/display.png diff --git a/src/net/apocalypselabs/symat/editor.png b/src/net/apocalypselabs/symat/images/editor.png similarity index 100% rename from src/net/apocalypselabs/symat/editor.png rename to src/net/apocalypselabs/symat/images/editor.png diff --git a/src/net/apocalypselabs/symat/graph.png b/src/net/apocalypselabs/symat/images/graph.png similarity index 100% rename from src/net/apocalypselabs/symat/graph.png rename to src/net/apocalypselabs/symat/images/graph.png diff --git a/src/net/apocalypselabs/symat/help.png b/src/net/apocalypselabs/symat/images/help.png similarity index 100% rename from src/net/apocalypselabs/symat/help.png rename to src/net/apocalypselabs/symat/images/help.png diff --git a/src/net/apocalypselabs/symat/shell.png b/src/net/apocalypselabs/symat/images/shell.png similarity index 100% rename from src/net/apocalypselabs/symat/shell.png rename to src/net/apocalypselabs/symat/images/shell.png