summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Conway <mikeconway@Mike-Conways-MacBook-Pro.local>2011-07-17 15:42:01 (GMT)
committer Mike Conway <mikeconway@Mike-Conways-MacBook-Pro.local>2011-07-17 15:42:01 (GMT)
commit67b3b364f48b20f37d7c7b0c1d6e25d8d684f539 (patch)
treeadff2ea90a7cd31abfe50dbb397377f2d3fd235a
parent0d31b23376f102bfde4dcea650f4691e97aff048 (diff)
downloadQCG-Data-67b3b364f48b20f37d7c7b0c1d6e25d8d684f539.zip
QCG-Data-67b3b364f48b20f37d7c7b0c1d6e25d8d684f539.tar.gz
QCG-Data-67b3b364f48b20f37d7c7b0c1d6e25d8d684f539.tar.bz2
clean up initial setup, now calls to save synch, thats yet to be implemented
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/services/IdropConfigurationServiceImpl.java1
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/SetupWizard.form141
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/SetupWizard.java143
-rw-r--r--idrop-swing/src/main/resources/idrop.properties2
-rw-r--r--idrop-swing/src/main/resources/org/irods/jargon/idrop/desktop/systraygui/viscomponents/Bundle.properties8
5 files changed, 144 insertions, 151 deletions
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/services/IdropConfigurationServiceImpl.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/services/IdropConfigurationServiceImpl.java
index afd5df0..d29bf55 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/services/IdropConfigurationServiceImpl.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/services/IdropConfigurationServiceImpl.java
@@ -277,4 +277,5 @@ public class IdropConfigurationServiceImpl implements IdropConfigurationService
log.error("exception removing config property");
}
}
+
}
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/SetupWizard.form b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/SetupWizard.form
index a83f32a..44696ad 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/SetupWizard.form
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/SetupWizard.form
@@ -24,7 +24,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,-16,0,0,3,-38"/>
+ <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,2,49,0,0,3,-38"/>
</AuxValues>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
@@ -100,36 +100,30 @@
<Container class="javax.swing.JPanel" name="panelTabSeeSysTrayQuestion">
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
- <BorderConstraints direction="Center"/>
+ <BorderConstraints direction="North"/>
</Constraint>
</Constraints>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/>
<SubComponents>
- <Container class="javax.swing.JScrollPane" name="jScrollPane1">
- <AuxValues>
- <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
- </AuxValues>
-
- <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
- <SubComponents>
- <Component class="javax.swing.JTextArea" name="txtSeeIcon">
- <Properties>
- <Property name="columns" type="int" value="60"/>
- <Property name="editable" type="boolean" value="false"/>
- <Property name="lineWrap" type="boolean" value="true"/>
- <Property name="rows" type="int" value="8"/>
- <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/viscomponents/Bundle.properties" key="SetupWizard.txtSeeIcon.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
- </Property>
- <Property name="wrapStyleWord" type="boolean" value="true"/>
- </Properties>
- </Component>
- </SubComponents>
- </Container>
+ <Component class="javax.swing.JLabel" name="jLabel2">
+ <Properties>
+ <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/viscomponents/Bundle.properties" key="SetupWizard.jLabel2.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ </Property>
+ </Properties>
+ </Component>
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="panelTabSeeSysTrayAnswer">
+ <Properties>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="null"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="null"/>
+ </Property>
+ </Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
<BorderConstraints direction="South"/>
@@ -192,30 +186,13 @@
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/>
<SubComponents>
- <Container class="javax.swing.JScrollPane" name="jScrollPane2">
- <AuxValues>
- <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
- </AuxValues>
-
- <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
- <SubComponents>
- <Component class="javax.swing.JTextArea" name="txtSeeIcon1">
- <Properties>
- <Property name="columns" type="int" value="60"/>
- <Property name="editable" type="boolean" value="false"/>
- <Property name="lineWrap" type="boolean" value="true"/>
- <Property name="rows" type="int" value="8"/>
- <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/viscomponents/Bundle.properties" key="SetupWizard.txtSeeIcon1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
- </Property>
- <Property name="wrapStyleWord" type="boolean" value="true"/>
- <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="null"/>
- </Property>
- </Properties>
- </Component>
- </SubComponents>
- </Container>
+ <Component class="javax.swing.JLabel" name="jLabel3">
+ <Properties>
+ <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/viscomponents/Bundle.properties" key="SetupWizard.jLabel3.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ </Property>
+ </Properties>
+ </Component>
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="panelTabNameDeviceAnswer">
@@ -242,19 +219,6 @@
</Property>
</Properties>
</Component>
- <Component class="javax.swing.JButton" name="btnSetDeviceName">
- <Properties>
- <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/viscomponents/Bundle.properties" key="SetupWizard.btnSetDeviceName.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
- </Property>
- <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/viscomponents/Bundle.properties" key="SetupWizard.btnSetDeviceName.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
- </Property>
- </Properties>
- <Events>
- <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnSetDeviceNameActionPerformed"/>
- </Events>
- </Component>
</SubComponents>
</Container>
</SubComponents>
@@ -281,27 +245,13 @@
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/>
<SubComponents>
- <Container class="javax.swing.JScrollPane" name="scrollInitialSynchSetupQuestion">
- <AuxValues>
- <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
- </AuxValues>
-
- <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
- <SubComponents>
- <Component class="javax.swing.JTextArea" name="txtInitialSynchSetupQuestion">
- <Properties>
- <Property name="columns" type="int" value="60"/>
- <Property name="editable" type="boolean" value="false"/>
- <Property name="lineWrap" type="boolean" value="true"/>
- <Property name="rows" type="int" value="8"/>
- <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/viscomponents/Bundle.properties" key="SetupWizard.txtInitialSynchSetupQuestion.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
- </Property>
- <Property name="wrapStyleWord" type="boolean" value="true"/>
- </Properties>
- </Component>
- </SubComponents>
- </Container>
+ <Component class="javax.swing.JLabel" name="jLabel4">
+ <Properties>
+ <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/viscomponents/Bundle.properties" key="SetupWizard.jLabel4.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ </Property>
+ </Properties>
+ </Component>
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="pnlInitialSynchSetupAnswer">
@@ -320,12 +270,22 @@
</Constraint>
</Constraints>
- <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridLayout">
- <Property name="columns" type="int" value="1"/>
- <Property name="rows" type="int" value="0"/>
- </Layout>
+ <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
<SubComponents>
<Container class="javax.swing.JPanel" name="pnlLocalSynch">
+ <Properties>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="null"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="null"/>
+ </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="9" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="10" insetsBottom="0" insetsRight="10" anchor="17" weightX="0.0" weightY="0.0"/>
+ </Constraint>
+ </Constraints>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/>
<SubComponents>
@@ -367,6 +327,11 @@
</Border>
</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="9" gridHeight="2" fill="1" ipadX="0" ipadY="0" insetsTop="20" insetsLeft="20" insetsBottom="20" insetsRight="20" anchor="10" weightX="0.0" weightY="0.0"/>
+ </Constraint>
+ </Constraints>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridLayout">
<Property name="columns" type="int" value="1"/>
@@ -385,6 +350,7 @@
<Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
<ComponentRef name="bnGroupSynchType"/>
</Property>
+ <Property name="selected" type="boolean" value="true"/>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/viscomponents/Bundle.properties" key="SetupWizard.radioBackup.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
@@ -415,6 +381,11 @@
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="pnlIrodsSynch">
+ <Constraints>
+ <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
+ <GridBagConstraints gridX="0" gridY="3" gridWidth="9" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="10" insetsBottom="0" insetsRight="10" anchor="17" weightX="0.0" weightY="0.0"/>
+ </Constraint>
+ </Constraints>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/>
<SubComponents>
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/SetupWizard.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/SetupWizard.java
index 8ec63c0..9a79c68 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/SetupWizard.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/SetupWizard.java
@@ -9,6 +9,7 @@ import java.awt.Color;
import java.awt.Dimension;
import java.awt.Toolkit;
import javax.swing.JFileChooser;
+import javax.swing.JOptionPane;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import org.irods.jargon.idrop.desktop.systraygui.IDROPCore;
@@ -66,6 +67,7 @@ public class SetupWizard extends javax.swing.JDialog {
// <editor-fold defaultstate="collapsed"
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
private void initComponents() {
+ java.awt.GridBagConstraints gridBagConstraints;
bnGroupSynchType = new javax.swing.ButtonGroup();
panelTop = new javax.swing.JPanel();
@@ -73,23 +75,19 @@ public class SetupWizard extends javax.swing.JDialog {
tabWizardTabs = new javax.swing.JTabbedPane();
panelTabSeeSysTray = new javax.swing.JPanel();
panelTabSeeSysTrayQuestion = new javax.swing.JPanel();
- jScrollPane1 = new javax.swing.JScrollPane();
- txtSeeIcon = new javax.swing.JTextArea();
+ jLabel2 = new javax.swing.JLabel();
panelTabSeeSysTrayAnswer = new javax.swing.JPanel();
btnSeeSystemTrayYes = new javax.swing.JButton();
btnSeeSystemTrayNo = new javax.swing.JButton();
panelTabNameDevice = new javax.swing.JPanel();
panelTabNameDeviceQuestion = new javax.swing.JPanel();
- jScrollPane2 = new javax.swing.JScrollPane();
- txtSeeIcon1 = new javax.swing.JTextArea();
+ jLabel3 = new javax.swing.JLabel();
panelTabNameDeviceAnswer = new javax.swing.JPanel();
lblDeviceName = new javax.swing.JLabel();
txtDeviceName = new javax.swing.JTextField();
- btnSetDeviceName = new javax.swing.JButton();
pnlInitialSynchSetup = new javax.swing.JPanel();
pnlInitialSynchSetupQuestion = new javax.swing.JPanel();
- scrollInitialSynchSetupQuestion = new javax.swing.JScrollPane();
- txtInitialSynchSetupQuestion = new javax.swing.JTextArea();
+ jLabel4 = new javax.swing.JLabel();
pnlInitialSynchSetupAnswer = new javax.swing.JPanel();
pnlSynchData = new javax.swing.JPanel();
pnlLocalSynch = new javax.swing.JPanel();
@@ -132,17 +130,13 @@ public class SetupWizard extends javax.swing.JDialog {
panelTabSeeSysTray.setLayout(new java.awt.BorderLayout());
- txtSeeIcon.setColumns(60);
- txtSeeIcon.setEditable(false);
- txtSeeIcon.setLineWrap(true);
- txtSeeIcon.setRows(8);
- txtSeeIcon.setText(org.openide.util.NbBundle.getMessage(SetupWizard.class, "SetupWizard.txtSeeIcon.text")); // NOI18N
- txtSeeIcon.setWrapStyleWord(true);
- jScrollPane1.setViewportView(txtSeeIcon);
+ jLabel2.setText(org.openide.util.NbBundle.getMessage(SetupWizard.class, "SetupWizard.jLabel2.text")); // NOI18N
+ panelTabSeeSysTrayQuestion.add(jLabel2);
- panelTabSeeSysTrayQuestion.add(jScrollPane1);
+ panelTabSeeSysTray.add(panelTabSeeSysTrayQuestion, java.awt.BorderLayout.NORTH);
- panelTabSeeSysTray.add(panelTabSeeSysTrayQuestion, java.awt.BorderLayout.CENTER);
+ panelTabSeeSysTrayAnswer.setMinimumSize(null);
+ panelTabSeeSysTrayAnswer.setPreferredSize(null);
btnSeeSystemTrayYes.setMnemonic('y');
btnSeeSystemTrayYes.setToolTipText(org.openide.util.NbBundle.getMessage(SetupWizard.class, "SetupWizard.btnSeeSystemTrayYes.toolTipText")); // NOI18N
@@ -170,16 +164,8 @@ public class SetupWizard extends javax.swing.JDialog {
panelTabNameDevice.setLayout(new java.awt.BorderLayout());
- txtSeeIcon1.setColumns(60);
- txtSeeIcon1.setEditable(false);
- txtSeeIcon1.setLineWrap(true);
- txtSeeIcon1.setRows(8);
- txtSeeIcon1.setText(org.openide.util.NbBundle.getMessage(SetupWizard.class, "SetupWizard.txtSeeIcon1.text")); // NOI18N
- txtSeeIcon1.setWrapStyleWord(true);
- txtSeeIcon1.setPreferredSize(null);
- jScrollPane2.setViewportView(txtSeeIcon1);
-
- panelTabNameDeviceQuestion.add(jScrollPane2);
+ jLabel3.setText(org.openide.util.NbBundle.getMessage(SetupWizard.class, "SetupWizard.jLabel3.text")); // NOI18N
+ panelTabNameDeviceQuestion.add(jLabel3);
panelTabNameDevice.add(panelTabNameDeviceQuestion, java.awt.BorderLayout.CENTER);
@@ -190,36 +176,23 @@ public class SetupWizard extends javax.swing.JDialog {
txtDeviceName.setText(org.openide.util.NbBundle.getMessage(SetupWizard.class, "SetupWizard.txtDeviceName.text")); // NOI18N
panelTabNameDeviceAnswer.add(txtDeviceName);
- btnSetDeviceName.setText(org.openide.util.NbBundle.getMessage(SetupWizard.class, "SetupWizard.btnSetDeviceName.text")); // NOI18N
- btnSetDeviceName.setToolTipText(org.openide.util.NbBundle.getMessage(SetupWizard.class, "SetupWizard.btnSetDeviceName.toolTipText")); // NOI18N
- btnSetDeviceName.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- btnSetDeviceNameActionPerformed(evt);
- }
- });
- panelTabNameDeviceAnswer.add(btnSetDeviceName);
-
panelTabNameDevice.add(panelTabNameDeviceAnswer, java.awt.BorderLayout.SOUTH);
tabWizardTabs.addTab(org.openide.util.NbBundle.getMessage(SetupWizard.class, "SetupWizard.panelTabNameDevice.TabConstraints.tabTitle"), panelTabNameDevice); // NOI18N
pnlInitialSynchSetup.setLayout(new java.awt.BorderLayout());
- txtInitialSynchSetupQuestion.setColumns(60);
- txtInitialSynchSetupQuestion.setEditable(false);
- txtInitialSynchSetupQuestion.setLineWrap(true);
- txtInitialSynchSetupQuestion.setRows(8);
- txtInitialSynchSetupQuestion.setText(org.openide.util.NbBundle.getMessage(SetupWizard.class, "SetupWizard.txtInitialSynchSetupQuestion.text")); // NOI18N
- txtInitialSynchSetupQuestion.setWrapStyleWord(true);
- scrollInitialSynchSetupQuestion.setViewportView(txtInitialSynchSetupQuestion);
-
- pnlInitialSynchSetupQuestion.add(scrollInitialSynchSetupQuestion);
+ jLabel4.setText(org.openide.util.NbBundle.getMessage(SetupWizard.class, "SetupWizard.jLabel4.text")); // NOI18N
+ pnlInitialSynchSetupQuestion.add(jLabel4);
pnlInitialSynchSetup.add(pnlInitialSynchSetupQuestion, java.awt.BorderLayout.CENTER);
pnlInitialSynchSetupAnswer.setLayout(new java.awt.BorderLayout());
- pnlSynchData.setLayout(new java.awt.GridLayout(0, 1));
+ pnlSynchData.setLayout(new java.awt.GridBagLayout());
+
+ pnlLocalSynch.setMinimumSize(null);
+ pnlLocalSynch.setPreferredSize(null);
txtLocalPath.setColumns(80);
txtLocalPath.setText(org.openide.util.NbBundle.getMessage(SetupWizard.class, "SetupWizard.txtLocalPath.text")); // NOI18N
@@ -241,7 +214,14 @@ public class SetupWizard extends javax.swing.JDialog {
});
pnlLocalSynch.add(btnChooseLocalSynch);
- pnlSynchData.add(pnlLocalSynch);
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 0;
+ gridBagConstraints.gridy = 0;
+ gridBagConstraints.gridwidth = 9;
+ gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
+ gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
+ gridBagConstraints.insets = new java.awt.Insets(0, 10, 0, 10);
+ pnlSynchData.add(pnlLocalSynch, gridBagConstraints);
pnlSynchMode.setBorder(javax.swing.BorderFactory.createLineBorder(new java.awt.Color(0, 0, 0)));
pnlSynchMode.setLayout(new java.awt.GridLayout(0, 1));
@@ -250,6 +230,7 @@ public class SetupWizard extends javax.swing.JDialog {
pnlSynchMode.add(jLabel1);
bnGroupSynchType.add(radioBackup);
+ radioBackup.setSelected(true);
radioBackup.setText(org.openide.util.NbBundle.getMessage(SetupWizard.class, "SetupWizard.radioBackup.text")); // NOI18N
pnlSynchMode.add(radioBackup);
@@ -263,7 +244,14 @@ public class SetupWizard extends javax.swing.JDialog {
radioSynch.setEnabled(false);
pnlSynchMode.add(radioSynch);
- pnlSynchData.add(pnlSynchMode);
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 0;
+ gridBagConstraints.gridy = 1;
+ gridBagConstraints.gridwidth = 9;
+ gridBagConstraints.gridheight = 2;
+ gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
+ gridBagConstraints.insets = new java.awt.Insets(20, 20, 20, 20);
+ pnlSynchData.add(pnlSynchMode, gridBagConstraints);
txtIrodsPath.setColumns(80);
txtIrodsPath.setText(org.openide.util.NbBundle.getMessage(SetupWizard.class, "SetupWizard.txtIrodsPath.text")); // NOI18N
@@ -285,7 +273,14 @@ public class SetupWizard extends javax.swing.JDialog {
});
pnlIrodsSynch.add(btnChooseIrodsSynch);
- pnlSynchData.add(pnlIrodsSynch);
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 0;
+ gridBagConstraints.gridy = 3;
+ gridBagConstraints.gridwidth = 9;
+ gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
+ gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
+ gridBagConstraints.insets = new java.awt.Insets(0, 10, 0, 10);
+ pnlSynchData.add(pnlIrodsSynch, gridBagConstraints);
pnlInitialSynchSetupAnswer.add(pnlSynchData, java.awt.BorderLayout.CENTER);
@@ -338,7 +333,10 @@ public class SetupWizard extends javax.swing.JDialog {
* @param evt
*/
private void btnSeeSystemTrayYesActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnSeeSystemTrayYesActionPerformed
+ saveSeeSystemTrayYas();
+ }
+ private void saveSeeSystemTrayYas() throws IdropRuntimeException {
log.info("indicates system try shown, set to not load gui");
try {
idropConfigurationService.updateConfig(IdropConfigurationService.SHOW_GUI, "false");
@@ -350,10 +348,10 @@ public class SetupWizard extends javax.swing.JDialog {
advanceTab();
}//GEN-LAST:event_btnSeeSystemTrayYesActionPerformed
- private void btnSetDeviceNameActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnSetDeviceNameActionPerformed
+ private void saveDeviceName() {
if (txtDeviceName.getText().length() == 0) {
txtDeviceName.setBackground(Color.red);
- MessageManager.showError(this, SETUP_ERROR_TITLE, "Device name is not entered");
+ MessageManager.showError(this, "Device name is not entered", SETUP_ERROR_TITLE);
return;
}
try {
@@ -365,7 +363,7 @@ public class SetupWizard extends javax.swing.JDialog {
}
advanceTab();
- }//GEN-LAST:event_btnSetDeviceNameActionPerformed
+ }
private void tabWizardTabsKeyPressed(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_tabWizardTabsKeyPressed
}//GEN-LAST:event_tabWizardTabsKeyPressed
@@ -400,7 +398,7 @@ public class SetupWizard extends javax.swing.JDialog {
private void btnChooseIrodsSynchActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnChooseIrodsSynchActionPerformed
try {
IRODSFinderDialog irodsFileSystemChooserView = new IRODSFinderDialog(null, true, idropCore);
- final Toolkit toolkit = Toolkit.getDefaultToolkit();
+ final Toolkit toolkit = Toolkit.getDefaultToolkit();
final Dimension screenSize = toolkit.getScreenSize();
final int x = (screenSize.width - irodsFileSystemChooserView.getWidth()) / 2;
final int y = (screenSize.height - irodsFileSystemChooserView.getHeight()) / 2;
@@ -430,7 +428,17 @@ public class SetupWizard extends javax.swing.JDialog {
}//GEN-LAST:event_txtLocalPathActionPerformed
private void btnForwardActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnForwardActionPerformed
- // TODO add your handling code here:
+ // forward acts differently according to the current tab
+ if (tabWizardTabs.getSelectedIndex() == 0) {
+ // advance from 'can you see icon'
+ saveSeeSystemTrayYas();
+ } else if (tabWizardTabs.getSelectedIndex() == 1) {
+ // advance tabs from 'name device;
+ saveDeviceName();
+ } else if (tabWizardTabs.getSelectedIndex() == 2) {
+ // advance from set up synch
+ saveSynch();
+ }
}//GEN-LAST:event_btnForwardActionPerformed
private void btnSeeSystemTrayNoActionPerformed(
@@ -482,10 +490,10 @@ public class SetupWizard extends javax.swing.JDialog {
private javax.swing.JButton btnLater;
private javax.swing.JButton btnSeeSystemTrayNo;
private javax.swing.JButton btnSeeSystemTrayYes;
- private javax.swing.JButton btnSetDeviceName;
private javax.swing.JLabel jLabel1;
- private javax.swing.JScrollPane jScrollPane1;
- private javax.swing.JScrollPane jScrollPane2;
+ private javax.swing.JLabel jLabel2;
+ private javax.swing.JLabel jLabel3;
+ private javax.swing.JLabel jLabel4;
private javax.swing.JLabel lblDeviceName;
private javax.swing.JLabel lblWelcome;
private javax.swing.JPanel panelTabNameDevice;
@@ -506,18 +514,33 @@ public class SetupWizard extends javax.swing.JDialog {
private javax.swing.JRadioButton radioBackup;
private javax.swing.JRadioButton radioFeed;
private javax.swing.JRadioButton radioSynch;
- private javax.swing.JScrollPane scrollInitialSynchSetupQuestion;
private javax.swing.JTabbedPane tabWizardTabs;
private javax.swing.JTextField txtDeviceName;
- private javax.swing.JTextArea txtInitialSynchSetupQuestion;
private javax.swing.JTextField txtIrodsPath;
private javax.swing.JTextField txtLocalPath;
- private javax.swing.JTextArea txtSeeIcon;
- private javax.swing.JTextArea txtSeeIcon1;
// End of variables declaration//GEN-END:variables
private void finishWizard() {
log.info("finishing wizard");
this.dispose();
}
+
+ private void saveSynch() {
+ if (txtLocalPath.getText().trim().length() == 0 && txtIrodsPath.getText().trim().length() == 0) {
+ log.info("ignoring synch for now");
+ } else if (txtLocalPath.getText().trim().length() == 0 || txtIrodsPath.getText().trim().length() == 0) {
+ int result = JOptionPane.showConfirmDialog(this,
+ "Skip sych?",
+ "Not all synch data entered, do you wish to skip? (This may be configured later)",
+ JOptionPane.OK_CANCEL_OPTION);
+ if (result == JOptionPane.OK_OPTION) {
+ advanceTab();
+ } else {
+ log.info("retry setup of synch");
+ }
+ } else {
+ log.info("saving synch data");
+ advanceTab();
+ }
+ }
}
diff --git a/idrop-swing/src/main/resources/idrop.properties b/idrop-swing/src/main/resources/idrop.properties
index 4b04a52..276c20e 100644
--- a/idrop-swing/src/main/resources/idrop.properties
+++ b/idrop-swing/src/main/resources/idrop.properties
@@ -1,5 +1,5 @@
policy.aware=false
-login.preset=false
+login.preset=true
force.mode=false
force.no.synch=false
advanced.view=true
diff --git a/idrop-swing/src/main/resources/org/irods/jargon/idrop/desktop/systraygui/viscomponents/Bundle.properties b/idrop-swing/src/main/resources/org/irods/jargon/idrop/desktop/systraygui/viscomponents/Bundle.properties
index 80381e8..c9aea0f 100644
--- a/idrop-swing/src/main/resources/org/irods/jargon/idrop/desktop/systraygui/viscomponents/Bundle.properties
+++ b/idrop-swing/src/main/resources/org/irods/jargon/idrop/desktop/systraygui/viscomponents/Bundle.properties
@@ -1,23 +1,18 @@
SetupWizard.lblWelcome.text=Welcome to iDrop!
SetupWizard.panelTabSeeSysTray.TabConstraints.tabTitle=See Icon
-SetupWizard.txtSeeIcon.text=Depending on your computer, you should see a green 'check box' in your System Tray. On Macs, this is usually on the top bar. On Windows, this is typically in the bottom right hand corner.\n\nSome operating systems require you to do some customization so that you can see the icon in your system tray. If you are having trouble seeing this, you can set iDrop to always show the main GUI. \n\nCan you see the green 'check box' for iDrop?
SetupWizard.btnSeeSystemTrayYes.text=jButton1
SetupWizard.btnSeeSystemTrayYes.label=Yes
SetupWizard.btnSeeSystemTrayYes.toolTipText=Click yes if you can see the system tray
SetupWizard.btnSeeSystemTrayNo.text=No
SetupWizard.btnSeeSystemTrayNo.toolTipText=Click if you do not see the check box in the system tray
SetupWizard.panelTabNameDevice.TabConstraints.tabTitle=Name Device
-SetupWizard.txtSeeIcon1.text=This computer on which you are running iDrop needs to be uniquely named. Please enter a name for this device...
SetupWizard.lblDeviceName.text=Device Name:
SetupWizard.txtDeviceName.text=
-SetupWizard.btnSetDeviceName.toolTipText=Sets the unique name of this device
-SetupWizard.btnSetDeviceName.text=Set device name
SetupWizard.btnBack.text=<< Back
SetupWizard.btnBack.toolTipText=Go to previous screen
SetupWizard.btnLater.text=Do this later, just start iDrop
SetupWizard.btnLater.toolTipText=Skip this configuration wizard and start iDrop
SetupWizard.pnlInitialSynchSetup.TabConstraints.tabTitle=Initial Synch
-SetupWizard.txtInitialSynchSetupQuestion.text=You may set up synch folders, so that a local folder on your computer synchs up with an iRODS folder. This can be used as a backup, or like a 'cloud' file store. All you need to do is run iDrop in the system tray, and it will keep track of your files.
SetupWizard.btnChooseLocalSynch.text=Choose Local Folder
SetupWizard.btnChooseLocalSynch.toolTipText=Choose the local folder
SetupWizard.btnChooseIrodsSynch.text=Choose iRODS Folder
@@ -33,3 +28,6 @@ SetupWizard.radioSynch.text=local <->iRODS Synchronization
SetupWizard.jLabel1.text=Select a synchronization mode
SetupWizard.btnForward.text=Forward >>
SetupWizard.btnForward.toolTipText=Go to previous screen
+SetupWizard.jLabel2.text=<html><h2>Welcome to iDrop. <p/>This setup wizard will help configure iDrop for your use, </h2><p/>\n<h3>iDrop should be represented by a check mark item in your system tray<p/>If you cannot see the check box, hit 'No', <p/>Otherwise, hit 'Yes', or 'Forward'</h3></html>
+SetupWizard.jLabel3.text=<html><h2>You need to name this device, please enter a device name and hit 'Forward'</h2></html>
+SetupWizard.jLabel4.text=<html><h2>Synch Setup</h2><p/><h3>iDrop can link local folders to folders on iRODS and do synchronization<p/>You may\nset up a synch now, or do this later in the preferences panels. <p/>Hit 'Forward' to skip or save.</h3></html>