diff options
4 files changed, 184 insertions, 142 deletions
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/iDrop.form b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/iDrop.form index d7e306d..a953c53 100644 --- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/iDrop.form +++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/iDrop.form @@ -91,6 +91,9 @@ <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/Bundle.properties" key="iDrop.btnMainToolbarTree.toolTipText" 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="null"/> + </Property> <Property name="borderPainted" type="boolean" value="false"/> <Property name="horizontalTextPosition" type="int" value="0"/> <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> @@ -121,6 +124,7 @@ <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor"> <Border info="null"/> </Property> + <Property name="borderPainted" type="boolean" value="false"/> <Property name="horizontalTextPosition" type="int" value="0"/> <Property name="verticalTextPosition" type="int" value="3"/> </Properties> @@ -144,6 +148,7 @@ <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor"> <Border info="null"/> </Property> + <Property name="borderPainted" type="boolean" value="false"/> <Property name="horizontalTextPosition" type="int" value="0"/> <Property name="verticalTextPosition" type="int" value="3"/> </Properties> @@ -164,6 +169,9 @@ <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/Bundle.properties" key="iDrop.btnMainToolbarRefresh.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="null"/> + </Property> <Property name="borderPainted" type="boolean" value="false"/> <Property name="horizontalTextPosition" type="int" value="0"/> <Property name="verticalTextPosition" type="int" value="3"/> @@ -177,39 +185,6 @@ </Constraint> </Constraints> </Component> - <Component class="javax.swing.JButton" name="btnMainToolbarTools"> - <Properties> - <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> - <Image iconType="3" name="/icon_tools.png"/> - </Property> - <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> - <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/Bundle.properties" key="iDrop.btnMainToolbarTools.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> - </Property> - <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> - <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/Bundle.properties" key="iDrop.btnMainToolbarTools.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> - </Property> - <Property name="borderPainted" type="boolean" value="false"/> - <Property name="horizontalTextPosition" type="int" value="0"/> - <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor"> - <Insets value="null"/> - </Property> - <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[53, 68]"/> - </Property> - <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[53, 68]"/> - </Property> - <Property name="verticalTextPosition" type="int" value="3"/> - </Properties> - <Events> - <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnMainToolbarToolsActionPerformed"/> - </Events> - <Constraints> - <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> - <GridBagConstraints gridX="10" gridY="1" gridWidth="1" gridHeight="1" fill="0" ipadX="2" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> - </Constraint> - </Constraints> - </Component> <Component class="javax.swing.JSeparator" name="jSeparator1"> <Properties> <Property name="orientation" type="int" value="1"/> @@ -243,6 +218,7 @@ <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor"> <Border info="null"/> </Property> + <Property name="borderPainted" type="boolean" value="false"/> <Property name="horizontalTextPosition" type="int" value="0"/> <Property name="verticalTextPosition" type="int" value="3"/> </Properties> @@ -266,12 +242,13 @@ <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor"> <Border info="null"/> </Property> + <Property name="borderPainted" type="boolean" value="false"/> <Property name="horizontalTextPosition" type="int" value="0"/> <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[81, 70]"/> + <Dimension value="[81, 68]"/> </Property> <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[81, 70]"/> + <Dimension value="[81, 68]"/> </Property> <Property name="verticalTextPosition" type="int" value="3"/> </Properties> @@ -289,6 +266,9 @@ <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> <Image iconType="3" name="/icon_editmetadata.png"/> </Property> + <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor"> + <Border info="null"/> + </Property> <Property name="borderPainted" type="boolean" value="false"/> <Property name="horizontalTextPosition" type="int" value="0"/> <Property name="label" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> @@ -309,13 +289,13 @@ <Properties> <Property name="orientation" type="int" value="1"/> <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[34, 60]"/> + <Dimension value="[10, 60]"/> </Property> <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[34, 60]"/> + <Dimension value="[10, 60]"/> </Property> <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[34, 60]"/> + <Dimension value="[10, 60]"/> </Property> </Properties> <Constraints> @@ -324,29 +304,39 @@ </Constraint> </Constraints> </Component> - <Component class="javax.swing.JButton" name="btnMainToolbarSync"> + <Component class="javax.swing.JButton" name="btnMainToolbarTools"> <Properties> <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> - <Image iconType="3" name="/icon_synch.png"/> + <Image iconType="3" name="/icon_tools.png"/> </Property> <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> - <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/Bundle.properties" key="iDrop.btnMainToolbarSync.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> + <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/Bundle.properties" key="iDrop.btnMainToolbarTools.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> + </Property> + <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> + <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/Bundle.properties" key="iDrop.btnMainToolbarTools.toolTipText" 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="null"/> </Property> + <Property name="borderPainted" type="boolean" value="false"/> <Property name="horizontalTextPosition" type="int" value="0"/> <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor"> <Insets value="null"/> </Property> + <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[53, 68]"/> + </Property> + <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[53, 68]"/> + </Property> <Property name="verticalTextPosition" type="int" value="3"/> </Properties> <Events> - <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnMainToolbarSyncActionPerformed"/> + <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnMainToolbarToolsActionPerformed"/> </Events> <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> - <GridBagConstraints gridX="11" gridY="1" gridWidth="1" gridHeight="1" fill="0" ipadX="2" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> + <GridBagConstraints gridX="9" gridY="1" gridWidth="1" gridHeight="1" fill="0" ipadX="2" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> </Component> @@ -361,6 +351,7 @@ <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor"> <Border info="null"/> </Property> + <Property name="borderPainted" type="boolean" value="false"/> <Property name="horizontalTextPosition" type="int" value="0"/> <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor"> <Insets value="null"/> @@ -372,7 +363,67 @@ </Events> <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> - <GridBagConstraints gridX="12" gridY="1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> + <GridBagConstraints gridX="10" gridY="1" gridWidth="1" gridHeight="1" fill="0" ipadX="2" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> + </Constraint> + </Constraints> + </Component> + <Component class="javax.swing.JButton" name="btnMainToolbarSync"> + <Properties> + <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> + <Image iconType="3" name="/icon_synch.png"/> + </Property> + <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> + <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/Bundle.properties" key="iDrop.btnMainToolbarSync.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="null"/> + </Property> + <Property name="borderPainted" type="boolean" value="false"/> + <Property name="horizontalTextPosition" type="int" value="0"/> + <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor"> + <Insets value="null"/> + </Property> + <Property name="verticalTextPosition" type="int" value="3"/> + </Properties> + <Events> + <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnMainToolbarSyncActionPerformed"/> + </Events> + <Constraints> + <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> + <GridBagConstraints gridX="11" gridY="1" gridWidth="1" gridHeight="1" fill="0" ipadX="2" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> + </Constraint> + </Constraints> + </Component> + <Component class="javax.swing.JButton" name="btnMainToolbarMetasearch"> + <Properties> + <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> + <Image iconType="3" name="/icon_metasearch.png"/> + </Property> + <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> + <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/Bundle.properties" key="iDrop.btnMainToolbarMetasearch.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="null"/> + </Property> + <Property name="borderPainted" type="boolean" value="false"/> + <Property name="horizontalTextPosition" type="int" value="0"/> + <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[65, 68]"/> + </Property> + <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[65, 68]"/> + </Property> + <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[60, 68]"/> + </Property> + <Property name="verticalTextPosition" type="int" value="3"/> + </Properties> + <Events> + <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnMainToolbarMetasearchActionPerformed"/> + </Events> + <Constraints> + <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> + <GridBagConstraints gridX="12" gridY="1" gridWidth="1" gridHeight="1" fill="0" ipadX="2" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> </Component> @@ -399,7 +450,7 @@ </Events> <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> - <GridBagConstraints gridX="12" gridY="0" gridWidth="1" gridHeight="1" fill="0" ipadX="1" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/> + <GridBagConstraints gridX="11" gridY="0" gridWidth="1" gridHeight="1" fill="0" ipadX="1" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> </Component> @@ -419,9 +470,12 @@ <Dimension value="[100, 20]"/> </Property> </Properties> + <Events> + <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="txtMainToolbarSearchTermsActionPerformed"/> + </Events> <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> - <GridBagConstraints gridX="13" gridY="0" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/> + <GridBagConstraints gridX="12" gridY="0" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> </Component> @@ -468,40 +522,6 @@ <Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/> </Container> - <Component class="javax.swing.JButton" name="btnMainToolbarSettings1"> - <Properties> - <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> - <Image iconType="3" name="/icon_metasearch.png"/> - </Property> - <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> - <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/Bundle.properties" key="iDrop.btnMainToolbarSettings1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> - </Property> - <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor"> - <Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo"> - <EmptyBorder/> - </Border> - </Property> - <Property name="horizontalTextPosition" type="int" value="0"/> - <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[65, 70]"/> - </Property> - <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[60, 69]"/> - </Property> - <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[60, 69]"/> - </Property> - <Property name="verticalTextPosition" type="int" value="3"/> - </Properties> - <Events> - <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnMainToolbarSettings1ActionPerformed"/> - </Events> - <Constraints> - <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> - <GridBagConstraints gridX="13" gridY="1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> - </Constraint> - </Constraints> - </Component> </SubComponents> </Container> <Container class="javax.swing.JPanel" name="pnlMainIrodsTree"> diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/iDrop.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/iDrop.java index 920a564..7ad9ffb 100644 --- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/iDrop.java +++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/iDrop.java @@ -1323,19 +1323,19 @@ public class iDrop extends javax.swing.JFrame implements ActionListener, btnMainToolbarDownload = new javax.swing.JButton(); btnMainToolbarUpload = new javax.swing.JButton(); btnMainToolbarRefresh = new javax.swing.JButton(); - btnMainToolbarTools = new javax.swing.JButton(); jSeparator1 = new javax.swing.JSeparator(); btnMainToolbarCopy = new javax.swing.JButton(); btnMainToolbarDelete = new javax.swing.JButton(); btnMainToolbarInfo = new javax.swing.JButton(); jSeparator3 = new javax.swing.JSeparator(); - btnMainToolbarSync = new javax.swing.JButton(); + btnMainToolbarTools = new javax.swing.JButton(); btnMainToolbarSettings = new javax.swing.JButton(); + btnMainToolbarSync = new javax.swing.JButton(); + btnMainToolbarMetasearch = new javax.swing.JButton(); btnMainToolbarSearchFiles = new javax.swing.JButton(); txtMainToolbarSearchTerms = new javax.swing.JTextField(); lblBreadCrumb = new javax.swing.JLabel(); pnlBreadCrumbNav = new javax.swing.JPanel(); - btnMainToolbarSettings1 = new javax.swing.JButton(); pnlMainIrodsTree = new javax.swing.JPanel(); splitPanelTrees = new javax.swing.JSplitPane(); scrollIrodsTree = new javax.swing.JScrollPane(); @@ -1392,6 +1392,7 @@ public class iDrop extends javax.swing.JFrame implements ActionListener, btnMainToolbarTree.setMnemonic('t'); btnMainToolbarTree.setText(org.openide.util.NbBundle.getMessage(iDrop.class, "iDrop.btnMainToolbarTree.text")); // NOI18N btnMainToolbarTree.setToolTipText(org.openide.util.NbBundle.getMessage(iDrop.class, "iDrop.btnMainToolbarTree.toolTipText")); // NOI18N + btnMainToolbarTree.setBorder(null); btnMainToolbarTree.setBorderPainted(false); btnMainToolbarTree.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER); btnMainToolbarTree.setMaximumSize(new java.awt.Dimension(53, 68)); @@ -1411,6 +1412,7 @@ public class iDrop extends javax.swing.JFrame implements ActionListener, btnMainToolbarDownload.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icon_download.png"))); // NOI18N btnMainToolbarDownload.setText(org.openide.util.NbBundle.getMessage(iDrop.class, "iDrop.btnMainToolbarDownload.text")); // NOI18N btnMainToolbarDownload.setBorder(null); + btnMainToolbarDownload.setBorderPainted(false); btnMainToolbarDownload.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER); btnMainToolbarDownload.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM); btnMainToolbarDownload.addActionListener(new java.awt.event.ActionListener() { @@ -1427,6 +1429,7 @@ public class iDrop extends javax.swing.JFrame implements ActionListener, btnMainToolbarUpload.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icon_upload.png"))); // NOI18N btnMainToolbarUpload.setText(org.openide.util.NbBundle.getMessage(iDrop.class, "iDrop.btnMainToolbarUpload.text")); // NOI18N btnMainToolbarUpload.setBorder(null); + btnMainToolbarUpload.setBorderPainted(false); btnMainToolbarUpload.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER); btnMainToolbarUpload.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM); btnMainToolbarUpload.addActionListener(new java.awt.event.ActionListener() { @@ -1442,6 +1445,7 @@ public class iDrop extends javax.swing.JFrame implements ActionListener, btnMainToolbarRefresh.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icon_refresh.png"))); // NOI18N btnMainToolbarRefresh.setText(org.openide.util.NbBundle.getMessage(iDrop.class, "iDrop.btnMainToolbarRefresh.text")); // NOI18N + btnMainToolbarRefresh.setBorder(null); btnMainToolbarRefresh.setBorderPainted(false); btnMainToolbarRefresh.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER); btnMainToolbarRefresh.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM); @@ -1456,26 +1460,6 @@ public class iDrop extends javax.swing.JFrame implements ActionListener, gridBagConstraints.ipadx = 2; pnlMainToolbarIcons.add(btnMainToolbarRefresh, gridBagConstraints); - btnMainToolbarTools.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icon_tools.png"))); // NOI18N - btnMainToolbarTools.setText(org.openide.util.NbBundle.getMessage(iDrop.class, "iDrop.btnMainToolbarTools.text")); // NOI18N - btnMainToolbarTools.setToolTipText(org.openide.util.NbBundle.getMessage(iDrop.class, "iDrop.btnMainToolbarTools.toolTipText")); // NOI18N - btnMainToolbarTools.setBorderPainted(false); - btnMainToolbarTools.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER); - btnMainToolbarTools.setMargin(null); - btnMainToolbarTools.setMaximumSize(new java.awt.Dimension(53, 68)); - btnMainToolbarTools.setMinimumSize(new java.awt.Dimension(53, 68)); - btnMainToolbarTools.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM); - btnMainToolbarTools.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - btnMainToolbarToolsActionPerformed(evt); - } - }); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 10; - gridBagConstraints.gridy = 1; - gridBagConstraints.ipadx = 2; - pnlMainToolbarIcons.add(btnMainToolbarTools, gridBagConstraints); - jSeparator1.setOrientation(javax.swing.SwingConstants.VERTICAL); jSeparator1.setMaximumSize(new java.awt.Dimension(34, 60)); jSeparator1.setMinimumSize(new java.awt.Dimension(34, 60)); @@ -1490,6 +1474,7 @@ public class iDrop extends javax.swing.JFrame implements ActionListener, btnMainToolbarCopy.setText(org.openide.util.NbBundle.getMessage(iDrop.class, "iDrop.btnMainToolbarCopy.text")); // NOI18N btnMainToolbarCopy.setActionCommand(org.openide.util.NbBundle.getMessage(iDrop.class, "iDrop.btnMainToolbarCopy.actionCommand")); // NOI18N btnMainToolbarCopy.setBorder(null); + btnMainToolbarCopy.setBorderPainted(false); btnMainToolbarCopy.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER); btnMainToolbarCopy.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM); btnMainToolbarCopy.addActionListener(new java.awt.event.ActionListener() { @@ -1506,9 +1491,10 @@ public class iDrop extends javax.swing.JFrame implements ActionListener, btnMainToolbarDelete.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icon_delete.png"))); // NOI18N btnMainToolbarDelete.setText(org.openide.util.NbBundle.getMessage(iDrop.class, "iDrop.btnMainToolbarDelete.text_1")); // NOI18N btnMainToolbarDelete.setBorder(null); + btnMainToolbarDelete.setBorderPainted(false); btnMainToolbarDelete.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER); - btnMainToolbarDelete.setMaximumSize(new java.awt.Dimension(81, 70)); - btnMainToolbarDelete.setPreferredSize(new java.awt.Dimension(81, 70)); + btnMainToolbarDelete.setMaximumSize(new java.awt.Dimension(81, 68)); + btnMainToolbarDelete.setPreferredSize(new java.awt.Dimension(81, 68)); btnMainToolbarDelete.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM); btnMainToolbarDelete.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -1522,6 +1508,7 @@ public class iDrop extends javax.swing.JFrame implements ActionListener, pnlMainToolbarIcons.add(btnMainToolbarDelete, gridBagConstraints); btnMainToolbarInfo.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icon_editmetadata.png"))); // NOI18N + btnMainToolbarInfo.setBorder(null); btnMainToolbarInfo.setBorderPainted(false); btnMainToolbarInfo.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER); btnMainToolbarInfo.setLabel(org.openide.util.NbBundle.getMessage(iDrop.class, "iDrop.btnMainToolbarInfo.label")); // NOI18N @@ -1538,17 +1525,57 @@ public class iDrop extends javax.swing.JFrame implements ActionListener, pnlMainToolbarIcons.add(btnMainToolbarInfo, gridBagConstraints); jSeparator3.setOrientation(javax.swing.SwingConstants.VERTICAL); - jSeparator3.setMaximumSize(new java.awt.Dimension(34, 60)); - jSeparator3.setMinimumSize(new java.awt.Dimension(34, 60)); - jSeparator3.setPreferredSize(new java.awt.Dimension(34, 60)); + jSeparator3.setMaximumSize(new java.awt.Dimension(10, 60)); + jSeparator3.setMinimumSize(new java.awt.Dimension(10, 60)); + jSeparator3.setPreferredSize(new java.awt.Dimension(10, 60)); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 8; gridBagConstraints.gridy = 1; pnlMainToolbarIcons.add(jSeparator3, gridBagConstraints); + btnMainToolbarTools.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icon_tools.png"))); // NOI18N + btnMainToolbarTools.setText(org.openide.util.NbBundle.getMessage(iDrop.class, "iDrop.btnMainToolbarTools.text")); // NOI18N + btnMainToolbarTools.setToolTipText(org.openide.util.NbBundle.getMessage(iDrop.class, "iDrop.btnMainToolbarTools.toolTipText")); // NOI18N + btnMainToolbarTools.setBorder(null); + btnMainToolbarTools.setBorderPainted(false); + btnMainToolbarTools.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER); + btnMainToolbarTools.setMargin(null); + btnMainToolbarTools.setMaximumSize(new java.awt.Dimension(53, 68)); + btnMainToolbarTools.setMinimumSize(new java.awt.Dimension(53, 68)); + btnMainToolbarTools.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM); + btnMainToolbarTools.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + btnMainToolbarToolsActionPerformed(evt); + } + }); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 9; + gridBagConstraints.gridy = 1; + gridBagConstraints.ipadx = 2; + pnlMainToolbarIcons.add(btnMainToolbarTools, gridBagConstraints); + + btnMainToolbarSettings.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icon_settings.png"))); // NOI18N + btnMainToolbarSettings.setText(org.openide.util.NbBundle.getMessage(iDrop.class, "iDrop.btnMainToolbarSettings.text")); // NOI18N + btnMainToolbarSettings.setBorder(null); + btnMainToolbarSettings.setBorderPainted(false); + btnMainToolbarSettings.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER); + btnMainToolbarSettings.setMargin(null); + btnMainToolbarSettings.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM); + btnMainToolbarSettings.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + btnMainToolbarSettingsActionPerformed(evt); + } + }); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 10; + gridBagConstraints.gridy = 1; + gridBagConstraints.ipadx = 2; + pnlMainToolbarIcons.add(btnMainToolbarSettings, gridBagConstraints); + btnMainToolbarSync.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icon_synch.png"))); // NOI18N btnMainToolbarSync.setText(org.openide.util.NbBundle.getMessage(iDrop.class, "iDrop.btnMainToolbarSync.text")); // NOI18N btnMainToolbarSync.setBorder(null); + btnMainToolbarSync.setBorderPainted(false); btnMainToolbarSync.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER); btnMainToolbarSync.setMargin(null); btnMainToolbarSync.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM); @@ -1563,21 +1590,25 @@ public class iDrop extends javax.swing.JFrame implements ActionListener, gridBagConstraints.ipadx = 2; pnlMainToolbarIcons.add(btnMainToolbarSync, gridBagConstraints); - btnMainToolbarSettings.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icon_settings.png"))); // NOI18N - btnMainToolbarSettings.setText(org.openide.util.NbBundle.getMessage(iDrop.class, "iDrop.btnMainToolbarSettings.text")); // NOI18N - btnMainToolbarSettings.setBorder(null); - btnMainToolbarSettings.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER); - btnMainToolbarSettings.setMargin(null); - btnMainToolbarSettings.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM); - btnMainToolbarSettings.addActionListener(new java.awt.event.ActionListener() { + btnMainToolbarMetasearch.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icon_metasearch.png"))); // NOI18N + btnMainToolbarMetasearch.setText(org.openide.util.NbBundle.getMessage(iDrop.class, "iDrop.btnMainToolbarMetasearch.text")); // NOI18N + btnMainToolbarMetasearch.setBorder(null); + btnMainToolbarMetasearch.setBorderPainted(false); + btnMainToolbarMetasearch.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER); + btnMainToolbarMetasearch.setMaximumSize(new java.awt.Dimension(65, 68)); + btnMainToolbarMetasearch.setMinimumSize(new java.awt.Dimension(65, 68)); + btnMainToolbarMetasearch.setPreferredSize(new java.awt.Dimension(60, 68)); + btnMainToolbarMetasearch.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM); + btnMainToolbarMetasearch.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { - btnMainToolbarSettingsActionPerformed(evt); + btnMainToolbarMetasearchActionPerformed(evt); } }); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 12; gridBagConstraints.gridy = 1; - pnlMainToolbarIcons.add(btnMainToolbarSettings, gridBagConstraints); + gridBagConstraints.ipadx = 2; + pnlMainToolbarIcons.add(btnMainToolbarMetasearch, gridBagConstraints); btnMainToolbarSearchFiles.setIcon(new javax.swing.ImageIcon(getClass().getResource("/search_files.png"))); // NOI18N btnMainToolbarSearchFiles.setText(org.openide.util.NbBundle.getMessage(iDrop.class, "iDrop.btnMainToolbarSearchFiles.text")); // NOI18N @@ -1590,7 +1621,7 @@ public class iDrop extends javax.swing.JFrame implements ActionListener, } }); gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 12; + gridBagConstraints.gridx = 11; gridBagConstraints.gridy = 0; gridBagConstraints.ipadx = 1; gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_END; @@ -1601,8 +1632,13 @@ public class iDrop extends javax.swing.JFrame implements ActionListener, txtMainToolbarSearchTerms.setText(org.openide.util.NbBundle.getMessage(iDrop.class, "iDrop.txtMainToolbarSearchTerms.text")); // NOI18N txtMainToolbarSearchTerms.setToolTipText(org.openide.util.NbBundle.getMessage(iDrop.class, "iDrop.txtMainToolbarSearchTerms.toolTipText")); // NOI18N txtMainToolbarSearchTerms.setMinimumSize(new java.awt.Dimension(100, 20)); + txtMainToolbarSearchTerms.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + txtMainToolbarSearchTermsActionPerformed(evt); + } + }); gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 13; + gridBagConstraints.gridx = 12; gridBagConstraints.gridy = 0; gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_END; pnlMainToolbarIcons.add(txtMainToolbarSearchTerms, gridBagConstraints); @@ -1627,24 +1663,6 @@ public class iDrop extends javax.swing.JFrame implements ActionListener, gridBagConstraints.gridheight = java.awt.GridBagConstraints.REMAINDER; pnlMainToolbarIcons.add(pnlBreadCrumbNav, gridBagConstraints); - btnMainToolbarSettings1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icon_metasearch.png"))); // NOI18N - btnMainToolbarSettings1.setText(org.openide.util.NbBundle.getMessage(iDrop.class, "iDrop.btnMainToolbarSettings1.text")); // NOI18N - btnMainToolbarSettings1.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 1, 1, 1)); - btnMainToolbarSettings1.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER); - btnMainToolbarSettings1.setMaximumSize(new java.awt.Dimension(65, 70)); - btnMainToolbarSettings1.setMinimumSize(new java.awt.Dimension(60, 69)); - btnMainToolbarSettings1.setPreferredSize(new java.awt.Dimension(60, 69)); - btnMainToolbarSettings1.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM); - btnMainToolbarSettings1.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - btnMainToolbarSettings1ActionPerformed(evt); - } - }); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 13; - gridBagConstraints.gridy = 1; - pnlMainToolbarIcons.add(btnMainToolbarSettings1, gridBagConstraints); - pnlMain.add(pnlMainToolbarIcons, java.awt.BorderLayout.PAGE_START); pnlMainIrodsTree.setBorder(javax.swing.BorderFactory.createEtchedBorder()); @@ -1900,11 +1918,15 @@ public class iDrop extends javax.swing.JFrame implements ActionListener, popup.show(pnlBreadCrumbNav, p.x, p.y + btnMainToolbarTree.getHeight()); }//GEN-LAST:event_btnMainToolbarTreeActionPerformed - private void btnMainToolbarSettings1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnMainToolbarSettings1ActionPerformed + private void btnMainToolbarMetasearchActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnMainToolbarMetasearchActionPerformed MetaSearch idropMetaSearch = new MetaSearch(this, true, iDropCore, getIrodsTree()); idropMetaSearch.setLocationRelativeTo(null); idropMetaSearch.setVisible(true); - }//GEN-LAST:event_btnMainToolbarSettings1ActionPerformed + }//GEN-LAST:event_btnMainToolbarMetasearchActionPerformed + + private void txtMainToolbarSearchTermsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_txtMainToolbarSearchTermsActionPerformed + // TODO add your handling code here: + }//GEN-LAST:event_txtMainToolbarSearchTermsActionPerformed private void btnMainToolbarSettingsActionPerformed( final java.awt.event.ActionEvent evt) {// GEN-FIRST:event_btnMainToolbarSettingsActionPerformed @@ -2070,10 +2092,10 @@ public class iDrop extends javax.swing.JFrame implements ActionListener, private javax.swing.JButton btnMainToolbarDelete; private javax.swing.JButton btnMainToolbarDownload; private javax.swing.JButton btnMainToolbarInfo; + private javax.swing.JButton btnMainToolbarMetasearch; private javax.swing.JButton btnMainToolbarRefresh; private javax.swing.JButton btnMainToolbarSearchFiles; private javax.swing.JButton btnMainToolbarSettings; - private javax.swing.JButton btnMainToolbarSettings1; private javax.swing.JButton btnMainToolbarSync; private javax.swing.JButton btnMainToolbarTools; private javax.swing.JButton btnMainToolbarTree; diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java index f503107..35c84ec 100644 --- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java +++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java @@ -1,5 +1,5 @@ package org.irods.jargon.idrop.desktop.systraygui.utils; public final class Version { public static String VERSION="2.0.1-SNAPSHOT"; - public static String BUILD_TIME="20131009-0949"; + public static String BUILD_TIME="20131021-0932"; } diff --git a/idrop-swing/src/main/resources/org/irods/jargon/idrop/desktop/systraygui/Bundle.properties b/idrop-swing/src/main/resources/org/irods/jargon/idrop/desktop/systraygui/Bundle.properties index 2f987b7..b7b1ea9 100644 --- a/idrop-swing/src/main/resources/org/irods/jargon/idrop/desktop/systraygui/Bundle.properties +++ b/idrop-swing/src/main/resources/org/irods/jargon/idrop/desktop/systraygui/Bundle.properties @@ -348,8 +348,8 @@ DiffViewDialog.lblIrodsFileChecksumLbl.text=iRODS File Checksum: DiffViewDialog.lblIrodsFileChecksum.text=irodsfilechecksum iDrop.btnMainToolbarTree.text=Tree iDrop.btnMainToolbarTree.toolTipText=Adjust the tree root -iDrop.btnMainToolbarSettings1.text=MetaSearch MetadataSearchResultsDialog.title=Meta Search Results MetadataSearchResultsDialog.pnlTabSearch.toolTipText=Meta Search Results MetadataSearchResultsDialog.btnDismiss.text=Dismiss MetadataSearchResultsDialog.btnDismiss.label=Dismiss +iDrop.btnMainToolbarMetasearch.text=MetaSearch |