8 files changed, 128 insertions, 32 deletions

@@ -30,6 +30,10 @@
                   </Group>
                   <Group type="102" alignment="0" attributes="0">
                       <EmptySpace min="-2" pref="36" max="-2" attributes="0"/>
+                      <Component id="jLabel10" pref="351" max="32767" attributes="0"/>
+                  </Group>
+                  <Group type="102" alignment="0" attributes="0">
+                      <EmptySpace min="-2" pref="36" max="-2" attributes="0"/>
                       <Component id="jLabel6" pref="351" max="32767" attributes="0"/>
                   </Group>
                   <Group type="102" alignment="0" attributes="0">
@@ -64,16 +68,21 @@
                               <EmptySpace max="-2" attributes="0"/>
                               <Component id="jSpinner2" pref="239" max="32767" attributes="0"/>
                           </Group>
+                          <Group type="102" alignment="0" attributes="0">
+                              <Component id="jLabel9" min="-2" max="-2" attributes="0"/>
+                              <EmptySpace max="-2" attributes="0"/>
+                              <Component id="jCheckBox1" min="-2" max="-2" attributes="0"/>
+                          </Group>
                       </Group>
                   </Group>
-                  <Group type="102" alignment="1" attributes="0">
-                      <EmptySpace pref="341" max="32767" attributes="0"/>
-                      <Component id="jButton1" min="-2" max="-2" attributes="0"/>
-                  </Group>
                   <Group type="102" alignment="0" attributes="0">
                       <EmptySpace min="-2" pref="36" max="-2" attributes="0"/>
                       <Component id="jLabel4" min="-2" pref="351" max="-2" attributes="0"/>
                   </Group>
+                  <Group type="102" alignment="1" attributes="0">
+                      <EmptySpace pref="341" max="32767" attributes="0"/>
+                      <Component id="jButton1" min="-2" max="-2" attributes="0"/>
+                  </Group>
               </Group>
               <EmptySpace max="-2" attributes="0"/>
           </Group>
@@ -107,10 +116,17 @@
                   <Component id="jComboBox1" alignment="3" min="-2" max="-2" attributes="0"/>
               </Group>
               <EmptySpace max="-2" attributes="0"/>
-              <Component id="jLabel8" min="-2" pref="85" max="-2" attributes="0"/>
+              <Component id="jLabel8" min="-2" pref="90" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="1" attributes="0">
+                  <Component id="jLabel9" min="-2" max="-2" attributes="0"/>
+                  <Component id="jCheckBox1" min="-2" max="-2" attributes="0"/>
+              </Group>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="jLabel10" pref="34" max="32767" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
               <Component id="jButton1" min="-2" max="-2" attributes="0"/>
-              <EmptySpace max="32767" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
@@ -200,5 +216,23 @@
         <Property name="name" type="java.lang.String" value="jLabel8" noResource="true"/>
       </Properties>
     </Component>
+    <Component class="javax.swing.JLabel" name="jLabel9">
+      <Properties>
+        <Property name="text" type="java.lang.String" resourceKey="jLabel9.text"/>
+        <Property name="name" type="java.lang.String" value="jLabel9" noResource="true"/>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JCheckBox" name="jCheckBox1">
+      <Properties>
+        <Property name="text" type="java.lang.String" resourceKey="jCheckBox1.text"/>
+        <Property name="name" type="java.lang.String" value="jCheckBox1" noResource="true"/>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JLabel" name="jLabel10">
+      <Properties>
+        <Property name="text" type="java.lang.String" resourceKey="jLabel10.text"/>
+        <Property name="name" type="java.lang.String" value="jLabel10" noResource="true"/>
+      </Properties>
+    </Component>
   </SubComponents>
 </Form>
@@ -47,6 +47,8 @@ public class AdvancedSettingsForm extends javax.swing.JDialog {
         } else {
             jComboBox1.setSelectedIndex(1);
         }
