From 46c0465b1a1b2a190afe7c97e8cb86fee0d8ba17 Mon Sep 17 00:00:00 2001 From: skylarmt Date: Mon, 16 Feb 2015 18:38:47 -0700 Subject: [PATCH] Add option to hide recent item list --- src/net/apocalypselabs/symat/Display.form | 36 ++++++++++++------- src/net/apocalypselabs/symat/Display.java | 43 ++++++++++++++++------- src/net/apocalypselabs/symat/MainGUI.form | 2 +- src/net/apocalypselabs/symat/MainGUI.java | 11 +++++- 4 files changed, 64 insertions(+), 28 deletions(-) diff --git a/src/net/apocalypselabs/symat/Display.form b/src/net/apocalypselabs/symat/Display.form index 2cd362f..14453d5 100644 --- a/src/net/apocalypselabs/symat/Display.form +++ b/src/net/apocalypselabs/symat/Display.form @@ -8,18 +8,18 @@ - + - + - + - + @@ -44,15 +44,17 @@ - - - - - + + + + + + + - + @@ -61,8 +63,10 @@ + + - + @@ -87,7 +91,7 @@ - + @@ -110,7 +114,7 @@ - + @@ -131,5 +135,11 @@ + + + + + + diff --git a/src/net/apocalypselabs/symat/Display.java b/src/net/apocalypselabs/symat/Display.java index bd93862..e682fd6 100644 --- a/src/net/apocalypselabs/symat/Display.java +++ b/src/net/apocalypselabs/symat/Display.java @@ -72,14 +72,15 @@ public class Display extends javax.swing.JInternalFrame { themeLight = new javax.swing.JRadioButton(); themeDark = new javax.swing.JRadioButton(); saveBtn = new javax.swing.JButton(); + showRecent = new javax.swing.JCheckBox(); setClosable(true); setIconifiable(true); - setTitle("Theme"); + setTitle("Display"); setFrameIcon(new javax.swing.ImageIcon(getClass().getResource("/net/apocalypselabs/symat/icons/settings.png"))); // NOI18N - setMaximumSize(new java.awt.Dimension(170, 188)); - setMinimumSize(new java.awt.Dimension(170, 188)); - setPreferredSize(new java.awt.Dimension(170, 188)); + setMaximumSize(new java.awt.Dimension(160, 215)); + setMinimumSize(new java.awt.Dimension(160, 215)); + setPreferredSize(new java.awt.Dimension(160, 215)); addComponentListener(new java.awt.event.ComponentAdapter() { public void componentShown(java.awt.event.ComponentEvent evt) { formComponentShown(evt); @@ -91,7 +92,7 @@ public class Display extends javax.swing.JInternalFrame { themeGroup.add(themeLight); themeLight.setSelected(true); - themeLight.setText("Daylight"); + themeLight.setText("Day"); themeGroup.add(themeDark); themeDark.setText("NightDark"); @@ -105,7 +106,7 @@ public class Display extends javax.swing.JInternalFrame { .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(themeLight) .addComponent(themeDark)) - .addContainerGap(43, Short.MAX_VALUE)) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); jPanel1Layout.setVerticalGroup( jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -124,26 +125,32 @@ public class Display extends javax.swing.JInternalFrame { } }); + showRecent.setSelected(true); + showRecent.setText("Show recent items"); + 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() .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()) + .addComponent(saveBtn, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 73, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false) + .addComponent(jPanel1, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup() + .addContainerGap() + .addComponent(showRecent)))) + .addContainerGap(25, Short.MAX_VALUE)) ); layout.setVerticalGroup( 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(showRecent) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addComponent(saveBtn) - .addContainerGap(41, Short.MAX_VALUE)) + .addContainerGap(42, Short.MAX_VALUE)) ); pack(); @@ -161,6 +168,10 @@ public class Display extends javax.swing.JInternalFrame { themeDark.setSelected(false); } } + + if (!PrefStorage.getSetting("showrecent", "").equals("")) { + showRecent.setSelected(false); + } }//GEN-LAST:event_formComponentShown private void saveBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_saveBtnActionPerformed @@ -169,6 +180,11 @@ public class Display extends javax.swing.JInternalFrame { } else { PrefStorage.saveSetting("theme", "light"); } + if (showRecent.isSelected()) { + PrefStorage.saveSetting("showrecent", ""); + } else { + PrefStorage.saveSetting("showrecent", "no"); + } PrefStorage.save(); MainGUI.updateDisplay(); dispose(); @@ -177,6 +193,7 @@ public class Display extends javax.swing.JInternalFrame { // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JPanel jPanel1; private javax.swing.JButton saveBtn; + private javax.swing.JCheckBox showRecent; private javax.swing.JRadioButton themeDark; private javax.swing.ButtonGroup themeGroup; private javax.swing.JRadioButton themeLight; diff --git a/src/net/apocalypselabs/symat/MainGUI.form b/src/net/apocalypselabs/symat/MainGUI.form index 9c0fead..4376d7a 100644 --- a/src/net/apocalypselabs/symat/MainGUI.form +++ b/src/net/apocalypselabs/symat/MainGUI.form @@ -255,7 +255,7 @@ - + diff --git a/src/net/apocalypselabs/symat/MainGUI.java b/src/net/apocalypselabs/symat/MainGUI.java index a79645b..a2e1fef 100644 --- a/src/net/apocalypselabs/symat/MainGUI.java +++ b/src/net/apocalypselabs/symat/MainGUI.java @@ -200,6 +200,10 @@ public class MainGUI extends javax.swing.JFrame { setExtendedState(MAXIMIZED_BOTH); }); } + + if (!PrefStorage.getSetting("showrecent", "").equals("")) { + recentItemsPanel.setVisible(false); + } } public static void licenseRestrict(boolean restricted) { @@ -237,6 +241,11 @@ public class MainGUI extends javax.swing.JFrame { recentFileList.setForeground(Color.black); recentFileList.setBackground(Color.white); } + if (!PrefStorage.getSetting("showrecent", "").equals("")) { + recentItemsPanel.setVisible(false); + } else { + recentItemsPanel.setVisible(true); + } } /** @@ -478,7 +487,7 @@ public class MainGUI extends javax.swing.JFrame { }); displaySettingsBtn.setIcon(new javax.swing.ImageIcon(getClass().getResource("/net/apocalypselabs/symat/images/display.png"))); // NOI18N - displaySettingsBtn.setText("Theme"); + displaySettingsBtn.setText("Display"); displaySettingsBtn.setBorder(javax.swing.BorderFactory.createEmptyBorder(5, 5, 5, 5)); displaySettingsBtn.setFocusable(false); displaySettingsBtn.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);