From c63044652b47e5bc78df0f2ae0e8b3a993cfddff Mon Sep 17 00:00:00 2001 From: skylarmt Date: Fri, 27 Mar 2015 12:55:36 -0600 Subject: [PATCH] Add delete option to tasks, ensure compatability with 1.6 sytt files --- .../apocalypselabs/symat/components/Task.java | 3 ++ .../symat/components/TaskList.java | 2 +- .../symat/components/TaskMenu.form | 30 +++++++++++----- .../symat/components/TaskMenu.java | 34 +++++++++++++------ 4 files changed, 49 insertions(+), 20 deletions(-) diff --git a/src/net/apocalypselabs/symat/components/Task.java b/src/net/apocalypselabs/symat/components/Task.java index 04baede..ee323d6 100644 --- a/src/net/apocalypselabs/symat/components/Task.java +++ b/src/net/apocalypselabs/symat/components/Task.java @@ -178,6 +178,9 @@ public class Task extends javax.swing.JPanel { setComplete(percent); taskName.setText(tm.toString()); taskDesc.setText(tm.getDesc()); + if (tm.deleteMe()) { + getParent().remove(this); + } }//GEN-LAST:event_menuBtnActionPerformed diff --git a/src/net/apocalypselabs/symat/components/TaskList.java b/src/net/apocalypselabs/symat/components/TaskList.java index 0c381fe..2003913 100644 --- a/src/net/apocalypselabs/symat/components/TaskList.java +++ b/src/net/apocalypselabs/symat/components/TaskList.java @@ -13,7 +13,7 @@ import java.util.ArrayList; */ public class TaskList implements Serializable { - private static final long serialVersionUID = 13370L; + private static final long serialVersionUID = 6754527404697894562L; private final ArrayList tasks = new ArrayList<>(); private String title = "Untitled"; diff --git a/src/net/apocalypselabs/symat/components/TaskMenu.form b/src/net/apocalypselabs/symat/components/TaskMenu.form index 30cf758..e190c14 100644 --- a/src/net/apocalypselabs/symat/components/TaskMenu.form +++ b/src/net/apocalypselabs/symat/components/TaskMenu.form @@ -18,32 +18,39 @@ + - + - + + + + + - - - - - + - + - + + + + + + + @@ -91,5 +98,10 @@ + + + + + diff --git a/src/net/apocalypselabs/symat/components/TaskMenu.java b/src/net/apocalypselabs/symat/components/TaskMenu.java index db03239..fa22005 100644 --- a/src/net/apocalypselabs/symat/components/TaskMenu.java +++ b/src/net/apocalypselabs/symat/components/TaskMenu.java @@ -75,6 +75,10 @@ public class TaskMenu extends javax.swing.JPanel { return percentSlider.getValue(); } + public boolean deleteMe() { + return delCheck.isSelected(); + } + /** * Get the name of the task. * @return Task name. @@ -108,6 +112,7 @@ public class TaskMenu extends javax.swing.JPanel { descBox = new javax.swing.JTextArea(); jLabel3 = new javax.swing.JLabel(); percentSlider = new javax.swing.JSlider(); + delCheck = new javax.swing.JCheckBox(); jLabel1.setText("Task Name:"); @@ -126,40 +131,49 @@ public class TaskMenu extends javax.swing.JPanel { percentSlider.setSnapToTicks(true); percentSlider.setValue(0); + delCheck.setText("Delete this task"); + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); this.setLayout(layout); layout.setHorizontalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(nameBox) .addComponent(jScrollPane1) + .addComponent(percentSlider, javax.swing.GroupLayout.DEFAULT_SIZE, 375, Short.MAX_VALUE) .addGroup(layout.createSequentialGroup() .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(jLabel2) - .addComponent(jLabel3) - .addComponent(jLabel1)) + .addComponent(jLabel1) + .addComponent(jLabel3)) .addGap(0, 0, Short.MAX_VALUE)) - .addComponent(percentSlider, javax.swing.GroupLayout.DEFAULT_SIZE, 375, Short.MAX_VALUE) + .addGroup(layout.createSequentialGroup() + .addContainerGap() + .addComponent(delCheck) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() - .addComponent(jLabel3) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(percentSlider, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(jLabel1) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(nameBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(jLabel2) - .addGap(7, 7, 7) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 115, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(0, 0, 0)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(jLabel3) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(percentSlider, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGap(18, 18, 18) + .addComponent(delCheck) + .addContainerGap(16, Short.MAX_VALUE)) ); }// //GEN-END:initComponents // Variables declaration - do not modify//GEN-BEGIN:variables + private javax.swing.JCheckBox delCheck; private javax.swing.JTextArea descBox; private javax.swing.JLabel jLabel1; private javax.swing.JLabel jLabel2;