[SwapDV-commit] CVS: swapdv aboutDialog.java,NONE,1.1 README.scheduler,1.1,1.2 ReplayTV.java,1.31,1.32 SwapDV.form,1.27,1.28 SwapDV.java,1.66,1.67

[Gerry D. <gd...@us...>]

Update of /cvsroot/swapdv/swapdv
In directory usw-pr-cvs1:/tmp/cvs-serv5411

Modified Files:
	README.scheduler ReplayTV.java SwapDV.form SwapDV.java 
Added Files:
	aboutDialog.java 
Log Message:
Fix scheduler time bug, add about dialog w/Version and fix typos


--- NEW FILE ---
/*
 * aboutFrame.java
 *
 * Created on June 14, 2002, 3:01 PM
 */

package swapdv;

import java.awt.*;
import javax.swing.*;

/**
 *
 * @author  gerry
 */
public class aboutDialog extends javax.swing.JDialog {
  
  /** Creates new form aboutFrame */
  public aboutDialog() {
    initComponents();
    
    // Install the current version label and establish modality
    versionLabel.setText(swapdv.SwapDV.SWAPDV_VERSION);
    this.setModal(true);

    titleLabel.setIcon(swapdv.SwapDV.getSwapDV().iconSwapdv32);

    // Layout the panel
     this.pack();
    //this.setSize(400, 250);
    Dimension theScreen = Toolkit.getDefaultToolkit().getScreenSize();
    Dimension theFrame = this.getSize();
    
    theFrame.width = (theScreen.width - theFrame.width) / 2;
    theFrame.height = (theScreen.height - theFrame.height) / 2;
    this.setLocation(theFrame.width, theFrame.height);
  }
  
  /** This method is called from within the constructor to
   * initialize the form.
   * WARNING: Do NOT modify this code. The content of this method is
   * always regenerated by the Form Editor.
   */
  private void initComponents() {//GEN-BEGIN:initComponents
    java.awt.GridBagConstraints gridBagConstraints;

    aboutPanel = new javax.swing.JPanel();
    titlePanel = new javax.swing.JPanel();
    titleLabel = new javax.swing.JLabel();
    versionLabel = new javax.swing.JLabel();
    jLabel2 = new javax.swing.JLabel();
    okButton = new javax.swing.JButton();

    setTitle("About SwapDV");
    setResizable(false);
    setUndecorated(true);
    aboutPanel.setLayout(new java.awt.GridBagLayout());

    aboutPanel.setMinimumSize(new java.awt.Dimension(300, 200));
    aboutPanel.setPreferredSize(new java.awt.Dimension(300, 200));
    titlePanel.setLayout(new java.awt.GridBagLayout());

    titleLabel.setFont(new java.awt.Font("Dialog", 1, 24));
    titleLabel.setText("SwapDV");
    titleLabel.setIconTextGap(8);
    gridBagConstraints = new java.awt.GridBagConstraints();
    gridBagConstraints.gridx = 0;
    gridBagConstraints.gridy = 0;
    gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
    gridBagConstraints.insets = new java.awt.Insets(8, 8, 0, 0);
    gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
    gridBagConstraints.weightx = 1.0;
    titlePanel.add(titleLabel, gridBagConstraints);

    versionLabel.setFont(new java.awt.Font("Dialog", 1, 18));
    versionLabel.setText("V0.00");
    gridBagConstraints = new java.awt.GridBagConstraints();
    gridBagConstraints.gridx = 1;
    gridBagConstraints.gridy = 0;
    gridBagConstraints.insets = new java.awt.Insets(8, 4, 0, 8);
    gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST;
    titlePanel.add(versionLabel, gridBagConstraints);

    gridBagConstraints = new java.awt.GridBagConstraints();
    gridBagConstraints.gridx = 0;
    gridBagConstraints.gridy = 0;
    gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
    gridBagConstraints.insets = new java.awt.Insets(4, 16, 0, 16);
    gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH;
    gridBagConstraints.weightx = 1.0;
    aboutPanel.add(titlePanel, gridBagConstraints);

    jLabel2.setFont(new java.awt.Font("Dialog", 0, 12));
    jLabel2.setText("<HTML><HR WIDTH=\"100%\" SIZE=0 NOSHADE>SwapDV is a tool for hosting and distributing  <I>non-commercial</I>  digital video (DV) for viewing  on Digital Video Recorders (DVRs), such  as ReplayTVs and Tivos.  <BR><P> See EULA.txt, included with SwapDV,  for the terms and conditions of use.  <BR><P> For more information,  visit http://www.swapdv.net </HTML>");
    jLabel2.setVerticalAlignment(javax.swing.SwingConstants.TOP);
    jLabel2.setMaximumSize(new java.awt.Dimension(1000, 1000));
    jLabel2.setMinimumSize(new java.awt.Dimension(200, 100));
    jLabel2.setPreferredSize(new java.awt.Dimension(400, 300));
    jLabel2.setVerticalTextPosition(javax.swing.SwingConstants.TOP);
    gridBagConstraints = new java.awt.GridBagConstraints();
    gridBagConstraints.gridx = 0;
    gridBagConstraints.gridy = 1;
    gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
    gridBagConstraints.ipady = 80;
    gridBagConstraints.insets = new java.awt.Insets(0, 16, 0, 16);
    gridBagConstraints.weightx = 1.0;
    gridBagConstraints.weighty = 1.0;
    aboutPanel.add(jLabel2, gridBagConstraints);

    okButton.setFont(new java.awt.Font("Dialog", 0, 12));
    okButton.setText("Ok");
    okButton.addActionListener(new java.awt.event.ActionListener() {
      public void actionPerformed(java.awt.event.ActionEvent evt) {
        okButtonActionPerformed(evt);
      }
    });

    gridBagConstraints = new java.awt.GridBagConstraints();
    gridBagConstraints.gridx = 0;
    gridBagConstraints.gridy = 2;
    gridBagConstraints.insets = new java.awt.Insets(16, 4, 8, 4);
    gridBagConstraints.anchor = java.awt.GridBagConstraints.SOUTH;
    gridBagConstraints.weightx = 1.0;
    aboutPanel.add(okButton, gridBagConstraints);

    getContentPane().add(aboutPanel, java.awt.BorderLayout.CENTER);

    pack();
  }//GEN-END:initComponents

