summaryrefslogtreecommitdiffstats
path: root/idrop-lite
diff options
context:
space:
mode:
authormconway <michael.c.conway@gmail.com>2012-07-03 00:19:42 (GMT)
committer mconway <michael.c.conway@gmail.com>2012-07-03 00:19:42 (GMT)
commit34801a6b199f8c40e58d0c53cb98fa9830880440 (patch)
treeb32746ae2b8d23ce7b31536cb0306c1dbc5ac470 /idrop-lite
parenta0e869a6d843c798446fb066e0237dc81045ecfc (diff)
parentbdc0a30b27f1cb1b71dbc31cad4e78b68f2a1a2d (diff)
downloadQCG-Data-34801a6b199f8c40e58d0c53cb98fa9830880440.zip
QCG-Data-34801a6b199f8c40e58d0c53cb98fa9830880440.tar.gz
QCG-Data-34801a6b199f8c40e58d0c53cb98fa9830880440.tar.bz2
Merge branch 'master' of ssh://code.renci.org/gitroot/irodsidrop
Diffstat (limited to 'idrop-lite')
-rw-r--r--idrop-lite/src/main/java/org/irods/jargon/idrop/lite/iDropLiteApplet.form4
-rw-r--r--idrop-lite/src/main/java/org/irods/jargon/idrop/lite/iDropLiteApplet.java6
-rw-r--r--idrop-lite/src/main/resources/icon_delete.png (renamed from idrop-lite/src/main/java/org/irods/jargon/idrop/lite/images/icon_delete.png)bin3118 -> 3118 bytes
-rw-r--r--idrop-lite/src/main/resources/icon_idroplite_addtoqueue.png (renamed from idrop-lite/src/main/java/org/irods/jargon/idrop/lite/images/icon_idroplite_addtoqueue.png)bin3067 -> 3067 bytes
-rw-r--r--idrop-lite/src/main/resources/icon_idroplite_refresh.png (renamed from idrop-lite/src/main/java/org/irods/jargon/idrop/lite/images/icon_idroplite_refresh.png)bin3127 -> 3127 bytes
5 files changed, 6 insertions, 4 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 7ac96bb..1455b55 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
@@ -978,7 +978,7 @@
<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"/>
+ <Image iconType="3" name="/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.btnUploadLocalRefresh.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
@@ -1003,7 +1003,7 @@
<Font name="Lucida Grande" size="11" style="0"/>
</Property>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
- <Image iconType="3" name="/org/irods/jargon/idrop/lite/images/icon_idroplite_addtoqueue.png"/>
+ <Image iconType="3" name="/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, &quot;{key}&quot;)"/>
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 09b53b5..5283da9 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
@@ -1962,7 +1962,8 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
pnlUploadRefreshButton.setLayout(new java.awt.FlowLayout(java.awt.FlowLayout.LEFT, 2, 6));
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.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/irods/jargon/idrop/lite/images/icon_idroplite_refresh.png"))); // NOI18N
+ btnUploadLocalRefresh.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icon_idroplite_refresh.png")));
btnUploadLocalRefresh.setText(org.openide.util.NbBundle.getMessage(iDropLiteApplet.class, "iDropLiteApplet.btnUploadLocalRefresh.text")); // NOI18N
btnUploadLocalRefresh.setMaximumSize(new java.awt.Dimension(94, 34));
btnUploadLocalRefresh.setMinimumSize(new java.awt.Dimension(94, 34));
@@ -1975,7 +1976,8 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
pnlUploadRefreshButton.add(btnUploadLocalRefresh);
btnUploadMove.setFont(new java.awt.Font("Lucida Grande", 0, 11)); // NOI18N
- btnUploadMove.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/irods/jargon/idrop/lite/images/icon_idroplite_addtoqueue.png"))); // NOI18N
+ //btnUploadMove.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/irods/jargon/idrop/lite/images/icon_idroplite_addtoqueue.png"))); // NOI18N
+ btnUploadMove.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icon_idroplite_addtoqueue.png")));
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));
diff --git a/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/images/icon_delete.png b/idrop-lite/src/main/resources/icon_delete.png
index c19bd0e..c19bd0e 100644
--- a/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/images/icon_delete.png
+++ b/idrop-lite/src/main/resources/icon_delete.png
Binary files differ
diff --git a/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/images/icon_idroplite_addtoqueue.png b/idrop-lite/src/main/resources/icon_idroplite_addtoqueue.png
index 57404cf..57404cf 100644
--- a/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/images/icon_idroplite_addtoqueue.png
+++ b/idrop-lite/src/main/resources/icon_idroplite_addtoqueue.png
Binary files differ
diff --git a/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/images/icon_idroplite_refresh.png b/idrop-lite/src/main/resources/icon_idroplite_refresh.png
index f229e9b..f229e9b 100644
--- a/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/images/icon_idroplite_refresh.png
+++ b/idrop-lite/src/main/resources/icon_idroplite_refresh.png
Binary files differ