[SwapDV-commit] CVS: swapdv/Scheduler/actions copyShowAction.java,1.12,1.13 copyShowEditor.form,1.4,1.5 copyShowEditor.java,1.7,1.8 deleteShowAction.java,1.7,1.8

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

Update of /cvsroot/swapdv/swapdv/Scheduler/actions
In directory usw-pr-cvs1:/tmp/cvs-serv13571/Scheduler/actions

Modified Files:
	copyShowAction.java copyShowEditor.form copyShowEditor.java 
	deleteShowAction.java 
Log Message:
Added right click on show to schedule it via wizard, fixed
bug with copyShowAction not selecting via Replay Channel right, 
installed SwapDV icons into scheduler related frames.


Index: copyShowAction.java
===================================================================
RCS file: /cvsroot/swapdv/swapdv/Scheduler/actions/copyShowAction.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- copyShowAction.java	11 Jun 2002 15:50:04 -0000	1.12
+++ copyShowAction.java	17 Jun 2002 14:48:47 -0000	1.13
@@ -151,8 +151,8 @@
 
     // Match each possible component
     if (!isMatchingPattern(sourceCategory, theHeader.getCategory(theGuide.getChannel(theShow.created).category))) return false;
-    if (!isMatchingPattern(sourceReplayChannel,theGuide.getChannel(theShow.created).getChannelLabel())) return false;
-    if (!isMatchingPattern(sourceTVChannel, theShow.getChannelName())) return false;
+    if (!isMatchingPattern(sourceReplayChannel, theGuide.getChannel(theShow.created).getShowLabel())) return false;
+    if (!isMatchingPattern(sourceTVChannel, theShow.getChannelLabel())) return false;
     if (!isMatchingPattern(sourceShowTitle, showDesc.getShowTitle())) return false;
     if (!isMatchingPattern(sourceEpisodeTitle, showDesc.getEpisodeTitle())) return false;
     if (!isMatchingPattern(sourceEpisodeDescription, showDesc.getShowDescription())) return false;

Index: copyShowEditor.form
===================================================================
RCS file: /cvsroot/swapdv/swapdv/Scheduler/actions/copyShowEditor.form,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- copyShowEditor.form	7 Jun 2002 22:12:45 -0000	1.4
+++ copyShowEditor.form	17 Jun 2002 14:48:48 -0000	1.5
@@ -638,6 +638,11 @@
               </Constraints>
             </Component>
             <Component class="javax.swing.JComboBox" name="copyToChannel">
+              <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+                  <Font name="Dialog" size="12" style="0"/>
+                </Property>
+              </Properties>
               <Constraints>
                 <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
                   <GridBagConstraints gridX="1" gridY="1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="17" weightX="1.0" weightY="0.0"/>

Index: copyShowEditor.java
===================================================================
RCS file: /cvsroot/swapdv/swapdv/Scheduler/actions/copyShowEditor.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- copyShowEditor.java	12 Jun 2002 01:27:15 -0000	1.7
+++ copyShowEditor.java	17 Jun 2002 14:48:48 -0000	1.8
@@ -847,6 +847,7 @@
     gridBagConstraints.insets = new java.awt.Insets(4, 4, 4, 0);
     copyToChannelPanel.add(copyToSpecificChannel, gridBagConstraints);
 
+    copyToChannel.setFont(new java.awt.Font("Dialog", 0, 12));
     gridBagConstraints = new java.awt.GridBagConstraints();
     gridBagConstraints.gridx = 1;
     gridBagConstraints.gridy = 1;

Index: deleteShowAction.java
===================================================================
RCS file: /cvsroot/swapdv/swapdv/Scheduler/actions/deleteShowAction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- deleteShowAction.java	12 Jun 2002 01:27:15 -0000	1.7
+++ deleteShowAction.java	17 Jun 2002 14:48:48 -0000	1.8
@@ -149,7 +149,7 @@
     // Match each possible component
     if (!isMatchingPattern(deleteCategory, theHeader.getCategory(theGuide.getChannel(theShow.created).category))) return false;
     if (!isMatchingPattern(deleteReplayChannel, theGuide.getChannel(theShow.created).getShowLabel())) return false;
-    if (!isMatchingPattern(deleteTVChannel, theShow.getChannelName())) return false;
+    if (!isMatchingPattern(deleteTVChannel, theShow.getChannelLabel())) return false;
     if (!isMatchingPattern(deleteShowTitle, showDesc.getShowTitle())) return false;
     if (!isMatchingPattern(deleteEpisodeTitle, showDesc.getEpisodeTitle())) return false;
     if (!isMatchingPattern(deleteEpisodeDescription, showDesc.getShowDescription())) return false;