summaryrefslogtreecommitdiffstats
path: root/idrop-lite
diff options
context:
space:
mode:
authorLISA STILLWELL <lisa@dhcp152-54-6-218.wireless.europa.renci.org>2012-01-26 20:59:28 (GMT)
committer LISA STILLWELL <lisa@dhcp152-54-6-218.wireless.europa.renci.org>2012-01-26 20:59:28 (GMT)
commit3221f966baf54f12322f110c2a30027d78be3efb (patch)
treec8315ffc1318991e7fdc31ae8b1e55c5528451a9 /idrop-lite
parent14e3aaaa6e3118f68834b35256b25918d569ecea (diff)
downloadQCG-Data-3221f966baf54f12322f110c2a30027d78be3efb.zip
QCG-Data-3221f966baf54f12322f110c2a30027d78be3efb.tar.gz
QCG-Data-3221f966baf54f12322f110c2a30027d78be3efb.tar.bz2
[#599] fix sizing of progress bar for windows os
Diffstat (limited to 'idrop-lite')
-rw-r--r--idrop-lite/src/main/java/org/irods/jargon/idrop/lite/iDropLiteApplet.form140
-rw-r--r--idrop-lite/src/main/java/org/irods/jargon/idrop/lite/iDropLiteApplet.java63
-rw-r--r--idrop-lite/src/main/resources/org/irods/jargon/idrop/lite/Bundle.properties1
3 files changed, 95 insertions, 109 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 5e4cce2..f24a687 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
@@ -19,7 +19,7 @@
<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
- <AuxValue 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,-62,0,0,2,-68"/>
+ <AuxValue 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,-74,0,0,2,-72"/>
</AuxValues>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
@@ -163,7 +163,7 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
- <EmptySpace min="0" pref="396" max="32767" attributes="0"/>
+ <EmptySpace min="0" pref="392" max="32767" attributes="0"/>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
@@ -396,12 +396,12 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
- <Component id="tabIrodsViews" alignment="0" pref="379" max="32767" attributes="0"/>
+ <Component id="tabIrodsViews" alignment="0" pref="375" max="32767" attributes="0"/>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
- <Component id="tabIrodsViews" alignment="0" pref="323" max="32767" attributes="0"/>
+ <Component id="tabIrodsViews" alignment="0" pref="311" max="32767" attributes="0"/>
</Group>
</DimensionLayout>
</Layout>
@@ -480,7 +480,7 @@
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="83" max="-2" attributes="0"/>
<Component id="jLabel5" min="-2" max="-2" attributes="0"/>
- <EmptySpace pref="187" max="32767" attributes="0"/>
+ <EmptySpace pref="183" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -489,7 +489,7 @@
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="84" max="-2" attributes="0"/>
<Component id="jLabel5" min="-2" max="-2" attributes="0"/>
- <EmptySpace pref="180" max="32767" attributes="0"/>
+ <EmptySpace pref="168" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -1013,7 +1013,7 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
- <EmptySpace min="0" pref="298" max="32767" attributes="0"/>
+ <EmptySpace min="0" pref="296" max="32767" attributes="0"/>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
@@ -1060,7 +1060,7 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
- <EmptySpace min="0" pref="298" max="32767" attributes="0"/>
+ <EmptySpace min="0" pref="296" max="32767" attributes="0"/>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
@@ -1462,7 +1462,7 @@
<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" pref="-60" max="-2" attributes="0"/>
+ <Component id="btnUploadBeginImport" min="-2" max="-2" attributes="0"/>
<EmptySpace min="0" pref="6" max="32767" attributes="0"/>
</Group>
</Group>
@@ -1741,8 +1741,13 @@
<SubComponents>
<Container class="javax.swing.JPanel" name="pnlIdropWebModeDownloadTarget">
<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="2" right="2" top="2"/>
+ </Border>
+ </Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[700, 35]"/>
+ <Dimension value="[700, 40]"/>
</Property>
</Properties>
<Constraints>
@@ -1783,6 +1788,11 @@
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="jPanel6">
+ <Properties>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[700, 60]"/>
+ </Property>
+ </Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
<BorderConstraints direction="Center"/>
@@ -1791,7 +1801,45 @@
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
<SubComponents>
- <Container class="javax.swing.JPanel" name="jPanel15">
+ <Container class="javax.swing.JPanel" name="jPanel16">
+ <Properties>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[700, 24]"/>
+ </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>
+ <DimensionLayout dim="0">
+ <Group type="103" groupAlignment="0" attributes="0">
+ <EmptySpace min="0" pref="686" max="32767" attributes="0"/>
+ </Group>
+ </DimensionLayout>
+ <DimensionLayout dim="1">
+ <Group type="103" groupAlignment="0" attributes="0">
+ <EmptySpace min="0" pref="24" max="32767" attributes="0"/>
+ </Group>
+ </DimensionLayout>
+ </Layout>
+ </Container>
+ <Container class="javax.swing.JPanel" name="pnlIdropWebModeProgressBar">
+ <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="10" left="15" right="15" top="0"/>
+ </Border>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[40, 24]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[700, 24]"/>
+ </Property>
+ </Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
<BorderConstraints direction="Center"/>
@@ -1800,37 +1848,9 @@
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
<SubComponents>
- <Container class="javax.swing.JPanel" name="jPanel16">
+ <Component class="javax.swing.JProgressBar" name="pbIdropWebModeDownloadProgress">
<Properties>
- <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[700, 10]"/>
- </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>
- <DimensionLayout dim="0">
- <Group type="103" groupAlignment="0" attributes="0">
- <EmptySpace min="0" pref="690" max="32767" attributes="0"/>
- </Group>
- </DimensionLayout>
- <DimensionLayout dim="1">
- <Group type="103" groupAlignment="0" attributes="0">
- <EmptySpace min="0" pref="10" max="32767" attributes="0"/>
- </Group>
- </DimensionLayout>
- </Layout>
- </Container>
- <Component class="javax.swing.JLabel" name="jLabel1">
- <Properties>
- <Property name="horizontalAlignment" type="int" value="0"/>
- <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.jLabel1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
- </Property>
+ <Property name="stringPainted" type="boolean" value="true"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
@@ -1838,45 +1858,19 @@
</Constraint>
</Constraints>
</Component>
- <Container class="javax.swing.JPanel" name="pnlIdropWebModeProgressBar">
- <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="0" left="20" right="20" top="0"/>
- </Border>
- </Property>
- <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[700, 75]"/>
- </Property>
- </Properties>
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
- <BorderConstraints direction="South"/>
- </Constraint>
- </Constraints>
-
- <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
- <SubComponents>
- <Component class="javax.swing.JProgressBar" name="pbIdropWebModeDownloadProgress">
- <Properties>
- <Property name="stringPainted" type="boolean" value="true"/>
- </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>
- </SubComponents>
- </Container>
</SubComponents>
</Container>
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="pnlIdropWebModeBeginDownload">
<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="3" left="3" right="3" top="3"/>
+ </Border>
+ </Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[700, 35]"/>
+ <Dimension value="[700, 40]"/>
</Property>
</Properties>
<Constraints>
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 89ae932..be2c352 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
@@ -849,7 +849,8 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
if (ts.getTransferType() == TransferStatus.TransferType.SYNCH || ts.getTransferType() == TransferStatus.TransferType.REPLICATE) {
log.info("no need to notify tree for synch or replicate");
} else if (ts.getTransferType() == TransferStatus.TransferType.GET
- && ts.getTransferState() == TransferStatus.TransferState.OVERALL_COMPLETION) {
+ && ts.getTransferState() == TransferStatus.TransferState.OVERALL_COMPLETION
+ && idropGui.displayMode == 1) {
try {
((LocalFileSystemModel) idropGui.getFileTree().getModel()).notifyCompletionOfOperation(idropGui.getFileTree(), ts);
@@ -1464,9 +1465,7 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
txtIdropWebModeDownloadTarget = new javax.swing.JTextField();
btnIdropWebModeTargetBrowse = new javax.swing.JButton();
jPanel6 = new javax.swing.JPanel();
- jPanel15 = new javax.swing.JPanel();
jPanel16 = new javax.swing.JPanel();
- jLabel1 = new javax.swing.JLabel();
pnlIdropWebModeProgressBar = new javax.swing.JPanel();
pbIdropWebModeDownloadProgress = new javax.swing.JProgressBar();
pnlIdropWebModeBeginDownload = new javax.swing.JPanel();
@@ -1527,7 +1526,7 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
pnlSearchSizer.setLayout(pnlSearchSizerLayout);
pnlSearchSizerLayout.setHorizontalGroup(
pnlSearchSizerLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 396, Short.MAX_VALUE)
+ .add(0, 392, Short.MAX_VALUE)
);
pnlSearchSizerLayout.setVerticalGroup(
pnlSearchSizerLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
@@ -1647,14 +1646,14 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
.add(pnlIrodsSearchLayout.createSequentialGroup()
.add(83, 83, 83)
.add(jLabel5)
- .addContainerGap(187, Short.MAX_VALUE))
+ .addContainerGap(183, Short.MAX_VALUE))
);
pnlIrodsSearchLayout.setVerticalGroup(
pnlIrodsSearchLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
.add(pnlIrodsSearchLayout.createSequentialGroup()
.add(84, 84, 84)
.add(jLabel5)
- .addContainerGap(180, Short.MAX_VALUE))
+ .addContainerGap(168, Short.MAX_VALUE))
);
tabIrodsViews.addTab(org.openide.util.NbBundle.getMessage(iDropLiteApplet.class, "iDropLiteApplet.pnlIrodsSearch.TabConstraints.tabTitle"), pnlIrodsSearch); // NOI18N
@@ -1663,11 +1662,11 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
pnlIrodsTree.setLayout(pnlIrodsTreeLayout);
pnlIrodsTreeLayout.setHorizontalGroup(
pnlIrodsTreeLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(tabIrodsViews, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 379, Short.MAX_VALUE)
+ .add(tabIrodsViews, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 375, Short.MAX_VALUE)
);
pnlIrodsTreeLayout.setVerticalGroup(
pnlIrodsTreeLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(tabIrodsViews, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 323, Short.MAX_VALUE)
+ .add(tabIrodsViews, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 311, Short.MAX_VALUE)
);
pnlSplitPaneLocalRemote.setRightComponent(pnlIrodsTree);
@@ -1865,7 +1864,7 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
pnlUploadRefreshButton.setRequestFocusEnabled(false);
pnlUploadRefreshButton.setLayout(new java.awt.BorderLayout());
- btnUploadUrl.setFont(new java.awt.Font("Lucida Grande", 0, 12)); // NOI18N
+ 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() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -1874,7 +1873,7 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
});
pnlUploadRefreshButton.add(btnUploadUrl, java.awt.BorderLayout.WEST);
- btnUploadLocalRefresh.setFont(new java.awt.Font("Lucida Grande", 0, 12)); // NOI18N
+ 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() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -1891,7 +1890,7 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
pnlUploadLocalDrivesFiller.setLayout(pnlUploadLocalDrivesFillerLayout);
pnlUploadLocalDrivesFillerLayout.setHorizontalGroup(
pnlUploadLocalDrivesFillerLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 298, Short.MAX_VALUE)
+ .add(0, 296, Short.MAX_VALUE)
);
pnlUploadLocalDrivesFillerLayout.setVerticalGroup(
pnlUploadLocalDrivesFillerLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
@@ -1913,7 +1912,7 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
jPanel5.setLayout(jPanel5Layout);
jPanel5Layout.setHorizontalGroup(
jPanel5Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 298, Short.MAX_VALUE)
+ .add(0, 296, Short.MAX_VALUE)
);
jPanel5Layout.setVerticalGroup(
jPanel5Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
@@ -1974,7 +1973,7 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
});
jPanel12.add(btnUploadMove);
- btnUploadCancel.setFont(new java.awt.Font("Lucida Grande", 0, 12)); // NOI18N
+ 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));
@@ -2104,11 +2103,11 @@ 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
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, 3, 0));
pnlUploadToolStatus.add(lblUploadTotalSize, java.awt.BorderLayout.SOUTH);
@@ -2118,7 +2117,7 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
jPanel17.setMinimumSize(new java.awt.Dimension(100, 40));
jPanel17.setPreferredSize(new java.awt.Dimension(106, 40));
- btnUploadBeginImport.setFont(new java.awt.Font("Lucida Grande", 0, 12)); // NOI18N
+ btnUploadBeginImport.setFont(new java.awt.Font("Lucida Grande", 0, 12));
btnUploadBeginImport.setText(org.openide.util.NbBundle.getMessage(iDropLiteApplet.class, "iDropLiteApplet.btnUploadBeginImport.text")); // NOI18N
btnUploadBeginImport.setEnabled(false);
btnUploadBeginImport.setMaximumSize(new java.awt.Dimension(115, 29));
@@ -2266,7 +2265,8 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
pnlIdropWebMode.setBorder(javax.swing.BorderFactory.createEmptyBorder(5, 5, 5, 5));
pnlIdropWebMode.setLayout(new java.awt.BorderLayout());
- pnlIdropWebModeDownloadTarget.setPreferredSize(new java.awt.Dimension(700, 35));
+ pnlIdropWebModeDownloadTarget.setBorder(javax.swing.BorderFactory.createEmptyBorder(2, 2, 2, 2));
+ pnlIdropWebModeDownloadTarget.setPreferredSize(new java.awt.Dimension(700, 40));
pnlIdropWebModeDownloadTarget.setLayout(new java.awt.BorderLayout());
txtIdropWebModeDownloadTarget.setText(org.openide.util.NbBundle.getMessage(iDropLiteApplet.class, "iDropLiteApplet.txtIdropWebModeDownloadTarget.text")); // NOI18N
@@ -2282,43 +2282,38 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
pnlIdropWebMode.add(pnlIdropWebModeDownloadTarget, java.awt.BorderLayout.NORTH);
+ jPanel6.setPreferredSize(new java.awt.Dimension(700, 60));
jPanel6.setLayout(new java.awt.BorderLayout());
- jPanel15.setLayout(new java.awt.BorderLayout());
-
- jPanel16.setPreferredSize(new java.awt.Dimension(700, 10));
+ jPanel16.setPreferredSize(new java.awt.Dimension(700, 24));
org.jdesktop.layout.GroupLayout jPanel16Layout = new org.jdesktop.layout.GroupLayout(jPanel16);
jPanel16.setLayout(jPanel16Layout);
jPanel16Layout.setHorizontalGroup(
jPanel16Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 690, Short.MAX_VALUE)
+ .add(0, 686, Short.MAX_VALUE)
);
jPanel16Layout.setVerticalGroup(
jPanel16Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 10, Short.MAX_VALUE)
+ .add(0, 24, Short.MAX_VALUE)
);
- jPanel15.add(jPanel16, java.awt.BorderLayout.PAGE_START);
+ jPanel6.add(jPanel16, java.awt.BorderLayout.NORTH);
- jLabel1.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
- jLabel1.setText(org.openide.util.NbBundle.getMessage(iDropLiteApplet.class, "iDropLiteApplet.jLabel1.text")); // NOI18N
- jPanel15.add(jLabel1, java.awt.BorderLayout.CENTER);
-
- pnlIdropWebModeProgressBar.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 20, 0, 20));
- pnlIdropWebModeProgressBar.setPreferredSize(new java.awt.Dimension(700, 75));
+ pnlIdropWebModeProgressBar.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 15, 10, 15));
+ pnlIdropWebModeProgressBar.setMinimumSize(new java.awt.Dimension(40, 24));
+ pnlIdropWebModeProgressBar.setPreferredSize(new java.awt.Dimension(700, 24));
pnlIdropWebModeProgressBar.setLayout(new java.awt.BorderLayout());
pbIdropWebModeDownloadProgress.setStringPainted(true);
pnlIdropWebModeProgressBar.add(pbIdropWebModeDownloadProgress, java.awt.BorderLayout.CENTER);
- jPanel15.add(pnlIdropWebModeProgressBar, java.awt.BorderLayout.SOUTH);
-
- jPanel6.add(jPanel15, java.awt.BorderLayout.CENTER);
+ jPanel6.add(pnlIdropWebModeProgressBar, java.awt.BorderLayout.CENTER);
pnlIdropWebMode.add(jPanel6, java.awt.BorderLayout.CENTER);
- pnlIdropWebModeBeginDownload.setPreferredSize(new java.awt.Dimension(700, 35));
+ pnlIdropWebModeBeginDownload.setBorder(javax.swing.BorderFactory.createEmptyBorder(3, 3, 3, 3));
+ pnlIdropWebModeBeginDownload.setPreferredSize(new java.awt.Dimension(700, 40));
pnlIdropWebModeBeginDownload.setLayout(new java.awt.BorderLayout());
btnIdropWebModeBeginDownload.setText(org.openide.util.NbBundle.getMessage(iDropLiteApplet.class, "iDropLiteApplet.btnIdropWebModeBeginDownload.text")); // NOI18N
@@ -2591,7 +2586,6 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
private javax.swing.JButton btnUploadLocalRefresh;
private javax.swing.JButton btnUploadMove;
private javax.swing.JButton btnUploadUrl;
- private javax.swing.JLabel jLabel1;
private javax.swing.JLabel jLabel5;
private javax.swing.JLabel jLabel6;
private javax.swing.JLabel jLabel7;
@@ -2602,7 +2596,6 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
private javax.swing.JPanel jPanel12;
private javax.swing.JPanel jPanel13;
private javax.swing.JPanel jPanel14;
- private javax.swing.JPanel jPanel15;
private javax.swing.JPanel jPanel16;
private javax.swing.JPanel jPanel17;
private javax.swing.JPanel jPanel2;
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 2f9010c..46db311 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
@@ -32,7 +32,6 @@ iDropLiteApplet.btnUploadUrl.text=Import file from URL
iDropLiteApplet.txtDownloadTarget.text=
iDropLiteApplet.bntBeginDownload.text=Begin Download
iDropLiteApplet.btnCancelDownload.text=Cancel
-iDropLiteApplet.jLabel1.text=Shopping Cart Download Progress
iDropLiteApplet.btnBrowseDownloadTarget.text=Browse
iDropLiteApplet.txtIdropWebModeDownloadTarget.text=
iDropLiteApplet.btnIdropWebModeTargetBrowse.text=Browse