From 255c2bbc97ed2c623b5897a0c068fc13a206d222 Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Thu, 31 Jul 2008 19:40:17 +0000 Subject: Client: Fixed up form label fields Previously, forms used
tags to break labels into lines, but it was discovered that a better effect could be generated by keeping the tag at the beginning, removing all of the
s, and resizing the JLabel. --- client/trunk/nbproject/project.properties | 6 ++- .../fourisland/instadisc/AdvancedSettingsForm.form | 10 ++--- .../fourisland/instadisc/AdvancedSettingsForm.java | 12 +++--- .../com/fourisland/instadisc/FirstRun/Step1.form | 44 +++++++--------------- .../com/fourisland/instadisc/FirstRun/Step1.java | 30 +++++---------- .../com/fourisland/instadisc/FirstRun/Step2.form | 16 ++++---- .../com/fourisland/instadisc/FirstRun/Step2.java | 16 ++++---- .../com/fourisland/instadisc/FirstRun/Step3.form | 12 +++--- .../com/fourisland/instadisc/FirstRun/Step3.java | 10 ++--- .../instadisc/FirstRun/resources/Step1.properties | 3 +- .../instadisc/FirstRun/resources/Step2.properties | 2 +- .../instadisc/FirstRun/resources/Step3.properties | 2 +- .../instadisc/ManageSubscriptionsForm.form | 31 +++++++-------- .../instadisc/ManageSubscriptionsForm.java | 27 ++++++------- .../resources/AdvancedSettingsForm.properties | 2 +- .../resources/ManageSubscriptionsForm.properties | 2 +- 16 files changed, 96 insertions(+), 129 deletions(-) diff --git a/client/trunk/nbproject/project.properties b/client/trunk/nbproject/project.properties index 505e8b5..61fbb43 100644 --- a/client/trunk/nbproject/project.properties +++ b/client/trunk/nbproject/project.properties @@ -30,7 +30,8 @@ javac.classpath=\ ${libs.BDB.classpath}:\ ${file.reference.commons-logging-1.1.jar}:\ ${file.reference.ws-commons-util-1.0.2.jar}:\ - ${libs.beans-binding.classpath} + ${libs.beans-binding.classpath}:\ + ${libs.absolutelayout.classpath} # Space-separated list of extra javac options javac.compilerargs= javac.deprecation=false @@ -57,6 +58,9 @@ jnlp.codebase.url=file:/home/hatkirby/NetBeansProjects/InstaDisc/dist/ jnlp.enabled=false jnlp.offline-allowed=false jnlp.signed=false +# Property libs.absolutelayout.classpath is set here just to make sharing of project simpler. +# The library definition has always preference over this property. +libs.absolutelayout.classpath=../../../../usr/share/netbeans/6.0.1/java1/modules/ext/AbsoluteLayout.jar # Property libs.BDB.classpath is set here just to make sharing of project simpler. # The library definition has always preference over this property. libs.BDB.classpath=lib/je-3.3.62.jar diff --git a/client/trunk/src/com/fourisland/instadisc/AdvancedSettingsForm.form b/client/trunk/src/com/fourisland/instadisc/AdvancedSettingsForm.form index f5189b4..f8e9990 100644 --- a/client/trunk/src/com/fourisland/instadisc/AdvancedSettingsForm.form +++ b/client/trunk/src/com/fourisland/instadisc/AdvancedSettingsForm.form @@ -31,31 +31,31 @@ - - + - + + - + - + diff --git a/client/trunk/src/com/fourisland/instadisc/AdvancedSettingsForm.java b/client/trunk/src/com/fourisland/instadisc/AdvancedSettingsForm.java index 312b3c3..2a07123 100644 --- a/client/trunk/src/com/fourisland/instadisc/AdvancedSettingsForm.java +++ b/client/trunk/src/com/fourisland/instadisc/AdvancedSettingsForm.java @@ -101,23 +101,23 @@ public class AdvancedSettingsForm extends javax.swing.JDialog { .addGroup(layout.createSequentialGroup() .addGap(12, 12, 12) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jLabel2) .addGroup(layout.createSequentialGroup() .addComponent(jLabel3) .addGap(18, 18, 18) - .addComponent(jSpinner1, javax.swing.GroupLayout.DEFAULT_SIZE, 240, Short.MAX_VALUE)) + .addComponent(jSpinner1, javax.swing.GroupLayout.DEFAULT_SIZE, 239, Short.MAX_VALUE)) .addGroup(layout.createSequentialGroup() .addComponent(jLabel5) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jSpinner2, javax.swing.GroupLayout.DEFAULT_SIZE, 240, Short.MAX_VALUE)) + .addComponent(jSpinner2, javax.swing.GroupLayout.DEFAULT_SIZE, 239, Short.MAX_VALUE)) .addGroup(layout.createSequentialGroup() .addGap(12, 12, 12) - .addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, 351, javax.swing.GroupLayout.PREFERRED_SIZE)))))) + .addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, 351, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, 347, javax.swing.GroupLayout.PREFERRED_SIZE))))) .addGroup(layout.createSequentialGroup() .addGap(36, 36, 36) - .addComponent(jLabel6, javax.swing.GroupLayout.DEFAULT_SIZE, 352, Short.MAX_VALUE)) + .addComponent(jLabel6, javax.swing.GroupLayout.DEFAULT_SIZE, 351, Short.MAX_VALUE)) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() - .addContainerGap(342, Short.MAX_VALUE) + .addContainerGap(341, Short.MAX_VALUE) .addComponent(jButton1))) .addContainerGap()) ); diff --git a/client/trunk/src/com/fourisland/instadisc/FirstRun/Step1.form b/client/trunk/src/com/fourisland/instadisc/FirstRun/Step1.form index deeffac..b392e54 100644 --- a/client/trunk/src/com/fourisland/instadisc/FirstRun/Step1.form +++ b/client/trunk/src/com/fourisland/instadisc/FirstRun/Step1.form @@ -23,41 +23,31 @@ - + - - - - - - - + + + + + + - + - + - - - - - - - - - - - - - - + + + + + @@ -70,12 +60,6 @@ - - - - - - diff --git a/client/trunk/src/com/fourisland/instadisc/FirstRun/Step1.java b/client/trunk/src/com/fourisland/instadisc/FirstRun/Step1.java index 039aacd..4a29d15 100644 --- a/client/trunk/src/com/fourisland/instadisc/FirstRun/Step1.java +++ b/client/trunk/src/com/fourisland/instadisc/FirstRun/Step1.java @@ -27,7 +27,6 @@ public class Step1 extends javax.swing.JDialog { private void initComponents() { jLabel1 = new javax.swing.JLabel(); - jLabel2 = new javax.swing.JLabel(); jButton1 = new javax.swing.JButton(); jLabel3 = new javax.swing.JLabel(); @@ -39,9 +38,6 @@ public class Step1 extends javax.swing.JDialog { jLabel1.setText(resourceMap.getString("jLabel1.text")); // NOI18N jLabel1.setName("jLabel1"); // NOI18N - jLabel2.setText(resourceMap.getString("jLabel2.text")); // NOI18N - jLabel2.setName("jLabel2"); // NOI18N - jButton1.setText(resourceMap.getString("jButton1.text")); // NOI18N jButton1.setName("jButton1"); // NOI18N jButton1.addActionListener(new java.awt.event.ActionListener() { @@ -63,28 +59,21 @@ public class Step1 extends javax.swing.JDialog { .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()) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) + .addComponent(jButton1) + .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, 466, javax.swing.GroupLayout.PREFERRED_SIZE)))) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() .addContainerGap() .addComponent(jLabel1) - .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()))) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(jLabel3) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(jButton1) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); pack(); @@ -115,7 +104,6 @@ public class Step1 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.JLabel jLabel2; 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 40adbd6..ba0b98c 100644 --- a/client/trunk/src/com/fourisland/instadisc/FirstRun/Step2.form +++ b/client/trunk/src/com/fourisland/instadisc/FirstRun/Step2.form @@ -26,10 +26,6 @@ - - - - @@ -39,16 +35,20 @@ - - - + + + - + + + + + diff --git a/client/trunk/src/com/fourisland/instadisc/FirstRun/Step2.java b/client/trunk/src/com/fourisland/instadisc/FirstRun/Step2.java index e81049a..99aee3f 100644 --- a/client/trunk/src/com/fourisland/instadisc/FirstRun/Step2.java +++ b/client/trunk/src/com/fourisland/instadisc/FirstRun/Step2.java @@ -90,9 +90,6 @@ public class Step2 extends javax.swing.JDialog { .addContainerGap() .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(jLabel1) - .addGroup(layout.createSequentialGroup() - .addGap(12, 12, 12) - .addComponent(jLabel6)) .addGroup(layout.createSequentialGroup() .addGap(12, 12, 12) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -101,13 +98,16 @@ public class Step2 extends javax.swing.JDialog { .addComponent(jLabel4)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .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))) + .addComponent(jTextField1, javax.swing.GroupLayout.DEFAULT_SIZE, 222, Short.MAX_VALUE) + .addComponent(jTextField3, javax.swing.GroupLayout.DEFAULT_SIZE, 222, Short.MAX_VALUE) + .addComponent(jPasswordField1, javax.swing.GroupLayout.DEFAULT_SIZE, 222, Short.MAX_VALUE))) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() - .addComponent(jLabel5, javax.swing.GroupLayout.DEFAULT_SIZE, 333, Short.MAX_VALUE) + .addComponent(jLabel5, javax.swing.GroupLayout.DEFAULT_SIZE, 317, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jButton1))) + .addComponent(jButton1)) + .addGroup(layout.createSequentialGroup() + .addGap(12, 12, 12) + .addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, 359, javax.swing.GroupLayout.PREFERRED_SIZE))) .addContainerGap()) ); layout.setVerticalGroup( diff --git a/client/trunk/src/com/fourisland/instadisc/FirstRun/Step3.form b/client/trunk/src/com/fourisland/instadisc/FirstRun/Step3.form index 618afab..bd32a05 100644 --- a/client/trunk/src/com/fourisland/instadisc/FirstRun/Step3.form +++ b/client/trunk/src/com/fourisland/instadisc/FirstRun/Step3.form @@ -24,20 +24,20 @@ - + + + + + - + - - - - diff --git a/client/trunk/src/com/fourisland/instadisc/FirstRun/Step3.java b/client/trunk/src/com/fourisland/instadisc/FirstRun/Step3.java index d696ebe..e37e4f3 100644 --- a/client/trunk/src/com/fourisland/instadisc/FirstRun/Step3.java +++ b/client/trunk/src/com/fourisland/instadisc/FirstRun/Step3.java @@ -55,16 +55,16 @@ public class Step3 extends javax.swing.JDialog { layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(layout.createSequentialGroup() + .addGap(165, 165, 165) + .addComponent(jButton1)) .addGroup(layout.createSequentialGroup() .addContainerGap() .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() .addGap(12, 12, 12) - .addComponent(jLabel2)) - .addComponent(jLabel1))) - .addGroup(layout.createSequentialGroup() - .addGap(165, 165, 165) - .addComponent(jButton1))) + .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, 347, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addComponent(jLabel1)))) .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); layout.setVerticalGroup( 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 5df982d..fb9ecf0 100644 --- a/client/trunk/src/com/fourisland/instadisc/FirstRun/resources/Step1.properties +++ b/client/trunk/src/com/fourisland/instadisc/FirstRun/resources/Step1.properties @@ -1,6 +1,5 @@ jLabel1.text=Welcome to the InstaDisc FirstRun Wizard! -jLabel2.text= #NOI18N jLabel1.font=DejaVu Sans-Plain-18 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. +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 7e7865b..eb8e058 100644 --- a/client/trunk/src/com/fourisland/instadisc/FirstRun/resources/Step2.properties +++ b/client/trunk/src/com/fourisland/instadisc/FirstRun/resources/Step2.properties @@ -8,5 +8,5 @@ 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. +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 b73d8fd..be0b987 100644 --- a/client/trunk/src/com/fourisland/instadisc/FirstRun/resources/Step3.properties +++ b/client/trunk/src/com/fourisland/instadisc/FirstRun/resources/Step3.properties @@ -2,4 +2,4 @@ jLabel1.text=Congradulations #NOI18N jLabel1.font=DejaVu Sans-Plain-18 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. +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/ManageSubscriptionsForm.form b/client/trunk/src/com/fourisland/instadisc/ManageSubscriptionsForm.form index aba7b45..f9efe54 100644 --- a/client/trunk/src/com/fourisland/instadisc/ManageSubscriptionsForm.form +++ b/client/trunk/src/com/fourisland/instadisc/ManageSubscriptionsForm.form @@ -23,28 +23,23 @@ + + - - - - - - - - - + + + + + + + + - - - - - - - + @@ -57,12 +52,12 @@ - + - + diff --git a/client/trunk/src/com/fourisland/instadisc/ManageSubscriptionsForm.java b/client/trunk/src/com/fourisland/instadisc/ManageSubscriptionsForm.java index c3cbf4a..6eeac2c 100644 --- a/client/trunk/src/com/fourisland/instadisc/ManageSubscriptionsForm.java +++ b/client/trunk/src/com/fourisland/instadisc/ManageSubscriptionsForm.java @@ -78,21 +78,18 @@ public class ManageSubscriptionsForm extends javax.swing.JDialog { 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() - .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(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 343, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jLabel2))))) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() - .addContainerGap(235, Short.MAX_VALUE) - .addComponent(jButton1) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jButton2))) + .addGap(12, 12, 12) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) + .addComponent(jLabel2, 0, 0, Short.MAX_VALUE) + .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 343, Short.MAX_VALUE) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() + .addComponent(jButton1) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(jButton2))))) .addContainerGap()) ); layout.setVerticalGroup( @@ -104,11 +101,11 @@ public class ManageSubscriptionsForm extends javax.swing.JDialog { .addComponent(jLabel2) .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, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(jButton2) .addComponent(jButton1)) - .addContainerGap()) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); pack(); diff --git a/client/trunk/src/com/fourisland/instadisc/resources/AdvancedSettingsForm.properties b/client/trunk/src/com/fourisland/instadisc/resources/AdvancedSettingsForm.properties index 2f547b3..55acc2a 100644 --- a/client/trunk/src/com/fourisland/instadisc/resources/AdvancedSettingsForm.properties +++ b/client/trunk/src/com/fourisland/instadisc/resources/AdvancedSettingsForm.properties @@ -1,7 +1,7 @@ jLabel1.text=Advanced Settings #NOI18N jLabel1.font=DejaVu Sans-Plain-18 -jLabel2.text=This section is for more advanced users who would like to
tweak their InstaDisc experience. +jLabel2.text=This section is for more advanced users who would like to tweak their InstaDisc experience. jLabel3.text=Item Buffer Size: jLabel4.text=This is the number of items that you would like to keep on the main InstaDisc screen. InstaDisc only holds so many Items at once, and you can specify how much that is. jLabel5.text=VerID Buffer Size: diff --git a/client/trunk/src/com/fourisland/instadisc/resources/ManageSubscriptionsForm.properties b/client/trunk/src/com/fourisland/instadisc/resources/ManageSubscriptionsForm.properties index 1fae114..33835ef 100644 --- a/client/trunk/src/com/fourisland/instadisc/resources/ManageSubscriptionsForm.properties +++ b/client/trunk/src/com/fourisland/instadisc/resources/ManageSubscriptionsForm.properties @@ -1,6 +1,6 @@ jLabel1.text=Manage Subscriptions #NOI18N jLabel1.font=DejaVu Sans-Plain-18 -jLabel2.text=If you get bored or annoyed with a certain subscription,
you can unsubscribe from it right here. Just choose the
subscription from the list below and click "Unsubscribe". +jLabel2.text=If you get bored or annoyed with a certain subscription, you can unsubscribe from it right here. Just choose the subscription from the list below and click "Unsubscribe". jButton1.text=Unsubscribe jButton2.text=Done -- cgit 1.4.1