Menu
▾
▴
swapdv-commit — Source commit change information
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
(22) |
May
(175) |
Jun
(188) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|---|
|
From: Gerry D. <gd...@us...> - 2002-06-17 23:53:23
|
Update of /cvsroot/swapdv/swapdv
In directory usw-pr-cvs1:/tmp/cvs-serv17412
Modified Files:
ReplayTV.form ReplayTV.java SwapDV.form SwapDV.java
Log Message:
Exposed download and throttle controls for entire server.
Aded per-remote device preference in store and added per-device preference
editor.
Allowed download/throttle controls to be adjusted on a per device basis
Index: ReplayTV.form
===================================================================
RCS file: /cvsroot/swapdv/swapdv/ReplayTV.form,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ReplayTV.form 17 Jun 2002 14:48:47 -0000 1.15
+++ ReplayTV.form 17 Jun 2002 23:53:19 -0000 1.16
@@ -89,7 +89,7 @@
<Property name="text" type="java.lang.String" value="File"/>
</Properties>
<SubComponents>
- <Menu class="javax.swing.JMenu" name="jMenu4">
+ <Menu class="javax.swing.JMenu" name="jAdvancedMenu">
<Properties>
<Property name="mnemonic" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
<Connection type="value" value="'a'" valueType="int"/>
@@ -121,6 +121,15 @@
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItemSaveGuideActionPerformed"/>
</Events>
</MenuItem>
+ <MenuItem class="javax.swing.JMenuItem" name="jMenuItemSettings">
+ <Properties>
+ <Property name="text" type="java.lang.String" value="Settings"/>
+ </Properties>
+
+ <Events>
+ <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItemSettingsActionPerformed"/>
+ </Events>
+ </MenuItem>
</SubComponents>
</Menu>
<MenuItem class="javax.swing.JMenuItem" name="jMenuItemClose">
@@ -161,6 +170,16 @@
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItemImport2ActionPerformed"/>
</Events>
</MenuItem>
+ <MenuItem class="javax.swing.JMenuItem" name="jMenuItemSchedule1">
+ <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="jMenuAdv2">
<Properties>
<Property name="mnemonic" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
@@ -270,8 +289,8 @@
</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="">
- <Property name="tabTitle" type="java.lang.String" value="Shows & Channels"/>
+ <JTabbedPaneConstraints tabName="Shows" toolTip="">
+ <Property name="tabTitle" type="java.lang.String" value="Shows"/>
<Property name="tabToolTip" type="java.lang.String" value=""/>
</JTabbedPaneConstraints>
</Constraint>
Index: ReplayTV.java
===================================================================
RCS file: /cvsroot/swapdv/swapdv/ReplayTV.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ReplayTV.java 17 Jun 2002 14:48:47 -0000 1.33
+++ ReplayTV.java 17 Jun 2002 23:53:19 -0000 1.34
@@ -50,6 +50,7 @@
public class ReplayTV extends javax.swing.JFrame implements LoggerI, Runnable, DragTableCallback {
Hashtable contents = new Hashtable();
public ReplayClient rrs = null;
+ replayPropertyEditor propertyEditor = null;
Guide guide = null;
SwapDV swapDV;
String replayAddr;
@@ -69,7 +70,7 @@
this.swapDV=swapDV;
this.replayAddr = replayAddr;
this.replayPort = replayPort;
- Logger.addLogger(this);
+ Logger.addLogger(this);
thread = new Thread(this);
thread.start();
}
@@ -109,8 +110,16 @@
swapDV.statusChange("Unable to connect to "+replayAddr+":"+replayPort+" - "+ex.getLocalizedMessage());
}
- setIconImage(rrs.isSwapDV() ? swapDV.iconSwapdv32.getImage() : swapDV.iconReplay32);
- cellRenderer.setIcons(rrs.isSwapDV() ? swapDV.iconSwapdv16 : swapDV.iconReplay16, swapDV.iconCategory, null, swapDV.iconShow);
+ if (rrs.isSwapDV()) {
+ jMenuItemSettings.setText("SwapDV Connection Settings ...");
+ setIconImage(swapDV.iconSwapdv32.getImage());
+ cellRenderer.setIcons(swapDV.iconSwapdv16, swapDV.iconCategory, null, swapDV.iconShow);
+ } else {
+ jMenuItemSettings.setText("ReplayTV Connection Settings ...");
+ setIconImage(swapDV.iconReplay32.getImage());
+ cellRenderer.setIcons(swapDV.iconReplay16, swapDV.iconCategory, null, swapDV.iconShow);
+ }
+
treeModel.setGuide(guide);
// select the root
jTree1.addSelectionPath(new TreePath(treeRoot));
@@ -282,12 +291,14 @@
jLabelStatus = new javax.swing.JLabel();
jMenuBar1 = new javax.swing.JMenuBar();
jMenuFile = new javax.swing.JMenu();
- jMenu4 = new javax.swing.JMenu();
+ jAdvancedMenu = new javax.swing.JMenu();
jMenuItemSaveGuideFull = new javax.swing.JMenuItem();
jMenuItemSaveGuide = new javax.swing.JMenuItem();
+ jMenuItemSettings = new javax.swing.JMenuItem();
jMenuItemClose = new javax.swing.JMenuItem();
jMenuShow = new javax.swing.JMenu();
jMenuItemImport2 = new javax.swing.JMenuItem();
+ jMenuItemSchedule1 = new javax.swing.JMenuItem();
jMenuAdv2 = new javax.swing.JMenu();
jMenuItemSaveSwap2 = new javax.swing.JMenuItem();
jMenuItemSaveMPEG2 = new javax.swing.JMenuItem();
@@ -397,7 +408,7 @@
jSplitPaneContentGuide.setRightComponent(jScrollPaneShows);
- jTabbedPane1.addTab("Shows & Channels", null, jSplitPaneContentGuide, "");
+ jTabbedPane1.addTab("Shows", null, jSplitPaneContentGuide, "");
getContentPane().add(jTabbedPane1, java.awt.BorderLayout.CENTER);
@@ -407,8 +418,8 @@
jMenuFile.setMnemonic('F');
jMenuFile.setText("File");
- jMenu4.setMnemonic('a');
- jMenu4.setText("Advanced");
+ jAdvancedMenu.setMnemonic('a');
+ jAdvancedMenu.setText("Advanced");
jMenuItemSaveGuideFull.setMnemonic('g');
jMenuItemSaveGuideFull.setText("Download show & channel guide (full)");
jMenuItemSaveGuideFull.addActionListener(new java.awt.event.ActionListener() {
@@ -417,7 +428,7 @@
}
});
- jMenu4.add(jMenuItemSaveGuideFull);
+ jAdvancedMenu.add(jMenuItemSaveGuideFull);
jMenuItemSaveGuide.setMnemonic('n');
jMenuItemSaveGuide.setText("Download show & channel guide (no header)");
jMenuItemSaveGuide.addActionListener(new java.awt.event.ActionListener() {
@@ -426,8 +437,16 @@
}
});
- jMenu4.add(jMenuItemSaveGuide);
- jMenuFile.add(jMenu4);
+ jAdvancedMenu.add(jMenuItemSaveGuide);
+ jMenuItemSettings.setText("Settings");
+ jMenuItemSettings.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ jMenuItemSettingsActionPerformed(evt);
+ }
+ });
+
+ jAdvancedMenu.add(jMenuItemSettings);
+ jMenuFile.add(jAdvancedMenu);
jMenuItemClose.setMnemonic('C');
jMenuItemClose.setText("Close");
jMenuItemClose.addActionListener(new java.awt.event.ActionListener() {
@@ -459,6 +478,15 @@
});
jMenuShow.add(jMenuItemImport2);
+ jMenuItemSchedule1.setMnemonic('S');
+ jMenuItemSchedule1.setText("Schedule show to be copied ...");
+ jMenuItemSchedule1.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ jMenuItemScheduleActionPerformed(evt);
+ }
+ });
+
+ jMenuShow.add(jMenuItemSchedule1);
jMenuAdv2.setMnemonic('a');
jMenuAdv2.setText("Advanced");
jMenuItemSaveSwap2.setMnemonic('s');
@@ -501,6 +529,15 @@
setLocation((screenSize.width-400)/2,(screenSize.height-300)/2);
}//GEN-END:initComponents
+ private void jMenuItemSettingsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jMenuItemSettingsActionPerformed
+ // Init property editor, if needed
+ if (propertyEditor == null) {
+ propertyEditor = new replayPropertyEditor(this, true);
+ propertyEditor.setClient(rrs);
+ }
+ propertyEditor.editProperties();
+ }//GEN-LAST:event_jMenuItemSettingsActionPerformed
+
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) {
@@ -545,7 +582,7 @@
// Install the wizard and start it
theWizard.setEvent(theEvent);
theWizard.setFinishButtonEnabled(true);
- eventWizardFrame.startWizard();
+ eventWizardFrame.startWizard(1);
}//GEN-LAST:event_jMenuItemScheduleActionPerformed
private void jMenuItemShowDeleteActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jMenuItemShowDeleteActionPerformed
@@ -746,6 +783,7 @@
// Variables declaration - do not modify//GEN-BEGIN:variables
+ private javax.swing.JMenuItem jMenuItemSchedule1;
private javax.swing.JMenuItem jMenuItemSaveMPEG;
private javax.swing.JLabel jLabelStatus;
private javax.swing.JMenuItem jMenuItemClose;
@@ -760,11 +798,12 @@
private javax.swing.JMenuItem jMenuItemImport2;
private javax.swing.JMenuItem jMenuItemShowDelete2;
private javax.swing.JMenuItem jMenuItemSaveSwap;
- private javax.swing.JMenu jMenu4;
+ private javax.swing.JMenu jAdvancedMenu;
private javax.swing.JMenu jMenuAdv2;
private javax.swing.JMenuItem jMenuItemImport;
- private javax.swing.JMenuItem jMenuItemSchedule;
+ private javax.swing.JMenuItem jMenuItemSettings;
private javax.swing.JTabbedPane jTabbedPane1;
+ private javax.swing.JMenuItem jMenuItemSchedule;
private javax.swing.JScrollPane jScrollPaneChannels;
private javax.swing.JMenu jMenuAdv;
private javax.swing.JTree jTree1;
Index: SwapDV.form
===================================================================
RCS file: /cvsroot/swapdv/swapdv/SwapDV.form,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- SwapDV.form 17 Jun 2002 14:48:47 -0000 1.31
+++ SwapDV.form 17 Jun 2002 23:53:19 -0000 1.32
@@ -349,6 +349,20 @@
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItemShowMove2ActionPerformed"/>
</Events>
</MenuItem>
+ <MenuItem class="javax.swing.JSeparator" name="jSeparator11">
+ </MenuItem>
+ <MenuItem class="javax.swing.JMenuItem" name="jMenuItemScheduleCopy1">
+ <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="jSeparator12">
+ </MenuItem>
<Menu class="javax.swing.JMenu" name="jMenuShowAdv2">
<Properties>
<Property name="mnemonic" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
Index: SwapDV.java
===================================================================
RCS file: /cvsroot/swapdv/swapdv/SwapDV.java,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- SwapDV.java 17 Jun 2002 14:48:47 -0000 1.71
+++ SwapDV.java 17 Jun 2002 23:53:19 -0000 1.72
@@ -84,7 +84,7 @@
static final int CONTENTTAB = 0;
static final int DOWNLOADTAB = 1;
static final int UPLOADTAB = 2;
- public static Image iconReplay32 = null;
+ public static ImageIcon iconReplay32 = null;
public static ImageIcon iconSwapdv32 = null;
public static Image iconSearch32 = null;
public static Icon iconReplay16 = null;
@@ -143,7 +143,7 @@
iconSwapdv16 = new ImageIcon(getClass().getResource("icons/swapdv16x16.gif"));
iconSearch16 = new ImageIcon(getClass().getResource("icons/search16x16.gif"));
iconConfig16 = new ImageIcon(getClass().getResource("icons/config16x16.gif"));
- iconReplay32 = (new ImageIcon(getClass().getResource("icons/replay32x32.gif"))).getImage();
+ iconReplay32 = new ImageIcon(getClass().getResource("icons/replay32x32.gif"));
iconSwapdv32 = new ImageIcon(getClass().getResource("icons/swapdv32x32.gif"));
iconSearch32 = (new ImageIcon(getClass().getResource("icons/search32x32.gif"))).getImage();
iconGo = new ImageIcon(getClass().getResource("icons/go.gif"));
@@ -555,6 +555,15 @@
}
}
+ /*
+ * Return a store for replay/swapDV device specific infomarion
+ */
+ public pStoreNodeI getDeviceStore(String deviceIPAddr) {
+ if ((deviceIPAddr == null) || (deviceIPAddr.equals(""))) return null;
+ return pStore.getDomain("DEVICE_PREFS").getChild("DEVICE_" + deviceIPAddr);
+ }
+
+
private void importShow(ImportInfo info, boolean move) {
if (info.dstMpg.length() == 0)
return;
@@ -988,6 +997,9 @@
jMenuItemShowPlay2 = new javax.swing.JMenuItem();
jMenuItemShowEdit2 = new javax.swing.JMenuItem();
jMenuItemShowMove2 = new javax.swing.JMenuItem();
+ jSeparator11 = new javax.swing.JSeparator();
+ jMenuItemScheduleCopy1 = new javax.swing.JMenuItem();
+ jSeparator12 = new javax.swing.JSeparator();
jMenuShowAdv2 = new javax.swing.JMenu();
jMenuItemShowExport2 = new javax.swing.JMenuItem();
jSeparator1 = new javax.swing.JSeparator();
@@ -1353,6 +1365,17 @@
});
jMenuShow.add(jMenuItemShowMove2);
+ jMenuShow.add(jSeparator11);
+ jMenuItemScheduleCopy1.setMnemonic('S');
+ jMenuItemScheduleCopy1.setText("Schedule Similar Shows to be copied ...");
+ jMenuItemScheduleCopy1.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ jMenuItemScheduleCopyActionPerformed(evt);
+ }
+ });
+
+ jMenuShow.add(jMenuItemScheduleCopy1);
+ jMenuShow.add(jSeparator12);
jMenuShowAdv2.setMnemonic('A');
jMenuShowAdv2.setText("Advanced");
jMenuItemShowExport2.setMnemonic('x');
@@ -1654,7 +1677,7 @@
// Install the wizard and start it
theWizard.setEvent(theEvent);
theWizard.setFinishButtonEnabled(true);
- eventWizardFrame.startWizard();
+ eventWizardFrame.startWizard(1);
}//GEN-LAST:event_jMenuItemScheduleCopyActionPerformed
private void jMenuItemCatRename2ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jMenuItemCatRename2ActionPerformed
@@ -2177,7 +2200,7 @@
return;
}
details = setup.details;
- jtellaConfig = setup.config;
+ //jtellaConfig = setup.config;
storeValues();
upnp.stopRunning();
upnp = new UPnP(this, details.IP);
@@ -2471,7 +2494,9 @@
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JSeparator jSeparator9;
private javax.swing.JSeparator jSeparator8;
+ private javax.swing.JSeparator jSeparator12;
private javax.swing.JSeparator jSeparator7;
+ private javax.swing.JSeparator jSeparator11;
private javax.swing.JSplitPane jSplitPaneContentGuide;
private javax.swing.JSeparator jSeparator6;
private javax.swing.JSeparator jSeparator10;
@@ -2514,6 +2539,7 @@
private javax.swing.JMenuItem jMenuItemShowExport;
private javax.swing.JScrollPane jScrollPaneDownloads;
private javax.swing.JMenu jMenuHelp;
+ private javax.swing.JMenuItem jMenuItemScheduleCopy1;
private javax.swing.JMenuItem jMenuItemShowMove2;
private javax.swing.JTable jTableDownloads;
private javax.swing.JCheckBoxMenuItem jCheckBoxAutoStart;
|
|
From: Gerry D. <gd...@us...> - 2002-06-17 23:53:23
|
Update of /cvsroot/swapdv/swapdv/ui
In directory usw-pr-cvs1:/tmp/cvs-serv17412/ui
Modified Files:
ServerProperties.form ServerProperties.java
Added Files:
replayPropertyEditor.form replayPropertyEditor.java
Log Message:
Exposed download and throttle controls for entire server.
Aded per-remote device preference in store and added per-device preference
editor.
Allowed download/throttle controls to be adjusted on a per device basis
--- NEW FILE ---
<?xml version="1.0" encoding="UTF-8" ?>
<Form version="1.0" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
<SyntheticProperties>
<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="1"/>
<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,49,0,0,1,-8"/>
</SyntheticProperties>
<Events>
<EventHandler event="windowClosing" listener="java.awt.event.WindowListener" parameters="java.awt.event.WindowEvent" handler="closeDialog"/>
</Events>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
<SubComponents>
<Component class="javax.swing.JLabel" name="replayName">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Dialog" size="24" style="1"/>
</Property>
<Property name="text" type="java.lang.String" value="Media Room"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
<GridBagConstraints gridX="0" gridY="0" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="8" insetsLeft="8" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.5" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JLabel" name="replayAddr">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Dialog" size="18" style="1"/>
</Property>
<Property name="text" type="java.lang.String" value="10.0.10.1:80"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
<GridBagConstraints gridX="1" gridY="0" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="8" insetsLeft="8" insetsBottom="0" insetsRight="8" anchor="13" weightX="0.5" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
<Container class="javax.swing.JPanel" name="importControlPanel">
<Properties>
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
<Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
<TitledBorder title="Download/Import Controls"/>
</Border>
</Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
<GridBagConstraints gridX="0" gridY="1" gridWidth="2" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="8" insetsBottom="0" insetsRight="8" anchor="10" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
<SubComponents>
<Component class="javax.swing.JLabel" name="jLabel3">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Dialog" size="12" style="0"/>
</Property>
<Property name="text" type="java.lang.String" value="Max # of simultaneous imports"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
<GridBagConstraints gridX="0" gridY="0" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="0" insetsRight="0" anchor="13" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JTextField" name="maxImports">
<Properties>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[70, 19]"/>
</Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[70, 19]"/>
</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="0" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JTextField" name="maxTransferSpeed">
<Properties>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[70, 19]"/>
</Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[70, 19]"/>
</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="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JLabel" name="jLabel4">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Dialog" size="12" style="0"/>
</Property>
<Property name="text" type="java.lang.String" value="Max Transfer speed"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
<GridBagConstraints gridX="0" gridY="1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="4" insetsRight="0" anchor="13" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JLabel" name="jLabel1">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Dialog" size="12" style="0"/>
</Property>
<Property name="text" type="java.lang.String" value="Kbytes/sec (default 614)"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
<GridBagConstraints gridX="2" gridY="1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="0" insetsRight="4" anchor="17" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JLabel" name="jLabel2">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Dialog" size="12" style="0"/>
</Property>
<Property name="text" type="java.lang.String" value="(default 2)"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
<GridBagConstraints gridX="2" gridY="0" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="0" insetsRight="4" anchor="17" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
</SubComponents>
</Container>
<Component class="javax.swing.JLabel" name="jLabel5">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Dialog" size="12" style="0"/>
</Property>
<Property name="text" type="java.lang.String" value="<HTML> <B>NOTE</B><BR> Changing these parameters can result in crashing your ReplayTV unit and in some cases, corrupting the data on the unit, possibly rendering the ReplayTV unit unusable. <BR><P>If you change these values, you do so soley at <B><FONT COLOR=#FF0000>your own risk</FONT></B>. </HTML>"/>
<Property name="verticalAlignment" type="int" value="1"/>
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[300, 200]"/>
</Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[300, 100]"/>
</Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
<GridBagConstraints gridX="0" gridY="2" gridWidth="2" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="8" insetsBottom="0" insetsRight="8" anchor="10" weightX="1.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
<Container class="javax.swing.JPanel" name="buttonPanel">
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
<GridBagConstraints gridX="0" gridY="3" gridWidth="2" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="15" weightX="1.0" weightY="1.0"/>
</Constraint>
</Constraints>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/>
<SubComponents>
<Component class="javax.swing.JButton" name="okButton">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Dialog" size="12" style="0"/>
</Property>
<Property name="text" type="java.lang.String" value="OK"/>
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[72, 25]"/>
</Property>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[72, 25]"/>
</Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[72, 25]"/>
</Property>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="okButtonActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JButton" name="cancelButton">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Dialog" size="12" style="0"/>
</Property>
<Property name="text" type="java.lang.String" value="Cancel"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="cancelButtonActionPerformed"/>
</Events>
</Component>
</SubComponents>
</Container>
</SubComponents>
</Form>
--- NEW FILE ---
/*
* replayPropertyEditor.java
*
* Created on June 17, 2002, 1:40 PM
*/
package swapdv.ui;
import java.awt.*;
import javax.swing.*;
import swapdv.ReplayClient.*;
/**
*
* @author gerry
*/
public class replayPropertyEditor extends javax.swing.JDialog {
ReplayClient curClient = null;
JFrame ourParent = null;
/** Creates new form replayPropertyEditor */
public replayPropertyEditor(javax.swing.JFrame parent, boolean modal) {
super(parent, modal);
ourParent = parent;
initComponents();
}
public void setClient(ReplayClient theClient) {
curClient = theClient;
}
public ReplayClient getClient() { return curClient; }
public boolean editProperties() {
if (curClient == null) return false;
// Install the basics
replayName.setText(curClient.name);
replayAddr.setText(curClient.ipAddr + ":" + curClient.port);
// Install an icon
if (curClient.isSwapDV()) {
replayName.setIcon(swapdv.SwapDV.getSwapDV().iconSwapdv32);
} else {
replayName.setIcon(swapdv.SwapDV.getSwapDV().iconReplay32);
}
// Install dialog title
this.setTitle("Connection Settings for " + curClient.name);
// Install current max # of imports
maxImports.setText(String.valueOf(swapdv.Download.DownloadCounter.getCounter().getDownloadLimit(curClient.ipAddr)));
// Install current default xfer rate
int defaultRate = (int) ThrottledInputStream.replayThrottledRate;
if (curClient.isSwapDV()) defaultRate = 0;
maxTransferSpeed.setText(String.valueOf(swapdv.SwapDV.getSwapDV().getDeviceStore(curClient.ipAddr).getIntAttribute("MAX_XFER_RATE", defaultRate)));
// Smush it all together
this.pack();
// Calculate the best location
Point theOrigin = ourParent.getLocation();
Dimension theSize = ourParent.getSize();
Dimension ourSize = this.getSize();
Point ourOrigin = new Point();
// Figure X coord
ourOrigin.x = ((theSize.width - ourSize.width) / 2) + theOrigin.x;
ourOrigin.y = ((theSize.height - ourSize.height) / 2) + theOrigin.y;
this.setLocation(ourOrigin);
// And away we go!
this.setVisible(true);
return true;
}
// Validates the number. If it's invalid, then it displays an error message and
// returns a value one less than your low limit.
private int validateNumber(String theText, int lowLimit, int highLimit, String identText) {
int theValue = 0;
// If the field is blank, error out
if (theText.length() == 0) {
JOptionPane.showMessageDialog(this, "Please enter a valid number for" + identText, "Missing number",
JOptionPane.ERROR_MESSAGE);
return lowLimit - 1;
}
try {
theValue = Integer.parseInt(theText);
} catch (NumberFormatException numError) {
JOptionPane.showMessageDialog(this, "Please enter a valid number for " + identText, "Invalid/illegal number found",
JOptionPane.ERROR_MESSAGE);
return lowLimit - 1;
}
// Make sure it's in range
if ((theValue < lowLimit) || (theValue > highLimit)) {
JOptionPane.showMessageDialog(this, "Please enter a valid number between " + lowLimit + " and " + highLimit + " for " + identText, "Invalid/out of range number found",
JOptionPane.ERROR_MESSAGE);
return lowLimit - 1;
}
return theValue;
}
private boolean saveEditValues() {
int newMaxImports = 0;
int newMaxSpeed = 0;
// Attempt the conditionally convertibles first
if ((newMaxImports = validateNumber(maxImports.getText(), 1, 20, "Max # of imports")) < 1) return false;
if ((newMaxSpeed = validateNumber(maxTransferSpeed.getText(), 0, 1024000, "Max Transfer speed")) < 0) return false;
// Now save off values
swapdv.Download.DownloadCounter.getCounter().setDownloadLimit(curClient.ipAddr, newMaxImports);
swapdv.SwapDV.getSwapDV().getDeviceStore(curClient.ipAddr).setAttribute("MAX_XFER_RATE", newMaxSpeed);
// And we are done
return true;
}
/** 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;
replayName = new javax.swing.JLabel();
replayAddr = new javax.swing.JLabel();
importControlPanel = new javax.swing.JPanel();
jLabel3 = new javax.swing.JLabel();
maxImports = new javax.swing.JTextField();
maxTransferSpeed = new javax.swing.JTextField();
jLabel4 = new javax.swing.JLabel();
jLabel1 = new javax.swing.JLabel();
jLabel2 = new javax.swing.JLabel();
jLabel5 = new javax.swing.JLabel();
buttonPanel = new javax.swing.JPanel();
okButton = new javax.swing.JButton();
cancelButton = new javax.swing.JButton();
getContentPane().setLayout(new java.awt.GridBagLayout());
addWindowListener(new java.awt.event.WindowAdapter() {
public void windowClosing(java.awt.event.WindowEvent evt) {
closeDialog(evt);
}
});
replayName.setFont(new java.awt.Font("Dialog", 1, 24));
replayName.setText("Media Room");
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 0;
gridBagConstraints.insets = new java.awt.Insets(8, 8, 0, 0);
gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
gridBagConstraints.weightx = 0.5;
getContentPane().add(replayName, gridBagConstraints);
replayAddr.setFont(new java.awt.Font("Dialog", 1, 18));
replayAddr.setText("10.0.10.1:80");
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
gridBagConstraints.gridy = 0;
gridBagConstraints.insets = new java.awt.Insets(8, 8, 0, 8);
gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST;
gridBagConstraints.weightx = 0.5;
getContentPane().add(replayAddr, gridBagConstraints);
importControlPanel.setLayout(new java.awt.GridBagLayout());
importControlPanel.setBorder(new javax.swing.border.TitledBorder("Download/Import Controls"));
jLabel3.setFont(new java.awt.Font("Dialog", 0, 12));
jLabel3.setText("Max # of simultaneous imports");
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 0;
gridBagConstraints.insets = new java.awt.Insets(4, 4, 0, 0);
gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST;
importControlPanel.add(jLabel3, gridBagConstraints);
maxImports.setMinimumSize(new java.awt.Dimension(70, 19));
maxImports.setPreferredSize(new java.awt.Dimension(70, 19));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
gridBagConstraints.gridy = 0;
gridBagConstraints.insets = new java.awt.Insets(4, 4, 0, 0);
gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
importControlPanel.add(maxImports, gridBagConstraints);
maxTransferSpeed.setMinimumSize(new java.awt.Dimension(70, 19));
maxTransferSpeed.setPreferredSize(new java.awt.Dimension(70, 19));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
gridBagConstraints.gridy = 1;
gridBagConstraints.insets = new java.awt.Insets(4, 4, 0, 0);
gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
importControlPanel.add(maxTransferSpeed, gridBagConstraints);
jLabel4.setFont(new java.awt.Font("Dialog", 0, 12));
jLabel4.setText("Max Transfer speed");
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 1;
gridBagConstraints.insets = new java.awt.Insets(4, 4, 4, 0);
gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST;
importControlPanel.add(jLabel4, gridBagConstraints);
jLabel1.setFont(new java.awt.Font("Dialog", 0, 12));
jLabel1.setText("Kbytes/sec (default 614)");
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 2;
gridBagConstraints.gridy = 1;
gridBagConstraints.insets = new java.awt.Insets(4, 4, 0, 4);
gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
importControlPanel.add(jLabel1, gridBagConstraints);
jLabel2.setFont(new java.awt.Font("Dialog", 0, 12));
jLabel2.setText("(default 2)");
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 2;
gridBagConstraints.gridy = 0;
gridBagConstraints.insets = new java.awt.Insets(4, 4, 0, 4);
gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
importControlPanel.add(jLabel2, gridBagConstraints);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 1;
gridBagConstraints.gridwidth = 2;
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
gridBagConstraints.insets = new java.awt.Insets(4, 8, 0, 8);
getContentPane().add(importControlPanel, gridBagConstraints);
jLabel5.setFont(new java.awt.Font("Dialog", 0, 12));
jLabel5.setText("<HTML> <B>NOTE</B><BR> Changing these parameters can result in crashing your ReplayTV unit and in some cases, corrupting the data on the unit, possibly rendering the ReplayTV unit unusable. <BR><P>If you change these values, you do so soley at <B><FONT COLOR=#FF0000>your own risk</FONT></B>. </HTML>");
jLabel5.setVerticalAlignment(javax.swing.SwingConstants.TOP);
jLabel5.setMaximumSize(new java.awt.Dimension(300, 200));
jLabel5.setPreferredSize(new java.awt.Dimension(300, 100));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 2;
gridBagConstraints.gridwidth = 2;
gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
gridBagConstraints.insets = new java.awt.Insets(4, 8, 0, 8);
gridBagConstraints.weightx = 1.0;
getContentPane().add(jLabel5, gridBagConstraints);
okButton.setFont(new java.awt.Font("Dialog", 0, 12));
okButton.setText("OK");
okButton.setMaximumSize(new java.awt.Dimension(72, 25));
okButton.setMinimumSize(new java.awt.Dimension(72, 25));
okButton.setPreferredSize(new java.awt.Dimension(72, 25));
okButton.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
okButtonActionPerformed(evt);
}
});
buttonPanel.add(okButton);
cancelButton.setFont(new java.awt.Font("Dialog", 0, 12));
cancelButton.setText("Cancel");
cancelButton.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
cancelButtonActionPerformed(evt);
}
});
buttonPanel.add(cancelButton);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 3;
gridBagConstraints.gridwidth = 2;
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
gridBagConstraints.anchor = java.awt.GridBagConstraints.SOUTH;
gridBagConstraints.weightx = 1.0;
gridBagConstraints.weighty = 1.0;
getContentPane().add(buttonPanel, gridBagConstraints);
pack();
}//GEN-END:initComponents
private void okButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_okButtonActionPerformed
if (!saveEditValues()) return;
closeDialog(null);
}//GEN-LAST:event_okButtonActionPerformed
private void cancelButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cancelButtonActionPerformed
closeDialog(null);
}//GEN-LAST:event_cancelButtonActionPerformed
/** Closes the dialog */
private void closeDialog(java.awt.event.WindowEvent evt) {//GEN-FIRST:event_closeDialog
setVisible(false);
dispose();
}//GEN-LAST:event_closeDialog
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JLabel replayAddr;
private javax.swing.JPanel buttonPanel;
private javax.swing.JButton okButton;
private javax.swing.JPanel importControlPanel;
private javax.swing.JTextField maxImports;
private javax.swing.JTextField maxTransferSpeed;
private javax.swing.JLabel replayName;
private javax.swing.JButton cancelButton;
private javax.swing.JLabel jLabel5;
private javax.swing.JLabel jLabel4;
private javax.swing.JLabel jLabel3;
private javax.swing.JLabel jLabel2;
private javax.swing.JLabel jLabel1;
// End of variables declaration//GEN-END:variables
}
Index: ServerProperties.form
===================================================================
RCS file: /cvsroot/swapdv/swapdv/ui/ServerProperties.form,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ServerProperties.form 7 Jun 2002 23:36:36 -0000 1.3
+++ ServerProperties.form 17 Jun 2002 23:53:19 -0000 1.4
@@ -3,24 +3,22 @@
<Form version="1.0" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
<Properties>
<Property name="title" type="java.lang.String" value="Server Properties"/>
+ <Property name="modal" type="boolean" value="true"/>
</Properties>
<SyntheticProperties>
- <SyntheticProperty name="menuBar" type="java.lang.String" value="(No Menu)"/>
<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,0,-56,0,0,1,44"/>
<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="1"/>
<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,94,0,0,1,-26"/>
</SyntheticProperties>
<Events>
<EventHandler event="windowClosing" listener="java.awt.event.WindowListener" parameters="java.awt.event.WindowEvent" handler="closeDialog"/>
</Events>
- <AuxValues>
- </AuxValues>
-
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
<SubComponents>
<Container class="javax.swing.JPanel" name="jPanelokOrNot">
@@ -34,6 +32,9 @@
<SubComponents>
<Component class="javax.swing.JButton" name="jButtonOK">
<Properties>
+ <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+ <Font name="Dialog" size="12" style="0"/>
+ </Property>
<Property name="mnemonic" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
<Connection code="'O'" type="code"/>
</Property>
@@ -46,6 +47,9 @@
</Component>
<Component class="javax.swing.JButton" name="jButtonCancel">
<Properties>
+ <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+ <Font name="Dialog" size="12" style="0"/>
+ </Property>
<Property name="mnemonic" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
<Connection code="'C'" type="code"/>
</Property>
@@ -61,33 +65,47 @@
<Container class="javax.swing.JTabbedPane" name="jTabbedPane1">
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
- <BorderConstraints direction="North"/>
+ <BorderConstraints direction="Center"/>
</Constraint>
</Constraints>
<Layout class="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout"/>
<SubComponents>
- <Container class="javax.swing.JPanel" name="jPanelLabel">
+ <Container class="javax.swing.JPanel" name="serverPanel">
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
- <JTabbedPaneConstraints tabName="SwapDV/ReplayTV Server" toolTip=""/>
+ <JTabbedPaneConstraints tabName="SwapDV/ReplayTV Server" toolTip="">
+ <Property name="tabTitle" type="java.lang.String" value="SwapDV/ReplayTV Server"/>
+ <Property name="tabToolTip" type="java.lang.String" value=""/>
+ </JTabbedPaneConstraints>
</Constraint>
</Constraints>
- <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBoxLayout"/>
+ <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
<SubComponents>
<Container class="javax.swing.JPanel" name="jPanel16">
+ <Constraints>
+ <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
+ <GridBagConstraints gridX="0" gridY="0" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="11" weightX="1.0" weightY="1.0"/>
+ </Constraint>
+ </Constraints>
- <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBoxLayout">
- <Property name="axis" type="int" value="1"/>
- </Layout>
+ <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
<SubComponents>
<Container class="javax.swing.JPanel" name="jPanel1">
+ <Constraints>
+ <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
+ <GridBagConstraints gridX="0" gridY="0" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="0" insetsRight="4" anchor="17" weightX="1.0" weightY="0.0"/>
+ </Constraint>
+ </Constraints>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
<SubComponents>
<Component class="javax.swing.JLabel" name="jLabelIP">
<Properties>
+ <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+ <Font name="Dialog" size="12" style="0"/>
+ </Property>
<Property name="horizontalAlignment" type="int" value="2"/>
<Property name="text" type="java.lang.String" value="Set IP address"/>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
@@ -129,11 +147,19 @@
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="jPanel2">
+ <Constraints>
+ <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
+ <GridBagConstraints gridX="0" gridY="1" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="0" insetsRight="4" anchor="17" weightX="1.0" weightY="0.0"/>
+ </Constraint>
+ </Constraints>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
<SubComponents>
<Component class="javax.swing.JLabel" name="jLabelServerPort">
<Properties>
+ <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+ <Font name="Dialog" size="12" style="0"/>
+ </Property>
<Property name="text" type="java.lang.String" value="Server port"/>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[90, 17]"/>
@@ -155,11 +181,19 @@
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="jPanel3">
+ <Constraints>
+ <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
+ <GridBagConstraints gridX="0" gridY="2" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="0" insetsRight="4" anchor="17" weightX="1.0" weightY="0.0"/>
+ </Constraint>
+ </Constraints>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
<SubComponents>
<Component class="javax.swing.JLabel" name="jLabelServerAlias">
<Properties>
+ <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+ <Font name="Dialog" size="12" style="0"/>
+ </Property>
<Property name="horizontalAlignment" type="int" value="2"/>
<Property name="text" type="java.lang.String" value="Server alias"/>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
@@ -182,11 +216,19 @@
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="jPanel4">
+ <Constraints>
+ <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
+ <GridBagConstraints gridX="0" gridY="3" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="0" insetsRight="4" anchor="17" weightX="1.0" weightY="0.0"/>
+ </Constraint>
+ </Constraints>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
<SubComponents>
<Component class="javax.swing.JLabel" name="jLabelDir">
<Properties>
+ <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+ <Font name="Dialog" size="12" style="0"/>
+ </Property>
<Property name="text" type="java.lang.String" value="Root directory"/>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[90, 17]"/>
@@ -235,6 +277,9 @@
</Container>
<Component class="javax.swing.JButton" name="jButtonBrowse">
<Properties>
+ <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+ <Font name="Dialog" size="12" style="0"/>
+ </Property>
<Property name="mnemonic" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
<Connection code="'B'" type="code"/>
</Property>
@@ -259,11 +304,19 @@
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="jPanel5">
+ <Constraints>
+ <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
+ <GridBagConstraints gridX="0" gridY="4" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="0" insetsRight="4" anchor="17" weightX="1.0" weightY="0.0"/>
+ </Constraint>
+ </Constraints>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
<SubComponents>
<Component class="javax.swing.JLabel" name="jLabelUPnPRepeat">
<Properties>
+ <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+ <Font name="Dialog" size="12" style="0"/>
+ </Property>
<Property name="text" type="java.lang.String" value="UPnP repeat"/>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[90, 17]"/>
@@ -285,11 +338,19 @@
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="jPanel6">
+ <Constraints>
+ <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
+ <GridBagConstraints gridX="0" gridY="5" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="0" insetsRight="4" anchor="17" weightX="1.0" weightY="0.0"/>
+ </Constraint>
+ </Constraints>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
<SubComponents>
<Component class="javax.swing.JLabel" name="jLabelSerialNumber">
<Properties>
+ <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+ <Font name="Dialog" size="12" style="0"/>
+ </Property>
<Property name="text" type="java.lang.String" value="Serial number"/>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[90, 17]"/>
@@ -311,11 +372,19 @@
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="jPanel7">
+ <Constraints>
+ <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
+ <GridBagConstraints gridX="0" gridY="6" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="0" insetsRight="4" anchor="17" weightX="1.0" weightY="0.0"/>
+ </Constraint>
+ </Constraints>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
<SubComponents>
<Component class="javax.swing.JLabel" name="jLabelUUID">
<Properties>
+ <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+ <Font name="Dialog" size="12" style="0"/>
+ </Property>
<Property name="text" type="java.lang.String" value="UUID"/>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[90, 17]"/>
@@ -337,11 +406,19 @@
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="jPanel9">
+ <Constraints>
+ <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
+ <GridBagConstraints gridX="0" gridY="7" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="0" insetsRight="4" anchor="17" weightX="1.0" weightY="0.0"/>
+ </Constraint>
+ </Constraints>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
<SubComponents>
<Component class="javax.swing.JLabel" name="jLabelLog">
<Properties>
+ <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+ <Font name="Dialog" size="12" style="0"/>
+ </Property>
<Property name="text" type="java.lang.String" value="Log requests"/>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[90, 17]"/>
@@ -366,10 +443,13 @@
</Container>
</SubComponents>
</Container>
- <Container class="javax.swing.JPanel" name="jPanel28">
+ <Container class="javax.swing.JPanel" name="gnutellaPanel">
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
- <JTabbedPaneConstraints tabName="Gnutella Server" toolTip=""/>
+ <JTabbedPaneConstraints tabName="Gnutella Server" toolTip="">
+ <Property name="tabTitle" type="java.lang.String" value="Gnutella Server"/>
+ <Property name="tabToolTip" type="java.lang.String" value=""/>
+ </JTabbedPaneConstraints>
</Constraint>
</Constraints>
@@ -725,6 +805,209 @@
</Container>
</SubComponents>
</Container>
+ </SubComponents>
+ </Container>
+ <Container class="javax.swing.JPanel" name="downloadPanel">
+ <Constraints>
+ <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
+ <JTabbedPaneConstraints tabName="Download Controls">
+ <Property name="tabTitle" type="java.lang.String" value="Download Controls"/>
+ </JTabbedPaneConstraints>
+ </Constraint>
+ </Constraints>
+
+ <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
+ <SubComponents>
+ <Component class="javax.swing.JLabel" name="jLabel3">
+ <Properties>
+ <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+ <Font name="Dialog" size="12" style="0"/>
+ </Property>
+ <Property name="text" type="java.lang.String" value="Maximum Total # of concurrent imports"/>
+ </Properties>
+ <Constraints>
+ <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
+ <GridBagConstraints gridX="0" gridY="0" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="8" insetsLeft="8" insetsBottom="0" insetsRight="0" anchor="13" weightX="0.0" weightY="0.0"/>
+ </Constraint>
+ </Constraints>
+ </Component>
+ <Component class="javax.swing.JTextField" name="totalDownloadLimit">
+ <Properties>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[70, 19]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[70, 19]"/>
+ </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="0" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="8" insetsLeft="4" insetsBottom="0" insetsRight="4" anchor="17" weightX="0.0" weightY="0.0"/>
+ </Constraint>
+ </Constraints>
+ </Component>
+ <Container class="javax.swing.JPanel" name="replayDefaultsPanel">
+ <Properties>
+ <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
+ <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
+ <TitledBorder title="ReplayTV Device Defaults"/>
+ </Border>
+ </Property>
+ </Properties>
+ <Constraints>
+ <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
+ <GridBagConstraints gridX="0" gridY="1" gridWidth="3" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="8" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="11" weightX="1.0" weightY="0.0"/>
+ </Constraint>
+ </Constraints>
+
+ <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
+ <SubComponents>
+ <Component class="javax.swing.JLabel" name="jLabel2">
+ <Properties>
+ <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+ <Font name="Dialog" size="12" style="0"/>
+ </Property>
+ <Property name="text" type="java.lang.String" value="Max Transfer speed"/>
+ </Properties>
+ <Constraints>
+ <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
+ <GridBagConstraints gridX="0" gridY="1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="4" insetsRight="0" anchor="13" weightX="0.0" weightY="0.0"/>
+ </Constraint>
+ </Constraints>
+ </Component>
+ <Component class="javax.swing.JLabel" name="jLabel1">
+ <Properties>
+ <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+ <Font name="Dialog" size="12" style="0"/>
+ </Property>
+ <Property name="text" type="java.lang.String" value="Max # of simultaneous imports"/>
+ </Properties>
+ <Constraints>
+ <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
+ <GridBagConstraints gridX="0" gridY="0" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="0" insetsRight="0" anchor="13" weightX="0.0" weightY="0.0"/>
+ </Constraint>
+ </Constraints>
+ </Component>
+ <Component class="javax.swing.JTextField" name="deviceDownloadLimit">
+ <Properties>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[70, 19]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[70, 19]"/>
+ </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="0" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="0" insetsRight="4" anchor="17" weightX="0.0" weightY="0.0"/>
+ </Constraint>
+ </Constraints>
+ </Component>
+ <Component class="javax.swing.JTextField" name="deviceRateLimit">
+ <Properties>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[70, 19]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[70, 19]"/>
+ </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="0.0" weightY="0.0"/>
+ </Constraint>
+ </Constraints>
+ </Component>
+ <Component class="javax.swing.JLabel" name="jLabel41">
+ <Properties>
+ <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+ <Font name="Dialog" size="12" style="0"/>
+ </Property>
+ <Property name="text" type="java.lang.String" value="Kbytes/Sec (default is 614)"/>
+ </Properties>
+ <Constraints>
+ <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
+ <GridBagConstraints gridX="2" gridY="1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="1.0" weightY="0.0"/>
+ </Constraint>
+ </Constraints>
+ </Component>
+ <Component class="javax.swing.JLabel" name="jLabel4">
+ <Properties>
+ <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+ <Font name="Dialog" size="12" style="0"/>
+ </Property>
+ <Property name="text" type="java.lang.String" value="<HTML>
(0 for unlimited transfer rate - <B>DANGEROUS!!</B>)
</HTML>"/>
+ </Properties>
+ <Constraints>
+ <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
+ <GridBagConstraints gridX="0" gridY="2" gridWidth="3" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="10" weightX="0.0" weightY="0.0"/>
+ </Constraint>
+ </Constraints>
+ </Component>
+ <Component class="javax.swing.JLabel" name="jLabel7">
+ <Properties>
+ <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+ <Font name="Dialog" size="12" style="0"/>
+ </Property>
+ <Property name="text" type="java.lang.String" value="(default is 2)"/>
+ </Properties>
+ <Constraints>
+ <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
+ <GridBagConstraints gridX="2" gridY="0" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
+ </Constraint>
+ </Constraints>
+ </Component>
+ <Component class="javax.swing.JCheckBox" name="applyToAll">
+ <Properties>
+ <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+ <Font name="Dialog" size="12" style="0"/>
+ </Property>
+ <Property name="text" type="java.lang.String" value="Apply Changes to all known Replay/SwapDV servers?"/>
+ </Properties>
+ <Constraints>
+ <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
+ <GridBagConstraints gridX="0" gridY="3" gridWidth="3" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="10" insetsLeft="4" insetsBottom="4" insetsRight="8" anchor="10" weightX="0.0" weightY="0.0"/>
+ </Constraint>
+ </Constraints>
+ </Component>
+ </SubComponents>
+ </Container>
+ <Component class="javax.swing.JLabel" name="jLabel5">
+ <Properties>
+ <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
+ <Color blue="ff" green="ff" red="ff" type="rgb"/>
+ </Property>
+ <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+ <Font name="Dialog" size="12" style="0"/>
+ </Property>
+ <Property name="text" type="java.lang.String" value="<HTML> <B>NOTE</B><BR> Changing these parameters can result in crashing your ReplayTV unit and in some cases, corrupting the data on the unit, possibly rendering the ReplayTV unit unusable. <BR><P>If you change these values, you do so soley at <B><FONT COLOR=#FF0000>your own risk</FONT></B>. </HTML>"/>
+ <Property name="verticalAlignment" type="int" value="1"/>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[300, 200]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[300, 100]"/>
+ </Property>
+ </Properties>
+ <Constraints>
+ <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
+ <GridBagConstraints gridX="0" gridY="2" gridWidth="3" gridHeight...
[truncated message content] |
|
From: Gerry D. <gd...@us...> - 2002-06-17 23:53:22
|
Update of /cvsroot/swapdv/swapdv/ReplayClient
In directory usw-pr-cvs1:/tmp/cvs-serv17412/ReplayClient
Modified Files:
ReplayConnection.java ThrottledInputStream.java
Log Message:
Exposed download and throttle controls for entire server.
Aded per-remote device preference in store and added per-device preference
editor.
Allowed download/throttle controls to be adjusted on a per device basis
Index: ReplayConnection.java
===================================================================
RCS file: /cvsroot/swapdv/swapdv/ReplayClient/ReplayConnection.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ReplayConnection.java 11 Jun 2002 18:26:58 -0000 1.6
+++ ReplayConnection.java 17 Jun 2002 23:53:19 -0000 1.7
@@ -101,19 +101,24 @@
is = new ThrottledInputStream(s.getInputStream());
DataInputStream dis = new DataInputStream(is);
do {
- //line = dis.readLine();
line = swapdv.Util.readLine(dis);
- if (line.indexOf("X-User-Agent: SwapDV") != -1)
- isSwapDV = true;
+ if (line.indexOf("X-User-Agent: SwapDV") != -1) isSwapDV = true;
} while (line != null && line.length() > 0);
- //readUntilByte((byte)0x0a);
} catch (IOException ex) {
ex.printStackTrace();
Logger.log(c.chan, LoggerI.LEVEL_ERR, ex.getMessage());
return;
}
- if (!isSwapDV)
- is.setRate(ThrottledInputStream.replayThrottledRate);
+
+ // Establish an appropriate default xfer rate
+ long defaultRate = ThrottledInputStream.replayThrottledRate;
+ if (isSwapDV) defaultRate = 0;
+
+ // Install the xfer rate
+ long deviceRate = (long) swapdv.SwapDV.getSwapDV().getDeviceStore(c.ipAddr).getIntAttribute("MAX_XFER_RATE", (int) defaultRate);
+ is.setRate(deviceRate);
+ Logger.log(c.chan, LoggerI.LEVEL_DEBUG, "Set max transfer rate for device " + c.ipAddr + " to " + deviceRate + " bytes/sec");
+
Logger.log(c.chan, LoggerI.LEVEL_DEBUG, "Processed http header");
}
Index: ThrottledInputStream.java
===================================================================
RCS file: /cvsroot/swapdv/swapdv/ReplayClient/ThrottledInputStream.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ThrottledInputStream.java 3 Jun 2002 23:03:03 -0000 1.5
+++ ThrottledInputStream.java 17 Jun 2002 23:53:19 -0000 1.6
@@ -86,7 +86,7 @@
}
private void enforceRate() {
- if (byteCount>byteWindow && desiredRate>0) {
+ if ((desiredRate > 0) && (byteCount > byteWindow)) {
// time to do a new rate adjustment
long timeTaken = System.currentTimeMillis() - byteWindowTime;
if (timeTaken==0) {
|
|
From: Gerry D. <gd...@us...> - 2002-06-17 23:53:22
|
Update of /cvsroot/swapdv/swapdv/Download
In directory usw-pr-cvs1:/tmp/cvs-serv17412/Download
Modified Files:
DownloadCounter.java
Log Message:
Exposed download and throttle controls for entire server.
Aded per-remote device preference in store and added per-device preference
editor.
Allowed download/throttle controls to be adjusted on a per device basis
Index: DownloadCounter.java
===================================================================
RCS file: /cvsroot/swapdv/swapdv/Download/DownloadCounter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DownloadCounter.java 7 Jun 2002 22:12:45 -0000 1.5
+++ DownloadCounter.java 17 Jun 2002 23:53:19 -0000 1.6
@@ -42,8 +42,7 @@
public class DownloadCounter {
private static DownloadCounter counter = null;
- private int maxPerDevice = 2;
- private int maxTotal = 9;
+ private int defaultMaxPerDevice = 2;
private int pendingDownloads = 0;
private Hashtable downloadDevices = new Hashtable();
@@ -57,43 +56,66 @@
public static void setProperties(pStoreNodeI config) {
DownloadCounter theCounter = getCounter();
- theCounter.maxTotal = config.getIntAttribute("maxDownloadsTotal", theCounter.maxTotal);
- theCounter.maxPerDevice = config.getIntAttribute("maxDownloadsPerDevice", theCounter.maxPerDevice);
+ DownloadDevice.setMaxTotalDownloads(config.getIntAttribute("maxDownloadsTotal", 9));
+ theCounter.defaultMaxPerDevice = config.getIntAttribute("defaultMaxDownloadsPerDevice", 2);
}
public static void getProperties(pStoreNodeI config) {
DownloadCounter theCounter = getCounter();
- config.setAttribute("maxDownloadsTotal", theCounter.maxTotal);
- config.setAttribute("maxDownloadsPerDevice", theCounter.maxPerDevice);
+ config.setAttribute("maxDownloadsTotal", DownloadDevice.getMaxTotalDownloads());
+ config.setAttribute("defaultMaxDownloadsPerDevice", theCounter.defaultMaxPerDevice);
}
- public void setPerDeviceDownloadLimit(int newLimit) {
+ /**
+ * Set the default maximim number of downloads for new devices. This is a
+ * default and as soon as the device has been downloaded once, it no longer
+ * affects that unit - only new ones
+ **/
+ public void setDefaultPerDeviceDownloadLimit(int newLimit) {
if (newLimit <= 0) return;
-
- synchronized(downloadDevices) {
- maxPerDevice = newLimit;
-
- Enumeration theDevices = downloadDevices.elements();
- while (theDevices.hasMoreElements()) {
- ((DownloadDevice) theDevices.nextElement()).maxPerDevice = newLimit;
- }
- }
+ defaultMaxPerDevice = newLimit;
}
- public int getPerDeviceDownloadLimit() { return maxPerDevice; }
+ public int getDefaultPerDeviceDownloadLimit() { return defaultMaxPerDevice; }
+
+ /**
+ * Set the maximum number of downloads that SwapDV will allow at any one time
+ **/
public void setTotalDownloadLimit(int newLimit) {
if (newLimit <= 0) return;
+ DownloadDevice.setMaxTotalDownloads(newLimit);
+ }
+ public int getTotalDownloadLimit() { return DownloadDevice.getMaxTotalDownloads(); }
+
+ public void setDownloadLimit(String theDeviceIP, int theLimit) {
+ if (theLimit <= 0) return;
+
+ DownloadDevice ipDevice = null;
- synchronized(downloadDevices) {
- maxTotal = newLimit;
+ synchronized(downloadDevices) {
+ // Get/create download tracker for each device
+ if ((ipDevice = (DownloadDevice) downloadDevices.get(theDeviceIP)) == null) {
+ ipDevice = new DownloadDevice(theDeviceIP, defaultMaxPerDevice);
+ downloadDevices.put(theDeviceIP, ipDevice);
+ }
- Enumeration theDevices = downloadDevices.elements();
- while (theDevices.hasMoreElements()) {
- ((DownloadDevice) theDevices.nextElement()).maxTotal = newLimit;
+ ipDevice.setDownloadLimit(theLimit);
+ }
+ }
+
+ public int getDownloadLimit(String theDeviceIP) {
+ DownloadDevice ipDevice = null;
+
+ synchronized(downloadDevices) {
+ // Get/create download tracker for each device
+ if ((ipDevice = (DownloadDevice) downloadDevices.get(theDeviceIP)) == null) {
+ return defaultMaxPerDevice;
}
+
+ return ipDevice.getDownloadLimit();
}
}
- public int getTotalDownloadLimit() { return maxTotal; }
+
/* returns true if the thread was not interrupted */
public boolean incCount(String IP) {
@@ -102,7 +124,7 @@
synchronized(downloadDevices) {
// Get/create download tracker for each device
if ((ipDevice = (DownloadDevice) downloadDevices.get(IP)) == null) {
- ipDevice = new DownloadDevice(IP, maxPerDevice, maxTotal);
+ ipDevice = new DownloadDevice(IP, defaultMaxPerDevice);
downloadDevices.put(IP, ipDevice);
}
@@ -131,29 +153,46 @@
}
class DownloadDevice {
- public static int totalDownloads = 0;
+ private static int maxTotalDownloads = 0;
+ private static int totalCurrentDownloads = 0;
public String theIP = null;
public int downloadCount = 0;
public Vector curThreads = new Vector();
+ private pStoreNodeI deviceInfo = null;
+ private int maxForDevice = 0;
+
- public int maxPerDevice = 0;
- public int maxTotal = 0;
+ public static void setMaxTotalDownloads(int newLimit) {
+ maxTotalDownloads = newLimit;
+ }
+ public static int getMaxTotalDownloads() { return maxTotalDownloads; }
+
- public DownloadDevice(String newIP, int maxDevice, int maxTotal) {
+ public DownloadDevice(String newIP, int defaultMaxDownloads) {
theIP = newIP;
- this.maxPerDevice = maxDevice;
- this.maxTotal = maxTotal;
+ deviceInfo = swapdv.SwapDV.getSwapDV().getDeviceStore(theIP);
+ maxForDevice = deviceInfo.getIntAttribute("MAX_DOWNLOADS", defaultMaxDownloads);
}
+ public void setDownloadLimit(int newLimit) {
+ if (newLimit <= 0) return;
+ maxForDevice = newLimit;
+ deviceInfo.setAttribute("MAX_DOWNLOADS", maxForDevice);
+ }
+ public int getDownloadLimit() { return maxForDevice; }
+
+ public int getCurrentDownloads() { return downloadCount; }
+
+
// Attempt to increment the download count. If the count is below
// the max OR this downloader is already downloading (duplicate call),
// then TRUE is returned. Otherwise, if there are no slots, FALSE
// is returned.
public boolean incUsage(Thread theThread) {
synchronized(curThreads) {
- // Bomb out if we maxed out this unit
- if (totalDownloads >= maxTotal) return false;
+ // Bomb out if we maxed out
+ if (totalCurrentDownloads >= maxTotalDownloads) return false;
// See if we are already listed
int threadCount = curThreads.size();
@@ -162,11 +201,11 @@
}
// If not, see if there are any open limits
- if (downloadCount >= maxPerDevice) return false;
+ if (downloadCount >= maxForDevice) return false;
// Add us in and we are on our way
downloadCount++;
- totalDownloads++;
+ totalCurrentDownloads++;
curThreads.add(theThread);
return true;
}
@@ -192,8 +231,10 @@
// Remove us and decrement the counter
curThreads.remove(theThread);
downloadCount--;
- totalDownloads--;
+ totalCurrentDownloads--;
return true;
}
}
+
+
}
|
|
From: Gerry D. <gd...@us...> - 2002-06-17 23:53:22
|
Update of /cvsroot/swapdv/swapdv/Scheduler/wizards
In directory usw-pr-cvs1:/tmp/cvs-serv17412/Scheduler/wizards
Modified Files:
abstractWizard.java
Log Message:
Exposed download and throttle controls for entire server.
Aded per-remote device preference in store and added per-device preference
editor.
Allowed download/throttle controls to be adjusted on a per device basis
Index: abstractWizard.java
===================================================================
RCS file: /cvsroot/swapdv/swapdv/Scheduler/wizards/abstractWizard.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- abstractWizard.java 17 Jun 2002 14:48:48 -0000 1.4
+++ abstractWizard.java 17 Jun 2002 23:53:19 -0000 1.5
@@ -239,13 +239,17 @@
}
- public boolean startWizard() {
+ public boolean startWizard(int startPanelIndex) {
// Make sure the basics are in place
if (panelList.size() == 0) return false;
if (wizardPanel == null) return false;
// And install the starting panel
- return setPanel(0);
+ return setPanel(startPanelIndex);
+ }
+
+ public boolean startWizard() {
+ return startWizard(0);
}
// Override if you have anything in particular you want to do when
|
|
From: Gerry D. <gd...@us...> - 2002-06-17 23:53:22
|
Update of /cvsroot/swapdv/swapdv/Scheduler In directory usw-pr-cvs1:/tmp/cvs-serv17412/Scheduler Modified Files: schdWizardI.java Log Message: Exposed download and throttle controls for entire server. Aded per-remote device preference in store and added per-device preference editor. Allowed download/throttle controls to be adjusted on a per device basis Index: schdWizardI.java =================================================================== RCS file: /cvsroot/swapdv/swapdv/Scheduler/schdWizardI.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- schdWizardI.java 8 Jun 2002 21:29:05 -0000 1.2 +++ schdWizardI.java 17 Jun 2002 23:53:19 -0000 1.3 @@ -66,6 +66,7 @@ public schdEventQueue getEventQueue(); public boolean startWizard(); + public boolean startWizard(int startPanelIndex); public boolean completeWizard(boolean showErrorPanel); public void cancelWizard(); |
|
From: Gerry D. <gd...@us...> - 2002-06-17 23:53:22
|
Update of /cvsroot/swapdv/swapdv/Scheduler/ui
In directory usw-pr-cvs1:/tmp/cvs-serv17412/Scheduler/ui
Modified Files:
schdWizardFrame.java
Log Message:
Exposed download and throttle controls for entire server.
Aded per-remote device preference in store and added per-device preference
editor.
Allowed download/throttle controls to be adjusted on a per device basis
Index: schdWizardFrame.java
===================================================================
RCS file: /cvsroot/swapdv/swapdv/Scheduler/ui/schdWizardFrame.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- schdWizardFrame.java 17 Jun 2002 14:48:48 -0000 1.6
+++ schdWizardFrame.java 17 Jun 2002 23:53:19 -0000 1.7
@@ -86,9 +86,9 @@
return true;
}
- public void startWizard() {
+ public void startWizard(int startPanelIndex) {
// Install first panel and update it
- theWizard.startWizard();
+ theWizard.startWizard(startPanelIndex);
updatePanel();
this.pack();
@@ -111,6 +111,10 @@
// Show it off!
this.setVisible(true);
+ }
+
+ public void startWizard() {
+ startWizard(0);
}
private boolean finishWizard() {
|
|
From: Jim V. <jim...@us...> - 2002-06-17 21:04:24
|
Update of /cvsroot/swapdv/swapdv
In directory usw-pr-cvs1:/tmp/cvs-serv30189
Modified Files:
Util.java
Log Message:
getSaveFileName() now creates a new File when setting the selected
name back to defName after a directory change. With 1.4, using the
old File caused the current directory to be changed back to the
intial directory.
Index: Util.java
===================================================================
RCS file: /cvsroot/swapdv/swapdv/Util.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Util.java 17 Jun 2002 20:16:15 -0000 1.10
+++ Util.java 17 Jun 2002 21:04:22 -0000 1.11
@@ -159,8 +159,7 @@
defName=defName.replace('/',' ');
defName=defName.replace('\\',' ');
- final File defFile = new File(defName);
-
+
if (saveFileDialog == null)
saveFileDialog = new JFileChooser();
@@ -176,10 +175,11 @@
saveFileDialog.addChoosableFileFilter(new ExtFileFilter(srcFile));
// Make sure the default filename is reselected every time the directory changes
+ final String defName2 = defName;
saveFileDialog.addPropertyChangeListener(new PropertyChangeListener() {
public void propertyChange(PropertyChangeEvent e) {
if (e.getPropertyName().equals(JFileChooser.DIRECTORY_CHANGED_PROPERTY)) {
- saveFileDialog.setSelectedFile(defFile);
+ saveFileDialog.setSelectedFile(new File(saveFileDialog.getCurrentDirectory(), defName2));
}
}
});
|
|
From: Jim V. <jim...@us...> - 2002-06-17 20:16:19
|
Update of /cvsroot/swapdv/swapdv
In directory usw-pr-cvs1:/tmp/cvs-serv14402
Modified Files:
Util.java
Log Message:
Downgrading "read LF before CR" message from NOTICE to DEBUG.
Index: Util.java
===================================================================
RCS file: /cvsroot/swapdv/swapdv/Util.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Util.java 12 Jun 2002 22:16:14 -0000 1.9
+++ Util.java 17 Jun 2002 20:16:15 -0000 1.10
@@ -223,7 +223,7 @@
if (theChar == (int) '\r')
theChar = theStream.read();
else
- Logger.log(0, LoggerI.LEVEL_NOTICE, "Read a LF before a CR in http data stream");
+ Logger.log(0, LoggerI.LEVEL_DEBUG, "Read a LF before a CR in http data stream");
return lineBuffer.toString();
}
|
|
From: Jim V. <jim...@us...> - 2002-06-17 20:10:08
|
Update of /cvsroot/swapdv/swapdv
In directory usw-pr-cvs1:/tmp/cvs-serv12123
Modified Files:
aboutDialog.java aboutDialog.form
Log Message:
calling setUndecorated() in a try block, to prevent noSuchMethod
exceptions from making the dialog undisplayable on Java < 1.4.
Index: aboutDialog.java
===================================================================
RCS file: /cvsroot/swapdv/swapdv/aboutDialog.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- aboutDialog.java 14 Jun 2002 22:23:48 -0000 1.2
+++ aboutDialog.java 17 Jun 2002 20:10:01 -0000 1.3
@@ -17,6 +17,9 @@
/** Creates new form aboutFrame */
public aboutDialog() {
+ try {
+ setUndecorated(true); // didn't exist prior to 1.4
+ } catch (Exception e) {} // ignore
initComponents();
// Install the current version label and establish modality
@@ -26,7 +29,7 @@
titleLabel.setIcon(swapdv.SwapDV.getSwapDV().iconSwapdv32);
// Layout the panel
- this.pack();
+ this.pack();
//this.setSize(400, 250);
Dimension theScreen = Toolkit.getDefaultToolkit().getScreenSize();
Dimension theFrame = this.getSize();
@@ -51,7 +54,6 @@
setTitle("About SwapDV");
setResizable(false);
- setUndecorated(true);
aboutPanel.setLayout(new java.awt.GridBagLayout());
java.awt.GridBagConstraints gridBagConstraints1;
Index: aboutDialog.form
===================================================================
RCS file: /cvsroot/swapdv/swapdv/aboutDialog.form,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- aboutDialog.form 14 Jun 2002 22:23:48 -0000 1.2
+++ aboutDialog.form 17 Jun 2002 20:10:01 -0000 1.3
@@ -4,7 +4,6 @@
<Properties>
<Property name="title" type="java.lang.String" value="About SwapDV"/>
<Property name="resizable" type="boolean" value="false"/>
- <Property name="undecorated" type="boolean" value="true"/>
</Properties>
<SyntheticProperties>
<SyntheticProperty name="menuBar" type="java.lang.String" value="(No Menu)"/>
@@ -15,6 +14,9 @@
<SyntheticProperty name="generateSize" type="boolean" value="true"/>
<SyntheticProperty name="generateCenter" type="boolean" value="true"/>
</SyntheticProperties>
+
+ <AuxValues>
+ </AuxValues>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
<SubComponents>
|
|
From: Gerry D. <gd...@us...> - 2002-06-17 14:48:52
|
Update of /cvsroot/swapdv/swapdv/Scheduler/ui
In directory usw-pr-cvs1:/tmp/cvs-serv13571/Scheduler/ui
Modified Files:
schdActionEditorFrame.java schdEventEditorFrame.java
schdEventListFrame.java schdWizardFrame.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: schdActionEditorFrame.java
===================================================================
RCS file: /cvsroot/swapdv/swapdv/Scheduler/ui/schdActionEditorFrame.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- schdActionEditorFrame.java 14 Jun 2002 21:47:05 -0000 1.6
+++ schdActionEditorFrame.java 17 Jun 2002 14:48:48 -0000 1.7
@@ -95,11 +95,11 @@
actionEditor.setAction(currentAction);
this.pack();
if (!attrsRestored) {
- this.setIconImage(swapdv.SwapDV.getSwapDV().iconSwapdv32.getImage());
actionUtils.restoreActionEditorAttrs(this);
attrsRestored = true;
}
+ this.setIconImage(swapdv.SwapDV.getSwapDV().iconSwapdv32.getImage());
this.setVisible(true);
editFrameInUse = true;
if (newAction)
Index: schdEventEditorFrame.java
===================================================================
RCS file: /cvsroot/swapdv/swapdv/Scheduler/ui/schdEventEditorFrame.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- schdEventEditorFrame.java 14 Jun 2002 21:47:05 -0000 1.9
+++ schdEventEditorFrame.java 17 Jun 2002 14:48:48 -0000 1.10
@@ -107,13 +107,13 @@
theFrame.width = (theScreen.width - theFrame.width) / 2;
theFrame.height = (theScreen.height - theFrame.height) / 2;
this.setLocation(theFrame.width, theFrame.height);
- this.setIconImage(swapdv.SwapDV.getSwapDV().iconSwapdv32.getImage());
}
attrsRestored = true;
}
// Install new event to edit
+ this.setIconImage(swapdv.SwapDV.getSwapDV().iconSwapdv32.getImage());
schdEditor.setEvent(currentEvent);
this.setVisible(true);
editFrameInUse = true;
Index: schdEventListFrame.java
===================================================================
RCS file: /cvsroot/swapdv/swapdv/Scheduler/ui/schdEventListFrame.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- schdEventListFrame.java 14 Jun 2002 21:47:05 -0000 1.10
+++ schdEventListFrame.java 17 Jun 2002 14:48:48 -0000 1.11
@@ -109,10 +109,10 @@
theFrame.width = (theScreen.width - theFrame.width) / 2;
theFrame.height = (theScreen.height - theFrame.height) / 2;
this.setLocation(theFrame.width, theFrame.height);
- this.setIconImage(swapdv.SwapDV.getSwapDV().iconSwapdv32.getImage());
} else
((pStoreJTable) eventListing).restoreTableLayout(prefsStore);
+ this.setIconImage(swapdv.SwapDV.getSwapDV().iconSwapdv32.getImage());
setVisible(true);
} else {
this.toFront();
Index: schdWizardFrame.java
===================================================================
RCS file: /cvsroot/swapdv/swapdv/Scheduler/ui/schdWizardFrame.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- schdWizardFrame.java 14 Jun 2002 21:47:05 -0000 1.5
+++ schdWizardFrame.java 17 Jun 2002 14:48:48 -0000 1.6
@@ -102,11 +102,10 @@
theFrame.width = (theScreen.width - theFrame.width) / 2;
theFrame.height = (theScreen.height - theFrame.height) / 2;
this.setLocation(theFrame.width, theFrame.height);
-
- this.setIconImage(swapdv.SwapDV.getSwapDV().iconSwapdv32.getImage());
}
// Lay things out
+ this.setIconImage(swapdv.SwapDV.getSwapDV().iconSwapdv32.getImage());
this.invalidate();
this.validate();
|
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();
|
|
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
}
|
|
From: Gerry D. <gd...@us...> - 2002-06-17 14:48:51
|
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;
|
|
From: Jim V. <jim...@us...> - 2002-06-14 23:57:35
|
Update of /cvsroot/swapdv/swapdv
In directory usw-pr-cvs1:/tmp/cvs-serv5736
Modified Files:
SwapDV.java SwapDV.form
Log Message:
Menu name change.
Index: SwapDV.java
===================================================================
RCS file: /cvsroot/swapdv/swapdv/SwapDV.java,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- SwapDV.java 14 Jun 2002 22:38:13 -0000 1.69
+++ SwapDV.java 14 Jun 2002 23:57:30 -0000 1.70
@@ -1403,7 +1403,7 @@
jMenuFetch.add(jMenuItemSearch);
jMenuBar1.add(jMenuFetch);
jMenuLibraryServer.setMnemonic('S');
- jMenuLibraryServer.setText("Sharing");
+ jMenuLibraryServer.setText("Server");
jMenuItemStart.setMnemonic('a');
jMenuItemStart.setText("Start SwapDV/ReplayTV server");
jMenuItemStart.addActionListener(new java.awt.event.ActionListener() {
Index: SwapDV.form
===================================================================
RCS file: /cvsroot/swapdv/swapdv/SwapDV.form,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- SwapDV.form 14 Jun 2002 22:24:28 -0000 1.29
+++ SwapDV.form 14 Jun 2002 23:57:30 -0000 1.30
@@ -574,7 +574,7 @@
<Property name="mnemonic" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
<Connection type="value" value="'S'" valueType="int"/>
</Property>
- <Property name="text" type="java.lang.String" value="Sharing"/>
+ <Property name="text" type="java.lang.String" value="Server"/>
</Properties>
<SubComponents>
<MenuItem class="javax.swing.JMenuItem" name="jMenuItemStart">
|
|
From: Jim V. <jim...@us...> - 2002-06-14 22:38:16
|
Update of /cvsroot/swapdv/swapdv
In directory usw-pr-cvs1:/tmp/cvs-serv18796
Modified Files:
SwapDV.java
Log Message:
Changed "Shows & Channels" tab to just "Shows".
Index: SwapDV.java
===================================================================
RCS file: /cvsroot/swapdv/swapdv/SwapDV.java,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- SwapDV.java 14 Jun 2002 22:24:28 -0000 1.68
+++ SwapDV.java 14 Jun 2002 22:38:13 -0000 1.69
@@ -164,6 +164,7 @@
jScrollPaneDownloads.getViewport().setBackground(java.awt.Color.white);
jScrollPaneUploads.getViewport().setBackground(java.awt.Color.white);
jTableUploads.getColumnModel().getColumn(2).setPreferredWidth(500);
+ jTabbedPane1.setTitleAt(0, "Shows");
// no need to keep references to these
new DropTable(jTree1, "tree");
|
|
From: Jim V. <jim...@us...> - 2002-06-14 22:28:55
|
Update of /cvsroot/swapdv/swapdv In directory usw-pr-cvs1:/tmp/cvs-serv16098 Modified Files: SwapDV.jarContent Log Message: Added EULA.txt Index: SwapDV.jarContent =================================================================== RCS file: /cvsroot/swapdv/swapdv/SwapDV.jarContent,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 Binary files /tmp/cvs3Rr1Fa and /tmp/cvsYUrmeb differ |
|
From: Jim V. <jim...@us...> - 2002-06-14 22:24:31
|
Update of /cvsroot/swapdv/swapdv
In directory usw-pr-cvs1:/tmp/cvs-serv14763
Modified Files:
SwapDV.java SwapDV.form
Log Message:
Moved Show, Channel & Category menus to new Edit menu.
Index: SwapDV.java
===================================================================
RCS file: /cvsroot/swapdv/swapdv/SwapDV.java,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- SwapDV.java 14 Jun 2002 21:47:05 -0000 1.67
+++ SwapDV.java 14 Jun 2002 22:24:28 -0000 1.68
@@ -932,658 +932,661 @@
* WARNING: Do NOT modify this code. The content of this method is
* always regenerated by the Form Editor.
*/
- private void initComponents() {//GEN-BEGIN:initComponents
- jPopupMenuChannels = new javax.swing.JPopupMenu();
- jMenuItemChannelMove = new javax.swing.JMenuItem();
- jMenuChanAdv = new javax.swing.JMenu();
- jMenuItemImport = new javax.swing.JMenuItem();
- jMenuItemRenameChan = new javax.swing.JMenuItem();
- jSeparator4 = new javax.swing.JSeparator();
- jMenuItemDelete = new javax.swing.JMenuItem();
[...1456 lines suppressed...]
+ private javax.swing.JMenu jMenuProxies;
+ private javax.swing.JMenuItem jMenuItemProxiesAdd;
+ private javax.swing.JMenu jMenuRemove;
+ private javax.swing.JMenu jMenuScheduler;
+ private javax.swing.JMenuItem jNewEvent;
+ private javax.swing.JMenuItem jScheduleEditor;
+ private javax.swing.JMenu jMenuHelp;
+ private javax.swing.JMenuItem jMenuItemAbout;
+ 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.JScrollPane jScrollPaneDownloads;
+ private javax.swing.JTable jTableDownloads;
+ private javax.swing.JScrollPane jScrollPaneUploads;
+ private javax.swing.JTable jTableUploads;
+ // End of variables declaration//GEN-END:variables
}
Index: SwapDV.form
===================================================================
RCS file: /cvsroot/swapdv/swapdv/SwapDV.form,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- SwapDV.form 14 Jun 2002 21:47:05 -0000 1.28
+++ SwapDV.form 14 Jun 2002 22:24:28 -0000 1.29
@@ -9,7 +9,7 @@
<Property name="mnemonic" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
<Connection type="value" value="'M'" valueType="int"/>
</Property>
- <Property name="text" type="java.lang.String" value="Move"/>
+ <Property name="text" type="java.lang.String" value="Move to category ..."/>
</Properties>
<Events>
@@ -275,6 +275,250 @@
</MenuItem>
</SubComponents>
</Menu>
+ <Menu class="javax.swing.JMenu" name="jMenuEdit">
+ <Properties>
+ <Property name="mnemonic" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
+ <Connection type="value" value="'E'" valueType="int"/>
+ </Property>
+ <Property name="text" type="java.lang.String" value="Edit"/>
+ </Properties>
+ <SubComponents>
+ <Menu class="javax.swing.JMenu" name="jMenuShow">
+ <Properties>
+ <Property name="mnemonic" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
+ <Connection type="value" value="'h'" valueType="int"/>
+ </Property>
+ <Property name="text" type="java.lang.String" value="Show"/>
+ <Property name="toolTipText" type="java.lang.String" value=""/>
+ </Properties>
+
+ <Events>
+ <EventHandler event="menuSelected" listener="javax.swing.event.MenuListener" parameters="javax.swing.event.MenuEvent" handler="jMenuShowMenuSelected"/>
+ </Events>
+ <SubComponents>
+ <MenuItem class="javax.swing.JMenuItem" name="jMenuItemShowPlay2">
+ <Properties>
+ <Property name="mnemonic" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
+ <Connection type="value" value="'P'" valueType="int"/>
+ </Property>
+ <Property name="text" type="java.lang.String" value="Play"/>
+ <Property name="enabled" type="boolean" value="false"/>
+ </Properties>
+
+ <Events>
+ <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItemShowPlay2ActionPerformed"/>
+ </Events>
+ </MenuItem>
+ <MenuItem class="javax.swing.JMenuItem" name="jMenuItemShowEdit2">
+ <Properties>
+ <Property name="mnemonic" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
+ <Connection type="value" value="'E'" valueType="int"/>
+ </Property>
+ <Property name="text" type="java.lang.String" value="Edit"/>
+ <Property name="enabled" type="boolean" value="false"/>
+ </Properties>
+
+ <Events>
+ <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItemShowEdit2ActionPerformed"/>
+ </Events>
+ </MenuItem>
+ <MenuItem class="javax.swing.JMenuItem" name="jMenuItemShowMove2">
+ <Properties>
+ <Property name="mnemonic" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
+ <Connection type="value" value="'M'" valueType="int"/>
+ </Property>
+ <Property name="text" type="java.lang.String" value="Move to channel ..."/>
+ <Property name="enabled" type="boolean" value="false"/>
+ </Properties>
+
+ <Events>
+ <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItemShowMove2ActionPerformed"/>
+ </Events>
+ </MenuItem>
+ <Menu class="javax.swing.JMenu" name="jMenuShowAdv2">
+ <Properties>
+ <Property name="mnemonic" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
+ <Connection type="value" value="'A'" valueType="int"/>
+ </Property>
+ <Property name="text" type="java.lang.String" value="Advanced"/>
+ </Properties>
+ <SubComponents>
+ <MenuItem class="javax.swing.JMenuItem" name="jMenuItemShowExport2">
+ <Properties>
+ <Property name="mnemonic" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
+ <Connection type="value" value="'x'" valueType="int"/>
+ </Property>
+ <Property name="text" type="java.lang.String" value="Export show to swap files"/>
+ <Property name="enabled" type="boolean" value="false"/>
+ </Properties>
+
+ <Events>
+ <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItemShowExport2ActionPerformed"/>
+ </Events>
+ </MenuItem>
+ </SubComponents>
+ </Menu>
+ <MenuItem class="javax.swing.JSeparator" name="jSeparator1">
+ </MenuItem>
+ <MenuItem class="javax.swing.JMenuItem" name="jMenuItemShowDelete2">
+ <Properties>
+ <Property name="mnemonic" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
+ <Connection type="value" value="'D'" valueType="int"/>
+ </Property>
+ <Property name="text" type="java.lang.String" value="Delete"/>
+ <Property name="enabled" type="boolean" value="false"/>
+ </Properties>
+
+ <Events>
+ <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItemShowDelete2ActionPerformed"/>
+ </Events>
+ </MenuItem>
+ </SubComponents>
+ </Menu>
+ <Menu class="javax.swing.JMenu" name="jMenuContentGuide">
+ <Properties>
+ <Property name="mnemonic" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
+ <Connection type="value" value="'C'" valueType="int"/>
+ </Property>
+ <Property name="text" type="java.lang.String" value="Channel"/>
+ </Properties>
+
+ <Events>
+ <EventHandler event="menuSelected" listener="javax.swing.event.MenuListener" parameters="javax.swing.event.MenuEvent" handler="jMenuContentGuideMenuSelected"/>
+ </Events>
+ <SubComponents>
+ <MenuItem class="javax.swing.JMenuItem" name="jMenuItemAddChannel">
+ <Properties>
+ <Property name="mnemonic" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
+ <Connection type="value" value="'A'" valueType="int"/>
+ </Property>
+ <Property name="text" type="java.lang.String" value="Add channel"/>
+ </Properties>
+
+ <Events>
+ <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItemAddChannelActionPerformed"/>
+ </Events>
+ </MenuItem>
+ <MenuItem class="javax.swing.JMenuItem" name="jMenuItemChannelMove2">
+ <Properties>
+ <Property name="mnemonic" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
+ <Connection type="value" value="'M'" valueType="int"/>
+ </Property>
+ <Property name="text" type="java.lang.String" value="Move to category ..."/>
+ <Property name="enabled" type="boolean" value="false"/>
+ </Properties>
+
+ <Events>
+ <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItemChannelMove2ActionPerformed"/>
+ </Events>
+ </MenuItem>
+ <Menu class="javax.swing.JMenu" name="jMenuChanAdv2">
+ <Properties>
+ <Property name="mnemonic" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
+ <Connection type="value" value="'a'" valueType="int"/>
+ </Property>
+ <Property name="text" type="java.lang.String" value="Advanced"/>
+ <Property name="enabled" type="boolean" value="false"/>
+ </Properties>
+ <SubComponents>
+ <MenuItem class="javax.swing.JMenuItem" name="jMenuItemImport2">
+ <Properties>
+ <Property name="mnemonic" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
+ <Connection type="value" value="'I'" valueType="int"/>
+ </Property>
+ <Property name="text" type="java.lang.String" value="Import show from swap files"/>
+ <Property name="enabled" type="boolean" value="false"/>
+ </Properties>
+
+ <Events>
+ <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItemImport2ActionPerformed"/>
+ </Events>
+ </MenuItem>
+ </SubComponents>
+ </Menu>
+ <MenuItem class="javax.swing.JMenuItem" name="jMenuItemChanRename2">
+ <Properties>
+ <Property name="mnemonic" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
+ <Connection type="value" value="'R'" valueType="int"/>
+ </Property>
+ <Property name="text" type="java.lang.String" value="Rename"/>
+ </Properties>
+
+ <Events>
+ <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItemChanRename2ActionPerformed"/>
+ </Events>
+ </MenuItem>
+ <MenuItem class="javax.swing.JSeparator" name="jSeparator2">
+ </MenuItem>
+ <MenuItem class="javax.swing.JMenuItem" name="jMenuItemDelete2">
+ <Properties>
+ <Property name="mnemonic" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
+ <Connection type="value" value="'D'" valueType="int"/>
+ </Property>
+ <Property name="text" type="java.lang.String" value="Delete"/>
+ <Property name="enabled" type="boolean" value="false"/>
+ </Properties>
+
+ <Events>
+ <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItemDelete2ActionPerformed"/>
+ </Events>
+ </MenuItem>
+ </SubComponents>
+ </Menu>
+ <Menu class="javax.swing.JMenu" name="jMenuCategory">
+ <Properties>
+ <Property name="mnemonic" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
+ <Connection type="value" value="'g'" valueType="int"/>
+ </Property>
+ <Property name="text" type="java.lang.String" value="Category"/>
+ </Properties>
+
+ <Events>
+ <EventHandler event="menuSelected" listener="javax.swing.event.MenuListener" parameters="javax.swing.event.MenuEvent" handler="jMenuCategoryMenuSelected"/>
+ </Events>
+ <SubComponents>
+ <MenuItem class="javax.swing.JMenuItem" name="jMenuItemCategoryAdd">
+ <Properties>
+ <Property name="mnemonic" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
+ <Connection type="value" value="'a'" valueType="int"/>
+ </Property>
+ <Property name="text" type="java.lang.String" value="Add category"/>
+ </Properties>
+
+ <Events>
+ <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItemCategoryAddActionPerformed"/>
+ </Events>
+ </MenuItem>
+ <MenuItem class="javax.swing.JMenuItem" name="jMenuItemCatRename">
+ <Properties>
+ <Property name="mnemonic" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
+ <Connection type="value" value="'R'" valueType="int"/>
+ </Property>
+ <Property name="text" type="java.lang.String" value="Rename"/>
+ </Properties>
+
+ <Events>
+ <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItemCatRenameActionPerformed"/>
+ </Events>
+ </MenuItem>
+ <MenuItem class="javax.swing.JSeparator" name="jSeparator7">
+ </MenuItem>
+ <MenuItem class="javax.swing.JMenuItem" name="jMenuItemCategoryDelete">
+ <Properties>
+ <Property name="mnemonic" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
+ <Connection type="value" value="'d'" valueType="int"/>
+ </Property>
+ <Property name="text" type="java.lang.String" value="Delete"/>
+ </Properties>
+
+ <Events>
+ <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItemCategoryDeleteActionPerformed"/>
+ </Events>
+ </MenuItem>
+ </SubComponents>
+ </Menu>
+ </SubComponents>
+ </Menu>
<Menu class="javax.swing.JMenu" name="jMenuFetch">
<Properties>
<Property name="mnemonic" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
@@ -418,240 +662,6 @@
</Menu>
</SubComponents>
</Menu>
- <Menu class="javax.swing.JMenu" name="jMenuShow">
- <Properties>
- <Property name="mnemonic" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
- <Connection type="value" value="'h'" valueType="int"/>
- </Property>
- <Property name="text" type="java.lang.String" value="Show"/>
- <Property name="toolTipText" type="java.lang.String" value=""/>
- </Properties>
-
- <Events>
- <EventHandler event="menuSelected" listener="javax.swing.event.MenuListener" parameters="javax.swing.event.MenuEvent" handler="jMenuShowMenuSelected"/>
- </Events>
- <SubComponents>
- <MenuItem class="javax.swing.JMenuItem" name="jMenuItemShowPlay2">
- <Properties>
- <Property name="mnemonic" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
- <Connection type="value" value="'P'" valueType="int"/>
- </Property>
- <Property name="text" type="java.lang.String" value="Play"/>
- <Property name="enabled" type="boolean" value="false"/>
- </Properties>
-
- <Events>
- <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItemShowPlay2ActionPerformed"/>
- </Events>
- </MenuItem>
- <MenuItem class="javax.swing.JMenuItem" name="jMenuItemShowEdit2">
- <Properties>
- <Property name="mnemonic" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
- <Connection type="value" value="'E'" valueType="int"/>
- </Property>
- <Property name="text" type="java.lang.String" value="Edit"/>
- <Property name="enabled" type="boolean" value="false"/>
- </Properties>
-
- <Events>
- <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItemShowEdit2ActionPerformed"/>
- </Events>
- </MenuItem>
- <MenuItem class="javax.swing.JMenuItem" name="jMenuItemShowMove2">
- <Properties>
- <Property name="mnemonic" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
- <Connection type="value" value="'M'" valueType="int"/>
- </Property>
- <Property name="text" type="java.lang.String" value="Move to channel ..."/>
- <Property name="enabled" type="boolean" value="false"/>
- </Properties>
-
- <Events>
- <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItemShowMove2ActionPerformed"/>
- </Events>
- </MenuItem>
- <Menu class="javax.swing.JMenu" name="jMenuShowAdv2">
- <Properties>
- <Property name="mnemonic" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
- <Connection type="value" value="'A'" valueType="int"/>
- </Property>
- <Property name="text" type="java.lang.String" value="Advanced"/>
- </Properties>
- <SubComponents>
- <MenuItem class="javax.swing.JMenuItem" name="jMenuItemShowExport2">
- <Properties>
- <Property name="mnemonic" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
- <Connection type="value" value="'x'" valueType="int"/>
- </Property>
- <Property name="text" type="java.lang.String" value="Export show to swap files"/>
- <Property name="enabled" type="boolean" value="false"/>
- </Properties>
-
- <Events>
- <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItemShowExport2ActionPerformed"/>
- </Events>
- </MenuItem>
- </SubComponents>
- </Menu>
- <MenuItem class="javax.swing.JSeparator" name="jSeparator1">
- </MenuItem>
- <MenuItem class="javax.swing.JMenuItem" name="jMenuItemShowDelete2">
- <Properties>
- <Property name="mnemonic" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
- <Connection type="value" value="'D'" valueType="int"/>
- </Property>
- <Property name="text" type="java.lang.String" value="Delete"/>
- <Property name="enabled" type="boolean" value="false"/>
- </Properties>
-
- <Events>
- <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItemShowDelete2ActionPerformed"/>
- </Events>
- </MenuItem>
- </SubComponents>
- </Menu>
- <Menu class="javax.swing.JMenu" name="jMenuContentGuide">
- <Properties>
- <Property name="mnemonic" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
- <Connection type="value" value="'C'" valueType="int"/>
- </Property>
- <Property name="text" type="java.lang.String" value="Channel"/>
- </Properties>
-
- <Events>
- <EventHandler event="menuSelected" listener="javax.swing.event.MenuListener" parameters="javax.swing.event.MenuEvent" handler="jMenuContentGuideMenuSelected"/>
- </Events>
- <SubComponents>
- <MenuItem class="javax.swing.JMenuItem" name="jMenuItemAddChannel">
- <Properties>
- <Property name="mnemonic" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
- <Connection type="value" value="'A'" valueType="int"/>
- </Property>
- <Property name="text" type="java.lang.String" value="Add channel"/>
- </Properties>
-
- <Events>
- <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItemAddChannelActionPerformed"/>
- </Events>
- </MenuItem>
- <MenuItem class="javax.swing.JMenuItem" name="jMenuItemChannelMove2">
- <Properties>
- <Property name="mnemonic" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
- <Connection type="value" value="'M'" valueType="int"/>
- </Property>
- <Property name="text" type="java.lang.String" value="Move"/>
- <Property name="enabled" type="boolean" value="false"/>
- </Properties>
-
- <Events>
- <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItemChannelMove2ActionPerformed"/>
- </Events>
- </MenuItem>
- <Menu class="javax.swing.JMenu" name="jMenuChanAdv2">
- <Properties>
- <Property name="mnemonic" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
- <Connection type="value" value="'a'" valueType="int"/>
- </Property>
- <Property name="text" type="java.lang.String" value="Advanced"/>
- <Property name="enabled" type="boolean" value="false"/>
- </Properties>
- <SubComponents>
- <MenuItem class="javax.swing.JMenuItem" name="jMenuItemImport2">
- <Properties>
- <Property name="mnemonic" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
- <Connection type="value" value="'I'" valueType="int"/>
- </Property>
- <Property name="text" type="java.lang.String" value="Import show from swap files"/>
- <Property name="enabled" type="boolean" value="false"/>
- </Properties>
-
- <Events>
- <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItemImport2ActionPerformed"/>
- </Events>
- </MenuItem>
- </SubComponents>
- </Menu>
- <MenuItem class="javax.swing.JMenuItem" name="jMenuItemChanRename2">
- <Properties>
- <Property name="mnemonic" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
- <Connection type="value" value="'R'" valueType="int"/>
- </Property>
- <Property name="text" type="java.lang.String" value="Rename"/>
- </Properties>
-
- <Events>
- <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItemChanRename2ActionPerformed"/>
- </Events>
- </MenuItem>
- <MenuItem class="javax.swing.JSeparator" name="jSeparator2">
- </MenuItem>
- <MenuItem class="javax.swing.JMenuItem" name="jMenuItemDelete2">
- <Properties>
- <Property name="mnemonic" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
- <Connection type="value" value="'D'" valueType="int"/>
- </Property>
- <Property name="text" type="java.lang.String" value="Delete"/>
- <Property name="enabled" type="boolean" value="false"/>
- </Properties>
-
- <Events>
- <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItemDelete2ActionPerformed"/>
- </Events>
- </MenuItem>
- </SubComponents>
- </Menu>
- <Menu class="javax.swing.JMenu" name="jMenuCategory">
- <Properties>
- <Property name="mnemonic" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
- <Connection type="value" value="'g'" valueType="int"/>
- </Property>
- <Property name="text" type="java.lang.String" value="Category"/>
- </Properties>
-
- <Events>
- <EventHandler event="menuSelected" listener="javax.swing.event.MenuListener" parameters="javax.swing.event.MenuEvent" handler="jMenuCategoryMenuSelected"/>
- </Events>
- <SubComponents>
- <MenuItem class="javax.swing.JMenuItem" name="jMenuItemCategoryAdd">
- <Properties>
- <Property name="mnemonic" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
- <Connection type="value" value="'a'" valueType="int"/>
- </Property>
- <Property name="text" type="java.lang.String" value="Add category"/>
- </Properties>
-
- <Events>
- <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItemCategoryAddActionPerformed"/>
- </Events>
- </MenuItem>
- <MenuItem class="javax.swing.JMenuItem" name="jMenuItemCatRename">
- <Properties>
- <Property name="mnemonic" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
- <Connection type="value" value="'R'" valueType="int"/>
- </Property>
- <Property name="text" type="java.lang.String" value="Rename"/>
- </Properties>
-
- <Events>
- <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItemCatRenameActionPerformed"/>
- </Events>
- </MenuItem>
- <MenuItem class="javax.swing.JSeparator" name="jSeparator7">
- </MenuItem>
- <MenuItem class="javax.swing.JMenuItem" name="jMenuItemCategoryDelete">
- <Properties>
- <Property name="mnemonic" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
- <Connection type="value" value="'d'" valueType="int"/>
- </Property>
- <Property name="text" type="java.lang.String" value="Delete"/>
- </Properties>
-
- <Events>
- <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItemCategoryDeleteActionPerformed"/>
- </Events>
- </MenuItem>
- </SubComponents>
- </Menu>
<Menu class="javax.swing.JMenu" name="jMenuScheduler">
<Properties>
<Property name="mnemonic" type="int" value="101"/>
@@ -718,7 +728,6 @@
<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>
@@ -758,10 +767,7 @@
</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="">
- <Property name="tabTitle" type="java.lang.String" value="Shows & Channels"/>
- <Property name="tabToolTip" type="java.lang.String" value=""/>
- </JTabbedPaneConstraints>
+ <JTabbedPaneConstraints tabName="Shows & Channels" toolTip=""/>
</Constraint>
</Constraints>
@@ -858,10 +864,7 @@
</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="">
- <Property name="tabTitle" type="java.lang.String" value="Downloads"/>
- <Property name="tabToolTip" type="java.lang.String" value=""/>
- </JTabbedPaneConstraints>
+ <JTabbedPaneConstraints tabName="Downloads" toolTip=""/>
</Constraint>
</Constraints>
@@ -893,10 +896,7 @@
</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="">
- <Property name="tabTitle" type="java.lang.String" value="Uploads"/>
- <Property name="tabToolTip" type="java.lang.String" value=""/>
- </JTabbedPaneConstraints>
+ <JTabbedPaneConstraints tabName="Uploads" toolTip=""/>
</Constraint>
</Constraints>
|
|
From: Jim V. <jim...@us...> - 2002-06-14 22:23:52
|
Update of /cvsroot/swapdv/swapdv
In directory usw-pr-cvs1:/tmp/cvs-serv14619
Modified Files:
aboutDialog.form aboutDialog.java
Log Message:
Removed 2 <BR> tags from jLabel to make text fit into box.
Index: aboutDialog.form
===================================================================
RCS file: /cvsroot/swapdv/swapdv/aboutDialog.form,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aboutDialog.form 14 Jun 2002 21:47:57 -0000 1.1
+++ aboutDialog.form 14 Jun 2002 22:23:48 -0000 1.2
@@ -7,13 +7,13 @@
<Property name="undecorated" type="boolean" value="true"/>
</Properties>
<SyntheticProperties>
+ <SyntheticProperty name="menuBar" type="java.lang.String" value="(No Menu)"/>
<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="1"/>
<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,0,-22,0,0,2,67"/>
</SyntheticProperties>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
@@ -38,7 +38,7 @@
<Container class="javax.swing.JPanel" name="titlePanel">
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="0" gridY="0" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="16" insetsBottom="0" insetsRight="16" anchor="11" weightX="1.0" weightY="0.0"/>
+ <GridBagConstraints anchor="11" fill="2" gridHeight="1" gridWidth="1" gridX="0" gridY="0" insetsBottom="0" insetsLeft="16" insetsRight="16" insetsTop="4" ipadX="0" ipadY="0" weightX="1.0" weightY="0.0"/>
</Constraint>
</Constraints>
@@ -54,7 +54,7 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="0" gridY="0" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="8" insetsLeft="8" insetsBottom="0" insetsRight="0" anchor="17" weightX="1.0" weightY="0.0"/>
+ <GridBagConstraints anchor="17" fill="2" gridHeight="1" gridWidth="1" gridX="0" gridY="0" insetsBottom="0" insetsLeft="8" insetsRight="0" insetsTop="8" ipadX="0" ipadY="0" weightX="1.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
@@ -67,7 +67,7 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="1" gridY="0" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="8" insetsLeft="4" insetsBottom="0" insetsRight="8" anchor="13" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints anchor="13" fill="0" gridHeight="1" gridWidth="1" gridX="1" gridY="0" insetsBottom="0" insetsLeft="4" insetsRight="8" insetsTop="8" ipadX="0" ipadY="0" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
@@ -78,7 +78,7 @@
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Dialog" size="12" style="0"/>
</Property>
- <Property name="text" type="java.lang.String" value="<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>"/>
+ <Property name="text" type="java.lang.String" value="<HTML><HR WIDTH="100%" SIZE=0 NOSHADE><FONT SIZE="-1">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>See EULA.txt, included with SwapDV, for the terms and conditions of use. <BR>For more information, visit http://www.swapdv.net</FONT></HTML>"/>
<Property name="verticalAlignment" type="int" value="1"/>
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[1000, 1000]"/>
@@ -93,7 +93,7 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="0" gridY="1" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="80" insetsTop="0" insetsLeft="16" insetsBottom="0" insetsRight="16" anchor="10" weightX="1.0" weightY="1.0"/>
+ <GridBagConstraints anchor="10" fill="2" gridHeight="1" gridWidth="1" gridX="0" gridY="1" insetsBottom="0" insetsLeft="16" insetsRight="16" insetsTop="0" ipadX="0" ipadY="80" weightX="1.0" weightY="1.0"/>
</Constraint>
</Constraints>
</Component>
@@ -110,7 +110,7 @@
</Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="0" gridY="2" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="16" insetsLeft="4" insetsBottom="8" insetsRight="4" anchor="15" weightX="1.0" weightY="0.0"/>
+ <GridBagConstraints anchor="15" fill="0" gridHeight="1" gridWidth="1" gridX="0" gridY="2" insetsBottom="8" insetsLeft="4" insetsRight="4" insetsTop="16" ipadX="0" ipadY="0" weightX="1.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
Index: aboutDialog.java
===================================================================
RCS file: /cvsroot/swapdv/swapdv/aboutDialog.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aboutDialog.java 14 Jun 2002 21:47:05 -0000 1.1
+++ aboutDialog.java 14 Jun 2002 22:23:48 -0000 1.2
@@ -42,90 +42,90 @@
* 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();
+ 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());
+ java.awt.GridBagConstraints gridBagConstraints1;
+
+ aboutPanel.setMinimumSize(new java.awt.Dimension(300, 200));
+ aboutPanel.setPreferredSize(new java.awt.Dimension(300, 200));
+ titlePanel.setLayout(new java.awt.GridBagLayout());
+ java.awt.GridBagConstraints gridBagConstraints2;
+
+ titleLabel.setFont(new java.awt.Font("Dialog", 1, 24));
+ titleLabel.setText("SwapDV");
+ titleLabel.setIconTextGap(8);
+ gridBagConstraints2 = new java.awt.GridBagConstraints();
+ gridBagConstraints2.gridx = 0;
+ gridBagConstraints2.gridy = 0;
+ gridBagConstraints2.fill = java.awt.GridBagConstraints.HORIZONTAL;
+ gridBagConstraints2.insets = new java.awt.Insets(8, 8, 0, 0);
+ gridBagConstraints2.anchor = java.awt.GridBagConstraints.WEST;
+ gridBagConstraints2.weightx = 1.0;
+ titlePanel.add(titleLabel, gridBagConstraints2);
+
+ versionLabel.setFont(new java.awt.Font("Dialog", 1, 18));
+ versionLabel.setText("V0.00");
+ gridBagConstraints2 = new java.awt.GridBagConstraints();
+ gridBagConstraints2.gridx = 1;
+ gridBagConstraints2.gridy = 0;
+ gridBagConstraints2.insets = new java.awt.Insets(8, 4, 0, 8);
+ gridBagConstraints2.anchor = java.awt.GridBagConstraints.EAST;
+ titlePanel.add(versionLabel, gridBagConstraints2);
+
+ gridBagConstraints1 = new java.awt.GridBagConstraints();
+ gridBagConstraints1.gridx = 0;
+ gridBagConstraints1.gridy = 0;
+ gridBagConstraints1.fill = java.awt.GridBagConstraints.HORIZONTAL;
+ gridBagConstraints1.insets = new java.awt.Insets(4, 16, 0, 16);
+ gridBagConstraints1.anchor = java.awt.GridBagConstraints.NORTH;
+ gridBagConstraints1.weightx = 1.0;
+ aboutPanel.add(titlePanel, gridBagConstraints1);
+
+ jLabel2.setFont(new java.awt.Font("Dialog", 0, 12));
+ jLabel2.setText("<HTML><HR WIDTH=\"100%\" SIZE=0 NOSHADE><FONT SIZE=\"-1\">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>See EULA.txt, included with SwapDV, for the terms and conditions of use. <BR>For more information, visit http://www.swapdv.net</FONT></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);
+ gridBagConstraints1 = new java.awt.GridBagConstraints();
+ gridBagConstraints1.gridx = 0;
+ gridBagConstraints1.gridy = 1;
+ gridBagConstraints1.fill = java.awt.GridBagConstraints.HORIZONTAL;
+ gridBagConstraints1.ipady = 80;
+ gridBagConstraints1.insets = new java.awt.Insets(0, 16, 0, 16);
+ gridBagConstraints1.weightx = 1.0;
+ gridBagConstraints1.weighty = 1.0;
+ aboutPanel.add(jLabel2, gridBagConstraints1);
+
+ 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);
+ }
+ });
+
+ gridBagConstraints1 = new java.awt.GridBagConstraints();
+ gridBagConstraints1.gridx = 0;
+ gridBagConstraints1.gridy = 2;
+ gridBagConstraints1.insets = new java.awt.Insets(16, 4, 8, 4);
+ gridBagConstraints1.anchor = java.awt.GridBagConstraints.SOUTH;
+ gridBagConstraints1.weightx = 1.0;
+ aboutPanel.add(okButton, gridBagConstraints1);
+
+ getContentPane().add(aboutPanel, java.awt.BorderLayout.CENTER);
+
+ pack();
}//GEN-END:initComponents
private void okButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_okButtonActionPerformed
@@ -134,12 +134,12 @@
// 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 titleLabel;
+ private javax.swing.JLabel versionLabel;
private javax.swing.JLabel jLabel2;
+ private javax.swing.JButton okButton;
// End of variables declaration//GEN-END:variables
}
|
|
From: Jonathan T. <jo...@us...> - 2002-06-14 21:57:43
|
Update of /cvsroot/swapdv/swapdv In directory usw-pr-cvs1:/tmp/cvs-serv8234 Modified Files: RELEASE_NOTES.txt Log Message: gnutella comment Index: RELEASE_NOTES.txt =================================================================== RCS file: /cvsroot/swapdv/swapdv/RELEASE_NOTES.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- RELEASE_NOTES.txt 14 Jun 2002 21:41:59 -0000 1.2 +++ RELEASE_NOTES.txt 14 Jun 2002 21:57:40 -0000 1.3 @@ -16,3 +16,7 @@ ----- * Downloading more resiliant to prevent stalling * Many reported bugs + +Removed: +-------- +* Gnutella support |
|
From: Jonathan T. <jo...@us...> - 2002-06-14 21:51:56
|
Update of /cvsroot/swapdv/swapdv In directory usw-pr-cvs1:/tmp/cvs-serv6758 Modified Files: README.txt Log Message: 0.7 changes Index: README.txt =================================================================== RCS file: /cvsroot/swapdv/swapdv/README.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- README.txt 11 May 2002 00:22:44 -0000 1.1 +++ README.txt 14 Jun 2002 21:51:53 -0000 1.2 @@ -1,92 +1,102 @@ -SwapDV - P2P Digital Video Server with support for ReplayTVs -(c) FX Palo Alto Laboratory, Inc. - -For the latest information please visit http://swapdv.sourceforge.net/ or email sw...@fx... - - -Installing ----------- -Unzip this archive to a suitable directory. No further installation is required. - -Requirements ------------- -SwapDV should run on any Java-enabled platform (Unix/Windows/Mac) - -This release of SwapDV requires a Java Virtual Machine version 1.3. or above. We recommend you download and install the Sun JRE 1.3.1. from http://java.sun.com/j2se/1.3/download.html - -Running -------- -On Windows platforms: -* double-click on "SwapDV.jar" -On Unix platforms: -* run "java -jar SwapDV.jar" -On Mac OS X platforms: -* double click on "SwapDV.jar" runs as a *client only* (because a regular user can't open port 80) -* From "Terminal", enter the Unix command: "sudo java -jar SwapDV.jar" and enter the admin password when prompted - - -Using SwapDV ------------- -The first time you run SwapDV it will prompt you for a directory to store the SwapDV library files in (the videos, show information etc.). Use the folder browser to select or create one. - -The main SwapDV window has 3 tabs: - -* Shows & Channels - this lists the digital video content being served by your SwapDV server -* Downloads - this lists the digital video currently being downloaded from external SwapDV servers or ReplayTV boxes -* Uploads - this lists the shows being downloaded by other SwapDV servers from you - -Right clicking on the rows in any of the tables in these tabs provides further options. - -The File menu has 4 items: -* Select MPEG Player - specify the Mpeg player used to play back videos locally -* Auto-save changes - when checked any changes to the shows and channels are saved immediately -* Save changes - if auto-save is disabled this saves the current show & channel guide -* Quit - quit - -The Download menu has 4 items: -* Browse detected - this submenu allows you to browse the contents of other local SwapDv and ReplayTV servers detected on the network -* Browse recent - this submenu lists SwapDV and ReplayTV servers you have recently browsed -* Browse - specify the IP address of a remote SwapDV or ReplayTV box and browse its contents -* Search - search other SwapDV applications using the Gnutella network - -The Sharing menu has 3 items: -* Start/Stop server - starts and stops the SwapDV/ReplayTV server (normally on port 80) -This allows ReplayTV boxes on your network to "see" the SwapDV server as another ReplayTV box on the network. You can then play content back on your replayTV directly from this server -*IMPORTANT* The SwapDV server MUST run on port 80. This means that you need to stop any other web-servers running on the local machine if you want to enable this functionality. -* Restart server on startup - configures whether the SwapDV server should automatically start when SwapDV runs -* Advanced->Server log - displays a log of server and SwapDV messages -* Advanced->Server Configuration - change various SwapDV server and Gnutella configuration options -* Advanced->SwapDV proxies - make another ReplayTV in a different subnet available to ReplayTV boxes on this network - -The Show menu has 5 items (also available by right clicking on a show in the shows & channels tab): -* Play - play the show locally on the machine using the configured mpeg2 player (see File menu) -* Edit - edits the shows information -* Move to channel - changes the shows channel -* Advanced->Export show... - saves the show information into 3 files necessary for swapping or archiving -* Delete - deletes the show from the guide (and also deletes the corresponding video files on the disk) - -The Channel menu has 4 items (also available by right clicking on a channel in the shows & channels tab): -* Add channel - adds a new channel to the channel list -* Edit - TBD -* Advanced->Import show... - loads and adds a show to this channel. Requires at least the .ndx and .mpg parts of the show -* Delete - deletes the channel AND shows associated with the channel - -Dragging and dropping: -SwapDV supports various drag and drop operations. -You can drag shows or channels from a browsed remote swapdv/replaytv server onto shows & channels to download them -You can drag shows in your shows & channels tab onto a channel to change their channel. - -Removing --------- -Delete the SwapDV.jar and all .txt -Locate the directory you chose to store the SwapDV contents in and delete it. - -Known bugs ----------- -* ? - -Playing Mpegs on the PC/Mac/Unix box ------------------------------------- -The Replay videos are MPEG2 files, with a slightly unusual format. The following players have been recommended as working well with these videos: -* PC, Try the elcard player, available from http://www.elecard.com/ +SwapDV - P2P Digital Video Server with support for ReplayTVs +(c) FX Palo Alto Laboratory, Inc. + +For the latest information please visit http://swapdv.sourceforge.net/ or email sw...@fx... + +Installing +---------- +Unzip this archive to a suitable directory. No further installation is required. + +Requirements +------------ +SwapDV should run on any Java-enabled platform (Unix/Windows/Mac) + +This release of SwapDV requires a Java Virtual Machine version 1.3. or above. We recommend you download and install the Sun JRE 1.4 from http://java.sun.com/j2se/1.4/download.html + +Running +------- +On Windows platforms: +* double-click on "SwapDV.jar" +On Unix platforms: +* run "java -jar SwapDV.jar" +On Mac OS X platforms: +* double click on "SwapDV.jar" runs as a *client only* (because a regular user can't open port 80) +* From "Terminal", enter the Unix command: "sudo java -jar SwapDV.jar" and enter the admin password when prompted + +Using SwapDV +------------ +The first time you run SwapDV it will prompt you for a directory to store the SwapDV library files in (the videos, show information etc.). Use the folder browser to select or create one. + +The main SwapDV window has 3 tabs: + +* Shows & Channels - this lists the digital video content being served by your SwapDV server +* Downloads - this lists the digital video currently being downloaded from external SwapDV servers or ReplayTV boxes +* Uploads - this lists the shows being downloaded by other SwapDV servers from you + +Right clicking on the rows in any of the tables or tree elements in these tabs provides further options. + +The File menu has 4 items: +* Select MPEG Player - specify the Mpeg player used to play back videos locally +* Auto-save changes - when checked any changes to the shows and channels are saved immediately +* Save changes - if auto-save is disabled this saves the current show & channel guide +* Quit - quit + +The Edit->Category menu has 3 items (also available by right clicking on a channel in the shows & channels tab): +* Add - adds a new category +* Rename - renames the category +* Delete - deletes the category. All channels and shows are moved to the "uncategorized" category + +The Edit->Channel menu has 5 items (also available by right clicking on a channel in the shows & channels tab): +* Add channel - adds a new channel to the channel list +* Move to category - changes the category of that channel (and all shows in it) +* Rename - change the channel name +* Advanced->Import show... - loads and adds a show to this channel. Requires at least the .ndx and .mpg parts of the show +* Delete - deletes the channel AND shows associated with the channel + +The Edit->Show menu has 5 items (also available by right clicking on a show in the shows & channels tab): +* Play - play the show locally on the machine using the configured mpeg2 player (see File menu) +* Edit - edits the shows information +* Move to channel - changes the shows channel +* Advanced->Export show... - saves the show information into 3 files necessary for swapping or archiving +* Delete - deletes the show from the guide (and also deletes the corresponding video files on the disk) + +The Connect menu has 4 items: +* Browse detected - this submenu allows you to browse the contents of other local SwapDv and ReplayTV servers detected on the network +* Browse recent - this submenu lists SwapDV and ReplayTV servers you have recently browsed +* Browse - specify the IP address of a remote SwapDV or ReplayTV box and browse its contents + +The Server menu has 3 items: +* Start/Stop server - starts and stops the SwapDV/ReplayTV server (normally on port 80) +This allows ReplayTV boxes on your network to "see" the SwapDV server as another ReplayTV box on the network. You can then play content back on your replayTV directly from this server +*IMPORTANT* The SwapDV server MUST run on port 80. This means that you need to stop any other web-servers running on the local machine if you want to enable this functionality. +* Restart server on startup - configures whether the SwapDV server should automatically start when SwapDV runs +* Advanced->Server log - displays a log of server and SwapDV messages +* Advanced->Server Configuration - change various SwapDV server and Gnutella configuration options +* Advanced->SwapDV proxies - make another ReplayTV in a different subnet available to ReplayTV boxes on this network + +The Scheduler menu has 2 items: +* Schedule new event - brings up a wizard to create a new event +* Schedule events manager - allows you to manage and edit existing events +See README.scheduler for more information on scheduling events + +Dragging and dropping: +SwapDV supports various drag and drop operations. +You can drag shows or channels from a browsed remote swapdv/replaytv server onto shows & channels to download them +You can drag shows in your shows & channels tab onto a channel to change their channel. +You can drag channels between categories. +... and so on. + +Removing +-------- +Delete the SwapDV.jar and all .txt +Locate the directory you chose to store the SwapDV contents in and delete it. + +Known bugs +---------- +* ? + +Playing Mpegs on the PC/Mac/Unix box +------------------------------------ +The Replay videos are MPEG2 files, with a slightly unusual format. The following players have been recommended as working well with these videos: +* PC, Try the elcard player, available from http://www.elecard.com/ * Mac, MacOS X with the VLC application available from http://www.videolan.org/vlc/macosx.html |
|
From: Gerry D. <gd...@us...> - 2002-06-14 21:47:59
|
Update of /cvsroot/swapdv/swapdv
In directory usw-pr-cvs1:/tmp/cvs-serv5795
Added Files:
aboutDialog.form
Log Message:
Forgot .form for new aboutDialog.java
--- NEW FILE ---
<?xml version="1.0" encoding="UTF-8" ?>
<Form version="1.0" type="org.netbeans.modules.form.forminfo.JFrameFormInfo">
<Properties>
<Property name="title" type="java.lang.String" value="About SwapDV"/>
<Property name="resizable" type="boolean" value="false"/>
<Property name="undecorated" type="boolean" value="true"/>
</Properties>
<SyntheticProperties>
<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="1"/>
<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,0,-22,0,0,2,67"/>
</SyntheticProperties>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
<SubComponents>
<Container class="javax.swing.JPanel" name="aboutPanel">
<Properties>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[300, 200]"/>
</Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[300, 200]"/>
</Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
<BorderConstraints direction="Center"/>
</Constraint>
</Constraints>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
<SubComponents>
<Container class="javax.swing.JPanel" name="titlePanel">
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
<GridBagConstraints gridX="0" gridY="0" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="16" insetsBottom="0" insetsRight="16" anchor="11" weightX="1.0" weightY="0.0"/>
</Constraint>
</Constraints>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
<SubComponents>
<Component class="javax.swing.JLabel" name="titleLabel">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Dialog" size="24" style="1"/>
</Property>
<Property name="text" type="java.lang.String" value="SwapDV"/>
<Property name="iconTextGap" type="int" value="8"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
<GridBagConstraints gridX="0" gridY="0" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="8" insetsLeft="8" insetsBottom="0" insetsRight="0" anchor="17" weightX="1.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JLabel" name="versionLabel">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Dialog" size="18" style="1"/>
</Property>
<Property name="text" type="java.lang.String" value="V0.00"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
<GridBagConstraints gridX="1" gridY="0" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="8" insetsLeft="4" insetsBottom="0" insetsRight="8" anchor="13" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
</SubComponents>
</Container>
<Component class="javax.swing.JLabel" name="jLabel2">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Dialog" size="12" style="0"/>
</Property>
<Property name="text" type="java.lang.String" value="<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>"/>
<Property name="verticalAlignment" type="int" value="1"/>
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[1000, 1000]"/>
</Property>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[200, 100]"/>
</Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[400, 300]"/>
</Property>
<Property name="verticalTextPosition" type="int" value="1"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
<GridBagConstraints gridX="0" gridY="1" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="80" insetsTop="0" insetsLeft="16" insetsBottom="0" insetsRight="16" anchor="10" weightX="1.0" weightY="1.0"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JButton" name="okButton">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Dialog" size="12" style="0"/>
</Property>
<Property name="text" type="java.lang.String" value="Ok"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="okButtonActionPerformed"/>
</Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
<GridBagConstraints gridX="0" gridY="2" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="16" insetsLeft="4" insetsBottom="8" insetsRight="4" anchor="15" weightX="1.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
</SubComponents>
</Container>
</SubComponents>
</Form>
|
|
From: Gerry D. <gd...@us...> - 2002-06-14 21:47:09
|
Update of /cvsroot/swapdv/swapdv/Scheduler/queue
In directory usw-pr-cvs1:/tmp/cvs-serv5411/Scheduler/queue
Modified Files:
schdEvent.java
Log Message:
Fix scheduler time bug, add about dialog w/Version and fix typos
Index: schdEvent.java
===================================================================
RCS file: /cvsroot/swapdv/swapdv/Scheduler/queue/schdEvent.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- schdEvent.java 11 Jun 2002 15:50:04 -0000 1.9
+++ schdEvent.java 14 Jun 2002 21:47:05 -0000 1.10
@@ -349,12 +349,12 @@
GregorianCalendar theTime = new GregorianCalendar();
theTime.setTime(theDate);
- return (theTime.get(GregorianCalendar.HOUR) * 60) + theTime.get(GregorianCalendar.MINUTE);
+ return (theTime.get(GregorianCalendar.HOUR_OF_DAY) * 60) + theTime.get(GregorianCalendar.MINUTE);
}
// Return time of day in minute since midnight for the passed calendar
private int getTimeOfDay(GregorianCalendar theTime) {
- return (theTime.get(GregorianCalendar.HOUR) * 60) + theTime.get(GregorianCalendar.MINUTE);
+ return (theTime.get(GregorianCalendar.HOUR_OF_DAY) * 60) + theTime.get(GregorianCalendar.MINUTE);
}
/** check to see if the event is considered runnable at this time.
|
|
From: Gerry D. <gd...@us...> - 2002-06-14 21:47:08
|
Update of /cvsroot/swapdv/swapdv/Scheduler/wizards
In directory usw-pr-cvs1:/tmp/cvs-serv5411/Scheduler/wizards
Modified Files:
deleteShowTimePanel.java newShowTimePanel.form
newShowTimePanel.java
Log Message:
Fix scheduler time bug, add about dialog w/Version and fix typos
Index: deleteShowTimePanel.java
===================================================================
RCS file: /cvsroot/swapdv/swapdv/Scheduler/wizards/deleteShowTimePanel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- deleteShowTimePanel.java 12 Jun 2002 01:27:15 -0000 1.1
+++ deleteShowTimePanel.java 14 Jun 2002 21:47:05 -0000 1.2
@@ -23,7 +23,7 @@
/** Creates new form newShowTimePanel */
public deleteShowTimePanel() {
- super("Choose time of day", "Choose what time of the day and what days in the week you want SwapDV to scan for shows to delete.<BR><P>Times is in 12 hour, AM/PM format (i.e. 9:15 AM or 11:30 PM).<BR><P>Days of the week allow you to delete shows only on days you choose.");
+ super("Choose time of day", "Choose what time of the day and what days in the week you want SwapDV to scan for shows to delete.<BR><P>Times are in 12 hour, AM/PM format (i.e. 9:15 AM or 11:30 PM).<BR><P>Days of the week allow you to delete shows only on days you choose.");
initComponents();
}
Index: newShowTimePanel.form
===================================================================
RCS file: /cvsroot/swapdv/swapdv/Scheduler/wizards/newShowTimePanel.form,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- newShowTimePanel.form 8 Jun 2002 21:29:05 -0000 1.1
+++ newShowTimePanel.form 14 Jun 2002 21:47:05 -0000 1.2
@@ -175,7 +175,6 @@
<Font name="Dialog" size="12" style="0"/>
</Property>
<Property name="selected" type="boolean" value="true"/>
- <Property name="toolTipText" type="java.lang.String" value="null"/>
<Property name="horizontalAlignment" type="int" value="0"/>
</Properties>
</Component>
Index: newShowTimePanel.java
===================================================================
RCS file: /cvsroot/swapdv/swapdv/Scheduler/wizards/newShowTimePanel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- newShowTimePanel.java 8 Jun 2002 21:29:05 -0000 1.1
+++ newShowTimePanel.java 14 Jun 2002 21:47:05 -0000 1.2
@@ -23,7 +23,7 @@
/** Creates new form newShowTimePanel */
public newShowTimePanel() {
- super("Choose time of day", "Choose what time of the day and what days in the week you want SwapDV to scan for new shows.<BR><P>Times is in 12 hour, AM/PM format (i.e. 9:15 AM or 11:30 PM).<BR><P>Days of the week allow you to copy new shows only on days you choose.");
+ super("Choose time of day", "Choose what time of the day and what days in the week you want SwapDV to scan for new shows.<BR><P>Times are in 12 hour, AM/PM format (i.e. 9:15 AM or 11:30 PM).<BR><P>Days of the week allow you to copy new shows only on days you choose.");
initComponents();
}
|
|
From: Gerry D. <gd...@us...> - 2002-06-14 21:47:08
|
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 & Channels" toolTip=""/>
+ <JTabbedPaneConstraints tabName="Shows & Channels" toolTip="">
+ <Property name="tabTitle" type="java.lang.String" value="Shows & 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
}
|