  private void okButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_okButtonActionPerformed
    this.setVisible(false);
  }//GEN-LAST:event_okButtonActionPerformed
  
 
  // Variables declaration - do not modify//GEN-BEGIN:variables
  private javax.swing.JLabel titleLabel;
  private javax.swing.JLabel versionLabel;
  private javax.swing.JPanel aboutPanel;
  private javax.swing.JButton okButton;
  private javax.swing.JPanel titlePanel;
  private javax.swing.JLabel jLabel2;
  // End of variables declaration//GEN-END:variables
  
}

Index: README.scheduler
===================================================================
RCS file: /cvsroot/swapdv/swapdv/README.scheduler,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.scheduler	2 Jun 2002 23:11:13 -0000	1.1
+++ README.scheduler	14 Jun 2002 21:47:05 -0000	1.2
@@ -13,10 +13,11 @@
 
 * In many cases (most even), each event will have a single action
 
+* Use the wizards to set events up, then tweak them in the manager (if needed)
 
 Accessing the scheduler
 
-The scheduler control panel is accessed via the File->Scheduler menu
+The scheduler control panel is accessed via the Scheduler->Scheduled Events Manager menu
 item on the main SwapDV panel.  
 
 Chosing this will bring up a list of any currently scheduled events. 
@@ -30,7 +31,7 @@
 scheduler and forget to restart the schedule, it will remain paused
 indefinatly (event between restarts of the SwapDV application).
 
-Pauing the scheduler only affects the automatic checking for and
+Pausing the scheduler only affects the automatic checking for and
 running of your scheduled events.  You can still edit the events 
 while paused, but they will not automatically be run.
 
@@ -424,20 +425,6 @@
 
 This tab controls where and how shows are copied into the local swapDV guide.
 
-Copy Shows to Local Category
-This allows you to say which category the show will be copied to in
-your SwapDV guide.  If "Use Same Category as Show was recorded in" is
-selected, then a selected show would attempt to copy itself into the
-same category on SwapDV as it had on the ReplayTV.  However, if there
-is no such category on SwapDV, the show will not be copied.  If "Copy
-all shows to Category" is selected, then you must choose a category
-that all new shows will be copied into.  Categories are defined in
-SwapDV from a number of places, including from the main "My SwapDV"
-panels "Category" menu.  Note: If you setup an action to copy to a
-specific category and then later delete that category without deleting
-the action, all attempts by that action to copy a show will fail until
-either the actions is updated or the category is re-created.
-
 Copy Shows to Local Channel
 This allows you to say which channel the show will be copied to in
 your SwapDV guide.  If "Use Same Channel as Show was recorded in" is
@@ -502,4 +489,5 @@
 shows title/description are compared.  Unlike elsewhere in this
 action, matches are exact (not keywords), though we don't care about
 upper/lower case when matching.
+
 

Index: ReplayTV.java
===================================================================
RCS file: /cvsroot/swapdv/swapdv/ReplayTV.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ReplayTV.java	11 Jun 2002 15:50:03 -0000	1.31
+++ ReplayTV.java	14 Jun 2002 21:47:05 -0000	1.32
@@ -101,7 +101,7 @@
             swapDV.statusChange("Unable to connect to "+replayAddr+":"+replayPort+" - "+ex.getLocalizedMessage());
         }
         
-        setIconImage(rrs.isSwapDV() ? swapDV.iconSwapdv32 : swapDV.iconReplay32);
+        setIconImage(rrs.isSwapDV() ? swapDV.iconSwapdv32.getImage() : swapDV.iconReplay32);
         cellRenderer.setIcons(rrs.isSwapDV() ? swapDV.iconSwapdv16 : swapDV.iconReplay16, swapDV.iconCategory, null, swapDV.iconShow);
         treeModel.setGuide(guide);
         // select the root
@@ -256,231 +256,232 @@
      * WARNING: Do NOT modify this code. The content of this method is
      * always regenerated by the Form Editor.
      */
