Menu
▾
▴
[SwapDV-commit] CVS: swapdv/Scheduler/wizards abstractWizard.java,1.3,1.4 newShowChannelPanel.java,1.1,1.2 newShowNamePanel.java,1.1,1.2 newShowReplayPanel.java,1.3,1.4 newShowTitlePanel.java,1.2,1.3 newShowWizard.java,1.1,1.2
Update of /cvsroot/swapdv/swapdv/Scheduler/wizards
In directory usw-pr-cvs1:/tmp/cvs-serv13571/Scheduler/wizards
Modified Files:
abstractWizard.java newShowChannelPanel.java
newShowNamePanel.java newShowReplayPanel.java
newShowTitlePanel.java newShowWizard.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: abstractWizard.java
===================================================================
RCS file: /cvsroot/swapdv/swapdv/Scheduler/wizards/abstractWizard.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- abstractWizard.java 8 Jun 2002 21:29:05 -0000 1.3
+++ abstractWizard.java 17 Jun 2002 14:48:48 -0000 1.4
@@ -243,9 +243,6 @@
// Make sure the basics are in place
if (panelList.size() == 0) return false;
if (wizardPanel == null) return false;
-
- // Init the finish button
- finishButtonOK = false;
// And install the starting panel
return setPanel(0);
Index: newShowChannelPanel.java
===================================================================
RCS file: /cvsroot/swapdv/swapdv/Scheduler/wizards/newShowChannelPanel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- newShowChannelPanel.java 8 Jun 2002 21:29:05 -0000 1.1
+++ newShowChannelPanel.java 17 Jun 2002 14:48:48 -0000 1.2
@@ -107,7 +107,11 @@
public boolean makePanelActive() {
// Prep the combo
if (channelCombo.getItemCount() == 0) {
- String defaultChannel = panelWizard.getPrefsStore().getAttribute("LAST_DEST_CHANNEL");
+ // Seetup default channel
+ copyShowAction theAction = (copyShowAction) panelWizard.getEvent().getAction(0);
+ String defaultChannel = theAction.destReplayChannel;
+ if (defaultChannel.equals("")) defaultChannel = panelWizard.getPrefsStore().getAttribute("LAST_DEST_CHANNEL");
+
String channelList[] = actionUtils.getChannelList();
channelCombo.setModel(new DefaultComboBoxModel(channelList));
int channelCount = channelList.length;
@@ -120,7 +124,7 @@
}
}
- return true;
+ return super.makePanelActive();
}
/**
Index: newShowNamePanel.java
===================================================================
RCS file: /cvsroot/swapdv/swapdv/Scheduler/wizards/newShowNamePanel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- newShowNamePanel.java 8 Jun 2002 21:29:05 -0000 1.1
+++ newShowNamePanel.java 17 Jun 2002 14:48:48 -0000 1.2
@@ -14,6 +14,7 @@
* @author gerry
*/
public class newShowNamePanel extends abstractWizardPanel {
+ private boolean panelInitialized = false;
/** Creates new form newShowNamePanel */
public newShowNamePanel() {
@@ -54,6 +55,17 @@
}//GEN-END:initComponents
+ public boolean makePanelActive() {
+ // Init values, if any
+ if (!panelInitialized) {
+ eventNameField.setText(panelWizard.getEvent().getDescription());
+ panelInitialized = true;
+ }
+
+ return super.makePanelActive();
+ }
+
+
/**
* Check the current panel to make sure everything on it is
* OK and save things off. This is usually called before a
Index: newShowReplayPanel.java
===================================================================
RCS file: /cvsroot/swapdv/swapdv/Scheduler/wizards/newShowReplayPanel.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- newShowReplayPanel.java 9 Jun 2002 17:24:52 -0000 1.3
+++ newShowReplayPanel.java 17 Jun 2002 14:48:48 -0000 1.4
@@ -73,7 +73,9 @@
if (replayTVComboBox.getItemCount() != 0) return true;
// Get the default device, if any
- String defaultDevice = panelWizard.getPrefsStore().getAttribute("LAST_REPLAY_DEVICE");
+ String defaultDevice = theAction.sourceDeviceName;
+ if (defaultDevice.equals("")) defaultDevice = panelWizard.getPrefsStore().getAttribute("LAST_REPLAY_DEVICE");
+ if (defaultDevice.equals("All ReplayTVs")) defaultDevice = "";
// Build list of known devices
deviceMenu = actionUtils.getDeviceMenu();
Index: newShowTitlePanel.java
===================================================================
RCS file: /cvsroot/swapdv/swapdv/Scheduler/wizards/newShowTitlePanel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- newShowTitlePanel.java 12 Jun 2002 01:27:15 -0000 1.2
+++ newShowTitlePanel.java 17 Jun 2002 14:48:48 -0000 1.3
@@ -14,7 +14,8 @@
* @author gerry
*/
public class newShowTitlePanel extends abstractWizardPanel {
-
+ public boolean panelInitialized = false;
+
/** Creates new form newShowTitle */
public newShowTitlePanel() {
super("Choose Show",
@@ -87,6 +88,19 @@
}//GEN-END:initComponents
+ public boolean makePanelActive() {
+ // Init values, if any
+ if (!panelInitialized) {
+ copyShowAction theAction = (copyShowAction) panelWizard.getEvent().getAction(0);
+ showTitle.setText(theAction.sourceShowTitle);
+ showChannel.setText(theAction.sourceReplayChannel);
+ panelInitialized = true;
+ }
+
+ return super.makePanelActive();
+ }
+
+
/**
* Check the current panel to make sure everything on it is
* OK and save things off. This is usually called before a
Index: newShowWizard.java
===================================================================
RCS file: /cvsroot/swapdv/swapdv/Scheduler/wizards/newShowWizard.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- newShowWizard.java 8 Jun 2002 21:29:05 -0000 1.1
+++ newShowWizard.java 17 Jun 2002 14:48:48 -0000 1.2
@@ -32,8 +32,13 @@
public boolean startWizard() {
// Create a new event with an action
- curEvent = new schdEvent();
- curEvent.addAction(actionUtils.getNewAction("Copy Show"));
+ if (curEvent == null) {
+ curEvent = new schdEvent();
+ curEvent.addAction(actionUtils.getNewAction("Copy Show"));
+ finishButtonOK = false;
+ } else {
+ finishButtonOK = !curEvent.getDescription().equals("");
+ }
// And we are ready to tock
return super.startWizard();
|
