diff -c -C 5 jbidwatcher-0.9.9/FilterManager.java jbidwatcher-0.9.9-mcp/FilterManager.java
*** jbidwatcher-0.9.9/FilterManager.java	2005-08-10 20:41:52.000000000 +0200
--- jbidwatcher-0.9.9-mcp/FilterManager.java	2006-02-25 15:39:42.000000000 +0100
***************
*** 278,288 ****
      if(!ae.isSticky() || ae.getCategory() == null) {
        //  Hardcode seller and ended checks.
        if(ae.isSeller()) {
          return findSellerList();
        }
!       if(ae.isEnded()) {
          return findCompletedList();
        }
      }
      category = ae.getCategory();
  
--- 278,289 ----
      if(!ae.isSticky() || ae.getCategory() == null) {
        //  Hardcode seller and ended checks.
        if(ae.isSeller()) {
          return findSellerList();
        }
!       if(JConfig.queryConfiguration("move_completed", "true").equals("true")
!          && ae.isEnded()) {
          return findCompletedList();
        }
      }
      category = ae.getCategory();
  
diff -c -C 5 jbidwatcher-0.9.9/JConfigGeneralTab.java jbidwatcher-0.9.9-mcp/JConfigGeneralTab.java
*** jbidwatcher-0.9.9/JConfigGeneralTab.java	2005-10-13 10:38:07.000000000 +0200
--- jbidwatcher-0.9.9-mcp/JConfigGeneralTab.java	2006-02-25 15:39:42.000000000 +0100
***************
*** 42,51 ****
--- 42,52 ----
    //private JCheckBox affiliateBox;
    private JCheckBox ignoreDeletedBox;
    private JCheckBox allowConfigUpdateBox;
    private JCheckBox allowArchival;
  
+   private JCheckBox moveCompletedBox;
    private JCheckBox limitsBox = null;
  
    private JCheckBox macMetalBox = null;
    private JCheckBox winTrayBox = null;
    private JCheckBox minimizeTrayBox = null;
***************
*** 91,100 ****
--- 92,102 ----
      }
      //JConfig.setConfiguration("ebay.affiliate", affiliateBox.isSelected() ? "true" : "false");
      JConfig.setConfiguration("deleted.ignore", ignoreDeletedBox.isSelected() ? "true" : "false");
  
      JConfig.setConfiguration("limits.enabled", limitsBox.isSelected() ? "true" : "false");
+     JConfig.setConfiguration("move_completed", moveCompletedBox.isSelected() ? "true" : "false");
      if (limitsBox.isSelected()) {
        JConfig.setConfiguration("limits.amount", spendLimit.getText());
      }
  
      if (JConfig.queryConfiguration("limits.amount", "null").equals("null")) {
***************
*** 143,152 ****
--- 145,155 ----
  
      return true;
    }
  
    public void updateValues() {
+     String doMoveCompleted = JConfig.queryConfiguration("move_completed", "true");
      String doUpdates = JConfig.queryConfiguration("updates.enabled", "true");
      String doDebugging = JConfig.queryConfiguration("debugging", "false");
      String doLogging = JConfig.queryConfiguration("logging", "true");
      //String doaffiliate = JConfig.queryConfiguration("ebay.affiliate", "false");
      String doIgnoreDeleted = JConfig.queryConfiguration("deleted.ignore", "true");
***************
*** 161,170 ****
--- 164,174 ----
      debuggingBox.setSelected(doDebugging.equals("true"));
      loggingBox.setSelected(doLogging.equals("true"));
      //affiliateBox.setSelected(doaffiliate.equals("true"));
      ignoreDeletedBox.setSelected(doIgnoreDeleted.equals("true"));
      allowConfigUpdateBox.setSelected(doAllowConfigUpdates.equals("true"));
+     moveCompletedBox.setSelected(doMoveCompleted.equals("true"));
      allowArchival.setSelected(doArchival.equals("true"));
      if(Platform.isWindows() && winTrayBox != null) {
        winTrayBox.setSelected(doWinTray.equals("true"));
        minimizeTrayBox.setEnabled(doWinTray.equals("true"));
        minimizeTrayBox.setSelected(doMinimize.equals("true"));
***************
*** 225,235 ****
  
    private JPanel buildCheckboxPanel() {
      JPanel tp = new JPanel();
  
      tp.setBorder(BorderFactory.createTitledBorder("General Options"));
!     tp.setLayout(new GridLayout(0, 2));
  
      doVersionUpdateCheckBox = new JCheckBox("Regularly check for new versions");
      doVersionUpdateCheckBox.setToolTipText("Once a day check for updates, config changes or notices necessary to keep JBidwatcher running smoothly.");
      tp.add(doVersionUpdateCheckBox);
  
--- 229,244 ----
  
    private JPanel buildCheckboxPanel() {
      JPanel tp = new JPanel();
  
      tp.setBorder(BorderFactory.createTitledBorder("General Options"));
!     if(Platform.isMac() || Platform.isWindows()) {
!       tp.setLayout(new GridLayout(1, 2));
!     } else {
!       tp.setLayout(new GridLayout(0, 2));
!     }
! 
  
      doVersionUpdateCheckBox = new JCheckBox("Regularly check for new versions");
      doVersionUpdateCheckBox.setToolTipText("Once a day check for updates, config changes or notices necessary to keep JBidwatcher running smoothly.");
      tp.add(doVersionUpdateCheckBox);
  
***************
*** 248,257 ****
--- 257,270 ----
  
      debuggingBox = new JCheckBox("Debugging");
      debuggingBox.setToolTipText("Enable tracking a lot more information about the state of the program as it's working.");
      tp.add(debuggingBox);
  
+     moveCompletedBox = new JCheckBox("Move Completed Auctions.");
+     moveCompletedBox.setToolTipText("move completed auctions to \"complete\" tab.");
+     tp.add(moveCompletedBox);
+ 
      loggingBox = new JCheckBox("Logging");
      loggingBox.setToolTipText("Enable logging to error[.###].log files in the JBidwatcher home directory.");
      tp.add(loggingBox);
  
      //affiliateBox = new JCheckBox("Enable Affiliate Use");
diff -c -C 5 jbidwatcher-0.9.9/Makefile jbidwatcher-0.9.9-mcp/Makefile
*** jbidwatcher-0.9.9/Makefile	2005-10-13 10:38:49.000000000 +0200
--- jbidwatcher-0.9.9-mcp/Makefile	2006-02-25 15:39:34.000000000 +0100
***************
*** 21,31 ****
  #
  # If you are comfortable with those issues, feel free to use javac!
  #
  
  JAR = jar
! VER = 0.9.9
  JAVAC = javac
  PRODUCT= JBidWatcher
  TARSRC = jbidwatcher-$(VER)
  BINARY = $(PRODUCT)-$(VER).jar
  OPT_BIN= $(PRODUCT)-$(VER)_o.jar
--- 21,31 ----
  #
  # If you are comfortable with those issues, feel free to use javac!
  #
  
  JAR = jar
! VER = 0.9.9-mcp
  JAVAC = javac
  PRODUCT= JBidWatcher
  TARSRC = jbidwatcher-$(VER)
  BINARY = $(PRODUCT)-$(VER).jar
  OPT_BIN= $(PRODUCT)-$(VER)_o.jar