-    private void initComponents() {//GEN-BEGIN:initComponents
-        jPopupMenuShows = new javax.swing.JPopupMenu();
-        jMenuItemImport = new javax.swing.JMenuItem();
-        jMenuAdv = new javax.swing.JMenu();
-        jMenuItemSaveSwap = new javax.swing.JMenuItem();
-        jMenuItemSaveMPEG = new javax.swing.JMenuItem();
-        jSeparator1 = new javax.swing.JSeparator();
-        jMenuItemShowDelete = new javax.swing.JMenuItem();
-        jMenuBar1 = new javax.swing.JMenuBar();
-        jMenuFile = new javax.swing.JMenu();
-        jMenu4 = new javax.swing.JMenu();
-        jMenuItemSaveGuideFull = new javax.swing.JMenuItem();
-        jMenuItemSaveGuide = new javax.swing.JMenuItem();
-        jMenuItemClose = new javax.swing.JMenuItem();
-        jMenuShow = new javax.swing.JMenu();
-        jMenuItemImport2 = new javax.swing.JMenuItem();
-        jMenuAdv2 = new javax.swing.JMenu();
-        jMenuItemSaveSwap2 = new javax.swing.JMenuItem();
-        jMenuItemSaveMPEG2 = new javax.swing.JMenuItem();
-        jSeparator2 = new javax.swing.JSeparator();
-        jMenuItemShowDelete2 = new javax.swing.JMenuItem();
-        jTabbedPane1 = new javax.swing.JTabbedPane();
-        jSplitPaneContentGuide = new javax.swing.JSplitPane();
-        jScrollPaneChannels = new javax.swing.JScrollPane();
-        jTree1 = new javax.swing.JTree();
-        jScrollPaneShows = new javax.swing.JScrollPane();
-        jTableShows = new javax.swing.JTable();
-        jLabelStatus = new javax.swing.JLabel();
-        
-        jMenuItemImport.setMnemonic('i');
-        jMenuItemImport.setText("Download show to My SwapDV");
-        jMenuItemImport.setEnabled(false);
-        jMenuItemImport.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                jMenuItemImportActionPerformed(evt);
-            }
-        });
-        
-        jPopupMenuShows.add(jMenuItemImport);
-        jMenuAdv.setMnemonic('A');
-        jMenuAdv.setText("Advanced");
-        jMenuItemSaveSwap.setMnemonic('s');
-        jMenuItemSaveSwap.setText("Download show swap files");
-        jMenuItemSaveSwap.setEnabled(false);
-        jMenuItemSaveSwap.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                jMenuItemSaveSwapActionPerformed(evt);
-            }
-        });
-        
-        jMenuAdv.add(jMenuItemSaveSwap);
-        jMenuItemSaveMPEG.setMnemonic('m');
-        jMenuItemSaveMPEG.setText("Download show MPEG for ReplayTV");
-        jMenuItemSaveMPEG.setEnabled(false);
-        jMenuItemSaveMPEG.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                jMenuItemSaveMPEGActionPerformed(evt);
-            }
-        });
-        
-        jMenuAdv.add(jMenuItemSaveMPEG);
-        jPopupMenuShows.add(jMenuAdv);
-        jPopupMenuShows.add(jSeparator1);
-        jMenuItemShowDelete.setMnemonic('D');
-        jMenuItemShowDelete.setText("Delete");
-        jMenuItemShowDelete.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                jMenuItemShowDeleteActionPerformed(evt);
-            }
-        });
-        
-        jPopupMenuShows.add(jMenuItemShowDelete);
-        jMenuFile.setMnemonic('F');
-        jMenuFile.setText("File");
-        jMenu4.setMnemonic('a');
-        jMenu4.setText("Advanced");
-        jMenuItemSaveGuideFull.setMnemonic('g');
-        jMenuItemSaveGuideFull.setText("Download show &  channel guide (full)");
-        jMenuItemSaveGuideFull.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                jMenuItemSaveGuideFullActionPerformed(evt);
-            }
-        });
-        
-        jMenu4.add(jMenuItemSaveGuideFull);
-        jMenuItemSaveGuide.setMnemonic('n');
-        jMenuItemSaveGuide.setText("Download show & channel guide (no header)");
-        jMenuItemSaveGuide.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                jMenuItemSaveGuideActionPerformed(evt);
-            }
-        });
-        
-        jMenu4.add(jMenuItemSaveGuide);
-        jMenuFile.add(jMenu4);
-        jMenuItemClose.setMnemonic('C');
-        jMenuItemClose.setText("Close");
-        jMenuItemClose.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                jMenuItemCloseActionPerformed(evt);
-            }
-        });
-        
-        jMenuFile.add(jMenuItemClose);
-        jMenuBar1.add(jMenuFile);
-        jMenuShow.setMnemonic('S');
-        jMenuShow.setText("Show");
-        jMenuShow.addMenuListener(new javax.swing.event.MenuListener() {
-            public void menuSelected(javax.swing.event.MenuEvent evt) {
-                jMenuShowMenuSelected(evt);
-            }
-            public void menuDeselected(javax.swing.event.MenuEvent evt) {
-            }
-            public void menuCanceled(javax.swing.event.MenuEvent evt) {
-            }
-        });
-        
-        jMenuItemImport2.setMnemonic('D');
-        jMenuItemImport2.setText("Download show to My SwapDV");
-        jMenuItemImport2.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                jMenuItemImport2ActionPerformed(evt);
-            }
-        });
-        
-        jMenuShow.add(jMenuItemImport2);
-        jMenuAdv2.setMnemonic('a');
-        jMenuAdv2.setText("Advanced");
-        jMenuItemSaveSwap2.setMnemonic('s');
-        jMenuItemSaveSwap2.setText("Download show swap files");
-        jMenuItemSaveSwap2.setEnabled(false);
-        jMenuItemSaveSwap2.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                jMenuItemSaveSwap2ActionPerformed(evt);
-            }
-        });
-        
-        jMenuAdv2.add(jMenuItemSaveSwap2);
-        jMenuItemSaveMPEG2.setMnemonic('m');
-        jMenuItemSaveMPEG2.setText("Download show MPEG for ReplayTV");
-        jMenuItemSaveMPEG2.setEnabled(false);
-        jMenuItemSaveMPEG2.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                jMenuItemSaveMPEG2ActionPerformed(evt);
-            }
-        });
-        
-        jMenuAdv2.add(jMenuItemSaveMPEG2);
-        jMenuShow.add(jMenuAdv2);
-        jMenuShow.add(jSeparator2);
-        jMenuItemShowDelete2.setMnemonic('D');
-        jMenuItemShowDelete2.setText("Delete");
-        jMenuItemShowDelete2.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                jMenuItemShowDelete2ActionPerformed(evt);
-            }
-        });
-        
-        jMenuShow.add(jMenuItemShowDelete2);
-        jMenuBar1.add(jMenuShow);
-        
-        setTitle("My SwapDV");
-        setIconImage(getIconImage());
-        addWindowListener(new java.awt.event.WindowAdapter() {
-            public void windowClosing(java.awt.event.WindowEvent evt) {
-                exitForm(evt);
-            }
-        });
-        
-        jTabbedPane1.setToolTipText("");
-        jTabbedPane1.setMinimumSize(new java.awt.Dimension(100, 300));
-        jTabbedPane1.setPreferredSize(new java.awt.Dimension(460, 500));
-        jSplitPaneContentGuide.setDividerLocation(100);
-        jSplitPaneContentGuide.setDividerSize(2);
-        jSplitPaneContentGuide.setToolTipText("");
-        jSplitPaneContentGuide.setContinuousLayout(true);
-        jScrollPaneChannels.setToolTipText("Channels");
-        jScrollPaneChannels.setMinimumSize(new java.awt.Dimension(0, 50));
-        jTree1.setCellRenderer(cellRenderer);
-        jTree1.setModel(treeModel);
-        jTree1.addMouseListener(new java.awt.event.MouseAdapter() {
-            public void mouseClicked(java.awt.event.MouseEvent evt) {
-                jTree1MouseClicked(evt);
-            }
-        });
-        
-        jScrollPaneChannels.setViewportView(jTree1);
-        
-        jSplitPaneContentGuide.setLeftComponent(jScrollPaneChannels);
-        
-        jScrollPaneShows.setToolTipText("Shows");
-        jScrollPaneShows.setMinimumSize(new java.awt.Dimension(0, 50));
-        jScrollPaneShows.addMouseListener(new java.awt.event.MouseAdapter() {
-            public void mouseClicked(java.awt.event.MouseEvent evt) {
-                jScrollPaneShowsMouseClicked(evt);
-            }
-        });
-        
-        jTableShows.setModel(listShows);
-        jTableShows.setToolTipText("Shows");
-        jTableShows.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_OFF);
-        jTableShows.addMouseListener(new java.awt.event.MouseAdapter() {
-            public void mouseClicked(java.awt.event.MouseEvent evt) {
-                jTableShowsMouseClicked(evt);
-            }
-        });
-        
-        jScrollPaneShows.setViewportView(jTableShows);
-        
-        jSplitPaneContentGuide.setRightComponent(jScrollPaneShows);
-        
-        jTabbedPane1.addTab("Shows & Channels", jSplitPaneContentGuide);
-        
-        getContentPane().add(jTabbedPane1, java.awt.BorderLayout.CENTER);
-        
-        jLabelStatus.setVerticalAlignment(javax.swing.SwingConstants.BOTTOM);
-        jLabelStatus.setHorizontalTextPosition(javax.swing.SwingConstants.LEFT);
-        getContentPane().add(jLabelStatus, java.awt.BorderLayout.SOUTH);
-        
-        setJMenuBar(jMenuBar1);
-        pack();
-        java.awt.Dimension screenSize = java.awt.Toolkit.getDefaultToolkit().getScreenSize();
-        setSize(new java.awt.Dimension(400, 300));
-        setLocation((screenSize.width-400)/2,(screenSize.height-300)/2);
-    }//GEN-END:initComponents
+  private void initComponents() {//GEN-BEGIN:initComponents
+    jPopupMenuShows = new javax.swing.JPopupMenu();
+    jMenuItemImport = new javax.swing.JMenuItem();
+    jMenuAdv = new javax.swing.JMenu();
+    jMenuItemSaveSwap = new javax.swing.JMenuItem();
+    jMenuItemSaveMPEG = new javax.swing.JMenuItem();
+    jSeparator1 = new javax.swing.JSeparator();
+    jMenuItemShowDelete = new javax.swing.JMenuItem();
+    jTabbedPane1 = new javax.swing.JTabbedPane();
+    jSplitPaneContentGuide = new javax.swing.JSplitPane();
+    jScrollPaneChannels = new javax.swing.JScrollPane();
+    jTree1 = new javax.swing.JTree();
+    jScrollPaneShows = new javax.swing.JScrollPane();
+    jTableShows = new javax.swing.JTable();
+    jLabelStatus = new javax.swing.JLabel();
+    jMenuBar1 = new javax.swing.JMenuBar();
+    jMenuFile = new javax.swing.JMenu();
+    jMenu4 = new javax.swing.JMenu();
+    jMenuItemSaveGuideFull = new javax.swing.JMenuItem();
+    jMenuItemSaveGuide = new javax.swing.JMenuItem();
+    jMenuItemClose = new javax.swing.JMenuItem();
+    jMenuShow = new javax.swing.JMenu();
+    jMenuItemImport2 = new javax.swing.JMenuItem();
+    jMenuAdv2 = new javax.swing.JMenu();
+    jMenuItemSaveSwap2 = new javax.swing.JMenuItem();
+    jMenuItemSaveMPEG2 = new javax.swing.JMenuItem();
+    jSeparator2 = new javax.swing.JSeparator();
+    jMenuItemShowDelete2 = new javax.swing.JMenuItem();
+
+    jMenuItemImport.setMnemonic('i');
+    jMenuItemImport.setText("Download show to My SwapDV");
+    jMenuItemImport.setEnabled(false);
+    jMenuItemImport.addActionListener(new java.awt.event.ActionListener() {
+      public void actionPerformed(java.awt.event.ActionEvent evt) {
+        jMenuItemImportActionPerformed(evt);
+      }
+    });
+
+    jPopupMenuShows.add(jMenuItemImport);
+    jMenuAdv.setMnemonic('A');
+    jMenuAdv.setText("Advanced");
+    jMenuItemSaveSwap.setMnemonic('s');
+    jMenuItemSaveSwap.setText("Download show swap files");
+    jMenuItemSaveSwap.setEnabled(false);
+    jMenuItemSaveSwap.addActionListener(new java.awt.event.ActionListener() {
+      public void actionPerformed(java.awt.event.ActionEvent evt) {
+        jMenuItemSaveSwapActionPerformed(evt);
+      }
+    });
+
+    jMenuAdv.add(jMenuItemSaveSwap);
+    jMenuItemSaveMPEG.setMnemonic('m');
+    jMenuItemSaveMPEG.setText("Download show MPEG for ReplayTV");
+    jMenuItemSaveMPEG.setEnabled(false);
+    jMenuItemSaveMPEG.addActionListener(new java.awt.event.ActionListener() {
+      public void actionPerformed(java.awt.event.ActionEvent evt) {
+        jMenuItemSaveMPEGActionPerformed(evt);
+      }
+    });
+
+    jMenuAdv.add(jMenuItemSaveMPEG);
+    jPopupMenuShows.add(jMenuAdv);
+    jPopupMenuShows.add(jSeparator1);
+    jMenuItemShowDelete.setMnemonic('D');
+    jMenuItemShowDelete.setText("Delete");
+    jMenuItemShowDelete.addActionListener(new java.awt.event.ActionListener() {
+      public void actionPerformed(java.awt.event.ActionEvent evt) {
+        jMenuItemShowDeleteActionPerformed(evt);
+      }
+    });
+
+    jPopupMenuShows.add(jMenuItemShowDelete);
+
+    setTitle("My SwapDV");
+    setIconImage(getIconImage());
+    addWindowListener(new java.awt.event.WindowAdapter() {
+      public void windowClosing(java.awt.event.WindowEvent evt) {
+        exitForm(evt);
+      }
+    });
+
+    jTabbedPane1.setToolTipText("");
+    jTabbedPane1.setMinimumSize(new java.awt.Dimension(100, 300));
+    jTabbedPane1.setPreferredSize(new java.awt.Dimension(460, 500));
+    jSplitPaneContentGuide.setDividerLocation(100);
+    jSplitPaneContentGuide.setDividerSize(2);
+    jSplitPaneContentGuide.setToolTipText("");
+    jSplitPaneContentGuide.setContinuousLayout(true);
+    jScrollPaneChannels.setToolTipText("Channels");
+    jScrollPaneChannels.setMinimumSize(new java.awt.Dimension(0, 50));
+    jTree1.setCellRenderer(cellRenderer);
+    jTree1.setModel(treeModel);
+    jTree1.addMouseListener(new java.awt.event.MouseAdapter() {
+      public void mouseClicked(java.awt.event.MouseEvent evt) {
+        jTree1MouseClicked(evt);
+      }
+    });
+
+    jScrollPaneChannels.setViewportView(jTree1);
+
+    jSplitPaneContentGuide.setLeftComponent(jScrollPaneChannels);
+
+    jScrollPaneShows.setToolTipText("Shows");
+    jScrollPaneShows.setMinimumSize(new java.awt.Dimension(0, 50));
+    jScrollPaneShows.addMouseListener(new java.awt.event.MouseAdapter() {
+      public void mouseClicked(java.awt.event.MouseEvent evt) {
+        jScrollPaneShowsMouseClicked(evt);
+      }
+    });
+
+    jTableShows.setModel(listShows);
+    jTableShows.setToolTipText("Shows");
+    jTableShows.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_OFF);
+    jTableShows.addMouseListener(new java.awt.event.MouseAdapter() {
+      public void mouseClicked(java.awt.event.MouseEvent evt) {
+        jTableShowsMouseClicked(evt);
+      }
+    });
+
+    jScrollPaneShows.setViewportView(jTableShows);
+
+    jSplitPaneContentGuide.setRightComponent(jScrollPaneShows);
+
+    jTabbedPane1.addTab("Shows & Channels", null, jSplitPaneContentGuide, "");
+
+    getContentPane().add(jTabbedPane1, java.awt.BorderLayout.CENTER);
+
+    jLabelStatus.setVerticalAlignment(javax.swing.SwingConstants.BOTTOM);
+    jLabelStatus.setHorizontalTextPosition(javax.swing.SwingConstants.LEFT);
+    getContentPane().add(jLabelStatus, java.awt.BorderLayout.SOUTH);
+
+    jMenuFile.setMnemonic('F');
+    jMenuFile.setText("File");
+    jMenu4.setMnemonic('a');
+    jMenu4.setText("Advanced");
+    jMenuItemSaveGuideFull.setMnemonic('g');
+    jMenuItemSaveGuideFull.setText("Download show &  channel guide (full)");
+    jMenuItemSaveGuideFull.addActionListener(new java.awt.event.ActionListener() {
+      public void actionPerformed(java.awt.event.ActionEvent evt) {
+        jMenuItemSaveGuideFullActionPerformed(evt);
+      }
+    });
+
+    jMenu4.add(jMenuItemSaveGuideFull);
+    jMenuItemSaveGuide.setMnemonic('n');
+    jMenuItemSaveGuide.setText("Download show & channel guide (no header)");
+    jMenuItemSaveGuide.addActionListener(new java.awt.event.ActionListener() {
+      public void actionPerformed(java.awt.event.ActionEvent evt) {
+        jMenuItemSaveGuideActionPerformed(evt);
+      }
+    });
+
+    jMenu4.add(jMenuItemSaveGuide);
+    jMenuFile.add(jMenu4);
+    jMenuItemClose.setMnemonic('C');
+    jMenuItemClose.setText("Close");
+    jMenuItemClose.addActionListener(new java.awt.event.ActionListener() {
+      public void actionPerformed(java.awt.event.ActionEvent evt) {
+        jMenuItemCloseActionPerformed(evt);
+      }
+    });
+
+    jMenuFile.add(jMenuItemClose);
+    jMenuBar1.add(jMenuFile);
+    jMenuShow.setMnemonic('S');
+    jMenuShow.setText("Show");
+    jMenuShow.addMenuListener(new javax.swing.event.MenuListener() {
+      public void menuSelected(javax.swing.event.MenuEvent evt) {
+        jMenuShowMenuSelected(evt);
+      }
+      public void menuDeselected(javax.swing.event.MenuEvent evt) {
+      }
+      public void menuCanceled(javax.swing.event.MenuEvent evt) {
+      }
+    });
+
+    jMenuItemImport2.setMnemonic('D');
+    jMenuItemImport2.setText("Download show to My SwapDV");
+    jMenuItemImport2.addActionListener(new java.awt.event.ActionListener() {
+      public void actionPerformed(java.awt.event.ActionEvent evt) {
+        jMenuItemImport2ActionPerformed(evt);
+      }
+    });
+
+    jMenuShow.add(jMenuItemImport2);
+    jMenuAdv2.setMnemonic('a');
+    jMenuAdv2.setText("Advanced");
+    jMenuItemSaveSwap2.setMnemonic('s');
+    jMenuItemSaveSwap2.setText("Download show swap files");
+    jMenuItemSaveSwap2.setEnabled(false);
+    jMenuItemSaveSwap2.addActionListener(new java.awt.event.ActionListener() {
+      public void actionPerformed(java.awt.event.ActionEvent evt) {
+        jMenuItemSaveSwap2ActionPerformed(evt);
+      }
+    });
+
+    jMenuAdv2.add(jMenuItemSaveSwap2);
+    jMenuItemSaveMPEG2.setMnemonic('m');
+    jMenuItemSaveMPEG2.setText("Download show MPEG for ReplayTV");
+    jMenuItemSaveMPEG2.setEnabled(false);
+    jMenuItemSaveMPEG2.addActionListener(new java.awt.event.ActionListener() {
+      public void actionPerformed(java.awt.event.ActionEvent evt) {
+        jMenuItemSaveMPEG2ActionPerformed(evt);
+      }
+    });
+
+    jMenuAdv2.add(jMenuItemSaveMPEG2);
+    jMenuShow.add(jMenuAdv2);
+    jMenuShow.add(jSeparator2);
+    jMenuItemShowDelete2.setMnemonic('D');
+    jMenuItemShowDelete2.setText("Delete");
+    jMenuItemShowDelete2.addActionListener(new java.awt.event.ActionListener() {
+      public void actionPerformed(java.awt.event.ActionEvent evt) {
+        jMenuItemShowDelete2ActionPerformed(evt);
+      }
+    });
+
+    jMenuShow.add(jMenuItemShowDelete2);
+    jMenuBar1.add(jMenuShow);
+    setJMenuBar(jMenuBar1);
+
+    pack();
+    java.awt.Dimension screenSize = java.awt.Toolkit.getDefaultToolkit().getScreenSize();
+    setSize(new java.awt.Dimension(400, 300));
+    setLocation((screenSize.width-400)/2,(screenSize.height-300)/2);
+  }//GEN-END:initComponents
 
     private void jMenuItemShowDeleteActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jMenuItemShowDeleteActionPerformed
         int rows [] = jTableShows.getSelectedRows();
