diff options
author | LISA STILLWELL <lisa@dhcp152-54-6-218.wireless.europa.renci.org> | 2012-07-02 16:18:55 (GMT) |
---|---|---|
committer | LISA STILLWELL <lisa@dhcp152-54-6-218.wireless.europa.renci.org> | 2012-07-02 16:18:55 (GMT) |
commit | 29a72885d9a251d65f522ccfa5e570684c90b67e (patch) | |
tree | 6c925f4417a55433c7e2852206e9b02725d9bc2d /idrop-lite | |
parent | e38a0ab57c642d295281f7c3775b3ec4460212f4 (diff) | |
download | QCG-Data-29a72885d9a251d65f522ccfa5e570684c90b67e.zip QCG-Data-29a72885d9a251d65f522ccfa5e570684c90b67e.tar.gz QCG-Data-29a72885d9a251d65f522ccfa5e570684c90b67e.tar.bz2 |
[#615] updated applet upload mode with latest changes 6/19/12 by S Oliver - iPlant
Diffstat (limited to 'idrop-lite')
3 files changed, 112 insertions, 28 deletions
diff --git a/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/iDropLiteApplet.form b/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/iDropLiteApplet.form index 8415bdb..7ac96bb 100644 --- a/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/iDropLiteApplet.form +++ b/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/iDropLiteApplet.form @@ -999,6 +999,9 @@ </Component> <Component class="javax.swing.JButton" name="btnUploadMove"> <Properties> + <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor"> + <Font name="Lucida Grande" size="11" style="0"/> + </Property> <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> <Image iconType="3" name="/org/irods/jargon/idrop/lite/images/icon_idroplite_addtoqueue.png"/> </Property> @@ -1418,7 +1421,7 @@ <Component class="javax.swing.JLabel" name="jLabel8"> <Properties> <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor"> - <Font name="Lucida Grande" size="11" style="0"/> + <Font name="Lucida Grande" size="12" style="0"/> </Property> <Property name="horizontalAlignment" type="int" value="2"/> <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> @@ -1469,6 +1472,9 @@ <Component class="javax.swing.JTextField" name="txtIRODSUploadDest"> <Properties> <Property name="editable" type="boolean" value="false"/> + <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor"> + <Font name="Lucida Grande" size="11" style="0"/> + </Property> <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> <ResourceString bundle="org/irods/jargon/idrop/lite/Bundle.properties" key="iDropLiteApplet.txtIRODSUploadDest.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> </Property> @@ -1478,7 +1484,6 @@ </Border> </Property> <Property name="dragEnabled" type="boolean" value="false"/> - <Property name="opaque" type="boolean" value="true"/> </Properties> <Events> <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="txtIRODSUploadDestActionPerformed"/> @@ -1569,8 +1574,13 @@ <SubComponents> <Container class="javax.swing.JPanel" name="jPanel1"> <Properties> + <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor"> + <Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo"> + <EmptyBorder bottom="2" left="6" right="0" top="2"/> + </Border> + </Property> <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[400, 38]"/> + <Dimension value="[450, 38]"/> </Property> </Properties> <Constraints> @@ -1579,36 +1589,67 @@ </Constraint> </Constraints> - <Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/> + <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/> <SubComponents> - <Component class="javax.swing.JTextField" name="txtDownloadTarget"> + <Component class="javax.swing.JLabel" name="jLabel2"> <Properties> <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor"> <Font name="Lucida Grande" size="12" style="0"/> </Property> <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> + <ResourceString bundle="org/irods/jargon/idrop/lite/Bundle.properties" key="iDropLiteApplet.jLabel2.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> + </Property> + </Properties> + <Constraints> + <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription"> + <BorderConstraints direction="West"/> + </Constraint> + </Constraints> + </Component> + <Component class="javax.swing.JTextField" name="txtDownloadTarget"> + <Properties> + <Property name="editable" type="boolean" value="false"/> + <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor"> + <Font name="Lucida Grande" size="11" style="0"/> + </Property> + <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> <ResourceString bundle="org/irods/jargon/idrop/lite/Bundle.properties" key="iDropLiteApplet.txtDownloadTarget.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> </Property> + <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor"> + <Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo"> + <EmptyBorder/> + </Border> + </Property> <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[300, 28]"/> + <Dimension value="[20, 28]"/> </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> </Component> <Component class="javax.swing.JButton" name="btnBrowseDownloadTarget"> <Properties> <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor"> - <Font name="Lucida Grande" size="12" style="0"/> + <Font name="Lucida Grande" size="11" style="0"/> </Property> <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> <ResourceString bundle="org/irods/jargon/idrop/lite/Bundle.properties" key="iDropLiteApplet.btnBrowseDownloadTarget.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> </Property> <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[80, 29]"/> + <Dimension value="[140, 30]"/> </Property> </Properties> <Events> <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnBrowseDownloadTargetActionPerformed"/> </Events> + <Constraints> + <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription"> + <BorderConstraints direction="East"/> + </Constraint> + </Constraints> </Component> </SubComponents> </Container> @@ -1673,6 +1714,11 @@ </Container> <Container class="javax.swing.JPanel" name="jPanel4"> <Properties> + <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor"> + <Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo"> + <EmptyBorder bottom="8" left="0" right="4" top="0"/> + </Border> + </Property> <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> <Dimension value="[160, 40]"/> </Property> @@ -1683,15 +1729,26 @@ </Constraint> </Constraints> - <Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/> + <Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"> + <Property name="alignment" type="int" value="2"/> + </Layout> <SubComponents> <Component class="javax.swing.JButton" name="bntBeginDownload"> <Properties> <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor"> - <Font name="Lucida Grande" size="12" style="0"/> + <Font name="Lucida Grande" size="11" style="0"/> </Property> - <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> - <ResourceString bundle="org/irods/jargon/idrop/lite/Bundle.properties" key="iDropLiteApplet.bntBeginDownload.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> + <Property name="label" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> + <ResourceString bundle="org/irods/jargon/idrop/lite/Bundle.properties" key="iDropLiteApplet.bntBeginDownload.label" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> + </Property> + <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[101, 30]"/> + </Property> + <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[101, 30]"/> + </Property> + <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[101, 33]"/> </Property> </Properties> <Events> diff --git a/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/iDropLiteApplet.java b/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/iDropLiteApplet.java index 5544dca..09b53b5 100644 --- a/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/iDropLiteApplet.java +++ b/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/iDropLiteApplet.java @@ -359,12 +359,22 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat break; case 2: log.info(">>>>>>>>>upload picker display mode"); + // need to make upload destination text box background invisible here since + // Netbeans GUI builder will not preserve correct setting + txtIRODSUploadDest.setBackground(new Color(0, 0, 0, 0)); + txtIRODSUploadDest.setOpaque(false); + cl.show(testCardPanel, "card3"); populateUploadDestination(); setupProgressTable(); break; case 3: log.info(">>>>>>>>>shopping cart display mode 3"); + // need to make download destination text box background invisible here since + // Netbeans GUI builder will not preserve correct setting + txtDownloadTarget.setBackground(new Color(0, 0, 0, 0)); + txtDownloadTarget.setOpaque(false); + dlgLocalFileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); cl.show(testCardPanel, "card4"); setupProgressTable(); @@ -1533,6 +1543,7 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat pnlOperationMode3 = new javax.swing.JPanel(); pnlDownloadModeTarget = new javax.swing.JPanel(); jPanel1 = new javax.swing.JPanel(); + jLabel2 = new javax.swing.JLabel(); txtDownloadTarget = new javax.swing.JTextField(); btnBrowseDownloadTarget = new javax.swing.JButton(); jPanel2 = new javax.swing.JPanel(); @@ -1863,7 +1874,7 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat jPanel8.setPreferredSize(new java.awt.Dimension(285, 20)); jPanel8.setLayout(new java.awt.FlowLayout(java.awt.FlowLayout.LEFT)); - jLabel6.setFont(new java.awt.Font("Lucida Grande", 1, 13)); // NOI18N + jLabel6.setFont(new java.awt.Font("Lucida Grande", 1, 13)); jLabel6.setText(org.openide.util.NbBundle.getMessage(iDropLiteApplet.class, "iDropLiteApplet.jLabel6.text")); // NOI18N jLabel6.setPreferredSize(new java.awt.Dimension(150, 17)); jPanel8.add(jLabel6); @@ -1904,7 +1915,7 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat jPanel10.setPreferredSize(new java.awt.Dimension(310, 20)); jPanel10.setLayout(new java.awt.FlowLayout(java.awt.FlowLayout.LEFT)); - jLabel7.setFont(new java.awt.Font("Lucida Grande", 1, 13)); // NOI18N + jLabel7.setFont(new java.awt.Font("Lucida Grande", 1, 13)); jLabel7.setText(org.openide.util.NbBundle.getMessage(iDropLiteApplet.class, "iDropLiteApplet.jLabel7.text")); // NOI18N jPanel10.add(jLabel7); @@ -1963,6 +1974,7 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat }); pnlUploadRefreshButton.add(btnUploadLocalRefresh); + btnUploadMove.setFont(new java.awt.Font("Lucida Grande", 0, 11)); // NOI18N btnUploadMove.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/irods/jargon/idrop/lite/images/icon_idroplite_addtoqueue.png"))); // NOI18N btnUploadMove.setText(org.openide.util.NbBundle.getMessage(iDropLiteApplet.class, "iDropLiteApplet.btnUploadMove.text")); // NOI18N btnUploadMove.setMargin(new java.awt.Insets(0, 0, 0, 0)); @@ -2121,7 +2133,7 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat pnlUploadToolStatus.setRequestFocusEnabled(false); pnlUploadToolStatus.setLayout(new java.awt.BorderLayout()); - lblUploadTotalFiles.setFont(new java.awt.Font("Lucida Grande", 0, 12)); // NOI18N + lblUploadTotalFiles.setFont(new java.awt.Font("Lucida Grande", 0, 12)); lblUploadTotalFiles.setText(org.openide.util.NbBundle.getMessage(iDropLiteApplet.class, "iDropLiteApplet.lblUploadTotalFiles.text")); // NOI18N lblUploadTotalFiles.setBorder(javax.swing.BorderFactory.createEmptyBorder(4, 0, 0, 0)); lblUploadTotalFiles.setMaximumSize(new java.awt.Dimension(122, 24)); @@ -2129,7 +2141,7 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat lblUploadTotalFiles.setPreferredSize(new java.awt.Dimension(122, 30)); pnlUploadToolStatus.add(lblUploadTotalFiles, java.awt.BorderLayout.NORTH); - lblUploadTotalSize.setFont(new java.awt.Font("Lucida Grande", 0, 12)); // NOI18N + lblUploadTotalSize.setFont(new java.awt.Font("Lucida Grande", 0, 12)); lblUploadTotalSize.setText(org.openide.util.NbBundle.getMessage(iDropLiteApplet.class, "iDropLiteApplet.lblUploadTotalSize.text")); // NOI18N lblUploadTotalSize.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 6, 0)); lblUploadTotalSize.setPreferredSize(new java.awt.Dimension(83, 30)); @@ -2197,12 +2209,11 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat }); pnlIRODSUploadBrowse.add(btnBrowseIRODSUploadDest, java.awt.BorderLayout.EAST); - txtIRODSUploadDest.setBackground(new Color(0, 0, 0, 0)); txtIRODSUploadDest.setEditable(false); + txtIRODSUploadDest.setFont(new java.awt.Font("Lucida Grande", 0, 11)); // NOI18N txtIRODSUploadDest.setText(org.openide.util.NbBundle.getMessage(iDropLiteApplet.class, "iDropLiteApplet.txtIRODSUploadDest.text")); // NOI18N txtIRODSUploadDest.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 5, 0, 0)); txtIRODSUploadDest.setDragEnabled(false); - txtIRODSUploadDest.setOpaque(false); txtIRODSUploadDest.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { txtIRODSUploadDestActionPerformed(evt); @@ -2251,22 +2262,30 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat pnlDownloadModeTarget.setPreferredSize(new java.awt.Dimension(700, 40)); pnlDownloadModeTarget.setLayout(new java.awt.BorderLayout()); - jPanel1.setPreferredSize(new java.awt.Dimension(400, 38)); + jPanel1.setBorder(javax.swing.BorderFactory.createEmptyBorder(2, 6, 2, 0)); + jPanel1.setPreferredSize(new java.awt.Dimension(450, 38)); + jPanel1.setLayout(new java.awt.BorderLayout()); - txtDownloadTarget.setFont(new java.awt.Font("Lucida Grande", 0, 12)); + jLabel2.setFont(new java.awt.Font("Lucida Grande", 0, 12)); // NOI18N + jLabel2.setText(org.openide.util.NbBundle.getMessage(iDropLiteApplet.class, "iDropLiteApplet.jLabel2.text")); // NOI18N + jPanel1.add(jLabel2, java.awt.BorderLayout.WEST); + + txtDownloadTarget.setEditable(false); + txtDownloadTarget.setFont(new java.awt.Font("Lucida Grande", 0, 11)); // NOI18N txtDownloadTarget.setText(org.openide.util.NbBundle.getMessage(iDropLiteApplet.class, "iDropLiteApplet.txtDownloadTarget.text")); // NOI18N - txtDownloadTarget.setPreferredSize(new java.awt.Dimension(300, 28)); - jPanel1.add(txtDownloadTarget); + txtDownloadTarget.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 1, 1, 1)); + txtDownloadTarget.setPreferredSize(new java.awt.Dimension(20, 28)); + jPanel1.add(txtDownloadTarget, java.awt.BorderLayout.CENTER); - btnBrowseDownloadTarget.setFont(new java.awt.Font("Lucida Grande", 0, 12)); + btnBrowseDownloadTarget.setFont(new java.awt.Font("Lucida Grande", 0, 11)); // NOI18N btnBrowseDownloadTarget.setText(org.openide.util.NbBundle.getMessage(iDropLiteApplet.class, "iDropLiteApplet.btnBrowseDownloadTarget.text")); // NOI18N - btnBrowseDownloadTarget.setPreferredSize(new java.awt.Dimension(80, 29)); + btnBrowseDownloadTarget.setPreferredSize(new java.awt.Dimension(140, 30)); btnBrowseDownloadTarget.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { btnBrowseDownloadTargetActionPerformed(evt); } }); - jPanel1.add(btnBrowseDownloadTarget); + jPanel1.add(btnBrowseDownloadTarget, java.awt.BorderLayout.EAST); pnlDownloadModeTarget.add(jPanel1, java.awt.BorderLayout.WEST); @@ -2294,10 +2313,15 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat pnlDownloadButtons.setLayout(new java.awt.BorderLayout()); pnlDownloadButtons.add(jPanel3, java.awt.BorderLayout.WEST); + jPanel4.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 8, 4)); jPanel4.setPreferredSize(new java.awt.Dimension(160, 40)); + jPanel4.setLayout(new java.awt.FlowLayout(java.awt.FlowLayout.RIGHT)); - bntBeginDownload.setFont(new java.awt.Font("Lucida Grande", 0, 12)); - bntBeginDownload.setText(org.openide.util.NbBundle.getMessage(iDropLiteApplet.class, "iDropLiteApplet.bntBeginDownload.text")); // NOI18N + bntBeginDownload.setFont(new java.awt.Font("Lucida Grande", 0, 11)); // NOI18N + bntBeginDownload.setLabel(org.openide.util.NbBundle.getMessage(iDropLiteApplet.class, "iDropLiteApplet.bntBeginDownload.label")); // NOI18N + bntBeginDownload.setMaximumSize(new java.awt.Dimension(101, 30)); + bntBeginDownload.setMinimumSize(new java.awt.Dimension(101, 30)); + bntBeginDownload.setPreferredSize(new java.awt.Dimension(101, 33)); bntBeginDownload.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { bntBeginDownloadActionPerformed(evt); @@ -2643,6 +2667,7 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat private javax.swing.JButton btnUploadMove; private javax.swing.JButton btnUploadUrl; private javax.swing.JLabel jLabel1; + private javax.swing.JLabel jLabel2; private javax.swing.JLabel jLabel5; private javax.swing.JLabel jLabel6; private javax.swing.JLabel jLabel7; diff --git a/idrop-lite/src/main/resources/org/irods/jargon/idrop/lite/Bundle.properties b/idrop-lite/src/main/resources/org/irods/jargon/idrop/lite/Bundle.properties index 99ab59f..20666f5 100644 --- a/idrop-lite/src/main/resources/org/irods/jargon/idrop/lite/Bundle.properties +++ b/idrop-lite/src/main/resources/org/irods/jargon/idrop/lite/Bundle.properties @@ -31,7 +31,7 @@ iDropLiteApplet.btnUploadBeginImport.text=Import Files iDropLiteApplet.btnUploadUrl.text=Import file from URL iDropLiteApplet.txtDownloadTarget.text= iDropLiteApplet.bntBeginDownload.text=Begin Download -iDropLiteApplet.btnBrowseDownloadTarget.text=Browse +iDropLiteApplet.btnBrowseDownloadTarget.text=Change Destination iDropLiteApplet.txtIdropWebModeDownloadTarget.text= iDropLiteApplet.btnIdropWebModeTargetBrowse.text=Browse iDropLiteApplet.btnIdropWebModeBeginDownload.text=Begin Download @@ -40,3 +40,5 @@ UploadFromURLDialog.jLabel1.text=Enter URL below (HTTP(S) or FTP only): UploadFromURLDialog.btnUploadDFromURL_Add.text=Add UploadFromURLDialog.btnUploadFromURL_Cancel.text=Cancel iDropLiteApplet.jLabel1.text=<html><p>Select a download location then click Begin Download</p></html> +iDropLiteApplet.jLabel2.text=Destination: +iDropLiteApplet.bntBeginDownload.label=Download |