From 4585e747d58889218c875eacdf383d013c7e5278 Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Thu, 31 Jul 2008 15:53:09 +0000 Subject: Client: Fixed up First Run form Changed the password field (which was a JTextField) in Step 2 to a JPasswordField which has getText() deprecated in favor of getPassword(), which returns the password in a char[]. Since I currently cannot be bothered parsing a char[], I've left it using the deprectated getText(). This must be fixed at some point. --- .../com/fourisland/instadisc/FirstRun/Step1.form | 117 ++++++--------------- .../com/fourisland/instadisc/FirstRun/Step1.java | 88 +++++----------- .../com/fourisland/instadisc/FirstRun/Step2.form | 86 ++++++--------- .../com/fourisland/instadisc/FirstRun/Step2.java | 88 +++++++--------- .../com/fourisland/instadisc/FirstRun/Step3.form | 38 ++----- .../com/fourisland/instadisc/FirstRun/Step3.java | 27 ++--- .../instadisc/FirstRun/resources/Step1.properties | 9 +- .../instadisc/FirstRun/resources/Step2.properties | 6 +- .../instadisc/FirstRun/resources/Step3.properties | 4 +- .../com/fourisland/instadisc/InstaDiscView.form | 6 ++ .../com/fourisland/instadisc/InstaDiscView.java | 6 ++ .../instadisc/resources/InstaDiscView.properties | 1 + 12 files changed, 172 insertions(+), 304 deletions(-) (limited to 'client') diff --git a/client/trunk/src/com/fourisland/instadisc/FirstRun/Step1.form b/client/trunk/src/com/fourisland/instadisc/FirstRun/Step1.form index b186d78..deeffac 100644 --- a/client/trunk/src/com/fourisland/instadisc/FirstRun/Step1.form +++ b/client/trunk/src/com/fourisland/instadisc/FirstRun/Step1.form @@ -22,47 +22,42 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + @@ -75,60 +70,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -138,5 +85,11 @@ + + + + + + diff --git a/client/trunk/src/com/fourisland/instadisc/FirstRun/Step1.java b/client/trunk/src/com/fourisland/instadisc/FirstRun/Step1.java index c0abbfa..039aacd 100644 --- a/client/trunk/src/com/fourisland/instadisc/FirstRun/Step1.java +++ b/client/trunk/src/com/fourisland/instadisc/FirstRun/Step1.java @@ -27,12 +27,9 @@ public class Step1 extends javax.swing.JDialog { private void initComponents() { jLabel1 = new javax.swing.JLabel(); - jScrollPane1 = new javax.swing.JScrollPane(); - jTextArea1 = new javax.swing.JTextArea(); jLabel2 = new javax.swing.JLabel(); - jScrollPane2 = new javax.swing.JScrollPane(); - jTextArea2 = new javax.swing.JTextArea(); jButton1 = new javax.swing.JButton(); + jLabel3 = new javax.swing.JLabel(); setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); setName("Form"); // NOI18N @@ -42,33 +39,9 @@ public class Step1 extends javax.swing.JDialog { jLabel1.setText(resourceMap.getString("jLabel1.text")); // NOI18N jLabel1.setName("jLabel1"); // NOI18N - jScrollPane1.setName("jScrollPane1"); // NOI18N - - jTextArea1.setBackground(resourceMap.getColor("jTextArea1.background")); // NOI18N - jTextArea1.setColumns(20); - jTextArea1.setEditable(false); - jTextArea1.setLineWrap(true); - jTextArea1.setRows(5); - jTextArea1.setText(resourceMap.getString("jTextArea1.text")); // NOI18N - jTextArea1.setWrapStyleWord(true); - jTextArea1.setName("jTextArea1"); // NOI18N - jScrollPane1.setViewportView(jTextArea1); - jLabel2.setText(resourceMap.getString("jLabel2.text")); // NOI18N jLabel2.setName("jLabel2"); // NOI18N - jScrollPane2.setName("jScrollPane2"); // NOI18N - - jTextArea2.setBackground(resourceMap.getColor("jTextArea2.background")); // NOI18N - jTextArea2.setColumns(20); - jTextArea2.setEditable(false); - jTextArea2.setLineWrap(true); - jTextArea2.setRows(5); - jTextArea2.setText(resourceMap.getString("jTextArea2.text")); // NOI18N - jTextArea2.setWrapStyleWord(true); - jTextArea2.setName("jTextArea2"); // NOI18N - jScrollPane2.setViewportView(jTextArea2); - jButton1.setText(resourceMap.getString("jButton1.text")); // NOI18N jButton1.setName("jButton1"); // NOI18N jButton1.addActionListener(new java.awt.event.ActionListener() { @@ -77,45 +50,41 @@ public class Step1 extends javax.swing.JDialog { } }); + jLabel3.setText(resourceMap.getString("jLabel3.text")); // NOI18N + jLabel3.setName("jLabel3"); // NOI18N + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); getContentPane().setLayout(layout); layout.setHorizontalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() - .addGap(134, 134, 134) - .addComponent(jLabel2) - .addContainerGap(178, Short.MAX_VALUE)) - .addGroup(layout.createSequentialGroup() - .addGap(43, 43, 43) - .addComponent(jLabel1) - .addContainerGap(56, Short.MAX_VALUE)) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() - .addGap(57, 57, 57) - .addComponent(jScrollPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 346, Short.MAX_VALUE) - .addGap(76, 76, 76)) - .addGroup(layout.createSequentialGroup() - .addGap(202, 202, 202) - .addComponent(jButton1) - .addContainerGap(235, Short.MAX_VALUE)) - .addGroup(layout.createSequentialGroup() - .addGap(23, 23, 23) - .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 426, javax.swing.GroupLayout.PREFERRED_SIZE) - .addContainerGap(30, Short.MAX_VALUE)) + .addContainerGap() + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(jLabel1) + .addGroup(layout.createSequentialGroup() + .addGap(12, 12, 12) + .addComponent(jLabel3) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(jLabel2) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(jButton1))) + .addContainerGap()) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() - .addGap(18, 18, 18) + .addContainerGap() .addComponent(jLabel1) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 127, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(18, 18, 18) - .addComponent(jLabel2) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jScrollPane2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(jButton1) - .addContainerGap(30, Short.MAX_VALUE)) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(layout.createSequentialGroup() + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 139, Short.MAX_VALUE) + .addComponent(jLabel2)) + .addGroup(layout.createSequentialGroup() + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) + .addComponent(jButton1) + .addComponent(jLabel3)) + .addContainerGap()))) ); pack(); @@ -147,10 +116,7 @@ public class Step1 extends javax.swing.JDialog { private javax.swing.JButton jButton1; private javax.swing.JLabel jLabel1; private javax.swing.JLabel jLabel2; - private javax.swing.JScrollPane jScrollPane1; - private javax.swing.JScrollPane jScrollPane2; - private javax.swing.JTextArea jTextArea1; - private javax.swing.JTextArea jTextArea2; + private javax.swing.JLabel jLabel3; // End of variables declaration//GEN-END:variables } diff --git a/client/trunk/src/com/fourisland/instadisc/FirstRun/Step2.form b/client/trunk/src/com/fourisland/instadisc/FirstRun/Step2.form index e408762..40adbd6 100644 --- a/client/trunk/src/com/fourisland/instadisc/FirstRun/Step2.form +++ b/client/trunk/src/com/fourisland/instadisc/FirstRun/Step2.form @@ -23,37 +23,32 @@ + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + - - + - - - - @@ -62,19 +57,19 @@ - + - - + + - + @@ -86,7 +81,6 @@ - @@ -99,28 +93,6 @@ - - - - - - - - - - - - - - - - - - - - - - @@ -133,12 +105,6 @@ - - - - - - @@ -172,5 +138,17 @@ + + + + + + + + + + + + diff --git a/client/trunk/src/com/fourisland/instadisc/FirstRun/Step2.java b/client/trunk/src/com/fourisland/instadisc/FirstRun/Step2.java index 7affbae..ef1ffd4 100644 --- a/client/trunk/src/com/fourisland/instadisc/FirstRun/Step2.java +++ b/client/trunk/src/com/fourisland/instadisc/FirstRun/Step2.java @@ -32,16 +32,15 @@ public class Step2 extends javax.swing.JDialog { private void initComponents() { jLabel1 = new javax.swing.JLabel(); - jScrollPane1 = new javax.swing.JScrollPane(); - jTextArea1 = new javax.swing.JTextArea(); jLabel2 = new javax.swing.JLabel(); jTextField1 = new javax.swing.JTextField(); - jTextField2 = new javax.swing.JTextField(); jTextField3 = new javax.swing.JTextField(); jLabel3 = new javax.swing.JLabel(); jLabel4 = new javax.swing.JLabel(); jLabel5 = new javax.swing.JLabel(); jButton1 = new javax.swing.JButton(); + jLabel6 = new javax.swing.JLabel(); + jPasswordField1 = new javax.swing.JPasswordField(); setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); setName("Form"); // NOI18N @@ -51,25 +50,12 @@ public class Step2 extends javax.swing.JDialog { jLabel1.setText(resourceMap.getString("jLabel1.text")); // NOI18N jLabel1.setName("jLabel1"); // NOI18N - jScrollPane1.setName("jScrollPane1"); // NOI18N - - jTextArea1.setBackground(resourceMap.getColor("jTextArea1.background")); // NOI18N - jTextArea1.setColumns(20); - jTextArea1.setEditable(false); - jTextArea1.setRows(5); - jTextArea1.setText(resourceMap.getString("jTextArea1.text")); // NOI18N - jTextArea1.setName("jTextArea1"); // NOI18N - jScrollPane1.setViewportView(jTextArea1); - jLabel2.setText(resourceMap.getString("jLabel2.text")); // NOI18N jLabel2.setName("jLabel2"); // NOI18N jTextField1.setText(resourceMap.getString("jTextField1.text")); // NOI18N jTextField1.setName("jTextField1"); // NOI18N - jTextField2.setText(resourceMap.getString("jTextField2.text")); // NOI18N - jTextField2.setName("jTextField2"); // NOI18N - jTextField3.setText(resourceMap.getString("jTextField3.text")); // NOI18N jTextField3.setName("jTextField3"); // NOI18N @@ -90,52 +76,55 @@ public class Step2 extends javax.swing.JDialog { } }); + jLabel6.setText(resourceMap.getString("jLabel6.text")); // NOI18N + jLabel6.setName("jLabel6"); // NOI18N + + jPasswordField1.setText(resourceMap.getString("jPasswordField1.text")); // NOI18N + jPasswordField1.setName("jPasswordField1"); // NOI18N + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); getContentPane().setLayout(layout); layout.setHorizontalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() + .addContainerGap() .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(jLabel1) .addGroup(layout.createSequentialGroup() - .addContainerGap() + .addGap(12, 12, 12) + .addComponent(jLabel6)) + .addGroup(layout.createSequentialGroup() + .addGap(12, 12, 12) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jLabel1) - .addGroup(layout.createSequentialGroup() - .addGap(12, 12, 12) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jLabel2) - .addComponent(jLabel3) - .addComponent(jLabel4)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jTextField2, javax.swing.GroupLayout.DEFAULT_SIZE, 227, Short.MAX_VALUE) - .addComponent(jTextField1, javax.swing.GroupLayout.DEFAULT_SIZE, 227, Short.MAX_VALUE) - .addComponent(jTextField3, javax.swing.GroupLayout.DEFAULT_SIZE, 227, Short.MAX_VALUE))))) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() - .addContainerGap() - .addComponent(jLabel5, javax.swing.GroupLayout.DEFAULT_SIZE, 322, Short.MAX_VALUE) + .addComponent(jLabel2) + .addComponent(jLabel3) + .addComponent(jLabel4)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jButton1)) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(jTextField1, javax.swing.GroupLayout.DEFAULT_SIZE, 238, Short.MAX_VALUE) + .addComponent(jTextField3, javax.swing.GroupLayout.DEFAULT_SIZE, 238, Short.MAX_VALUE) + .addComponent(jPasswordField1, javax.swing.GroupLayout.DEFAULT_SIZE, 238, Short.MAX_VALUE))) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() - .addGap(24, 24, 24) - .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 364, Short.MAX_VALUE))) + .addComponent(jLabel5, javax.swing.GroupLayout.DEFAULT_SIZE, 333, Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(jButton1))) .addContainerGap()) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() - .addContainerGap() + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(jLabel1) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(jLabel6) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(jLabel2) .addComponent(jTextField1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(jTextField2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jLabel3)) + .addComponent(jLabel3) + .addComponent(jPasswordField1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(jTextField3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) @@ -143,8 +132,7 @@ public class Step2 extends javax.swing.JDialog { .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(jButton1) - .addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, 40, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addContainerGap(47, Short.MAX_VALUE)) + .addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, 40, javax.swing.GroupLayout.PREFERRED_SIZE))) ); pack(); @@ -153,7 +141,12 @@ public class Step2 extends javax.swing.JDialog { if (jTextField1.getText().equals("")) { jLabel5.setText("Error: You forgot to enter a username"); } else { - if (jTextField2.getText().equals("")) { + /* TODO: Replace deprecated JPasswordField.getText() with + * JPasswordField.getPassword(). However, getPassword() + * returns the password in a char[], not a String, so + * it must be parsed prior to use. + */ + if (jPasswordField1.getText().equals("")) { jLabel5.setText("Error: You forgot to enter a password"); } else { if (jTextField3.getText().equals("")) { @@ -162,14 +155,14 @@ public class Step2 extends javax.swing.JDialog { try { URL url = new URL(jTextField3.getText()); - XmlRpc xmlrpc = new XmlRpc("checkRegistration", jTextField3.getText(), jTextField1.getText(), jTextField2.getText()); + XmlRpc xmlrpc = new XmlRpc("checkRegistration", jTextField3.getText(), jTextField1.getText(), jPasswordField1.getText()); Integer r = (Integer) xmlrpc.execute(); if (r == 1) { jLabel5.setText("Error: No registration exists on the specified Central Server with the specified UN/PW combination"); } else { - MD5 md5 = new MD5(jTextField2.getText()); + MD5 md5 = new MD5(jPasswordField1.getText()); Wrapper.setConfig("username", jTextField1.getText()); Wrapper.setConfig("password", md5.hash()); @@ -215,10 +208,9 @@ public class Step2 extends javax.swing.JDialog { private javax.swing.JLabel jLabel3; private javax.swing.JLabel jLabel4; private javax.swing.JLabel jLabel5; - private javax.swing.JScrollPane jScrollPane1; - private javax.swing.JTextArea jTextArea1; + private javax.swing.JLabel jLabel6; + private javax.swing.JPasswordField jPasswordField1; private javax.swing.JTextField jTextField1; - private javax.swing.JTextField jTextField2; private javax.swing.JTextField jTextField3; // End of variables declaration//GEN-END:variables } diff --git a/client/trunk/src/com/fourisland/instadisc/FirstRun/Step3.form b/client/trunk/src/com/fourisland/instadisc/FirstRun/Step3.form index 473876c..618afab 100644 --- a/client/trunk/src/com/fourisland/instadisc/FirstRun/Step3.form +++ b/client/trunk/src/com/fourisland/instadisc/FirstRun/Step3.form @@ -27,19 +27,19 @@ - + - + - + - + @@ -49,7 +49,7 @@ - + @@ -65,28 +65,6 @@ - - - - - - - - - - - - - - - - - - - - - - @@ -96,5 +74,11 @@ + + + + + + diff --git a/client/trunk/src/com/fourisland/instadisc/FirstRun/Step3.java b/client/trunk/src/com/fourisland/instadisc/FirstRun/Step3.java index 5eb7840..d696ebe 100644 --- a/client/trunk/src/com/fourisland/instadisc/FirstRun/Step3.java +++ b/client/trunk/src/com/fourisland/instadisc/FirstRun/Step3.java @@ -27,9 +27,8 @@ public class Step3 extends javax.swing.JDialog { private void initComponents() { jLabel1 = new javax.swing.JLabel(); - jScrollPane1 = new javax.swing.JScrollPane(); - jTextArea1 = new javax.swing.JTextArea(); jButton1 = new javax.swing.JButton(); + jLabel2 = new javax.swing.JLabel(); setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); setName("Form"); // NOI18N @@ -39,16 +38,6 @@ public class Step3 extends javax.swing.JDialog { jLabel1.setText(resourceMap.getString("jLabel1.text")); // NOI18N jLabel1.setName("jLabel1"); // NOI18N - jScrollPane1.setName("jScrollPane1"); // NOI18N - - jTextArea1.setBackground(resourceMap.getColor("jTextArea1.background")); // NOI18N - jTextArea1.setColumns(20); - jTextArea1.setEditable(false); - jTextArea1.setRows(5); - jTextArea1.setText(resourceMap.getString("jTextArea1.text")); // NOI18N - jTextArea1.setName("jTextArea1"); // NOI18N - jScrollPane1.setViewportView(jTextArea1); - jButton1.setText(resourceMap.getString("jButton1.text")); // NOI18N jButton1.setName("jButton1"); // NOI18N jButton1.addActionListener(new java.awt.event.ActionListener() { @@ -57,6 +46,9 @@ public class Step3 extends javax.swing.JDialog { } }); + jLabel2.setText(resourceMap.getString("jLabel2.text")); // NOI18N + jLabel2.setName("jLabel2"); // NOI18N + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); getContentPane().setLayout(layout); layout.setHorizontalGroup( @@ -68,12 +60,12 @@ public class Step3 extends javax.swing.JDialog { .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() .addGap(12, 12, 12) - .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 364, Short.MAX_VALUE)) + .addComponent(jLabel2)) .addComponent(jLabel1))) .addGroup(layout.createSequentialGroup() - .addGap(167, 167, 167) + .addGap(165, 165, 165) .addComponent(jButton1))) - .addContainerGap()) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -81,7 +73,7 @@ public class Step3 extends javax.swing.JDialog { .addContainerGap() .addComponent(jLabel1) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 104, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(jLabel2) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(jButton1) .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) @@ -115,8 +107,7 @@ public class Step3 extends javax.swing.JDialog { // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JButton jButton1; private javax.swing.JLabel jLabel1; - private javax.swing.JScrollPane jScrollPane1; - private javax.swing.JTextArea jTextArea1; + private javax.swing.JLabel jLabel2; // End of variables declaration//GEN-END:variables } diff --git a/client/trunk/src/com/fourisland/instadisc/FirstRun/resources/Step1.properties b/client/trunk/src/com/fourisland/instadisc/FirstRun/resources/Step1.properties index 8da8235..5df982d 100644 --- a/client/trunk/src/com/fourisland/instadisc/FirstRun/resources/Step1.properties +++ b/client/trunk/src/com/fourisland/instadisc/FirstRun/resources/Step1.properties @@ -1,11 +1,6 @@ jLabel1.text=Welcome to the InstaDisc FirstRun Wizard! -jTextArea1.text=This is, apparently, the first time you've run InstaDisc, so you need to step through me before being able to use InstaDisc.\n\nFirst, ensure that you've chosen and signed up for a Central Server. If you haven't, or don't even know what that means, please read:\n -#NOI18N -jTextArea1.background=239, 235, 231 -jLabel2.text=Choosing a Central Server +jLabel2.text= #NOI18N jLabel1.font=DejaVu Sans-Plain-18 -jTextArea2.text=before continuing. If you do know what you're doing, feel free to click on the NEXT button and get on with InstaDisc. -#NOI18N -jTextArea2.background=239, 235, 231 jButton1.text=Next +jLabel3.text=This is, apparently, the first time you've run InstaDisc, so you need to
step through me before being able to use InstaDisc.