@@ -678,34 +679,34 @@
     }
 
     
-    // Variables declaration - do not modify//GEN-BEGIN:variables
-    private javax.swing.JPopupMenu jPopupMenuShows;
-    private javax.swing.JMenuItem jMenuItemImport;
-    private javax.swing.JMenu jMenuAdv;
-    private javax.swing.JMenuItem jMenuItemSaveSwap;
-    private javax.swing.JMenuItem jMenuItemSaveMPEG;
-    private javax.swing.JSeparator jSeparator1;
-    private javax.swing.JMenuItem jMenuItemShowDelete;
-    private javax.swing.JMenuBar jMenuBar1;
-    private javax.swing.JMenu jMenuFile;
-    private javax.swing.JMenu jMenu4;
-    private javax.swing.JMenuItem jMenuItemSaveGuideFull;
-    private javax.swing.JMenuItem jMenuItemSaveGuide;
-    private javax.swing.JMenuItem jMenuItemClose;
-    private javax.swing.JMenu jMenuShow;
-    private javax.swing.JMenuItem jMenuItemImport2;
-    private javax.swing.JMenu jMenuAdv2;
-    private javax.swing.JMenuItem jMenuItemSaveSwap2;
-    private javax.swing.JMenuItem jMenuItemSaveMPEG2;
-    private javax.swing.JSeparator jSeparator2;
-    private javax.swing.JMenuItem jMenuItemShowDelete2;
-    private javax.swing.JTabbedPane jTabbedPane1;
-    private javax.swing.JSplitPane jSplitPaneContentGuide;
-    private javax.swing.JScrollPane jScrollPaneChannels;
-    private javax.swing.JTree jTree1;
-    private javax.swing.JScrollPane jScrollPaneShows;
-    private javax.swing.JTable jTableShows;
-    private javax.swing.JLabel jLabelStatus;
-    // End of variables declaration//GEN-END:variables
+  // Variables declaration - do not modify//GEN-BEGIN:variables
+  private javax.swing.JMenuItem jMenuItemSaveMPEG;
+  private javax.swing.JLabel jLabelStatus;
+  private javax.swing.JMenuItem jMenuItemClose;
+  private javax.swing.JSplitPane jSplitPaneContentGuide;
+  private javax.swing.JScrollPane jScrollPaneShows;
+  private javax.swing.JSeparator jSeparator2;
+  private javax.swing.JSeparator jSeparator1;
+  private javax.swing.JPopupMenu jPopupMenuShows;
+  private javax.swing.JMenuItem jMenuItemSaveMPEG2;
+  private javax.swing.JTable jTableShows;
+  private javax.swing.JMenuItem jMenuItemSaveGuideFull;
+  private javax.swing.JMenuItem jMenuItemImport2;
+  private javax.swing.JMenuItem jMenuItemShowDelete2;
+  private javax.swing.JMenuItem jMenuItemSaveSwap;
+  private javax.swing.JMenu jMenu4;
+  private javax.swing.JMenu jMenuAdv2;
+  private javax.swing.JMenuItem jMenuItemImport;
+  private javax.swing.JTabbedPane jTabbedPane1;
+  private javax.swing.JScrollPane jScrollPaneChannels;
+  private javax.swing.JMenu jMenuAdv;
+  private javax.swing.JTree jTree1;
+  private javax.swing.JMenuBar jMenuBar1;
+  private javax.swing.JMenuItem jMenuItemSaveSwap2;
+  private javax.swing.JMenu jMenuShow;
+  private javax.swing.JMenu jMenuFile;
+  private javax.swing.JMenuItem jMenuItemShowDelete;
+  private javax.swing.JMenuItem jMenuItemSaveGuide;
+  // End of variables declaration//GEN-END:variables
     
 }

