diff options
author | LISA STILLWELL <lisa@simon.local> | 2012-06-29 20:44:46 (GMT) |
---|---|---|
committer | LISA STILLWELL <lisa@simon.local> | 2012-06-29 20:44:46 (GMT) |
commit | c8ff59dab1394893d957db652dd01108dfe33700 (patch) | |
tree | 09ae13e85caca036eb3bbbc3b2ecb497ac071b0a /idrop-lite | |
parent | 5e2c9e0099136b2e0cfd579bbcfdf17c98622fd0 (diff) | |
download | QCG-Data-c8ff59dab1394893d957db652dd01108dfe33700.zip QCG-Data-c8ff59dab1394893d957db652dd01108dfe33700.tar.gz QCG-Data-c8ff59dab1394893d957db652dd01108dfe33700.tar.bz2 |
[#615] updated applet upload mode with latest changes 6/19/12 by S Oliver - iPlant
Diffstat (limited to 'idrop-lite')
-rw-r--r-- | idrop-lite/src/main/java/org/irods/jargon/idrop/lite/iDropLiteApplet.form | 494 | ||||
-rw-r--r-- | idrop-lite/src/main/java/org/irods/jargon/idrop/lite/iDropLiteApplet.java | 320 | ||||
-rw-r--r-- | idrop-lite/src/main/java/org/irods/jargon/idrop/lite/images/icon_delete.png | bin | 0 -> 3118 bytes | |||
-rw-r--r-- | idrop-lite/src/main/java/org/irods/jargon/idrop/lite/images/icon_idroplite_addtoqueue.png | bin | 0 -> 3067 bytes | |||
-rw-r--r-- | idrop-lite/src/main/java/org/irods/jargon/idrop/lite/images/icon_idroplite_refresh.png | bin | 0 -> 3127 bytes | |||
-rw-r--r-- | idrop-lite/src/main/resources/org/irods/jargon/idrop/lite/Bundle.properties | 14 |
6 files changed, 397 insertions, 431 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 43a07e9..9248759 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 @@ -6,7 +6,7 @@ <Dimension value="[250, 200]"/> </Property> <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[700, 450]"/> + <Dimension value="[700, 490]"/> </Property> </Properties> <AuxValues> @@ -27,7 +27,7 @@ <Container class="javax.swing.JPanel" name="pnllSeems2BneededForCorrectResizing"> <Properties> <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[720, 450]"/> + <Dimension value="[720, 490]"/> </Property> </Properties> <Constraints> @@ -42,6 +42,11 @@ </Layout> <SubComponents> <Container class="javax.swing.JPanel" name="testCardPanel"> + <Properties> + <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[710, 490]"/> + </Property> + </Properties> <Layout class="org.netbeans.modules.form.compat2.layouts.DesignCardLayout"/> <SubComponents> @@ -56,7 +61,7 @@ <Dimension value="[250, 200]"/> </Property> <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[700, 450]"/> + <Dimension value="[700, 490]"/> </Property> </Properties> <Constraints> @@ -727,7 +732,7 @@ <Dimension value="[250, 200]"/> </Property> <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[700, 450]"/> + <Dimension value="[700, 490]"/> </Property> </Properties> <Constraints> @@ -755,7 +760,7 @@ <Container class="javax.swing.JPanel" name="jPanel8"> <Properties> <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[150, 27]"/> + <Dimension value="[200, 27]"/> </Property> <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> <Dimension value="[285, 20]"/> @@ -767,12 +772,14 @@ </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="0"/> + </Layout> <SubComponents> <Component class="javax.swing.JLabel" name="jLabel6"> <Properties> <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor"> - <Font name="Lucida Grande" size="14" style="0"/> + <Font name="Lucida Grande" size="13" style="1"/> </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.jLabel6.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> @@ -787,10 +794,10 @@ <Container class="javax.swing.JPanel" name="jPanel9"> <Properties> <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[80, 0]"/> + <Dimension value="[10, 0]"/> </Property> <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[80, 24]"/> + <Dimension value="[10, 24]"/> </Property> </Properties> <Constraints> @@ -802,7 +809,7 @@ <Layout> <DimensionLayout dim="0"> <Group type="103" groupAlignment="0" attributes="0"> - <EmptySpace min="0" pref="80" max="32767" attributes="0"/> + <EmptySpace min="0" pref="12" max="32767" attributes="0"/> </Group> </DimensionLayout> <DimensionLayout dim="1"> @@ -815,10 +822,10 @@ <Container class="javax.swing.JPanel" name="jPanel10"> <Properties> <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[252, 27]"/> + <Dimension value="[252, 20]"/> </Property> <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[310, 17]"/> + <Dimension value="[310, 20]"/> </Property> </Properties> <Constraints> @@ -827,12 +834,14 @@ </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="0"/> + </Layout> <SubComponents> <Component class="javax.swing.JLabel" name="jLabel7"> <Properties> <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor"> - <Font name="Lucida Grande" size="14" style="0"/> + <Font name="Lucida Grande" size="13" style="1"/> </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.jLabel7.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> @@ -849,7 +858,7 @@ <Dimension value="[250, 160]"/> </Property> <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[700, 385]"/> + <Dimension value="[700, 425]"/> </Property> </Properties> <Constraints> @@ -866,7 +875,7 @@ <Dimension value="[150, 0]"/> </Property> <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[285, 380]"/> + <Dimension value="[285, 420]"/> </Property> </Properties> <Constraints> @@ -883,9 +892,8 @@ <Dimension value="[280, 35]"/> </Property> <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[280, 100]"/> + <Dimension value="[280, 120]"/> </Property> - <Property name="requestFocusEnabled" type="boolean" value="false"/> </Properties> <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription"> @@ -948,7 +956,7 @@ <Dimension value="[0, 0]"/> </Property> <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[101, 29]"/> + <Dimension value="[101, 54]"/> </Property> <Property name="requestFocusEnabled" type="boolean" value="false"/> </Properties> @@ -958,43 +966,84 @@ </Constraint> </Constraints> - <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/> + <Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"> + <Property name="alignment" type="int" value="0"/> + <Property name="horizontalGap" type="int" value="2"/> + <Property name="verticalGap" type="int" value="6"/> + </Layout> <SubComponents> - <Component class="javax.swing.JButton" name="btnUploadUrl"> + <Component class="javax.swing.JButton" name="btnUploadLocalRefresh"> <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="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> + <Image iconType="3" name="/org/irods/jargon/idrop/lite/images/icon_idroplite_refresh.png"/> </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.btnUploadUrl.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> + <ResourceString bundle="org/irods/jargon/idrop/lite/Bundle.properties" key="iDropLiteApplet.btnUploadLocalRefresh.text" 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="[85, 34]"/> + </Property> + <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[85, 34]"/> + </Property> + <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[92, 34]"/> </Property> </Properties> <Events> - <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnUploadUrlActionPerformed"/> + <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnUploadLocalRefreshActionPerformed"/> </Events> - <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.JButton" name="btnUploadLocalRefresh"> + <Component class="javax.swing.JButton" name="btnUploadMove"> + <Properties> + <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> + <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.btnUploadMove.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> + </Property> + <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor"> + <Insets value="[0, 0, 0, 0]"/> + </Property> + <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[75, 34]"/> + </Property> + <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[75, 34]"/> + </Property> + <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[200, 34]"/> + </Property> + </Properties> + <Events> + <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnUploadMoveActionPerformed"/> + </Events> + </Component> + <Component class="javax.swing.JButton" name="btnUploadUrl"> <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.btnUploadLocalRefresh.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> + <ResourceString bundle="org/irods/jargon/idrop/lite/Bundle.properties" key="iDropLiteApplet.btnUploadUrl.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> + </Property> + <Property name="enabled" type="boolean" value="false"/> + <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[0, 0]"/> + </Property> + <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[0, 0]"/> + </Property> + <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[0, 0]"/> </Property> </Properties> <Events> - <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnUploadLocalRefreshActionPerformed"/> + <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnUploadUrlActionPerformed"/> </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> @@ -1013,7 +1062,7 @@ <Layout> <DimensionLayout dim="0"> <Group type="103" groupAlignment="0" attributes="0"> - <EmptySpace min="0" pref="296" max="32767" attributes="0"/> + <EmptySpace min="0" pref="272" max="32767" attributes="0"/> </Group> </DimensionLayout> <DimensionLayout dim="1"> @@ -1048,7 +1097,7 @@ <Container class="javax.swing.JPanel" name="jPanel5"> <Properties> <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[283, 40]"/> + <Dimension value="[283, 60]"/> </Property> </Properties> <Constraints> @@ -1060,12 +1109,12 @@ <Layout> <DimensionLayout dim="0"> <Group type="103" groupAlignment="0" attributes="0"> - <EmptySpace min="0" pref="296" max="32767" attributes="0"/> + <EmptySpace min="0" pref="272" max="32767" attributes="0"/> </Group> </DimensionLayout> <DimensionLayout dim="1"> <Group type="103" groupAlignment="0" attributes="0"> - <EmptySpace min="0" pref="40" max="32767" attributes="0"/> + <EmptySpace min="0" pref="60" max="32767" attributes="0"/> </Group> </DimensionLayout> </Layout> @@ -1076,13 +1125,13 @@ <Properties> <Property name="autoscrolls" type="boolean" value="true"/> <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[80, 32767]"/> + <Dimension value="[10, 32767]"/> </Property> <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[80, 100]"/> + <Dimension value="[10, 100]"/> </Property> <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[80, 380]"/> + <Dimension value="[10, 440]"/> </Property> <Property name="requestFocusEnabled" type="boolean" value="false"/> </Properties> @@ -1094,95 +1143,6 @@ <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/> <SubComponents> - <Container class="javax.swing.JPanel" name="jPanel11"> - <Properties> - <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[80, 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="0" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="11" weightX="0.0" weightY="0.0"/> - </Constraint> - </Constraints> - - <Layout> - <DimensionLayout dim="0"> - <Group type="103" groupAlignment="0" attributes="0"> - <EmptySpace min="0" pref="80" max="32767" attributes="0"/> - </Group> - </DimensionLayout> - <DimensionLayout dim="1"> - <Group type="103" groupAlignment="0" attributes="0"> - <EmptySpace min="0" pref="100" max="32767" attributes="0"/> - </Group> - </DimensionLayout> - </Layout> - </Container> - <Container class="javax.swing.JPanel" name="jPanel12"> - <Properties> - <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[32767, 80]"/> - </Property> - <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[80, 80]"/> - </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="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="11" weightX="0.0" weightY="0.0"/> - </Constraint> - </Constraints> - - <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridLayout"> - <Property name="columns" type="int" value="1"/> - <Property name="rows" type="int" value="2"/> - </Layout> - <SubComponents> - <Component class="javax.swing.JButton" name="btnUploadMove"> - <Properties> - <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.btnUploadMove.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> - </Property> - <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor"> - <Insets value="[0, 0, 0, 0]"/> - </Property> - <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[75, 50]"/> - </Property> - <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[75, 50]"/> - </Property> - <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[80, 40]"/> - </Property> - </Properties> - <Events> - <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnUploadMoveActionPerformed"/> - </Events> - </Component> - <Component class="javax.swing.JButton" name="btnUploadCancel"> - <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.btnUploadCancel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> - </Property> - <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[50, 40]"/> - </Property> - <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[80, 40]"/> - </Property> - <Property name="requestFocusEnabled" type="boolean" value="false"/> - </Properties> - <Events> - <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnUploadCancelActionPerformed"/> - </Events> - </Component> - </SubComponents> - </Container> <Container class="javax.swing.JPanel" name="jPanel13"> <Properties> <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> @@ -1201,12 +1161,12 @@ <Layout> <DimensionLayout dim="0"> <Group type="103" groupAlignment="0" attributes="0"> - <EmptySpace min="0" pref="80" max="32767" attributes="0"/> + <EmptySpace min="0" pref="0" max="32767" attributes="0"/> </Group> </DimensionLayout> <DimensionLayout dim="1"> <Group type="103" groupAlignment="0" attributes="0"> - <EmptySpace min="0" pref="100" max="32767" attributes="0"/> + <EmptySpace min="0" pref="0" max="32767" attributes="0"/> </Group> </DimensionLayout> </Layout> @@ -1216,7 +1176,7 @@ <Container class="javax.swing.JPanel" name="pnlUploadTable"> <Properties> <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[310, 380]"/> + <Dimension value="[310, 420]"/> </Property> </Properties> <Constraints> @@ -1273,91 +1233,10 @@ </Component> </SubComponents> </Container> - <Container class="javax.swing.JPanel" name="pnlIRODSUploadDest"> - <Properties> - <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[163, 54]"/> - </Property> - </Properties> - <Constraints> - <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription"> - <BorderConstraints direction="First"/> - </Constraint> - </Constraints> - - <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/> - <SubComponents> - <Container class="javax.swing.JPanel" name="pnlIRODSUploadBrowse"> - <Constraints> - <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription"> - <BorderConstraints direction="North"/> - </Constraint> - </Constraints> - - <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/> - <SubComponents> - <Component class="javax.swing.JLabel" name="jLabel8"> - <Properties> - <Property name="horizontalAlignment" type="int" value="2"/> - <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.jLabel8.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> - </Property> - <Property name="horizontalTextPosition" type="int" value="2"/> - <Property name="verticalTextPosition" type="int" value="1"/> - </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.JButton" name="btnBrowseIRODSUploadDest"> - <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.btnBrowseIRODSUploadDest.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> - </Property> - </Properties> - <Events> - <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnBrowseIRODSUploadDestActionPerformed"/> - </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> - <Component class="javax.swing.JTextField" name="txtIRODSUploadDest"> - <Properties> - <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> - <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor"> - <Border info="org.netbeans.modules.form.compat2.border.EtchedBorderInfo"> - <EtchetBorder/> - </Border> - </Property> - <Property name="dragEnabled" type="boolean" value="false"/> - </Properties> - <Events> - <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="txtIRODSUploadDestActionPerformed"/> - </Events> - <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> - </SubComponents> - </Container> <Container class="javax.swing.JPanel" name="jPanel14"> <Properties> <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[320, 40]"/> + <Dimension value="[320, 60]"/> </Property> </Properties> <Constraints> @@ -1379,7 +1258,7 @@ <Dimension value="[210, 40]"/> </Property> <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[210, 40]"/> + <Dimension value="[200, 40]"/> </Property> <Property name="requestFocusEnabled" type="boolean" value="false"/> </Properties> @@ -1399,6 +1278,20 @@ <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.lblUploadTotalFiles.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 bottom="0" left="0" right="0" top="4"/> + </Border> + </Property> + <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[122, 24]"/> + </Property> + <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[122, 24]"/> + </Property> + <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[122, 30]"/> + </Property> </Properties> <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription"> @@ -1416,9 +1309,12 @@ </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 bottom="3" left="0" right="0" top="0"/> + <EmptyBorder bottom="6" left="0" right="0" top="0"/> </Border> </Property> + <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[83, 30]"/> + </Property> </Properties> <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription"> @@ -1434,7 +1330,7 @@ <Dimension value="[100, 40]"/> </Property> <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[106, 40]"/> + <Dimension value="[240, 40]"/> </Property> </Properties> <Constraints> @@ -1443,50 +1339,53 @@ </Constraint> </Constraints> - <Layout> - <DimensionLayout dim="0"> - <Group type="103" groupAlignment="0" attributes="0"> - <EmptySpace min="0" pref="106" max="32767" attributes="0"/> - <Group type="103" rootIndex="1" groupAlignment="0" attributes="0"> - <Group type="102" attributes="0"> - <EmptySpace min="0" pref="0" max="32767" attributes="0"/> - <Component id="btnUploadBeginImport" min="-2" max="-2" attributes="0"/> - <EmptySpace min="0" pref="0" max="32767" attributes="0"/> - </Group> - </Group> - </Group> - </DimensionLayout> - <DimensionLayout dim="1"> - <Group type="103" groupAlignment="0" attributes="0"> - <EmptySpace min="0" pref="40" max="32767" attributes="0"/> - <Group type="103" rootIndex="1" groupAlignment="0" attributes="0"> - <Group type="102" attributes="0"> - <EmptySpace min="0" pref="5" max="32767" attributes="0"/> - <Component id="btnUploadBeginImport" min="-2" max="-2" attributes="0"/> - <EmptySpace min="0" pref="6" max="32767" attributes="0"/> - </Group> - </Group> - </Group> - </DimensionLayout> + <Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"> + <Property name="alignment" type="int" value="2"/> + <Property name="horizontalGap" type="int" value="4"/> + <Property name="verticalGap" type="int" value="12"/> </Layout> <SubComponents> + <Component class="javax.swing.JButton" name="btnUploadCancel"> + <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="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> + <ResourceString bundle="org/irods/jargon/idrop/lite/Bundle.properties" key="iDropLiteApplet.btnUploadCancel.text" 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="[75, 34]"/> + </Property> + <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[50, 34]"/> + </Property> + <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[116, 38]"/> + </Property> + <Property name="requestFocusEnabled" type="boolean" value="false"/> + <Property name="rolloverEnabled" type="boolean" value="true"/> + </Properties> + <Events> + <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnUploadCancelActionPerformed"/> + </Events> + </Component> <Component class="javax.swing.JButton" name="btnUploadBeginImport"> <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.btnUploadBeginImport.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> </Property> <Property name="enabled" type="boolean" value="false"/> <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[115, 29]"/> + <Dimension value="[115, 34]"/> </Property> <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[115, 29]"/> + <Dimension value="[115, 34]"/> </Property> <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[106, 29]"/> + <Dimension value="[96, 38]"/> </Property> </Properties> <Events> @@ -1497,6 +1396,101 @@ </Container> </SubComponents> </Container> + <Container class="javax.swing.JPanel" name="pnlIRODSUploadBrowse"> + <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="12" left="4" right="2" top="8"/> + </Border> + </Property> + <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[215, 54]"/> + </Property> + </Properties> + <Constraints> + <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription"> + <BorderConstraints direction="North"/> + </Constraint> + </Constraints> + + <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/> + <SubComponents> + <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"/> + </Property> + <Property name="horizontalAlignment" type="int" value="2"/> + <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.jLabel8.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> + </Property> + <Property name="horizontalTextPosition" type="int" value="2"/> + <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[64, 34]"/> + </Property> + <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[64, 34]"/> + </Property> + <Property name="verticalTextPosition" type="int" value="1"/> + </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.JButton" name="btnBrowseIRODSUploadDest"> + <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="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> + <ResourceString bundle="org/irods/jargon/idrop/lite/Bundle.properties" key="iDropLiteApplet.btnBrowseIRODSUploadDest.text" 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="[155, 30]"/> + </Property> + <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[155, 30]"/> + </Property> + <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[140, 30]"/> + </Property> + </Properties> + <Events> + <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnBrowseIRODSUploadDestActionPerformed"/> + </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> + <Component class="javax.swing.JTextField" name="txtIRODSUploadDest"> + <Properties> + <Property name="editable" type="boolean" value="false"/> + <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> + <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="0" left="5" right="0" top="0"/> + </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"/> + </Events> + <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> + </SubComponents> + </Container> </SubComponents> </Container> </SubComponents> 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 ff8318d..b47e165 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,6 +359,7 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat case 2: log.info(">>>>>>>>>upload picker display mode"); cl.show(testCardPanel, "card3"); + loadUploadIcons(); populateUploadDestination(); setupProgressTable(); break; @@ -712,6 +713,10 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat } } + private void loadUploadIcons() { + + } + private void populateUploadDestination() { if ((uploadDest != null) && (uploadDest.length() > 0)) { txtIRODSUploadDest.setText(uploadDest); @@ -1505,31 +1510,28 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat scrollUploadLocalDrives = new javax.swing.JScrollPane(); lstUploadLocalDrives = new javax.swing.JList(); pnlUploadRefreshButton = new javax.swing.JPanel(); - btnUploadUrl = new javax.swing.JButton(); btnUploadLocalRefresh = new javax.swing.JButton(); + btnUploadMove = new javax.swing.JButton(); + btnUploadUrl = new javax.swing.JButton(); pnlUploadLocalDrivesFiller = new javax.swing.JPanel(); scrollUploadLocalTree = new javax.swing.JScrollPane(); jPanel5 = new javax.swing.JPanel(); pnlUploadCenterTools = new javax.swing.JPanel(); - jPanel11 = new javax.swing.JPanel(); - jPanel12 = new javax.swing.JPanel(); - btnUploadMove = new javax.swing.JButton(); - btnUploadCancel = new javax.swing.JButton(); jPanel13 = new javax.swing.JPanel(); pnlUploadTable = new javax.swing.JPanel(); jScrollPane5 = new javax.swing.JScrollPane(); tblUploadTable1 = new javax.swing.JTable(); - pnlIRODSUploadDest = new javax.swing.JPanel(); - pnlIRODSUploadBrowse = new javax.swing.JPanel(); - jLabel8 = new javax.swing.JLabel(); - btnBrowseIRODSUploadDest = new javax.swing.JButton(); - txtIRODSUploadDest = new javax.swing.JTextField(); jPanel14 = new javax.swing.JPanel(); pnlUploadToolStatus = new javax.swing.JPanel(); lblUploadTotalFiles = new javax.swing.JLabel(); lblUploadTotalSize = new javax.swing.JLabel(); jPanel17 = new javax.swing.JPanel(); + btnUploadCancel = new javax.swing.JButton(); btnUploadBeginImport = new javax.swing.JButton(); + pnlIRODSUploadBrowse = new javax.swing.JPanel(); + jLabel8 = new javax.swing.JLabel(); + btnBrowseIRODSUploadDest = new javax.swing.JButton(); + txtIRODSUploadDest = new javax.swing.JTextField(); pnlUploadToolbar = new javax.swing.JPanel(); jPanel7 = new javax.swing.JPanel(); pnlOperationMode3 = new javax.swing.JPanel(); @@ -1558,16 +1560,17 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat btnIdropWebModeBeginDownload = new javax.swing.JButton(); setMinimumSize(new java.awt.Dimension(250, 200)); - setPreferredSize(new java.awt.Dimension(700, 450)); + setPreferredSize(new java.awt.Dimension(700, 490)); - pnllSeems2BneededForCorrectResizing.setPreferredSize(new java.awt.Dimension(720, 450)); + pnllSeems2BneededForCorrectResizing.setPreferredSize(new java.awt.Dimension(720, 490)); pnllSeems2BneededForCorrectResizing.setLayout(new java.awt.GridLayout(1, 1)); + testCardPanel.setPreferredSize(new java.awt.Dimension(710, 490)); testCardPanel.setLayout(new java.awt.CardLayout()); pnlMain.setBorder(javax.swing.BorderFactory.createEtchedBorder()); pnlMain.setMinimumSize(new java.awt.Dimension(250, 200)); - pnlMain.setPreferredSize(new java.awt.Dimension(700, 450)); + pnlMain.setPreferredSize(new java.awt.Dimension(700, 490)); pnlMain.setLayout(new java.awt.BorderLayout()); pnlMainToolBar.setMinimumSize(new java.awt.Dimension(250, 30)); @@ -1854,16 +1857,17 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat testCardPanel.add(pnlMain, "card2"); pnlOperationMode2.setMinimumSize(new java.awt.Dimension(250, 200)); - pnlOperationMode2.setPreferredSize(new java.awt.Dimension(700, 450)); + pnlOperationMode2.setPreferredSize(new java.awt.Dimension(700, 490)); pnlOperationMode2.setLayout(new java.awt.BorderLayout()); pnlTitlleBar.setPreferredSize(new java.awt.Dimension(700, 24)); pnlTitlleBar.setLayout(new java.awt.GridBagLayout()); - jPanel8.setMinimumSize(new java.awt.Dimension(150, 27)); + jPanel8.setMinimumSize(new java.awt.Dimension(200, 27)); 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", 0, 14)); + jLabel6.setFont(new java.awt.Font("Lucida Grande", 1, 13)); // NOI18N jLabel6.setText(org.openide.util.NbBundle.getMessage(iDropLiteApplet.class, "iDropLiteApplet.jLabel6.text")); // NOI18N jLabel6.setPreferredSize(new java.awt.Dimension(150, 17)); jPanel8.add(jLabel6); @@ -1877,14 +1881,14 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat gridBagConstraints.weighty = 0.2; pnlTitlleBar.add(jPanel8, gridBagConstraints); - jPanel9.setMinimumSize(new java.awt.Dimension(80, 0)); - jPanel9.setPreferredSize(new java.awt.Dimension(80, 24)); + jPanel9.setMinimumSize(new java.awt.Dimension(10, 0)); + jPanel9.setPreferredSize(new java.awt.Dimension(10, 24)); org.jdesktop.layout.GroupLayout jPanel9Layout = new org.jdesktop.layout.GroupLayout(jPanel9); jPanel9.setLayout(jPanel9Layout); jPanel9Layout.setHorizontalGroup( jPanel9Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(0, 80, Short.MAX_VALUE) + .add(0, 12, Short.MAX_VALUE) ); jPanel9Layout.setVerticalGroup( jPanel9Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) @@ -1900,10 +1904,11 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat gridBagConstraints.weighty = 0.2; pnlTitlleBar.add(jPanel9, gridBagConstraints); - jPanel10.setMinimumSize(new java.awt.Dimension(252, 27)); - jPanel10.setPreferredSize(new java.awt.Dimension(310, 17)); + jPanel10.setMinimumSize(new java.awt.Dimension(252, 20)); + 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", 0, 14)); + jLabel7.setFont(new java.awt.Font("Lucida Grande", 1, 13)); // NOI18N jLabel7.setText(org.openide.util.NbBundle.getMessage(iDropLiteApplet.class, "iDropLiteApplet.jLabel7.text")); // NOI18N jPanel10.add(jLabel7); @@ -1919,16 +1924,15 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat pnlOperationMode2.add(pnlTitlleBar, java.awt.BorderLayout.NORTH); pnlUploadTrees.setMinimumSize(new java.awt.Dimension(250, 160)); - pnlUploadTrees.setPreferredSize(new java.awt.Dimension(700, 385)); + pnlUploadTrees.setPreferredSize(new java.awt.Dimension(700, 425)); pnlUploadTrees.setLayout(new java.awt.GridBagLayout()); pnlUploadLocalTree.setMinimumSize(new java.awt.Dimension(150, 0)); - pnlUploadLocalTree.setPreferredSize(new java.awt.Dimension(285, 380)); + pnlUploadLocalTree.setPreferredSize(new java.awt.Dimension(285, 420)); pnlUploadLocalTree.setLayout(new java.awt.BorderLayout()); pnlUploadRoots.setMinimumSize(new java.awt.Dimension(280, 35)); - pnlUploadRoots.setPreferredSize(new java.awt.Dimension(280, 100)); - pnlUploadRoots.setRequestFocusEnabled(false); + pnlUploadRoots.setPreferredSize(new java.awt.Dimension(280, 120)); pnlUploadRoots.setLayout(new java.awt.BorderLayout()); scrollUploadLocalDrives.setBorder(null); @@ -1946,27 +1950,48 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat pnlUploadRefreshButton.setMaximumSize(new java.awt.Dimension(1000, 34)); pnlUploadRefreshButton.setMinimumSize(new java.awt.Dimension(0, 0)); - pnlUploadRefreshButton.setPreferredSize(new java.awt.Dimension(101, 29)); + pnlUploadRefreshButton.setPreferredSize(new java.awt.Dimension(101, 54)); pnlUploadRefreshButton.setRequestFocusEnabled(false); - pnlUploadRefreshButton.setLayout(new java.awt.BorderLayout()); + pnlUploadRefreshButton.setLayout(new java.awt.FlowLayout(java.awt.FlowLayout.LEFT, 2, 6)); - btnUploadUrl.setFont(new java.awt.Font("Lucida Grande", 0, 12)); - btnUploadUrl.setText(org.openide.util.NbBundle.getMessage(iDropLiteApplet.class, "iDropLiteApplet.btnUploadUrl.text")); // NOI18N - btnUploadUrl.addActionListener(new java.awt.event.ActionListener() { + btnUploadLocalRefresh.setFont(new java.awt.Font("Lucida Grande", 0, 11)); // NOI18N + btnUploadLocalRefresh.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/irods/jargon/idrop/lite/images/icon_idroplite_refresh.png"))); // NOI18N + btnUploadLocalRefresh.setText(org.openide.util.NbBundle.getMessage(iDropLiteApplet.class, "iDropLiteApplet.btnUploadLocalRefresh.text")); // NOI18N + btnUploadLocalRefresh.setMaximumSize(new java.awt.Dimension(85, 34)); + btnUploadLocalRefresh.setMinimumSize(new java.awt.Dimension(85, 34)); + btnUploadLocalRefresh.setPreferredSize(new java.awt.Dimension(92, 34)); + btnUploadLocalRefresh.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { - btnUploadUrlActionPerformed(evt); + btnUploadLocalRefreshActionPerformed(evt); } }); - pnlUploadRefreshButton.add(btnUploadUrl, java.awt.BorderLayout.WEST); + pnlUploadRefreshButton.add(btnUploadLocalRefresh); - btnUploadLocalRefresh.setFont(new java.awt.Font("Lucida Grande", 0, 12)); - btnUploadLocalRefresh.setText(org.openide.util.NbBundle.getMessage(iDropLiteApplet.class, "iDropLiteApplet.btnUploadLocalRefresh.text")); // NOI18N - btnUploadLocalRefresh.addActionListener(new java.awt.event.ActionListener() { + 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)); + btnUploadMove.setMaximumSize(new java.awt.Dimension(75, 34)); + btnUploadMove.setMinimumSize(new java.awt.Dimension(75, 34)); + btnUploadMove.setPreferredSize(new java.awt.Dimension(200, 34)); + btnUploadMove.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { - btnUploadLocalRefreshActionPerformed(evt); + btnUploadMoveActionPerformed(evt); } }); - pnlUploadRefreshButton.add(btnUploadLocalRefresh, java.awt.BorderLayout.EAST); + pnlUploadRefreshButton.add(btnUploadMove); + + btnUploadUrl.setFont(new java.awt.Font("Lucida Grande", 0, 12)); // NOI18N + btnUploadUrl.setText(org.openide.util.NbBundle.getMessage(iDropLiteApplet.class, "iDropLiteApplet.btnUploadUrl.text")); // NOI18N + btnUploadUrl.setEnabled(false); + btnUploadUrl.setMaximumSize(new java.awt.Dimension(0, 0)); + btnUploadUrl.setMinimumSize(new java.awt.Dimension(0, 0)); + btnUploadUrl.setPreferredSize(new java.awt.Dimension(0, 0)); + btnUploadUrl.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + btnUploadUrlActionPerformed(evt); + } + }); + pnlUploadRefreshButton.add(btnUploadUrl); pnlUploadRoots.add(pnlUploadRefreshButton, java.awt.BorderLayout.NORTH); @@ -1976,7 +2001,7 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat pnlUploadLocalDrivesFiller.setLayout(pnlUploadLocalDrivesFillerLayout); pnlUploadLocalDrivesFillerLayout.setHorizontalGroup( pnlUploadLocalDrivesFillerLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(0, 296, Short.MAX_VALUE) + .add(0, 272, Short.MAX_VALUE) ); pnlUploadLocalDrivesFillerLayout.setVerticalGroup( pnlUploadLocalDrivesFillerLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) @@ -1992,17 +2017,17 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat scrollUploadLocalTree.setPreferredSize(new java.awt.Dimension(283, 400)); pnlUploadLocalTree.add(scrollUploadLocalTree, java.awt.BorderLayout.CENTER); - jPanel5.setPreferredSize(new java.awt.Dimension(283, 40)); + jPanel5.setPreferredSize(new java.awt.Dimension(283, 60)); org.jdesktop.layout.GroupLayout jPanel5Layout = new org.jdesktop.layout.GroupLayout(jPanel5); jPanel5.setLayout(jPanel5Layout); jPanel5Layout.setHorizontalGroup( jPanel5Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(0, 296, Short.MAX_VALUE) + .add(0, 272, Short.MAX_VALUE) ); jPanel5Layout.setVerticalGroup( jPanel5Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(0, 40, Short.MAX_VALUE) + .add(0, 60, Short.MAX_VALUE) ); pnlUploadLocalTree.add(jPanel5, java.awt.BorderLayout.SOUTH); @@ -2017,67 +2042,12 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat pnlUploadTrees.add(pnlUploadLocalTree, gridBagConstraints); pnlUploadCenterTools.setAutoscrolls(true); - pnlUploadCenterTools.setMaximumSize(new java.awt.Dimension(80, 32767)); - pnlUploadCenterTools.setMinimumSize(new java.awt.Dimension(80, 100)); - pnlUploadCenterTools.setPreferredSize(new java.awt.Dimension(80, 380)); + pnlUploadCenterTools.setMaximumSize(new java.awt.Dimension(10, 32767)); + pnlUploadCenterTools.setMinimumSize(new java.awt.Dimension(10, 100)); + pnlUploadCenterTools.setPreferredSize(new java.awt.Dimension(10, 440)); pnlUploadCenterTools.setRequestFocusEnabled(false); pnlUploadCenterTools.setLayout(new java.awt.GridBagLayout()); - jPanel11.setPreferredSize(new java.awt.Dimension(80, 100)); - - org.jdesktop.layout.GroupLayout jPanel11Layout = new org.jdesktop.layout.GroupLayout(jPanel11); - jPanel11.setLayout(jPanel11Layout); - jPanel11Layout.setHorizontalGroup( - jPanel11Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(0, 80, Short.MAX_VALUE) - ); - jPanel11Layout.setVerticalGroup( - jPanel11Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(0, 100, Short.MAX_VALUE) - ); - - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 0; - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH; - pnlUploadCenterTools.add(jPanel11, gridBagConstraints); - - jPanel12.setMaximumSize(new java.awt.Dimension(32767, 80)); - jPanel12.setMinimumSize(new java.awt.Dimension(80, 80)); - jPanel12.setLayout(new java.awt.GridLayout(2, 1)); - - btnUploadMove.setText(org.openide.util.NbBundle.getMessage(iDropLiteApplet.class, "iDropLiteApplet.btnUploadMove.text")); // NOI18N - btnUploadMove.setMargin(new java.awt.Insets(0, 0, 0, 0)); - btnUploadMove.setMaximumSize(new java.awt.Dimension(75, 50)); - btnUploadMove.setMinimumSize(new java.awt.Dimension(75, 50)); - btnUploadMove.setPreferredSize(new java.awt.Dimension(80, 40)); - btnUploadMove.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - btnUploadMoveActionPerformed(evt); - } - }); - jPanel12.add(btnUploadMove); - - btnUploadCancel.setFont(new java.awt.Font("Lucida Grande", 0, 12)); - btnUploadCancel.setText(org.openide.util.NbBundle.getMessage(iDropLiteApplet.class, "iDropLiteApplet.btnUploadCancel.text")); // NOI18N - btnUploadCancel.setMinimumSize(new java.awt.Dimension(50, 40)); - btnUploadCancel.setPreferredSize(new java.awt.Dimension(80, 40)); - btnUploadCancel.setRequestFocusEnabled(false); - btnUploadCancel.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - btnUploadCancelActionPerformed(evt); - } - }); - jPanel12.add(btnUploadCancel); - - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 1; - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH; - pnlUploadCenterTools.add(jPanel12, gridBagConstraints); - jPanel13.setMinimumSize(new java.awt.Dimension(80, 0)); jPanel13.setPreferredSize(new java.awt.Dimension(80, 100)); @@ -2085,11 +2055,11 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat jPanel13.setLayout(jPanel13Layout); jPanel13Layout.setHorizontalGroup( jPanel13Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(0, 80, Short.MAX_VALUE) + .add(0, 0, Short.MAX_VALUE) ); jPanel13Layout.setVerticalGroup( jPanel13Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(0, 100, Short.MAX_VALUE) + .add(0, 0, Short.MAX_VALUE) ); gridBagConstraints = new java.awt.GridBagConstraints(); @@ -2108,7 +2078,7 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat gridBagConstraints.weighty = 0.2; pnlUploadTrees.add(pnlUploadCenterTools, gridBagConstraints); - pnlUploadTable.setPreferredSize(new java.awt.Dimension(310, 380)); + pnlUploadTable.setPreferredSize(new java.awt.Dimension(310, 420)); pnlUploadTable.setLayout(new java.awt.BorderLayout()); jScrollPane5.setPreferredSize(new java.awt.Dimension(275, 370)); @@ -2146,100 +2116,105 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat pnlUploadTable.add(jScrollPane5, java.awt.BorderLayout.CENTER); - pnlIRODSUploadDest.setPreferredSize(new java.awt.Dimension(163, 54)); - pnlIRODSUploadDest.setLayout(new java.awt.BorderLayout()); - - pnlIRODSUploadBrowse.setLayout(new java.awt.BorderLayout()); - - jLabel8.setHorizontalAlignment(javax.swing.SwingConstants.LEFT); - jLabel8.setText(org.openide.util.NbBundle.getMessage(iDropLiteApplet.class, "iDropLiteApplet.jLabel8.text")); // NOI18N - jLabel8.setHorizontalTextPosition(javax.swing.SwingConstants.LEFT); - jLabel8.setVerticalTextPosition(javax.swing.SwingConstants.TOP); - pnlIRODSUploadBrowse.add(jLabel8, java.awt.BorderLayout.WEST); - - btnBrowseIRODSUploadDest.setFont(new java.awt.Font("Lucida Grande", 0, 12)); - btnBrowseIRODSUploadDest.setText(org.openide.util.NbBundle.getMessage(iDropLiteApplet.class, "iDropLiteApplet.btnBrowseIRODSUploadDest.text")); // NOI18N - btnBrowseIRODSUploadDest.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - btnBrowseIRODSUploadDestActionPerformed(evt); - } - }); - pnlIRODSUploadBrowse.add(btnBrowseIRODSUploadDest, java.awt.BorderLayout.EAST); - - pnlIRODSUploadDest.add(pnlIRODSUploadBrowse, java.awt.BorderLayout.NORTH); - - txtIRODSUploadDest.setText(org.openide.util.NbBundle.getMessage(iDropLiteApplet.class, "iDropLiteApplet.txtIRODSUploadDest.text")); // NOI18N - txtIRODSUploadDest.setBorder(javax.swing.BorderFactory.createEtchedBorder()); - txtIRODSUploadDest.setDragEnabled(false); - txtIRODSUploadDest.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - txtIRODSUploadDestActionPerformed(evt); - } - }); - pnlIRODSUploadDest.add(txtIRODSUploadDest, java.awt.BorderLayout.CENTER); - - pnlUploadTable.add(pnlIRODSUploadDest, java.awt.BorderLayout.PAGE_START); - - jPanel14.setPreferredSize(new java.awt.Dimension(320, 40)); + jPanel14.setPreferredSize(new java.awt.Dimension(320, 60)); jPanel14.setLayout(new java.awt.BorderLayout()); pnlUploadToolStatus.setBorder(javax.swing.BorderFactory.createEmptyBorder(3, 0, 0, 0)); pnlUploadToolStatus.setMinimumSize(new java.awt.Dimension(210, 40)); - pnlUploadToolStatus.setPreferredSize(new java.awt.Dimension(210, 40)); + pnlUploadToolStatus.setPreferredSize(new java.awt.Dimension(200, 40)); pnlUploadToolStatus.setRequestFocusEnabled(false); pnlUploadToolStatus.setLayout(new java.awt.BorderLayout()); - lblUploadTotalFiles.setFont(new java.awt.Font("Lucida Grande", 0, 12)); + lblUploadTotalFiles.setFont(new java.awt.Font("Lucida Grande", 0, 12)); // NOI18N 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)); + lblUploadTotalFiles.setMinimumSize(new java.awt.Dimension(122, 24)); + 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)); + lblUploadTotalSize.setFont(new java.awt.Font("Lucida Grande", 0, 12)); // NOI18N lblUploadTotalSize.setText(org.openide.util.NbBundle.getMessage(iDropLiteApplet.class, "iDropLiteApplet.lblUploadTotalSize.text")); // NOI18N - lblUploadTotalSize.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 3, 0)); + lblUploadTotalSize.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 6, 0)); + lblUploadTotalSize.setPreferredSize(new java.awt.Dimension(83, 30)); pnlUploadToolStatus.add(lblUploadTotalSize, java.awt.BorderLayout.SOUTH); jPanel14.add(pnlUploadToolStatus, java.awt.BorderLayout.WEST); jPanel17.setMinimumSize(new java.awt.Dimension(100, 40)); - jPanel17.setPreferredSize(new java.awt.Dimension(106, 40)); + jPanel17.setPreferredSize(new java.awt.Dimension(240, 40)); + jPanel17.setLayout(new java.awt.FlowLayout(java.awt.FlowLayout.RIGHT, 4, 12)); + + btnUploadCancel.setFont(new java.awt.Font("Lucida Grande", 0, 11)); // NOI18N + btnUploadCancel.setText(org.openide.util.NbBundle.getMessage(iDropLiteApplet.class, "iDropLiteApplet.btnUploadCancel.text")); // NOI18N + btnUploadCancel.setMaximumSize(new java.awt.Dimension(75, 34)); + btnUploadCancel.setMinimumSize(new java.awt.Dimension(50, 34)); + btnUploadCancel.setPreferredSize(new java.awt.Dimension(116, 38)); + btnUploadCancel.setRequestFocusEnabled(false); + btnUploadCancel.setRolloverEnabled(true); + btnUploadCancel.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + btnUploadCancelActionPerformed(evt); + } + }); + jPanel17.add(btnUploadCancel); - btnUploadBeginImport.setFont(new java.awt.Font("Lucida Grande", 0, 12)); + btnUploadBeginImport.setFont(new java.awt.Font("Lucida Grande", 0, 11)); // NOI18N btnUploadBeginImport.setText(org.openide.util.NbBundle.getMessage(iDropLiteApplet.class, "iDropLiteApplet.btnUploadBeginImport.text")); // NOI18N btnUploadBeginImport.setEnabled(false); - btnUploadBeginImport.setMaximumSize(new java.awt.Dimension(115, 29)); - btnUploadBeginImport.setMinimumSize(new java.awt.Dimension(115, 29)); - btnUploadBeginImport.setPreferredSize(new java.awt.Dimension(106, 29)); + btnUploadBeginImport.setMaximumSize(new java.awt.Dimension(115, 34)); + btnUploadBeginImport.setMinimumSize(new java.awt.Dimension(115, 34)); + btnUploadBeginImport.setPreferredSize(new java.awt.Dimension(96, 38)); btnUploadBeginImport.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { btnUploadBeginImportActionPerformed(evt); } }); - - org.jdesktop.layout.GroupLayout jPanel17Layout = new org.jdesktop.layout.GroupLayout(jPanel17); - jPanel17.setLayout(jPanel17Layout); - jPanel17Layout.setHorizontalGroup( - jPanel17Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(0, 106, Short.MAX_VALUE) - .add(jPanel17Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(jPanel17Layout.createSequentialGroup() - .add(0, 0, Short.MAX_VALUE) - .add(btnUploadBeginImport, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) - .add(0, 0, Short.MAX_VALUE))) - ); - jPanel17Layout.setVerticalGroup( - jPanel17Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(0, 40, Short.MAX_VALUE) - .add(jPanel17Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(jPanel17Layout.createSequentialGroup() - .add(0, 5, Short.MAX_VALUE) - .add(btnUploadBeginImport, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) - .add(0, 6, Short.MAX_VALUE))) - ); + jPanel17.add(btnUploadBeginImport); jPanel14.add(jPanel17, java.awt.BorderLayout.EAST); pnlUploadTable.add(jPanel14, java.awt.BorderLayout.PAGE_END); + pnlIRODSUploadBrowse.setBorder(javax.swing.BorderFactory.createEmptyBorder(8, 4, 12, 2)); + pnlIRODSUploadBrowse.setPreferredSize(new java.awt.Dimension(215, 54)); + pnlIRODSUploadBrowse.setLayout(new java.awt.BorderLayout()); + + jLabel8.setFont(new java.awt.Font("Lucida Grande", 0, 11)); // NOI18N + jLabel8.setHorizontalAlignment(javax.swing.SwingConstants.LEFT); + jLabel8.setText(org.openide.util.NbBundle.getMessage(iDropLiteApplet.class, "iDropLiteApplet.jLabel8.text")); // NOI18N + jLabel8.setHorizontalTextPosition(javax.swing.SwingConstants.LEFT); + jLabel8.setMaximumSize(new java.awt.Dimension(64, 34)); + jLabel8.setMinimumSize(new java.awt.Dimension(64, 34)); + jLabel8.setVerticalTextPosition(javax.swing.SwingConstants.TOP); + pnlIRODSUploadBrowse.add(jLabel8, java.awt.BorderLayout.WEST); + + btnBrowseIRODSUploadDest.setFont(new java.awt.Font("Lucida Grande", 0, 11)); // NOI18N + btnBrowseIRODSUploadDest.setText(org.openide.util.NbBundle.getMessage(iDropLiteApplet.class, "iDropLiteApplet.btnBrowseIRODSUploadDest.text")); // NOI18N + btnBrowseIRODSUploadDest.setMaximumSize(new java.awt.Dimension(155, 30)); + btnBrowseIRODSUploadDest.setMinimumSize(new java.awt.Dimension(155, 30)); + btnBrowseIRODSUploadDest.setPreferredSize(new java.awt.Dimension(140, 30)); + btnBrowseIRODSUploadDest.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + btnBrowseIRODSUploadDestActionPerformed(evt); + } + }); + pnlIRODSUploadBrowse.add(btnBrowseIRODSUploadDest, java.awt.BorderLayout.EAST); + + txtIRODSUploadDest.setEditable(false); + 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(true); + txtIRODSUploadDest.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + txtIRODSUploadDestActionPerformed(evt); + } + }); + pnlIRODSUploadBrowse.add(txtIRODSUploadDest, java.awt.BorderLayout.CENTER); + + pnlUploadTable.add(pnlIRODSUploadBrowse, java.awt.BorderLayout.NORTH); + gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 2; gridBagConstraints.gridy = 0; @@ -2281,12 +2256,12 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat jPanel1.setPreferredSize(new java.awt.Dimension(400, 38)); - txtDownloadTarget.setFont(new java.awt.Font("Lucida Grande", 0, 12)); // NOI18N + txtDownloadTarget.setFont(new java.awt.Font("Lucida Grande", 0, 12)); txtDownloadTarget.setText(org.openide.util.NbBundle.getMessage(iDropLiteApplet.class, "iDropLiteApplet.txtDownloadTarget.text")); // NOI18N txtDownloadTarget.setPreferredSize(new java.awt.Dimension(300, 28)); jPanel1.add(txtDownloadTarget); - btnBrowseDownloadTarget.setFont(new java.awt.Font("Lucida Grande", 0, 12)); // NOI18N + btnBrowseDownloadTarget.setFont(new java.awt.Font("Lucida Grande", 0, 12)); btnBrowseDownloadTarget.setText(org.openide.util.NbBundle.getMessage(iDropLiteApplet.class, "iDropLiteApplet.btnBrowseDownloadTarget.text")); // NOI18N btnBrowseDownloadTarget.setPreferredSize(new java.awt.Dimension(80, 29)); btnBrowseDownloadTarget.addActionListener(new java.awt.event.ActionListener() { @@ -2351,7 +2326,7 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat pnlIdropWebModeText.setPreferredSize(new java.awt.Dimension(682, 30)); pnlIdropWebModeText.setLayout(new java.awt.BorderLayout()); - jLabel1.setFont(new java.awt.Font("Lucida Grande", 0, 10)); // NOI18N + jLabel1.setFont(new java.awt.Font("Lucida Grande", 0, 10)); jLabel1.setHorizontalAlignment(javax.swing.SwingConstants.CENTER); jLabel1.setText(org.openide.util.NbBundle.getMessage(iDropLiteApplet.class, "iDropLiteApplet.jLabel1.text")); // NOI18N jLabel1.setMinimumSize(new java.awt.Dimension(57, 18)); @@ -2677,8 +2652,6 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat private javax.swing.JLabel jLabel8; private javax.swing.JPanel jPanel1; private javax.swing.JPanel jPanel10; - private javax.swing.JPanel jPanel11; - private javax.swing.JPanel jPanel12; private javax.swing.JPanel jPanel13; private javax.swing.JPanel jPanel14; private javax.swing.JPanel jPanel16; @@ -2709,7 +2682,6 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat private javax.swing.JPanel pnlDownloadProgressTable; private javax.swing.JPanel pnlDrivesFiller; private javax.swing.JPanel pnlIRODSUploadBrowse; - private javax.swing.JPanel pnlIRODSUploadDest; private javax.swing.JPanel pnlIdropBottom; private javax.swing.JPanel pnlIdropWebMode; private javax.swing.JPanel pnlIdropWebModeBeginDownload; diff --git a/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/images/icon_delete.png b/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/images/icon_delete.png Binary files differnew file mode 100644 index 0000000..c19bd0e --- /dev/null +++ b/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/images/icon_delete.png diff --git a/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/images/icon_idroplite_addtoqueue.png b/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/images/icon_idroplite_addtoqueue.png Binary files differnew file mode 100644 index 0000000..57404cf --- /dev/null +++ b/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/images/icon_idroplite_addtoqueue.png diff --git a/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/images/icon_idroplite_refresh.png b/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/images/icon_idroplite_refresh.png Binary files differnew file mode 100644 index 0000000..f229e9b --- /dev/null +++ b/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/images/icon_idroplite_refresh.png 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 47aa82a..99ab59f 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 @@ -6,9 +6,9 @@ iDropLiteApplet.jLabel3.AccessibleContext.accessibleName=Move files from your lo iDropLiteApplet.jPanel5.TabConstraints.tabTitle=tab4 iDropLiteApplet.jLabel3.AccessibleContext.accessibleName_1=Local File Tree View iDropLiteApplet.jLabel5.text=Coming soon! -iDropLiteApplet.jLabel6.text=Local File System -iDropLiteApplet.jLabel8.text=Import to: -iDropLiteApplet.jLabel7.text=Files(s) to Import +iDropLiteApplet.jLabel6.text=Local Files +iDropLiteApplet.jLabel8.text=Destination: +iDropLiteApplet.jLabel7.text=Files Queued for Import iDropLiteApplet.pnlIdropBottom.toolTipText=Display area for status and messages iDropLiteApplet.btnToggleLocalView.text=<<<Local Files iDropLiteApplet.btnLocalRefresh.text=Refresh @@ -21,13 +21,13 @@ iDropLiteApplet.pnlIrodsTreeView.TabConstraints.tabTitle=IRODS Tree View iDropLiteApplet.btnIrodsTreeRefresh.text=Refresh iDropLiteApplet.pnlIrodsSearch.TabConstraints.tabTitle=Search iDropLiteApplet.btnUploadLocalRefresh.text=Refresh -iDropLiteApplet.btnUploadMove.text=>> -iDropLiteApplet.btnUploadCancel.text=Clear -iDropLiteApplet.btnBrowseIRODSUploadDest.text=Change import location +iDropLiteApplet.btnUploadMove.text=Add Selected to Queue +iDropLiteApplet.btnUploadCancel.text=Clear File Queue +iDropLiteApplet.btnBrowseIRODSUploadDest.text=Change Destination iDropLiteApplet.txtIRODSUploadDest.text= iDropLiteApplet.lblUploadTotalFiles.text=Total Files to Upload: iDropLiteApplet.lblUploadTotalSize.text=Total File Size: -iDropLiteApplet.btnUploadBeginImport.text=Begin Import +iDropLiteApplet.btnUploadBeginImport.text=Import Files iDropLiteApplet.btnUploadUrl.text=Import file from URL iDropLiteApplet.txtDownloadTarget.text= iDropLiteApplet.bntBeginDownload.text=Begin Download |