Menu
▾
▴
[SwapDV-commit] CVS: swapdv ReplayTV.form,1.14,1.15 ReplayTV.java,1.32,1.33 SwapDV.form,1.30,1.31 SwapDV.java,1.70,1.71
|
From: Gerry D. <gd...@us...> - 2002-06-17 14:48:51
|
Update of /cvsroot/swapdv/swapdv
In directory usw-pr-cvs1:/tmp/cvs-serv13571
Modified Files:
ReplayTV.form ReplayTV.java SwapDV.form SwapDV.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: ReplayTV.form
===================================================================
RCS file: /cvsroot/swapdv/swapdv/ReplayTV.form,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ReplayTV.form 11 Jun 2002 15:50:03 -0000 1.14
+++ ReplayTV.form 17 Jun 2002 14:48:47 -0000 1.15
@@ -7,7 +7,7 @@
<MenuItem class="javax.swing.JMenuItem" name="jMenuItemImport">
<Properties>
<Property name="mnemonic" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
- <Connection type="value" value="'i'" valueType="int"/>
+ <Connection type="value" value="'M'" valueType="int"/>
</Property>
<Property name="text" type="java.lang.String" value="Download show to My SwapDV"/>
<Property name="enabled" type="boolean" value="false"/>
@@ -15,6 +15,16 @@
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItemImportActionPerformed"/>
+ </Events>
+ </MenuItem>
+ <MenuItem class="javax.swing.JMenuItem" name="jMenuItemSchedule">
+ <Properties>
+ <Property name="mnemonic" type="int" value="83"/>
+ <Property name="text" type="java.lang.String" value="Schedule show to be copied ..."/>
+ </Properties>
+
+ <Events>
+ <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItemScheduleActionPerformed"/>
</Events>
</MenuItem>
<Menu class="javax.swing.JMenu" name="jMenuAdv">
Index: ReplayTV.java
===================================================================
RCS file: /cvsroot/swapdv/swapdv/ReplayTV.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ReplayTV.java 14 Jun 2002 21:47:05 -0000 1.32
+++ ReplayTV.java 17 Jun 2002 14:48:47 -0000 1.33
@@ -40,6 +40,11 @@
import swapdv.Logger.*;
import swapdv.ReplayClient.*;
import swapdv.ReplayGuide.*;
+import swapdv.Scheduler.*;
+import swapdv.Scheduler.actions.*;
+import swapdv.Scheduler.queue.*;
+import swapdv.Scheduler.ui.*;
+import swapdv.Scheduler.wizards.*;
public class ReplayTV extends javax.swing.JFrame implements LoggerI, Runnable, DragTableCallback {
@@ -56,6 +61,9 @@
CategoryTreeCellRenderer cellRenderer;
Thread thread;
+ private schdWizardFrame eventWizardFrame = null;
+
+
/** Creates new form JFrame */
public ReplayTV(SwapDV swapDV, String replayAddr, int replayPort) {
this.swapDV=swapDV;
@@ -259,6 +267,7 @@
private void initComponents() {//GEN-BEGIN:initComponents
jPopupMenuShows = new javax.swing.JPopupMenu();
jMenuItemImport = new javax.swing.JMenuItem();
+ jMenuItemSchedule = new javax.swing.JMenuItem();
jMenuAdv = new javax.swing.JMenu();
jMenuItemSaveSwap = new javax.swing.JMenuItem();
jMenuItemSaveMPEG = new javax.swing.JMenuItem();
@@ -285,7 +294,7 @@
jSeparator2 = new javax.swing.JSeparator();
jMenuItemShowDelete2 = new javax.swing.JMenuItem();
- jMenuItemImport.setMnemonic('i');
+ jMenuItemImport.setMnemonic('M');
jMenuItemImport.setText("Download show to My SwapDV");
jMenuItemImport.setEnabled(false);
jMenuItemImport.addActionListener(new java.awt.event.ActionListener() {
@@ -295,6 +304,15 @@
});
jPopupMenuShows.add(jMenuItemImport);
+ jMenuItemSchedule.setMnemonic('S');
+ jMenuItemSchedule.setText("Schedule show to be copied ...");
+ jMenuItemSchedule.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ jMenuItemScheduleActionPerformed(evt);
+ }
+ });
+
+ jPopupMenuShows.add(jMenuItemSchedule);
jMenuAdv.setMnemonic('A');
jMenuAdv.setText("Advanced");
jMenuItemSaveSwap.setMnemonic('s');
@@ -483,6 +501,53 @@
setLocation((screenSize.width-400)/2,(screenSize.height-300)/2);
}//GEN-END:initComponents
+ private void jMenuItemScheduleActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jMenuItemScheduleActionPerformed
+ // Make sure they selected no more than one show
+ if (jTableShows.getSelectedRowCount() > 1) {
+ JOptionPane.showMessageDialog(this, "You can only select one show to schedule at a time", "Too many shows selected", JOptionPane.ERROR_MESSAGE);
+ return;
+ }
+
+ // Get the selected show
+ int theRow = jTableShows.getSelectedRow();
+ if (theRow < 0) return;
+ Show theShow = listShows.getShow(theRow);
+ Description showDesc = theShow.getDescription();
+
+ // Create the wizard frame if needed
+ if (eventWizardFrame == null) {
+ eventWizardFrame = new schdWizardFrame();
+ eventWizardFrame.setEventQueue(swapdv.SwapDV.getSwapDV().getSchdQueue());
+ } else {
+ // If it exists and is visible, don't start a new event, finish the last one
+ if (eventWizardFrame.isVisible()) {
+ eventWizardFrame.toFront();
+ return;
+ }
+ }
+
+ // Install the wizard
+ schdWizardI theWizard = wizardUtils.getWizard("Copy New Shows");
+ if (theWizard == null) return;
+ eventWizardFrame.setWizard(theWizard);
+
+ // Create the scheduled action with defaults in place
+ schdEvent theEvent = new schdEvent();
+ copyShowAction theAction = new copyShowAction();
+ theEvent.addAction(theAction);
+
+ // Configure the event for us
+ theEvent.setDescription("Copy new episodes of " + showDesc.getShowTitle());
+ theAction.setDescription("Copy new episodes of " + showDesc.getShowTitle());
+ theAction.sourceShowTitle = showDesc.getShowTitle();
+ theAction.sourceDeviceName = rrs.name;
+
+ // Install the wizard and start it
+ theWizard.setEvent(theEvent);
+ theWizard.setFinishButtonEnabled(true);
+ eventWizardFrame.startWizard();
+ }//GEN-LAST:event_jMenuItemScheduleActionPerformed
+
private void jMenuItemShowDeleteActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jMenuItemShowDeleteActionPerformed
int rows [] = jTableShows.getSelectedRows();
Show shows[] = new Show [rows.length];
@@ -523,6 +588,7 @@
switch(jTree1.getSelectionPath().getPathCount()) {
case 4:
jMenuItemImport.setEnabled(enable);
+ jMenuItemSchedule.setEnabled(enable);
jMenuItemSaveSwap.setEnabled(enable);
jMenuItemSaveMPEG.setEnabled(enable);
jMenuAdv.setEnabled(enable);
@@ -697,6 +763,7 @@
private javax.swing.JMenu jMenu4;
private javax.swing.JMenu jMenuAdv2;
private javax.swing.JMenuItem jMenuItemImport;
+ private javax.swing.JMenuItem jMenuItemSchedule;
private javax.swing.JTabbedPane jTabbedPane1;
private javax.swing.JScrollPane jScrollPaneChannels;
private javax.swing.JMenu jMenuAdv;
Index: SwapDV.form
===================================================================
RCS file: /cvsroot/swapdv/swapdv/SwapDV.form,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- SwapDV.form 14 Jun 2002 23:57:30 -0000 1.30
+++ SwapDV.form 17 Jun 2002 14:48:47 -0000 1.31
@@ -107,6 +107,20 @@
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItemShowMoveActionPerformed"/>
</Events>
</MenuItem>
+ <MenuItem class="javax.swing.JSeparator" name="jSeparator9">
+ </MenuItem>
+ <MenuItem class="javax.swing.JMenuItem" name="jMenuItemScheduleCopy">
+ <Properties>
+ <Property name="mnemonic" type="int" value="83"/>
+ <Property name="text" type="java.lang.String" value="Schedule Similar Shows to be copied ..."/>
+ </Properties>
+
+ <Events>
+ <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItemScheduleCopyActionPerformed"/>
+ </Events>
+ </MenuItem>
+ <MenuItem class="javax.swing.JSeparator" name="jSeparator10">
+ </MenuItem>
<Menu class="javax.swing.JMenu" name="jMenuShowAdv">
<Properties>
<Property name="mnemonic" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
@@ -722,12 +736,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,44,0,0,2,42"/>
+ <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,1,-112"/>
<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,1,-112"/>
</SyntheticProperties>
<Events>
@@ -767,7 +782,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 & Channels" toolTip=""/>
+ <JTabbedPaneConstraints tabName="Shows" toolTip="">
+ <Property name="tabTitle" type="java.lang.String" value="Shows"/>
+ <Property name="tabToolTip" type="java.lang.String" value=""/>
+ </JTabbedPaneConstraints>
</Constraint>
</Constraints>
@@ -864,7 +882,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>
@@ -896,7 +917,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.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- SwapDV.java 14 Jun 2002 23:57:30 -0000 1.70
+++ SwapDV.java 17 Jun 2002 14:48:47 -0000 1.71
@@ -45,6 +45,7 @@
import swapdv.Persistance.*;
import jargs.gnu.CmdLineParser;
import swapdv.Scheduler.*;
+import swapdv.Scheduler.actions.*;
import swapdv.Scheduler.queue.*;
import swapdv.Scheduler.ui.*;
import swapdv.Scheduler.wizards.*;
@@ -255,6 +256,10 @@
public boolean isGuideOk() {
return isGuideOk(false);
}
[...1545 lines suppressed...]
+ private javax.swing.JMenu jMenuEdit;
+ 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 jMenuItemLog;
+ private javax.swing.JMenuItem jMenuItemAddNewChannel;
+ 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 jMenuItemDeleteCategory;
+ private javax.swing.JMenu jMenuFile;
+ private javax.swing.JMenu jMenuShowAdv2;
+ private javax.swing.JMenuItem jMenuItemShowExport2;
+ private javax.swing.JMenu jMenuLocal;
+ // End of variables declaration//GEN-END:variables
}
|