Index: SwapDV.form
===================================================================
RCS file: /cvsroot/swapdv/swapdv/SwapDV.form,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- SwapDV.form	11 Jun 2002 23:37:18 -0000	1.27
+++ SwapDV.form	14 Jun 2002 21:47:05 -0000	1.28
@@ -660,7 +660,7 @@
           <SubComponents>
             <MenuItem class="javax.swing.JMenuItem" name="jNewEvent">
               <Properties>
-                <Property name="text" type="java.lang.String" value="Schedule New Event..."/>
+                <Property name="text" type="java.lang.String" value="Schedule New Event ..."/>
               </Properties>
 
               <Events>
@@ -669,7 +669,7 @@
             </MenuItem>
             <MenuItem class="javax.swing.JMenuItem" name="jScheduleEditor">
               <Properties>
-                <Property name="text" type="java.lang.String" value="Scheuled Events Manager..."/>
+                <Property name="text" type="java.lang.String" value="Scheduled Events Manager ..."/>
               </Properties>
 
               <Events>
@@ -712,12 +712,13 @@
   </Properties>
   <SyntheticProperties>
     <SyntheticProperty name="menuBar" type="java.lang.String" value="jMenuBar1"/>
-    <SyntheticProperty name="formSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,-91,0,0,2,-121"/>
+    <SyntheticProperty name="formSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,44,0,0,2,42"/>
     <SyntheticProperty name="formPosition" type="java.awt.Point" value="-84,-19,0,5,115,114,0,14,106,97,118,97,46,97,119,116,46,80,111,105,110,116,-74,-60,-118,114,52,126,-56,38,2,0,2,73,0,1,120,73,0,1,121,120,112,0,0,0,0,0,0,0,0"/>
     <SyntheticProperty name="formSizePolicy" type="int" value="0"/>
     <SyntheticProperty name="generatePosition" type="boolean" value="true"/>
     <SyntheticProperty name="generateSize" type="boolean" value="true"/>
     <SyntheticProperty name="generateCenter" type="boolean" value="true"/>
