diff --git a/src/net/apocalypselabs/symat/Display.form b/src/net/apocalypselabs/symat/Display.form index 26e9338..3e25307 100644 --- a/src/net/apocalypselabs/symat/Display.form +++ b/src/net/apocalypselabs/symat/Display.form @@ -12,6 +12,15 @@ + + + + + + + + + @@ -38,20 +47,14 @@ - - - - - - - - - - - - - - + + + + + + + + @@ -63,14 +66,13 @@ - - + - + @@ -210,42 +212,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/net/apocalypselabs/symat/Display.java b/src/net/apocalypselabs/symat/Display.java index 5909bb5..d70f966 100644 --- a/src/net/apocalypselabs/symat/Display.java +++ b/src/net/apocalypselabs/symat/Display.java @@ -60,13 +60,14 @@ 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); setTitle("Display Settings"); setFrameIcon(new javax.swing.ImageIcon(getClass().getResource("/net/apocalypselabs/symat/icons/settings.png"))); // NOI18N + setMaximumSize(new java.awt.Dimension(223, 167)); + setMinimumSize(new java.awt.Dimension(223, 167)); + setPreferredSize(new java.awt.Dimension(223, 167)); addComponentListener(new java.awt.event.ComponentAdapter() { public void componentShown(java.awt.event.ComponentEvent evt) { formComponentShown(evt); @@ -147,27 +148,6 @@ 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( @@ -176,17 +156,13 @@ public class Display extends javax.swing.JInternalFrame { .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() - .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)) - .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))) + .addComponent(jPanel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, 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) .addContainerGap()) ); layout.setVerticalGroup( @@ -195,13 +171,12 @@ 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) - .addComponent(jPanel3, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - .addGap(21, 21, 21) + .addComponent(jPanel2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(saveBtn) .addComponent(cancelBtn)) - .addContainerGap(15, Short.MAX_VALUE)) + .addContainerGap()) ); pack(); @@ -226,9 +201,6 @@ public class Display extends javax.swing.JInternalFrame { themeDark.setSelected(false); } } - if (PrefStorage.isset("advancedcontrols")) { - advOptionsBox.setSelected(true); - } }//GEN-LAST:event_formComponentShown private void saveBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_saveBtnActionPerformed @@ -238,11 +210,6 @@ public class Display extends javax.swing.JInternalFrame { } else { PrefStorage.saveSetting("theme", "light"); } - if (advOptionsBox.isSelected()) { - PrefStorage.saveSetting("advancedcontrols", "true"); - } else { - PrefStorage.unset("advancedcontrols"); - } if (!PrefStorage.save()) { // Something dun goofed... JOptionPane.showInternalMessageDialog(this, @@ -255,13 +222,11 @@ public class Display extends javax.swing.JInternalFrame { }//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;