about summary refs log tree commit diff stats
path: root/client/trunk/src
diff options
context:
space:
mode:
authorKelly Rauchenberger <fefferburbia@gmail.com>2008-07-31 19:40:17 +0000
committerKelly Rauchenberger <fefferburbia@gmail.com>2008-07-31 19:40:17 +0000
commit255c2bbc97ed2c623b5897a0c068fc13a206d222 (patch)
tree9ad24871f22ea4b8b6fae52bddc446edd1aa716a /client/trunk/src
parentbac48f155528976a1bd411693cb61a672d6623d0 (diff)
downloadinstadisc-255c2bbc97ed2c623b5897a0c068fc13a206d222.tar.gz
instadisc-255c2bbc97ed2c623b5897a0c068fc13a206d222.tar.bz2
instadisc-255c2bbc97ed2c623b5897a0c068fc13a206d222.zip
Client: Fixed up form label fields
Previously, forms used <BR> tags to break labels into lines, but it was discovered that a better effect could be generated by keeping the <HTML> tag at the beginning, removing all of the <BR>s, and resizing the JLabel.
Diffstat (limited to 'client/trunk/src')
-rw-r--r--client/trunk/src/com/fourisland/instadisc/AdvancedSettingsForm.form10
-rw-r--r--client/trunk/src/com/fourisland/instadisc/AdvancedSettingsForm.java12
-rw-r--r--client/trunk/src/com/fourisland/instadisc/FirstRun/Step1.form44
-rw-r--r--client/trunk/src/com/fourisland/instadisc/FirstRun/Step1.java30
-rw-r--r--client/trunk/src/com/fourisland/instadisc/FirstRun/Step2.form16
-rw-r--r--client/trunk/src/com/fourisland/instadisc/FirstRun/Step2.java16
-rw-r--r--client/trunk/src/com/fourisland/instadisc/FirstRun/Step3.form12
-rw-r--r--client/trunk/src/com/fourisland/instadisc/FirstRun/Step3.java10
-rw-r--r--client/trunk/src/com/fourisland/instadisc/FirstRun/resources/Step1.properties3
-rw-r--r--client/trunk/src/com/fourisland/instadisc/FirstRun/resources/Step2.properties2
-rw-r--r--client/trunk/src/com/fourisland/instadisc/FirstRun/resources/Step3.properties2
-rw-r--r--client/trunk/src/com/fourisland/instadisc/ManageSubscriptionsForm.form31
-rw-r--r--client/trunk/src/com/fourisland/instadisc/ManageSubscriptionsForm.java27
-rw-r--r--client/trunk/src/com/fourisland/instadisc/resources/AdvancedSettingsForm.properties2
-rw-r--r--client/trunk/src/com/fourisland/instadisc/resources/ManageSubscriptionsForm.properties2
15 files changed, 91 insertions, 128 deletions
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 @@
31 <Group type="102" alignment="0" attributes="0"> 31 <Group type="102" alignment="0" attributes="0">
32 <EmptySpace min="12" pref="12" max="12" attributes="0"/> 32 <EmptySpace min="12" pref="12" max="12" attributes="0"/>
33 <Group type="103" groupAlignment="0" attributes="0"> 33 <Group type="103" groupAlignment="0" attributes="0">
34 <Component id="jLabel2" alignment="0" min="-2" max="-2" attributes="0"/>
35 <Group type="102" alignment="0" attributes="0"> 34 <Group type="102" alignment="0" attributes="0">
36 <Component id="jLabel3" min="-2" max="-2" attributes="0"/> 35 <Component id="jLabel3" min="-2" max="-2" attributes="0"/>
37 <EmptySpace min="-2" pref="18" max="-2" attributes="0"/> 36 <EmptySpace min="-2" pref="18" max="-2" attributes="0"/>
38 <Component id="jSpinner1" pref="240" max="32767" attributes="0"/> 37 <Component id="jSpinner1" pref="239" max="32767" attributes="0"/>
39 </Group> 38 </Group>
40 <Group type="102" alignment="0" attributes="0"> 39 <Group type="102" alignment="0" attributes="0">
41 <Component id="jLabel5" min="-2" max="-2" attributes="0"/> 40 <Component id="jLabel5" min="-2" max="-2" attributes="0"/>
42 <EmptySpace max="-2" attributes="0"/> 41 <EmptySpace max="-2" attributes="0"/>
43 <Component id="jSpinner2" pref="240" max="32767" attributes="0"/> 42 <Component id="jSpinner2" pref="239" max="32767" attributes="0"/>
44 </Group> 43 </Group>
45 <Group type="102" attributes="0"> 44 <Group type="102" attributes="0">
46 <EmptySpace min="12" pref="12" max="12" attributes="0"/> 45 <EmptySpace min="12" pref="12" max="12" attributes="0"/>
47 <Component id="jLabel4" min="-2" pref="351" max="-2" attributes="0"/> 46 <Component id="jLabel4" min="-2" pref="351" max="-2" attributes="0"/>
48 </Group> 47 </Group>
48 <Component id="jLabel2" alignment="0" min="-2" pref="347" max="-2" attributes="0"/>
49 </Group> 49 </Group>
50 </Group> 50 </Group>
51 </Group> 51 </Group>
52 </Group> 52 </Group>
53 <Group type="102" alignment="0" attributes="0"> 53 <Group type="102" alignment="0" attributes="0">
54 <EmptySpace min="-2" pref="36" max="-2" attributes="0"/> 54 <EmptySpace min="-2" pref="36" max="-2" attributes="0"/>
55 <Component id="jLabel6" pref="352" max="32767" attributes="0"/> 55 <Component id="jLabel6" pref="351" max="32767" attributes="0"/>
56 </Group> 56 </Group>
57 <Group type="102" alignment="1" attributes="0"> 57 <Group type="102" alignment="1" attributes="0">
58 <EmptySpace pref="342" max="32767" attributes="0"/> 58 <EmptySpace pref="341" max="32767" attributes="0"/>
59 <Component id="jButton1" min="-2" max="-2" attributes="0"/> 59 <Component id="jButton1" min="-2" max="-2" attributes="0"/>
60 </Group> 60 </Group>
61 </Group> 61 </Group>
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 {
101 .addGroup(layout.createSequentialGroup() 101 .addGroup(layout.createSequentialGroup()
102 .addGap(12, 12, 12) 102 .addGap(12, 12, 12)
103 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) 103 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
104 .addComponent(jLabel2)
105 .addGroup(layout.createSequentialGroup() 104 .addGroup(layout.createSequentialGroup()
106 .addComponent(jLabel3) 105 .addComponent(jLabel3)
107 .addGap(18, 18, 18) 106 .addGap(18, 18, 18)
108 .addComponent(jSpinner1, javax.swing.GroupLayout.DEFAULT_SIZE, 240, Short.MAX_VALUE)) 107 .addComponent(jSpinner1, javax.swing.GroupLayout.DEFAULT_SIZE, 239, Short.MAX_VALUE))
109 .addGroup(layout.createSequentialGroup() 108 .addGroup(layout.createSequentialGroup()
110 .addComponent(jLabel5) 109 .addComponent(jLabel5)
111 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) 110 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
112 .addComponent(jSpinner2, javax.swing.GroupLayout.DEFAULT_SIZE, 240, Short.MAX_VALUE)) 111 .addComponent(jSpinner2, javax.swing.GroupLayout.DEFAULT_SIZE, 239, Short.MAX_VALUE))
113 .addGroup(layout.createSequentialGroup() 112 .addGroup(layout.createSequentialGroup()
114 .addGap(12, 12, 12) 113 .addGap(12, 12, 12)
115 .addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, 351, javax.swing.GroupLayout.PREFERRED_SIZE)))))) 114 .addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, 351, javax.swing.GroupLayout.PREFERRED_SIZE))
115 .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, 347, javax.swing.GroupLayout.PREFERRED_SIZE)))))
116 .addGroup(layout.createSequentialGroup() 116 .addGroup(layout.createSequentialGroup()
117 .addGap(36, 36, 36) 117 .addGap(36, 36, 36)
118 .addComponent(jLabel6, javax.swing.GroupLayout.DEFAULT_SIZE, 352, Short.MAX_VALUE)) 118 .addComponent(jLabel6, javax.swing.GroupLayout.DEFAULT_SIZE, 351, Short.MAX_VALUE))
119 .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() 119 .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
120 .addContainerGap(342, Short.MAX_VALUE) 120 .addContainerGap(341, Short.MAX_VALUE)
121 .addComponent(jButton1))) 121 .addComponent(jButton1)))
122 .addContainerGap()) 122 .addContainerGap())
123 ); 123 );
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 @@
23 <DimensionLayout dim="0"> 23 <DimensionLayout dim="0">
24 <Group type="103" groupAlignment="0" attributes="0"> 24 <Group type="103" groupAlignment="0" attributes="0">
25 <Group type="102" attributes="0"> 25 <Group type="102" attributes="0">
26 <EmptySpace max="-2" attributes="0"/> 26 <EmptySpace min="-2" max="-2" attributes="0"/>
27 <Group type="103" groupAlignment="0" attributes="0"> 27 <Group type="103" groupAlignment="0" attributes="0">
28 <Component id="jLabel1" min="-2" max="-2" attributes="0"/> 28 <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
29 <Group type="102" attributes="0"> 29 <Group type="102" alignment="0" attributes="0">
30 <EmptySpace min="12" pref="12" max="12" attributes="0"/> 30 <EmptySpace min="-2" pref="12" max="-2" attributes="0"/>
31 <Component id="jLabel3" min="-2" max="-2" attributes="0"/> 31 <Group type="103" groupAlignment="1" attributes="0">
32 <EmptySpace max="32767" attributes="0"/> 32 <Component id="jButton1" alignment="1" min="-2" max="-2" attributes="0"/>
33 <Component id="jLabel2" min="-2" max="-2" attributes="0"/> 33 <Component id="jLabel3" alignment="1" min="-2" pref="466" max="-2" attributes="0"/>
34 <EmptySpace max="32767" attributes="0"/> 34 </Group>
35 <Component id="jButton1" min="-2" max="-2" attributes="0"/>
36 </Group> 35 </Group>
37 </Group> 36 </Group>
38 <EmptySpace max="-2" attributes="0"/> 37 <EmptySpace max="32767" attributes="0"/>
39 </Group> 38 </Group>
40 </Group> 39 </Group>
41 </DimensionLayout> 40 </DimensionLayout>
42 <DimensionLayout dim="1"> 41 <DimensionLayout dim="1">
43 <Group type="103" groupAlignment="0" attributes="0"> 42 <Group type="103" groupAlignment="0" attributes="0">
44 <Group type="102" alignment="0" attributes="0"> 43 <Group type="102" alignment="0" attributes="0">
45 <EmptySpace max="-2" attributes="0"/> 44 <EmptySpace min="-2" max="-2" attributes="0"/>
46 <Component id="jLabel1" min="-2" max="-2" attributes="0"/> 45 <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
47 <Group type="103" groupAlignment="0" attributes="0"> 46 <EmptySpace max="-2" attributes="0"/>
48 <Group type="102" attributes="0"> 47 <Component id="jLabel3" min="-2" max="-2" attributes="0"/>
49 <EmptySpace pref="139" max="32767" attributes="0"/> 48 <EmptySpace max="-2" attributes="0"/>
50 <Component id="jLabel2" min="-2" max="-2" attributes="0"/> 49 <Component id="jButton1" min="-2" max="-2" attributes="0"/>
51 </Group> 50 <EmptySpace max="32767" attributes="0"/>
52 <Group type="102" alignment="0" attributes="0">
53 <EmptySpace max="-2" attributes="0"/>
54 <Group type="103" groupAlignment="1" attributes="0">
55 <Component id="jButton1" alignment="1" min="-2" max="-2" attributes="0"/>
56 <Component id="jLabel3" alignment="1" min="-2" max="-2" attributes="0"/>
57 </Group>
58 <EmptySpace max="-2" attributes="0"/>
59 </Group>
60 </Group>
61 </Group> 51 </Group>
62 </Group> 52 </Group>
63 </DimensionLayout> 53 </DimensionLayout>
@@ -70,12 +60,6 @@
70 <Property name="name" type="java.lang.String" value="jLabel1" noResource="true"/> 60 <Property name="name" type="java.lang.String" value="jLabel1" noResource="true"/>
71 </Properties> 61 </Properties>
72 </Component> 62 </Component>
73 <Component class="javax.swing.JLabel" name="jLabel2">
74 <Properties>
75 <Property name="text" type="java.lang.String" resourceKey="jLabel2.text"/>
76 <Property name="name" type="java.lang.String" value="jLabel2" noResource="true"/>
77 </Properties>
78 </Component>
79 <Component class="javax.swing.JButton" name="jButton1"> 63 <Component class="javax.swing.JButton" name="jButton1">
80 <Properties> 64 <Properties>
81 <Property name="text" type="java.lang.String" resourceKey="jButton1.text"/> 65 <Property name="text" type="java.lang.String" resourceKey="jButton1.text"/>
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 {
27 private void initComponents() { 27 private void initComponents() {
28 28
29 jLabel1 = new javax.swing.JLabel(); 29 jLabel1 = new javax.swing.JLabel();
30 jLabel2 = new javax.swing.JLabel();
31 jButton1 = new javax.swing.JButton(); 30 jButton1 = new javax.swing.JButton();
32 jLabel3 = new javax.swing.JLabel(); 31 jLabel3 = new javax.swing.JLabel();
33 32
@@ -39,9 +38,6 @@ public class Step1 extends javax.swing.JDialog {
39 jLabel1.setText(resourceMap.getString("jLabel1.text")); // NOI18N 38 jLabel1.setText(resourceMap.getString("jLabel1.text")); // NOI18N
40 jLabel1.setName("jLabel1"); // NOI18N 39 jLabel1.setName("jLabel1"); // NOI18N
41 40
42 jLabel2.setText(resourceMap.getString("jLabel2.text")); // NOI18N
43 jLabel2.setName("jLabel2"); // NOI18N
44
45 jButton1.setText(resourceMap.getString("jButton1.text")); // NOI18N 41 jButton1.setText(resourceMap.getString("jButton1.text")); // NOI18N
46 jButton1.setName("jButton1"); // NOI18N 42 jButton1.setName("jButton1"); // NOI18N
47 jButton1.addActionListener(new java.awt.event.ActionListener() { 43 jButton1.addActionListener(new java.awt.event.ActionListener() {
@@ -63,28 +59,21 @@ public class Step1 extends javax.swing.JDialog {
63 .addComponent(jLabel1) 59 .addComponent(jLabel1)
64 .addGroup(layout.createSequentialGroup() 60 .addGroup(layout.createSequentialGroup()
65 .addGap(12, 12, 12) 61 .addGap(12, 12, 12)
66 .addComponent(jLabel3) 62 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
67 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) 63 .addComponent(jButton1)
68 .addComponent(jLabel2) 64 .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, 466, javax.swing.GroupLayout.PREFERRED_SIZE))))
69 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) 65 .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
70 .addComponent(jButton1)))
71 .addContainerGap())
72 ); 66 );
73 layout.setVerticalGroup( 67 layout.setVerticalGroup(
74 layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) 68 layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
75 .addGroup(layout.createSequentialGroup() 69 .addGroup(layout.createSequentialGroup()
76 .addContainerGap() 70 .addContainerGap()
77 .addComponent(jLabel1) 71 .addComponent(jLabel1)
78 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) 72 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
79 .addGroup(layout.createSequentialGroup() 73 .addComponent(jLabel3)
80 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 139, Short.MAX_VALUE) 74 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
81 .addComponent(jLabel2)) 75 .addComponent(jButton1)
82 .addGroup(layout.createSequentialGroup() 76 .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
83 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
84 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
85 .addComponent(jButton1)
86 .addComponent(jLabel3))
87 .addContainerGap())))
88 ); 77 );
89 78
90 pack(); 79 pack();
@@ -115,7 +104,6 @@ public class Step1 extends javax.swing.JDialog {
115 // Variables declaration - do not modify//GEN-BEGIN:variables 104 // Variables declaration - do not modify//GEN-BEGIN:variables
116 private javax.swing.JButton jButton1; 105 private javax.swing.JButton jButton1;
117 private javax.swing.JLabel jLabel1; 106 private javax.swing.JLabel jLabel1;
118 private javax.swing.JLabel jLabel2;
119 private javax.swing.JLabel jLabel3; 107 private javax.swing.JLabel jLabel3;
120 // End of variables declaration//GEN-END:variables 108 // End of variables declaration//GEN-END:variables
121 109
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 @@
26 <EmptySpace max="-2" attributes="0"/> 26 <EmptySpace max="-2" attributes="0"/>
27 <Group type="103" groupAlignment="0" attributes="0"> 27 <Group type="103" groupAlignment="0" attributes="0">
28 <Component id="jLabel1" alignment="0" min="-2" max="-2" attributes="0"/> 28 <Component id="jLabel1" alignment="0" min="-2" max="-2" attributes="0"/>
29 <Group type="102" attributes="0">
30 <EmptySpace min="12" pref="12" max="12" attributes="0"/>
31 <Component id="jLabel6" min="-2" max="-2" attributes="0"/>
32 </Group>
33 <Group type="102" alignment="0" attributes="0"> 29 <Group type="102" alignment="0" attributes="0">
34 <EmptySpace min="12" pref="12" max="12" attributes="0"/> 30 <EmptySpace min="12" pref="12" max="12" attributes="0"/>
35 <Group type="103" groupAlignment="0" attributes="0"> 31 <Group type="103" groupAlignment="0" attributes="0">
@@ -39,16 +35,20 @@
39 </Group> 35 </Group>
40 <EmptySpace max="-2" attributes="0"/> 36 <EmptySpace max="-2" attributes="0"/>
41 <Group type="103" groupAlignment="0" attributes="0"> 37 <Group type="103" groupAlignment="0" attributes="0">
42 <Component id="jTextField1" alignment="0" pref="238" max="32767" attributes="0"/> 38 <Component id="jTextField1" alignment="0" pref="222" max="32767" attributes="0"/>
43 <Component id="jTextField3" alignment="0" pref="238" max="32767" attributes="0"/> 39 <Component id="jTextField3" alignment="0" pref="222" max="32767" attributes="0"/>
44 <Component id="jPasswordField1" alignment="0" pref="238" max="32767" attributes="0"/> 40 <Component id="jPasswordField1" alignment="0" pref="222" max="32767" attributes="0"/>
45 </Group> 41 </Group>
46 </Group> 42 </Group>
47 <Group type="102" alignment="1" attributes="0"> 43 <Group type="102" alignment="1" attributes="0">
48 <Component id="jLabel5" pref="333" max="32767" attributes="0"/> 44 <Component id="jLabel5" pref="317" max="32767" attributes="0"/>
49 <EmptySpace max="-2" attributes="0"/> 45 <EmptySpace max="-2" attributes="0"/>
50 <Component id="jButton1" min="-2" max="-2" attributes="0"/> 46 <Component id="jButton1" min="-2" max="-2" attributes="0"/>
51 </Group> 47 </Group>
48 <Group type="102" alignment="0" attributes="0">
49 <EmptySpace min="-2" pref="12" max="-2" attributes="0"/>
50 <Component id="jLabel6" min="-2" pref="359" max="-2" attributes="0"/>
51 </Group>
52 </Group> 52 </Group>
53 <EmptySpace max="-2" attributes="0"/> 53 <EmptySpace max="-2" attributes="0"/>
54 </Group> 54 </Group>
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
@@ -92,22 +92,22 @@ public class Step2 extends javax.swing.JDialog {
92 .addComponent(jLabel1) 92 .addComponent(jLabel1)
93 .addGroup(layout.createSequentialGroup() 93 .addGroup(layout.createSequentialGroup()
94 .addGap(12, 12, 12) 94 .addGap(12, 12, 12)
95 .addComponent(jLabel6))
96 .addGroup(layout.createSequentialGroup()
97 .addGap(12, 12, 12)
98 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) 95 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
99 .addComponent(jLabel2) 96 .addComponent(jLabel2)
100 .addComponent(jLabel3) 97 .addComponent(jLabel3)
101 .addComponent(jLabel4)) 98 .addComponent(jLabel4))
102 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) 99 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
103 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) 100 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
104 .addComponent(jTextField1, javax.swing.GroupLayout.DEFAULT_SIZE, 238, Short.MAX_VALUE) 101 .addComponent(jTextField1, javax.swing.GroupLayout.DEFAULT_SIZE, 222, Short.MAX_VALUE)
105 .addComponent(jTextField3, javax.swing.GroupLayout.DEFAULT_SIZE, 238, Short.MAX_VALUE) 102 .addComponent(jTextField3, javax.swing.GroupLayout.DEFAULT_SIZE, 222, Short.MAX_VALUE)
106 .addComponent(jPasswordField1, javax.swing.GroupLayout.DEFAULT_SIZE, 238, Short.MAX_VALUE))) 103 .addComponent(jPasswordField1, javax.swing.GroupLayout.DEFAULT_SIZE, 222, Short.MAX_VALUE)))
107 .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() 104 .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
108 .addComponent(jLabel5, javax.swing.GroupLayout.DEFAULT_SIZE, 333, Short.MAX_VALUE) 105 .addComponent(jLabel5, javax.swing.GroupLayout.DEFAULT_SIZE, 317, Short.MAX_VALUE)
109 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) 106 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
110 .addComponent(jButton1))) 107 .addComponent(jButton1))
108 .addGroup(layout.createSequentialGroup()
109 .addGap(12, 12, 12)
110 .addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, 359, javax.swing.GroupLayout.PREFERRED_SIZE)))
111 .addContainerGap()) 111 .addContainerGap())
112 ); 112 );
113 layout.setVerticalGroup( 113 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 @@
24 <Group type="103" groupAlignment="0" attributes="0"> 24 <Group type="103" groupAlignment="0" attributes="0">
25 <Group type="102" attributes="0"> 25 <Group type="102" attributes="0">
26 <Group type="103" groupAlignment="0" attributes="0"> 26 <Group type="103" groupAlignment="0" attributes="0">
27 <Group type="102" attributes="0"> 27 <Group type="102" alignment="0" attributes="0">
28 <EmptySpace min="-2" pref="165" max="-2" attributes="0"/>
29 <Component id="jButton1" min="-2" max="-2" attributes="0"/>
30 </Group>
31 <Group type="102" alignment="0" attributes="0">
28 <EmptySpace max="-2" attributes="0"/> 32 <EmptySpace max="-2" attributes="0"/>
29 <Group type="103" groupAlignment="0" attributes="0"> 33 <Group type="103" groupAlignment="0" attributes="0">
30 <Group type="102" attributes="0"> 34 <Group type="102" attributes="0">
31 <EmptySpace min="12" pref="12" max="12" attributes="0"/> 35 <EmptySpace min="12" pref="12" max="12" attributes="0"/>
32 <Component id="jLabel2" min="-2" max="-2" attributes="0"/> 36 <Component id="jLabel2" min="-2" pref="347" max="-2" attributes="0"/>
33 </Group> 37 </Group>
34 <Component id="jLabel1" alignment="0" min="-2" max="-2" attributes="0"/> 38 <Component id="jLabel1" alignment="0" min="-2" max="-2" attributes="0"/>
35 </Group> 39 </Group>
36 </Group> 40 </Group>
37 <Group type="102" alignment="0" attributes="0">
38 <EmptySpace min="-2" pref="165" max="-2" attributes="0"/>
39 <Component id="jButton1" min="-2" max="-2" attributes="0"/>
40 </Group>
41 </Group> 41 </Group>
42 <EmptySpace max="32767" attributes="0"/> 42 <EmptySpace max="32767" attributes="0"/>
43 </Group> 43 </Group>
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
@@ -56,15 +56,15 @@ public class Step3 extends javax.swing.JDialog {
56 .addGroup(layout.createSequentialGroup() 56 .addGroup(layout.createSequentialGroup()
57 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) 57 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
58 .addGroup(layout.createSequentialGroup() 58 .addGroup(layout.createSequentialGroup()
59 .addGap(165, 165, 165)
60 .addComponent(jButton1))
61 .addGroup(layout.createSequentialGroup()
59 .addContainerGap() 62 .addContainerGap()
60 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) 63 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
61 .addGroup(layout.createSequentialGroup() 64 .addGroup(layout.createSequentialGroup()
62 .addGap(12, 12, 12) 65 .addGap(12, 12, 12)
63 .addComponent(jLabel2)) 66 .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, 347, javax.swing.GroupLayout.PREFERRED_SIZE))
64 .addComponent(jLabel1))) 67 .addComponent(jLabel1))))
65 .addGroup(layout.createSequentialGroup()
66 .addGap(165, 165, 165)
67 .addComponent(jButton1)))
68 .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) 68 .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
69 ); 69 );
70 layout.setVerticalGroup( 70 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 @@
1jLabel1.text=Welcome to the InstaDisc FirstRun Wizard! 1jLabel1.text=Welcome to the InstaDisc FirstRun Wizard!
2jLabel2.text=<html>
3#NOI18N 2#NOI18N
4jLabel1.font=DejaVu Sans-Plain-18 3jLabel1.font=DejaVu Sans-Plain-18
5jButton1.text=Next 4jButton1.text=Next
6jLabel3.text=<html>This is, apparently, the first time you've run InstaDisc, so you need to<BR>step through me before being able to use InstaDisc.<BR><BR>First, ensure that you've chosen and signed up for a Central Server.<BR>If you haven't, or don't even know what that means, please read<BR><A HREF="http://fourisland.com/projects/instadisc/wiki/ChoosingACentralServer">Choosing a Central Server</A> before continuing. If you do know what<BR>you're doing, feel free to click on the NEXT button and get on with<BR>InstaDisc. 5jLabel3.text=<html>This is, apparently, the first time you've run InstaDisc, so you need to step through me before being able to use InstaDisc.<BR><BR>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 <A HREF="http://fourisland.com/projects/instadisc/wiki/ChoosingACentralServer">Choosing a Central Server</A> 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:
8jLabel4.text=Central Server URL: 8jLabel4.text=Central Server URL:
9jLabel5.text= 9jLabel5.text=
10jButton1.text=Next 10jButton1.text=Next
11jLabel6.text=<HTML>To use InstaDisc, you must have chosen and signed up for<BR>a Central Server. Please input below the details it gave you<BR>after registration. 11jLabel6.text=<HTML>To use InstaDisc, you must have chosen and signed up for a Central Server. Please input below the details it gave you after registration.
12jPasswordField1.text= 12jPasswordField1.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
2#NOI18N 2#NOI18N
3jLabel1.font=DejaVu Sans-Plain-18 3jLabel1.font=DejaVu Sans-Plain-18
4jButton1.text=Done 4jButton1.text=Done
5jLabel2.text=<HTML>YAY! You've successfully set up InstaDisc. To start<BR>using InstaDisc, quit this wizard (the DONE button),<BR>open InstaDisc again, and have fun! If you're ever<BR>confused, remember, the Help menu is your friend. 5jLabel2.text=<HTML>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 @@
23 <DimensionLayout dim="0"> 23 <DimensionLayout dim="0">
24 <Group type="103" groupAlignment="0" attributes="0"> 24 <Group type="103" groupAlignment="0" attributes="0">
25 <Group type="102" attributes="0"> 25 <Group type="102" attributes="0">
26 <EmptySpace max="-2" attributes="0"/>
26 <Group type="103" groupAlignment="0" attributes="0"> 27 <Group type="103" groupAlignment="0" attributes="0">
28 <Component id="jLabel1" alignment="0" min="-2" max="-2" attributes="0"/>
27 <Group type="102" alignment="0" attributes="0"> 29 <Group type="102" alignment="0" attributes="0">
28 <EmptySpace max="-2" attributes="0"/> 30 <EmptySpace min="12" pref="12" max="12" attributes="0"/>
29 <Group type="103" groupAlignment="0" attributes="0"> 31 <Group type="103" groupAlignment="0" max="-2" attributes="0">
30 <Component id="jLabel1" alignment="0" min="-2" max="-2" attributes="0"/> 32 <Component id="jLabel2" alignment="0" min="0" pref="0" max="32767" attributes="1"/>
31 <Group type="102" alignment="0" attributes="0"> 33 <Component id="jScrollPane1" alignment="0" pref="343" max="32767" attributes="1"/>
32 <EmptySpace min="12" pref="12" max="12" attributes="0"/> 34 <Group type="102" alignment="1" attributes="0">
33 <Group type="103" groupAlignment="0" attributes="0"> 35 <Component id="jButton1" min="-2" max="-2" attributes="0"/>
34 <Component id="jScrollPane1" alignment="0" min="-2" pref="343" max="-2" attributes="0"/> 36 <EmptySpace max="-2" attributes="0"/>
35 <Component id="jLabel2" alignment="0" min="-2" max="-2" attributes="0"/> 37 <Component id="jButton2" min="-2" max="-2" attributes="0"/>
36 </Group>
37 </Group> 38 </Group>
38 </Group> 39 </Group>
39 </Group> 40 </Group>
40 <Group type="102" alignment="1" attributes="0">
41 <EmptySpace pref="235" max="32767" attributes="0"/>
42 <Component id="jButton1" min="-2" max="-2" attributes="0"/>
43 <EmptySpace max="-2" attributes="0"/>
44 <Component id="jButton2" min="-2" max="-2" attributes="0"/>
45 </Group>
46 </Group> 41 </Group>
47 <EmptySpace max="-2" attributes="0"/> 42 <EmptySpace min="-2" max="-2" attributes="0"/>
48 </Group> 43 </Group>
49 </Group> 44 </Group>
50 </DimensionLayout> 45 </DimensionLayout>
@@ -57,12 +52,12 @@
57 <Component id="jLabel2" min="-2" max="-2" attributes="0"/> 52 <Component id="jLabel2" min="-2" max="-2" attributes="0"/>
58 <EmptySpace max="-2" attributes="0"/> 53 <EmptySpace max="-2" attributes="0"/>
59 <Component id="jScrollPane1" min="-2" max="-2" attributes="0"/> 54 <Component id="jScrollPane1" min="-2" max="-2" attributes="0"/>
60 <EmptySpace max="32767" attributes="0"/> 55 <EmptySpace max="-2" attributes="0"/>
61 <Group type="103" groupAlignment="3" attributes="0"> 56 <Group type="103" groupAlignment="3" attributes="0">
62 <Component id="jButton2" alignment="3" min="-2" max="-2" attributes="0"/> 57 <Component id="jButton2" alignment="3" min="-2" max="-2" attributes="0"/>
63 <Component id="jButton1" alignment="3" min="-2" max="-2" attributes="0"/> 58 <Component id="jButton1" alignment="3" min="-2" max="-2" attributes="0"/>
64 </Group> 59 </Group>
65 <EmptySpace max="-2" attributes="0"/> 60 <EmptySpace max="32767" attributes="0"/>
66 </Group> 61 </Group>
67 </Group> 62 </Group>
68 </DimensionLayout> 63 </DimensionLayout>
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 {
78 layout.setHorizontalGroup( 78 layout.setHorizontalGroup(
79 layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) 79 layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
80 .addGroup(layout.createSequentialGroup() 80 .addGroup(layout.createSequentialGroup()
81 .addContainerGap()
81 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) 82 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
83 .addComponent(jLabel1)
82 .addGroup(layout.createSequentialGroup() 84 .addGroup(layout.createSequentialGroup()
83 .addContainerGap() 85 .addGap(12, 12, 12)
84 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) 86 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
85 .addComponent(jLabel1) 87 .addComponent(jLabel2, 0, 0, Short.MAX_VALUE)
86 .addGroup(layout.createSequentialGroup() 88 .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 343, Short.MAX_VALUE)
87 .addGap(12, 12, 12) 89 .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
88 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) 90 .addComponent(jButton1)
89 .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 343, javax.swing.GroupLayout.PREFERRED_SIZE) 91 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
90 .addComponent(jLabel2))))) 92 .addComponent(jButton2)))))
91 .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
92 .addContainerGap(235, Short.MAX_VALUE)
93 .addComponent(jButton1)
94 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
95 .addComponent(jButton2)))
96 .addContainerGap()) 93 .addContainerGap())
97 ); 94 );
98 layout.setVerticalGroup( 95 layout.setVerticalGroup(
@@ -104,11 +101,11 @@ public class ManageSubscriptionsForm extends javax.swing.JDialog {
104 .addComponent(jLabel2) 101 .addComponent(jLabel2)
105 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) 102 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
106 .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) 103 .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
107 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) 104 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
108 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) 105 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
109 .addComponent(jButton2) 106 .addComponent(jButton2)
110 .addComponent(jButton1)) 107 .addComponent(jButton1))
111 .addContainerGap()) 108 .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
112 ); 109 );
113 110
114 pack(); 111 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 @@
1jLabel1.text=Advanced Settings 1jLabel1.text=Advanced Settings
2#NOI18N 2#NOI18N
3jLabel1.font=DejaVu Sans-Plain-18 3jLabel1.font=DejaVu Sans-Plain-18
4jLabel2.text=<HTML>This section is for more advanced users who would like to<BR>tweak their InstaDisc experience. 4jLabel2.text=<HTML>This section is for more advanced users who would like to tweak their InstaDisc experience.
5jLabel3.text=Item Buffer Size: 5jLabel3.text=Item Buffer Size:
6jLabel4.text=<HTML>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. 6jLabel4.text=<HTML>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.
7jLabel5.text=VerID Buffer Size: 7jLabel5.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 @@
1jLabel1.text=Manage Subscriptions 1jLabel1.text=Manage Subscriptions
2#NOI18N 2#NOI18N
3jLabel1.font=DejaVu Sans-Plain-18 3jLabel1.font=DejaVu Sans-Plain-18
4jLabel2.text=<HTML>If you get bored or annoyed with a certain subscription,<BR>you can unsubscribe from it right here. Just choose the<BR>subscription from the list below and click "Unsubscribe". 4jLabel2.text=<HTML>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".
5jButton1.text=Unsubscribe 5jButton1.text=Unsubscribe
6jButton2.text=Done 6jButton2.text=Done
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-16 05:24:56 +0000