+    <SyntheticProperty name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,44,0,0,2,42"/>
   </SyntheticProperties>
 
   <Events>
@@ -757,7 +758,10 @@
           </Properties>
           <Constraints>
             <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
-              <JTabbedPaneConstraints tabName="Shows &amp; Channels" toolTip=""/>
+              <JTabbedPaneConstraints tabName="Shows &amp; Channels" toolTip="">
+                <Property name="tabTitle" type="java.lang.String" value="Shows &amp; Channels"/>
+                <Property name="tabToolTip" type="java.lang.String" value=""/>
+              </JTabbedPaneConstraints>
             </Constraint>
           </Constraints>
 
@@ -854,7 +858,10 @@
           </Events>
           <Constraints>
             <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
-              <JTabbedPaneConstraints tabName="Downloads" toolTip=""/>
+              <JTabbedPaneConstraints tabName="Downloads" toolTip="">
+                <Property name="tabTitle" type="java.lang.String" value="Downloads"/>
+                <Property name="tabToolTip" type="java.lang.String" value=""/>
+              </JTabbedPaneConstraints>
             </Constraint>
           </Constraints>
 
@@ -886,7 +893,10 @@
           </Properties>
           <Constraints>
             <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
-              <JTabbedPaneConstraints tabName="Uploads" toolTip=""/>
+              <JTabbedPaneConstraints tabName="Uploads" toolTip="">
+                <Property name="tabTitle" type="java.lang.String" value="Uploads"/>
+                <Property name="tabToolTip" type="java.lang.String" value=""/>
+              </JTabbedPaneConstraints>
             </Constraint>
           </Constraints>
 