+        
+        jCheckBox1.setSelected(Wrapper.getConfig("useUnreadFlag").equals("true"));
     }
     
     /** This method is called from within the constructor to
@@ -70,6 +72,9 @@ public class AdvancedSettingsForm extends javax.swing.JDialog {
         jSpinner3 = new javax.swing.JSpinner();
         jComboBox1 = new javax.swing.JComboBox();
         jLabel8 = new javax.swing.JLabel();
+        jLabel9 = new javax.swing.JLabel();
+        jCheckBox1 = new javax.swing.JCheckBox();
+        jLabel10 = new javax.swing.JLabel();
 
         setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
         setName("Form"); // NOI18N
@@ -117,6 +122,15 @@ public class AdvancedSettingsForm extends javax.swing.JDialog {
         jLabel8.setText(resourceMap.getString("jLabel8.text")); // NOI18N
         jLabel8.setName("jLabel8"); // NOI18N
 
+        jLabel9.setText(resourceMap.getString("jLabel9.text")); // NOI18N
+        jLabel9.setName("jLabel9"); // NOI18N
+
+        jCheckBox1.setText(resourceMap.getString("jCheckBox1.text")); // NOI18N
+        jCheckBox1.setName("jCheckBox1"); // NOI18N
+
+        jLabel10.setText(resourceMap.getString("jLabel10.text")); // NOI18N
+        jLabel10.setName("jLabel10"); // NOI18N
+
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
         getContentPane().setLayout(layout);
         layout.setHorizontalGroup(
@@ -128,6 +142,9 @@ public class AdvancedSettingsForm extends javax.swing.JDialog {
                         .addComponent(jLabel8, javax.swing.GroupLayout.DEFAULT_SIZE, 351, Short.MAX_VALUE))
                     .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
                         .addGap(36, 36, 36)
+                        .addComponent(jLabel10, javax.swing.GroupLayout.DEFAULT_SIZE, 351, Short.MAX_VALUE))
+                    .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
+                        .addGap(36, 36, 36)
                         .addComponent(jLabel6, javax.swing.GroupLayout.DEFAULT_SIZE, 351, Short.MAX_VALUE))
                     .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
                         .addContainerGap()
@@ -153,13 +170,17 @@ public class AdvancedSettingsForm extends javax.swing.JDialog {
                             .addGroup(layout.createSequentialGroup()
                                 .addComponent(jLabel5)
                                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                                .addComponent(jSpinner2, javax.swing.GroupLayout.DEFAULT_SIZE, 239, Short.MAX_VALUE))))
-                    .addGroup(layout.createSequentialGroup()
-                        .addContainerGap(341, Short.MAX_VALUE)
-                        .addComponent(jButton1))
+                                .addComponent(jSpinner2, javax.swing.GroupLayout.DEFAULT_SIZE, 239, Short.MAX_VALUE))
+                            .addGroup(layout.createSequentialGroup()
+                                .addComponent(jLabel9)
+                                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                                .addComponent(jCheckBox1))))
                     .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
                         .addGap(36, 36, 36)
-                        .addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, 351, javax.swing.GroupLayout.PREFERRED_SIZE)))
+                        .addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, 351, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addGroup(layout.createSequentialGroup()
+                        .addContainerGap(341, Short.MAX_VALUE)
+                        .addComponent(jButton1)))
                 .addContainerGap())
         );
         layout.setVerticalGroup(
@@ -187,10 +208,16 @@ public class AdvancedSettingsForm extends javax.swing.JDialog {
                     .addComponent(jSpinner3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                     .addComponent(jComboBox1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(jLabel8, javax.swing.GroupLayout.PREFERRED_SIZE, 85, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addComponent(jLabel8, javax.swing.GroupLayout.PREFERRED_SIZE, 90, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+                    .addComponent(jLabel9)
+                    .addComponent(jCheckBox1))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(jLabel10, javax.swing.GroupLayout.DEFAULT_SIZE, 34, Short.MAX_VALUE)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(jButton1)
-                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                .addContainerGap())
         );
 
         pack();
@@ -201,6 +228,7 @@ public class AdvancedSettingsForm extends javax.swing.JDialog {
         Wrapper.setConfig("verIDBufferSize", ((Integer) jSpinner2.getValue()).toString());
         Wrapper.setConfig("ipCheckValue", ((Integer) jSpinner3.getValue()).toString());
         Wrapper.setConfig("ipCheckUnit", (String) jComboBox1.getSelectedItem());
+        Wrapper.setConfig("useUnreadFlag", ((Boolean) jCheckBox1.isSelected()).toString());
         
         ((InstaDiscView) InstaDiscApp.getApplication().getMainView()).updateTimer();
         
@@ -226,8 +254,10 @@ public class AdvancedSettingsForm extends javax.swing.JDialog {
     
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JButton jButton1;
+    private javax.swing.JCheckBox jCheckBox1;
     private javax.swing.JComboBox jComboBox1;
     private javax.swing.JLabel jLabel1;
+    private javax.swing.JLabel jLabel10;
     private javax.swing.JLabel jLabel2;
     private javax.swing.JLabel jLabel3;
     private javax.swing.JLabel jLabel4;
@@ -235,6 +265,7 @@ public class AdvancedSettingsForm extends javax.swing.JDialog {
     private javax.swing.JLabel jLabel6;
     private javax.swing.JLabel jLabel7;
     private javax.swing.JLabel jLabel8;
+    private javax.swing.JLabel jLabel9;
     private javax.swing.JSpinner jSpinner1;
     private javax.swing.JSpinner jSpinner2;
     private javax.swing.JSpinner jSpinner3;
@@ -170,6 +170,7 @@ public class Step2 extends javax.swing.JDialog {
                             Wrapper.setConfig("nextFilterID", "0");
                             Wrapper.setConfig("ipCheckValue", "1");
                             Wrapper.setConfig("ipCheckUnit", "day");
+                            Wrapper.setConfig("useUnreadFlag", "true");
                             Wrapper.setConfig("initCheck", "done");
                             
                             StepEndResults.ok = true;
@@ -32,8 +32,7 @@ public class IDItemListCellRenderer extends JLabel implements ListCellRenderer {
         {
             this.setText("<HTML><I>" + Wrapper.getSubscription(item.getSubscription()).getTitle() + "</I>, <B>" + item.getTitle() + "</B> by " + item.getAuthor());
         }
-        
-        if (item.getUnread())
+        if ((Wrapper.getConfig("useUnreadFlag").equals("true")) && (item.getUnread()))
         {
             this.setText(this.getText() + "<BR><B>New </B> at " + new SimpleDateFormat("EEEE, MMMM d yyyy k:mm aa").format(item.getRecieved()));
         }
@@ -46,7 +45,7 @@ public class IDItemListCellRenderer extends JLabel implements ListCellRenderer {
         {
             this.setForeground(arg0.getForeground());
 
-            if (item.getUnread())
+            if ((Wrapper.getConfig("useUnreadFlag").equals("true")) && (item.getUnread()))
             {
                 this.setBackground(java.awt.Color.yellow);
             } else
@@ -110,6 +110,9 @@
             <Property name="text" type="java.lang.String" resourceKey="jMenu1.text"/>
             <Property name="name" type="java.lang.String" value="jMenu1" noResource="true"/>
           </Properties>
+          <Events>
+            <EventHandler event="menuSelected" listener="javax.swing.event.MenuListener" parameters="javax.swing.event.MenuEvent" handler="jMenu1MenuSelected"/>
+          </Events>
           <SubComponents>
             <MenuItem class="javax.swing.JMenuItem" name="jMenuItem7">
               <Properties>
@@ -233,6 +233,15 @@ public class InstaDiscView extends FrameView {
 
         jMenu1.setText(resourceMap.getString("jMenu1.text")); // NOI18N
         jMenu1.setName("jMenu1"); // NOI18N
+        jMenu1.addMenuListener(new javax.swing.event.MenuListener() {
+            public void menuCanceled(javax.swing.event.MenuEvent evt) {
+            }
+            public void menuDeselected(javax.swing.event.MenuEvent evt) {
+            }
+            public void menuSelected(javax.swing.event.MenuEvent evt) {
+                jMenu1MenuSelected(evt);
+            }
+        });
 
         jMenuItem7.setText(resourceMap.getString("jMenuItem7.text")); // NOI18N
         jMenuItem7.setName("jMenuItem7"); // NOI18N
@@ -347,7 +356,11 @@ public class InstaDiscView extends FrameView {
             try {
                 if (java.awt.Desktop.isDesktopSupported())
                 {
-                    Wrapper.setUnreadFlagItem(item.getID(), false);
+                    if (Wrapper.getConfig("useUnreadFlag").equals("true"))
+                    {
+                        Wrapper.setUnreadFlagItem(item.getID(), false);
+                    }
+                    
                     refreshItemPane();
                     
                     java.awt.Desktop.getDesktop().browse(new URI(item.getURL()));
@@ -415,34 +428,47 @@ public class InstaDiscView extends FrameView {
     }//GEN-LAST:event_jMenuItem7ActionPerformed
 
     private void jList1MouseReleased(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_jList1MouseReleased
-        int i = jList1.locationToIndex(evt.getPoint());
-        if ((evt.isPopupTrigger()) && (i != -1))
+        if (Wrapper.getConfig("useUnreadFlag").equals("true"))
         {
-            jList1.setSelectedIndex(i);
-            new UnreadFlagPopupMenu((Item) jList1.getSelectedValue()).show(jList1, evt.getX(), evt.getY());
+            int i = jList1.locationToIndex(evt.getPoint());
+            if ((evt.isPopupTrigger()) && (i != -1))
+            {
+                jList1.setSelectedIndex(i);
+                new UnreadFlagPopupMenu((Item) jList1.getSelectedValue()).show(jList1, evt.getX(), evt.getY());
+            }
         }
     }//GEN-LAST:event_jList1MouseReleased
 
     private void jList1MousePressed(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_jList1MousePressed
-        int i = jList1.locationToIndex(evt.getPoint());
-        if ((evt.isPopupTrigger()) && (i != -1))
+        if (Wrapper.getConfig("useUnreadFlag").equals("true"))
         {
-            jList1.setSelectedIndex(i);
-            new UnreadFlagPopupMenu((Item) jList1.getSelectedValue()).show(jList1, evt.getX(), evt.getY());
+            int i = jList1.locationToIndex(evt.getPoint());
+            if ((evt.isPopupTrigger()) && (i != -1))
+            {
+                jList1.setSelectedIndex(i);
+                new UnreadFlagPopupMenu((Item) jList1.getSelectedValue()).show(jList1, evt.getX(), evt.getY());
+            }
         }
     }//GEN-LAST:event_jList1MousePressed
 
     private void jMenuItem8ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jMenuItem8ActionPerformed
-        Item[] items = Wrapper.getAllItem();
-        int i = 0;
-        for (i=0; i < items.length; i++)
+        if (Wrapper.getConfig("useUnreadFlag").equals("true"))
         {
-            Wrapper.setUnreadFlagItem(items[i].getID(), false);
-        }
+            Item[] items = Wrapper.getAllItem();
+            int i = 0;
+            for (i=0; i < items.length; i++)
+            {
+                Wrapper.setUnreadFlagItem(items[i].getID(), false);
+            }
         
-        refreshItemPane();
+            refreshItemPane();
+        }
     }//GEN-LAST:event_jMenuItem8ActionPerformed
 
+    private void jMenu1MenuSelected(javax.swing.event.MenuEvent evt) {//GEN-FIRST:event_jMenu1MenuSelected
+        jMenuItem8.setEnabled(Wrapper.getConfig("useUnreadFlag").equals("true"));
+    }//GEN-LAST:event_jMenu1MenuSelected
+
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JList jList1;
     private javax.swing.JMenu jMenu1;
@@ -4,7 +4,6 @@ import com.fourisland.instadisc.Database.Item;
 import com.fourisland.instadisc.Database.Wrapper;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import javax.swing.JList;
 import javax.swing.JMenuItem;
 import javax.swing.JPopupMenu;
 
@@ -9,3 +9,6 @@ jLabel6.text=<HTML>If this is a higher value, less viral Items will get in, but
 jButton1.text=Done
 jLabel7.text=IP Timer Interval:
 jLabel8.text=<HTML>This is how often InstaDisc contacts the Central Server to see if your IP Address has changed. If your IP Address has changed and the Central Server doesn't know about it yet, you won't be able to recieve InstaDisc Items.
+jLabel9.text=Use Unread Flag?
+jCheckBox1.text=
+jLabel10.text=<HTML>If this is checked, all incoming items will automatically be marked as read.