First, ensure that you've chosen and signed up for a Central Server.
If you haven't, or don't even know what that means, please read
Choosing a Central Server before continuing. If you do know what
you're doing, feel free to click on the NEXT button and get on with
InstaDisc. diff --git a/client/trunk/src/com/fourisland/instadisc/FirstRun/resources/Step2.properties b/client/trunk/src/com/fourisland/instadisc/FirstRun/resources/Step2.properties index 0c1f735..7e7865b 100644 --- a/client/trunk/src/com/fourisland/instadisc/FirstRun/resources/Step2.properties +++ b/client/trunk/src/com/fourisland/instadisc/FirstRun/resources/Step2.properties @@ -1,14 +1,12 @@ jLabel1.text=Central Server Details #NOI18N jLabel1.font=DejaVu Sans-Plain-18 -jTextArea1.text=To use InstaDisc, you must have chosen and signed up\nfor a Central Server. Please input below the details it\ngave you after registration. -#NOI18N -jTextArea1.background=239, 235, 231 jLabel2.text=Username: jTextField1.text= -jTextField2.text= jTextField3.text= jLabel3.text=Password: jLabel4.text=Central Server URL: jLabel5.text= jButton1.text=Next +jLabel6.text=To use InstaDisc, you must have chosen and signed up for
a Central Server. Please input below the details it gave you
after registration. +jPasswordField1.text= diff --git a/client/trunk/src/com/fourisland/instadisc/FirstRun/resources/Step3.properties b/client/trunk/src/com/fourisland/instadisc/FirstRun/resources/Step3.properties index 948623f..b73d8fd 100644 --- a/client/trunk/src/com/fourisland/instadisc/FirstRun/resources/Step3.properties +++ b/client/trunk/src/com/fourisland/instadisc/FirstRun/resources/Step3.properties @@ -1,7 +1,5 @@ jLabel1.text=Congradulations #NOI18N jLabel1.font=DejaVu Sans-Plain-18 -jTextArea1.text=YAY! You've successfully set up InstaDisc. To start using\nInstaDisc, quit this wizard (the DONE button), open\nInstaDisc again, and have fun!\n\nIf you're ever confused, remember, the Help menu is\nyour friend. -#NOI18N -jTextArea1.background=239, 235, 231 jButton1.text=Done +jLabel2.text=YAY! You've successfully set up InstaDisc. To start
using InstaDisc, quit this wizard (the DONE button),
open InstaDisc again, and have fun! If you're ever
confused, remember, the Help menu is your friend. diff --git a/client/trunk/src/com/fourisland/instadisc/InstaDiscView.form b/client/trunk/src/com/fourisland/instadisc/InstaDiscView.form index ec8d250..0f42036 100644 --- a/client/trunk/src/com/fourisland/instadisc/InstaDiscView.form +++ b/client/trunk/src/com/fourisland/instadisc/InstaDiscView.form @@ -117,6 +117,12 @@ + + + + + + diff --git a/client/trunk/src/com/fourisland/instadisc/InstaDiscView.java b/client/trunk/src/com/fourisland/instadisc/InstaDiscView.java index 5a71fac..7cce3cd 100644 --- a/client/trunk/src/com/fourisland/instadisc/InstaDiscView.java +++ b/client/trunk/src/com/fourisland/instadisc/InstaDiscView.java @@ -148,6 +148,7 @@ public class InstaDiscView extends FrameView { jMenu1 = new javax.swing.JMenu(); jMenuItem3 = new javax.swing.JMenuItem(); jMenuItem4 = new javax.swing.JMenuItem(); + jMenuItem5 = new javax.swing.JMenuItem(); javax.swing.JMenu helpMenu = new javax.swing.JMenu(); javax.swing.JMenuItem aboutMenuItem = new javax.swing.JMenuItem(); statusPanel = new javax.swing.JPanel(); @@ -220,6 +221,10 @@ public class InstaDiscView extends FrameView { jMenuItem4.setName("jMenuItem4"); // NOI18N jMenu1.add(jMenuItem4); + jMenuItem5.setText(resourceMap.getString("jMenuItem5.text")); // NOI18N + jMenuItem5.setName("jMenuItem5"); // NOI18N + jMenu1.add(jMenuItem5); + menuBar.add(jMenu1); helpMenu.setText(resourceMap.getString("helpMenu.text")); // NOI18N @@ -298,6 +303,7 @@ public class InstaDiscView extends FrameView { private javax.swing.JMenuItem jMenuItem2; private javax.swing.JMenuItem jMenuItem3; private javax.swing.JMenuItem jMenuItem4; + private javax.swing.JMenuItem jMenuItem5; private javax.swing.JScrollPane jScrollPane1; private javax.swing.JSeparator jSeparator1; private javax.swing.JPanel mainPanel; diff --git a/client/trunk/src/com/fourisland/instadisc/resources/InstaDiscView.properties b/client/trunk/src/com/fourisland/instadisc/resources/InstaDiscView.properties index 80a0b3e..4bef63f 100644 --- a/client/trunk/src/com/fourisland/instadisc/resources/InstaDiscView.properties +++ b/client/trunk/src/com/fourisland/instadisc/resources/InstaDiscView.properties @@ -35,3 +35,4 @@ jMenuItem2.text=Manage Subscriptions jMenu1.text=Tools jMenuItem3.text=Manage Filters jMenuItem4.text=Request Retained Items +jMenuItem5.text=Advanced Settings -- cgit 1.4.1