Index: SwapDV.java
===================================================================
RCS file: /cvsroot/swapdv/swapdv/SwapDV.java,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- SwapDV.java	13 Jun 2002 22:06:26 -0000	1.66
+++ SwapDV.java	14 Jun 2002 21:47:05 -0000	1.67
@@ -56,6 +56,8 @@
 import javax.swing.event.*;
 
 public class SwapDV extends javax.swing.JFrame implements LoggerI, UPnPDiscoverCallback, DragTableCallback, DownloadCallback, ListSelectionListener {
+    public static final String SWAPDV_VERSION = "V0.70";  
+  
     ReplayServer replay=null;
     public ReplayDetails details;
     boolean autoSave = true;
@@ -82,7 +84,7 @@
     static final int DOWNLOADTAB = 1;
     static final int UPLOADTAB = 2;
[...1507 lines suppressed...]
+  private javax.swing.JTabbedPane jTabbedPane1;
+  private javax.swing.JMenuItem jMenuItemShowPlay;
+  private javax.swing.JMenu jMenuContentGuide;
+  private javax.swing.JMenuItem jMenuItemQuit;
+  private javax.swing.JPopupMenu jPopupMenuDownloads;
+  private javax.swing.JTree jTree1;
+  private javax.swing.JMenuItem jMenuItemAddNewChannel;
+  private javax.swing.JMenuItem jMenuItemLog;
+  private javax.swing.JMenuItem jMenuItemCategoryAdd;
+  private javax.swing.JMenu jMenuCategory;
+  private javax.swing.JMenuBar jMenuBar1;
+  private javax.swing.JMenu jMenuShow;
+  private javax.swing.JMenuItem jMenuItemCategoryDelete;
+  private javax.swing.JMenuItem jMenuItemShowExport2;
+  private javax.swing.JMenu jMenuShowAdv2;
+  private javax.swing.JMenuItem jMenuItemDeleteCategory;
+  private javax.swing.JMenu jMenuFile;
+  private javax.swing.JMenu jMenuLocal;
+  // End of variables declaration//GEN-END:variables
 }