about summary refs log tree commit diff stats
path: root/client/trunk/src/com/fourisland
diff options
context:
space:
mode:
Diffstat (limited to 'client/trunk/src/com/fourisland')
-rw-r--r--client/trunk/src/com/fourisland/instadisc/AddSubscriptionForm.form46
-rw-r--r--client/trunk/src/com/fourisland/instadisc/AddSubscriptionForm.java40
-rw-r--r--client/trunk/src/com/fourisland/instadisc/AdvancedSettingsForm.form152
-rw-r--r--client/trunk/src/com/fourisland/instadisc/AdvancedSettingsForm.java186
-rw-r--r--client/trunk/src/com/fourisland/instadisc/FirstRun/Step2.java3
-rw-r--r--client/trunk/src/com/fourisland/instadisc/InstaDiscView.form3
-rw-r--r--client/trunk/src/com/fourisland/instadisc/InstaDiscView.java10
-rw-r--r--client/trunk/src/com/fourisland/instadisc/Item/Item.java2
-rw-r--r--client/trunk/src/com/fourisland/instadisc/Item/Verification.java2
-rw-r--r--client/trunk/src/com/fourisland/instadisc/resources/AddSubscriptionForm.properties2
-rw-r--r--client/trunk/src/com/fourisland/instadisc/resources/AdvancedSettingsForm.properties9
11 files changed, 411 insertions, 44 deletions
diff --git a/client/trunk/src/com/fourisland/instadisc/AddSubscriptionForm.form b/client/trunk/src/com/fourisland/instadisc/AddSubscriptionForm.form index 22f7ea6..c381e8d 100644 --- a/client/trunk/src/com/fourisland/instadisc/AddSubscriptionForm.form +++ b/client/trunk/src/com/fourisland/instadisc/AddSubscriptionForm.form
@@ -24,28 +24,30 @@
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 max="-2" attributes="0"/>
27 <Group type="103" groupAlignment="0" max="-2" 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" alignment="0" attributes="0"> 29 <Group type="103" alignment="0" groupAlignment="1" max="-2" attributes="0">
30 <EmptySpace min="12" pref="12" max="12" attributes="0"/> 30 <Group type="102" alignment="1" attributes="1">
31 <Group type="103" groupAlignment="0" attributes="0"> 31 <Component id="jLabel4" max="32767" attributes="0"/>
32 <Group type="102" alignment="0" attributes="0"> 32 <EmptySpace max="-2" attributes="0"/>
33 <Component id="jLabel3" min="-2" max="-2" attributes="0"/> 33 <Component id="jButton2" min="-2" max="-2" attributes="0"/>
34 <EmptySpace max="-2" attributes="0"/> 34 <EmptySpace max="-2" attributes="0"/>
35 <Component id="jTextField1" min="-2" pref="214" max="-2" attributes="0"/> 35 <Component id="jButton1" min="-2" max="-2" attributes="0"/>
36 </Group>
37 <Group type="102" alignment="0" attributes="0">
38 <EmptySpace min="12" pref="12" max="12" attributes="0"/>
39 <Group type="103" groupAlignment="1" max="-2" attributes="0">
40 <Component id="jLabel2" alignment="0" min="0" pref="0" max="32767" attributes="1"/>
41 <Group type="102" alignment="0" attributes="0">
42 <Component id="jLabel3" min="-2" max="-2" attributes="0"/>
43 <EmptySpace max="-2" attributes="0"/>
44 <Component id="jTextField1" min="-2" pref="214" max="-2" attributes="0"/>
45 </Group>
36 </Group> 46 </Group>
37 <Component id="jLabel2" alignment="0" min="-2" max="-2" attributes="0"/>
38 </Group> 47 </Group>
39 </Group> 48 </Group>
40 <Group type="102" alignment="1" attributes="1">
41 <Component id="jLabel4" max="32767" attributes="0"/>
42 <EmptySpace max="-2" attributes="0"/>
43 <Component id="jButton2" min="-2" max="-2" attributes="0"/>
44 <EmptySpace max="-2" attributes="0"/>
45 <Component id="jButton1" min="-2" max="-2" attributes="0"/>
46 </Group>
47 </Group> 49 </Group>
48 <EmptySpace max="-2" attributes="0"/> 50 <EmptySpace min="-2" max="-2" attributes="0"/>
49 </Group> 51 </Group>
50 </Group> 52 </Group>
51 </DimensionLayout> 53 </DimensionLayout>
@@ -62,10 +64,12 @@
62 <Component id="jTextField1" alignment="3" min="-2" max="-2" attributes="0"/> 64 <Component id="jTextField1" alignment="3" min="-2" max="-2" attributes="0"/>
63 </Group> 65 </Group>
64 <EmptySpace max="-2" attributes="0"/> 66 <EmptySpace max="-2" attributes="0"/>
65 <Group type="103" groupAlignment="3" attributes="0"> 67 <Group type="103" groupAlignment="1" attributes="0">
66 <Component id="jButton1" alignment="3" min="-2" max="-2" attributes="0"/> 68 <Component id="jLabel4" pref="29" max="32767" attributes="0"/>
67 <Component id="jButton2" alignment="3" min="-2" max="-2" attributes="0"/> 69 <Group type="103" alignment="0" groupAlignment="3" attributes="0">
68 <Component id="jLabel4" alignment="3" pref="29" max="32767" attributes="0"/> 70 <Component id="jButton1" alignment="3" min="-2" max="-2" attributes="0"/>
71 <Component id="jButton2" alignment="3" min="-2" max="-2" attributes="0"/>
72 </Group>
69 </Group> 73 </Group>
70 <EmptySpace max="32767" attributes="0"/> 74 <EmptySpace max="32767" attributes="0"/>
71 </Group> 75 </Group>
diff --git a/client/trunk/src/com/fourisland/instadisc/AddSubscriptionForm.java b/client/trunk/src/com/fourisland/instadisc/AddSubscriptionForm.java index 1609875..7b0fc08 100644 --- a/client/trunk/src/com/fourisland/instadisc/AddSubscriptionForm.java +++ b/client/trunk/src/com/fourisland/instadisc/AddSubscriptionForm.java
@@ -80,22 +80,23 @@ public class AddSubscriptionForm extends javax.swing.JDialog {
80 layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) 80 layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
81 .addGroup(layout.createSequentialGroup() 81 .addGroup(layout.createSequentialGroup()
82 .addContainerGap() 82 .addContainerGap()
83 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) 83 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
84 .addComponent(jLabel1) 84 .addComponent(jLabel1)
85 .addGroup(layout.createSequentialGroup() 85 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false)
86 .addGap(12, 12, 12) 86 .addGroup(layout.createSequentialGroup()
87 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) 87 .addComponent(jLabel4, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
88 .addGroup(layout.createSequentialGroup() 88 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
89 .addComponent(jLabel3) 89 .addComponent(jButton2)
90 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) 90 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
91 .addComponent(jTextField1, javax.swing.GroupLayout.PREFERRED_SIZE, 214, javax.swing.GroupLayout.PREFERRED_SIZE)) 91 .addComponent(jButton1))
92 .addComponent(jLabel2))) 92 .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
93 .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() 93 .addGap(12, 12, 12)
94 .addComponent(jLabel4, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) 94 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false)
95 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) 95 .addComponent(jLabel2, javax.swing.GroupLayout.Alignment.LEADING, 0, 0, Short.MAX_VALUE)
96 .addComponent(jButton2) 96 .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
97 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) 97 .addComponent(jLabel3)
98 .addComponent(jButton1))) 98 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
99 .addComponent(jTextField1, javax.swing.GroupLayout.PREFERRED_SIZE, 214, javax.swing.GroupLayout.PREFERRED_SIZE))))))
99 .addContainerGap()) 100 .addContainerGap())
100 ); 101 );
101 layout.setVerticalGroup( 102 layout.setVerticalGroup(
@@ -110,10 +111,11 @@ public class AddSubscriptionForm extends javax.swing.JDialog {
110 .addComponent(jLabel3) 111 .addComponent(jLabel3)
111 .addComponent(jTextField1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) 112 .addComponent(jTextField1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
112 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) 113 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
113 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) 114 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
114 .addComponent(jButton1) 115 .addComponent(jLabel4, javax.swing.GroupLayout.DEFAULT_SIZE, 29, Short.MAX_VALUE)
115 .addComponent(jButton2) 116 .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
116 .addComponent(jLabel4, javax.swing.GroupLayout.DEFAULT_SIZE, 29, Short.MAX_VALUE)) 117 .addComponent(jButton1)
118 .addComponent(jButton2)))
117 .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) 119 .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
118 ); 120 );
119 121
diff --git a/client/trunk/src/com/fourisland/instadisc/AdvancedSettingsForm.form b/client/trunk/src/com/fourisland/instadisc/AdvancedSettingsForm.form new file mode 100644 index 0000000..f5189b4 --- /dev/null +++ b/client/trunk/src/com/fourisland/instadisc/AdvancedSettingsForm.form
@@ -0,0 +1,152 @@
1<?xml version="1.0" encoding="UTF-8" ?>
2
3<Form version="1.5" maxVersion="1.5" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
4 <Properties>
5 <Property name="defaultCloseOperation" type="int" value="2"/>
6 <Property name="name" type="java.lang.String" value="Form" noResource="true"/>
7 </Properties>
8 <SyntheticProperties>
9 <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
10 </SyntheticProperties>
11 <AuxValues>
12 <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="2"/>
13 <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="true"/>
14 <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
15 <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
16 <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
17 <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
18 <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
19 <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
20 </AuxValues>
21
22 <Layout>
23 <DimensionLayout dim="0">
24 <Group type="103" groupAlignment="0" attributes="0">
25 <Group type="102" attributes="0">
26 <Group type="103" groupAlignment="0" attributes="0">
27 <Group type="102" alignment="0" attributes="0">
28 <EmptySpace max="-2" attributes="0"/>
29 <Group type="103" groupAlignment="0" attributes="0">
30 <Component id="jLabel1" alignment="0" min="-2" max="-2" attributes="0"/>
31 <Group type="102" alignment="0" attributes="0">
32 <EmptySpace min="12" pref="12" max="12" 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">
36 <Component id="jLabel3" min="-2" max="-2" attributes="0"/>
37 <EmptySpace min="-2" pref="18" max="-2" attributes="0"/>
38 <Component id="jSpinner1" pref="240" max="32767" attributes="0"/>
39 </Group>
40 <Group type="102" alignment="0" attributes="0">
41 <Component id="jLabel5" min="-2" max="-2" attributes="0"/>
42 <EmptySpace max="-2" attributes="0"/>
43 <Component id="jSpinner2" pref="240" max="32767" attributes="0"/>
44 </Group>
45 <Group type="102" attributes="0">
46 <EmptySpace min="12" pref="12" max="12" attributes="0"/>
47 <Component id="jLabel4" min="-2" pref="351" max="-2" attributes="0"/>
48 </Group>
49 </Group>
50 </Group>
51 </Group>
52 </Group>
53 <Group type="102" alignment="0" attributes="0">
54 <EmptySpace min="-2" pref="36" max="-2" attributes="0"/>
55 <Component id="jLabel6" pref="352" max="32767" attributes="0"/>
56 </Group>
57 <Group type="102" alignment="1" attributes="0">
58 <EmptySpace pref="342" max="32767" attributes="0"/>
59 <Component id="jButton1" min="-2" max="-2" attributes="0"/>
60 </Group>
61 </Group>
62 <EmptySpace max="-2" attributes="0"/>
63 </Group>
64 </Group>
65 </DimensionLayout>
66 <DimensionLayout dim="1">
67 <Group type="103" groupAlignment="0" attributes="0">
68 <Group type="102" alignment="0" attributes="0">
69 <EmptySpace max="-2" attributes="0"/>
70 <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
71 <EmptySpace max="-2" attributes="0"/>
72 <Component id="jLabel2" min="-2" max="-2" attributes="0"/>
73 <EmptySpace type="unrelated" max="-2" attributes="0"/>
74 <Group type="103" groupAlignment="3" attributes="0">
75 <Component id="jLabel3" alignment="3" min="-2" max="-2" attributes="0"/>
76 <Component id="jSpinner1" alignment="3" min="-2" max="-2" attributes="0"/>
77 </Group>
78 <EmptySpace max="-2" attributes="0"/>
79 <Component id="jLabel4" min="-2" max="-2" attributes="0"/>
80 <EmptySpace max="-2" attributes="0"/>
81 <Group type="103" groupAlignment="3" attributes="0">
82 <Component id="jLabel5" alignment="3" min="-2" max="-2" attributes="0"/>
83 <Component id="jSpinner2" alignment="3" min="-2" max="-2" attributes="0"/>
84 </Group>
85 <EmptySpace max="-2" attributes="0"/>
86 <Component id="jLabel6" min="-2" max="-2" attributes="0"/>
87 <EmptySpace max="32767" attributes="0"/>
88 <Component id="jButton1" min="-2" max="-2" attributes="0"/>
89 <EmptySpace max="-2" attributes="0"/>
90 </Group>
91 </Group>
92 </DimensionLayout>
93 </Layout>
94 <SubComponents>
95 <Component class="javax.swing.JLabel" name="jLabel1">
96 <Properties>
97 <Property name="font" type="java.awt.Font" resourceKey="jLabel1.font"/>
98 <Property name="text" type="java.lang.String" resourceKey="jLabel1.text"/>
99 <Property name="name" type="java.lang.String" value="jLabel1" noResource="true"/>
100 </Properties>
101 </Component>
102 <Component class="javax.swing.JLabel" name="jLabel2">
103 <Properties>
104 <Property name="text" type="java.lang.String" resourceKey="jLabel2.text"/>
105 <Property name="name" type="java.lang.String" value="jLabel2" noResource="true"/>
106 </Properties>
107 </Component>
108 <Component class="javax.swing.JLabel" name="jLabel3">
109 <Properties>
110 <Property name="text" type="java.lang.String" resourceKey="jLabel3.text"/>
111 <Property name="name" type="java.lang.String" value="jLabel3" noResource="true"/>
112 </Properties>
113 </Component>
114 <Component class="javax.swing.JSpinner" name="jSpinner1">
115 <Properties>
116 <Property name="name" type="java.lang.String" value="jSpinner1" noResource="true"/>
117 </Properties>
118 </Component>
119 <Component class="javax.swing.JLabel" name="jLabel4">
120 <Properties>
121 <Property name="text" type="java.lang.String" resourceKey="jLabel4.text"/>
122 <Property name="name" type="java.lang.String" value="jLabel4" noResource="true"/>
123 </Properties>
124 </Component>
125 <Component class="javax.swing.JLabel" name="jLabel5">
126 <Properties>
127 <Property name="text" type="java.lang.String" resourceKey="jLabel5.text"/>
128 <Property name="name" type="java.lang.String" value="jLabel5" noResource="true"/>
129 </Properties>
130 </Component>
131 <Component class="javax.swing.JSpinner" name="jSpinner2">
132 <Properties>
133 <Property name="name" type="java.lang.String" value="jSpinner2" noResource="true"/>
134 </Properties>
135 </Component>
136 <Component class="javax.swing.JLabel" name="jLabel6">
137 <Properties>
138 <Property name="text" type="java.lang.String" resourceKey="jLabel6.text"/>
139 <Property name="name" type="java.lang.String" value="jLabel6" noResource="true"/>
140 </Properties>
141 </Component>
142 <Component class="javax.swing.JButton" name="jButton1">
143 <Properties>
144 <Property name="text" type="java.lang.String" resourceKey="jButton1.text"/>
145 <Property name="name" type="java.lang.String" value="jButton1" noResource="true"/>
146 </Properties>
147 <Events>
148 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton1ActionPerformed"/>
149 </Events>
150 </Component>
151 </SubComponents>
152</Form>
diff --git a/client/trunk/src/com/fourisland/instadisc/AdvancedSettingsForm.java b/client/trunk/src/com/fourisland/instadisc/AdvancedSettingsForm.java new file mode 100644 index 0000000..312b3c3 --- /dev/null +++ b/client/trunk/src/com/fourisland/instadisc/AdvancedSettingsForm.java
@@ -0,0 +1,186 @@
1/*
2 * AdvancedSettingsForm.java
3 *
4 * Created on July 31, 2008, 12:43 PM
5 */
6
7package com.fourisland.instadisc;
8
9import com.fourisland.instadisc.Database.Wrapper;
10import javax.swing.SpinnerNumberModel;
11
12/**
13 *
14 * @author hatkirby
15 */
16public class AdvancedSettingsForm extends javax.swing.JDialog {
17
18 /** Creates new form AdvancedSettingsForm */
19 public AdvancedSettingsForm(java.awt.Frame parent, boolean modal) {
20 super(parent, modal);
21 initComponents();
22
23 SpinnerNumberModel sm = new SpinnerNumberModel();
24 sm.setValue(Integer.decode(Wrapper.getConfig("itemBufferSize")));
25 sm.setMaximum(100);
26 sm.setMinimum(1);
27 sm.setStepSize(1);
28 jSpinner1.setModel(sm);
29
30 SpinnerNumberModel sm2 = new SpinnerNumberModel();
31 sm2.setValue(Integer.decode(Wrapper.getConfig("verIDBufferSize")));
32 sm2.setMaximum(10000);
33 sm2.setMinimum(1);
34 sm2.setStepSize(1);
35 jSpinner2.setModel(sm2);
36 }
37
38 /** This method is called from within the constructor to
39 * initialize the form.
40 * WARNING: Do NOT modify this code. The content of this method is
41 * always regenerated by the Form Editor.
42 */
43 // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
44 private void initComponents() {
45
46 jLabel1 = new javax.swing.JLabel();
47 jLabel2 = new javax.swing.JLabel();
48 jLabel3 = new javax.swing.JLabel();
49 jSpinner1 = new javax.swing.JSpinner();
50 jLabel4 = new javax.swing.JLabel();
51 jLabel5 = new javax.swing.JLabel();
52 jSpinner2 = new javax.swing.JSpinner();
53 jLabel6 = new javax.swing.JLabel();
54 jButton1 = new javax.swing.JButton();
55
56 setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
57 setName("Form"); // NOI18N
58
59 org.jdesktop.application.ResourceMap resourceMap = org.jdesktop.application.Application.getInstance(com.fourisland.instadisc.InstaDiscApp.class).getContext().getResourceMap(AdvancedSettingsForm.class);
60 jLabel1.setFont(resourceMap.getFont("jLabel1.font")); // NOI18N
61 jLabel1.setText(resourceMap.getString("jLabel1.text")); // NOI18N
62 jLabel1.setName("jLabel1"); // NOI18N
63
64 jLabel2.setText(resourceMap.getString("jLabel2.text")); // NOI18N
65 jLabel2.setName("jLabel2"); // NOI18N
66
67 jLabel3.setText(resourceMap.getString("jLabel3.text")); // NOI18N
68 jLabel3.setName("jLabel3"); // NOI18N
69
70 jSpinner1.setName("jSpinner1"); // NOI18N
71
72 jLabel4.setText(resourceMap.getString("jLabel4.text")); // NOI18N
73 jLabel4.setName("jLabel4"); // NOI18N
74
75 jLabel5.setText(resourceMap.getString("jLabel5.text")); // NOI18N
76 jLabel5.setName("jLabel5"); // NOI18N
77
78 jSpinner2.setName("jSpinner2"); // NOI18N
79
80 jLabel6.setText(resourceMap.getString("jLabel6.text")); // NOI18N
81 jLabel6.setName("jLabel6"); // NOI18N
82
83 jButton1.setText(resourceMap.getString("jButton1.text")); // NOI18N
84 jButton1.setName("jButton1"); // NOI18N
85 jButton1.addActionListener(new java.awt.event.ActionListener() {
86 public void actionPerformed(java.awt.event.ActionEvent evt) {
87 jButton1ActionPerformed(evt);
88 }
89 });
90
91 javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
92 getContentPane().setLayout(layout);
93 layout.setHorizontalGroup(
94 layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
95 .addGroup(layout.createSequentialGroup()
96 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
97 .addGroup(layout.createSequentialGroup()
98 .addContainerGap()
99 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
100 .addComponent(jLabel1)
101 .addGroup(layout.createSequentialGroup()
102 .addGap(12, 12, 12)
103 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
104 .addComponent(jLabel2)
105 .addGroup(layout.createSequentialGroup()
106 .addComponent(jLabel3)
107 .addGap(18, 18, 18)
108 .addComponent(jSpinner1, javax.swing.GroupLayout.DEFAULT_SIZE, 240, Short.MAX_VALUE))
109 .addGroup(layout.createSequentialGroup()
110 .addComponent(jLabel5)
111 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
112 .addComponent(jSpinner2, javax.swing.GroupLayout.DEFAULT_SIZE, 240, Short.MAX_VALUE))
113 .addGroup(layout.createSequentialGroup()
114 .addGap(12, 12, 12)
115 .addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, 351, javax.swing.GroupLayout.PREFERRED_SIZE))))))
116 .addGroup(layout.createSequentialGroup()
117 .addGap(36, 36, 36)
118 .addComponent(jLabel6, javax.swing.GroupLayout.DEFAULT_SIZE, 352, Short.MAX_VALUE))
119 .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
120 .addContainerGap(342, Short.MAX_VALUE)
121 .addComponent(jButton1)))
122 .addContainerGap())
123 );
124 layout.setVerticalGroup(
125 layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
126 .addGroup(layout.createSequentialGroup()
127 .addContainerGap()
128 .addComponent(jLabel1)
129 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
130 .addComponent(jLabel2)
131 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
132 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
133 .addComponent(jLabel3)
134 .addComponent(jSpinner1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
135 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
136 .addComponent(jLabel4)
137 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
138 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
139 .addComponent(jLabel5)
140 .addComponent(jSpinner2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
141 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
142 .addComponent(jLabel6)
143 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
144 .addComponent(jButton1)
145 .addContainerGap())
146 );
147
148 pack();
149 }// </editor-fold>//GEN-END:initComponents
150
151 private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
152 Wrapper.setConfig("itemBufferSize", ((Integer) jSpinner1.getValue()).toString());
153 Wrapper.setConfig("verIDBufferSize", ((Integer) jSpinner2.getValue()).toString());
154 setVisible(false);
155 }//GEN-LAST:event_jButton1ActionPerformed
156
157 /**
158 * @param args the command line arguments
159 */
160 public static void main(String args[]) {
161 java.awt.EventQueue.invokeLater(new Runnable() {
162 public void run() {
163 AdvancedSettingsForm dialog = new AdvancedSettingsForm(new javax.swing.JFrame(), true);
164 dialog.addWindowListener(new java.awt.event.WindowAdapter() {
165 public void windowClosing(java.awt.event.WindowEvent e) {
166 System.exit(0);
167 }
168 });
169 dialog.setVisible(true);
170 }
171 });
172 }
173
174 // Variables declaration - do not modify//GEN-BEGIN:variables
175 private javax.swing.JButton jButton1;
176 private javax.swing.JLabel jLabel1;
177 private javax.swing.JLabel jLabel2;
178 private javax.swing.JLabel jLabel3;
179 private javax.swing.JLabel jLabel4;
180 private javax.swing.JLabel jLabel5;
181 private javax.swing.JLabel jLabel6;
182 private javax.swing.JSpinner jSpinner1;
183 private javax.swing.JSpinner jSpinner2;
184 // End of variables declaration//GEN-END:variables
185
186}
diff --git a/client/trunk/src/com/fourisland/instadisc/FirstRun/Step2.java b/client/trunk/src/com/fourisland/instadisc/FirstRun/Step2.java index ef1ffd4..e81049a 100644 --- a/client/trunk/src/com/fourisland/instadisc/FirstRun/Step2.java +++ b/client/trunk/src/com/fourisland/instadisc/FirstRun/Step2.java
@@ -167,7 +167,8 @@ public class Step2 extends javax.swing.JDialog {
167 Wrapper.setConfig("username", jTextField1.getText()); 167 Wrapper.setConfig("username", jTextField1.getText());
168 Wrapper.setConfig("password", md5.hash()); 168 Wrapper.setConfig("password", md5.hash());
169 Wrapper.setConfig("centralServerURL", jTextField3.getText()); 169 Wrapper.setConfig("centralServerURL", jTextField3.getText());
170 Wrapper.setConfig("itemsToHold", "10"); 170 Wrapper.setConfig("itemBufferSize", "10");
171 Wrapper.setConfig("verIDBufferSize", "100");
171 Wrapper.setConfig("initCheck", "done"); 172 Wrapper.setConfig("initCheck", "done");
172 173
173 StepEndResults.ok = true; 174 StepEndResults.ok = true;
diff --git a/client/trunk/src/com/fourisland/instadisc/InstaDiscView.form b/client/trunk/src/com/fourisland/instadisc/InstaDiscView.form index 7baafca..b000ed9 100644 --- a/client/trunk/src/com/fourisland/instadisc/InstaDiscView.form +++ b/client/trunk/src/com/fourisland/instadisc/InstaDiscView.form
@@ -125,6 +125,9 @@
125 <Property name="text" type="java.lang.String" resourceKey="jMenuItem5.text"/> 125 <Property name="text" type="java.lang.String" resourceKey="jMenuItem5.text"/>
126 <Property name="name" type="java.lang.String" value="jMenuItem5" noResource="true"/> 126 <Property name="name" type="java.lang.String" value="jMenuItem5" noResource="true"/>
127 </Properties> 127 </Properties>
128 <Events>
129 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItem5ActionPerformed"/>
130 </Events>
128 </MenuItem> 131 </MenuItem>
129 </SubComponents> 132 </SubComponents>
130 </Menu> 133 </Menu>
diff --git a/client/trunk/src/com/fourisland/instadisc/InstaDiscView.java b/client/trunk/src/com/fourisland/instadisc/InstaDiscView.java index 2a4481a..3c58bfc 100644 --- a/client/trunk/src/com/fourisland/instadisc/InstaDiscView.java +++ b/client/trunk/src/com/fourisland/instadisc/InstaDiscView.java
@@ -227,6 +227,11 @@ public class InstaDiscView extends FrameView {
227 227
228 jMenuItem5.setText(resourceMap.getString("jMenuItem5.text")); // NOI18N 228 jMenuItem5.setText(resourceMap.getString("jMenuItem5.text")); // NOI18N
229 jMenuItem5.setName("jMenuItem5"); // NOI18N 229 jMenuItem5.setName("jMenuItem5"); // NOI18N
230 jMenuItem5.addActionListener(new java.awt.event.ActionListener() {
231 public void actionPerformed(java.awt.event.ActionEvent evt) {
232 jMenuItem5ActionPerformed(evt);
233 }
234 });
230 jMenu1.add(jMenuItem5); 235 jMenu1.add(jMenuItem5);
231 236
232 menuBar.add(jMenu1); 237 menuBar.add(jMenu1);
@@ -305,6 +310,11 @@ public class InstaDiscView extends FrameView {
305 msf.setVisible(true); 310 msf.setVisible(true);
306 }//GEN-LAST:event_jMenuItem2ActionPerformed 311 }//GEN-LAST:event_jMenuItem2ActionPerformed
307 312
313 private void jMenuItem5ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jMenuItem5ActionPerformed
314 AdvancedSettingsForm asf = new AdvancedSettingsForm(new JFrame(), true);
315 asf.setVisible(true);
316 }//GEN-LAST:event_jMenuItem5ActionPerformed
317
308 // Variables declaration - do not modify//GEN-BEGIN:variables 318 // Variables declaration - do not modify//GEN-BEGIN:variables
309 private javax.swing.JList jList1; 319 private javax.swing.JList jList1;
310 private javax.swing.JMenu jMenu1; 320 private javax.swing.JMenu jMenu1;
diff --git a/client/trunk/src/com/fourisland/instadisc/Item/Item.java b/client/trunk/src/com/fourisland/instadisc/Item/Item.java index 5ed6fe9..fa3b50c 100644 --- a/client/trunk/src/com/fourisland/instadisc/Item/Item.java +++ b/client/trunk/src/com/fourisland/instadisc/Item/Item.java
@@ -35,7 +35,7 @@ public class Item {
35 xmlrpc.addParam(Integer.decode(headerMap.get("ID"))); 35 xmlrpc.addParam(Integer.decode(headerMap.get("ID")));
36 //xmlrpc.execute(); 36 //xmlrpc.execute();
37 37
38 if (Wrapper.countItem() >= Integer.decode(Wrapper.getConfig("itemsToHold"))) 38 if (Wrapper.countItem() >= Integer.decode(Wrapper.getConfig("itemBufferSize")))
39 { 39 {
40 Wrapper.dropFromTopItem(); 40 Wrapper.dropFromTopItem();
41 } 41 }
diff --git a/client/trunk/src/com/fourisland/instadisc/Item/Verification.java b/client/trunk/src/com/fourisland/instadisc/Item/Verification.java index 9646397..dc4c4a7 100644 --- a/client/trunk/src/com/fourisland/instadisc/Item/Verification.java +++ b/client/trunk/src/com/fourisland/instadisc/Item/Verification.java
@@ -31,7 +31,7 @@ public class Verification {
31 if (Wrapper.containsOldVerID(id)) { 31 if (Wrapper.containsOldVerID(id)) {
32 throw new VerificationIDReusedException(); 32 throw new VerificationIDReusedException();
33 } else { 33 } else {
34 if (Wrapper.countOldVerID() == 100) { 34 if (Wrapper.countOldVerID() == Integer.decode(Wrapper.getConfig("verIDBufferSize"))) {
35 Wrapper.emptyOldVerID(); 35 Wrapper.emptyOldVerID();
36 } 36 }
37 Wrapper.addOldVerID(id); 37 Wrapper.addOldVerID(id);
diff --git a/client/trunk/src/com/fourisland/instadisc/resources/AddSubscriptionForm.properties b/client/trunk/src/com/fourisland/instadisc/resources/AddSubscriptionForm.properties index a528bf6..a783681 100644 --- a/client/trunk/src/com/fourisland/instadisc/resources/AddSubscriptionForm.properties +++ b/client/trunk/src/com/fourisland/instadisc/resources/AddSubscriptionForm.properties
@@ -1,7 +1,7 @@
1jLabel1.text=Add a Subscription 1jLabel1.text=Add a Subscription
2#NOI18N 2#NOI18N
3jLabel1.font=DejaVu Sans-Plain-18 3jLabel1.font=DejaVu Sans-Plain-18
4jLabel2.text=<HTML>To recieve InstaDisc notifications, you need to subscribe<BR>to a website's content. If a website supports InstaDisc<BR>it should be advertising a link to an "InstaDisc Subscription<BR>File". To subscribe to that website's content, copy the URL<BR>into the box below. 4jLabel2.text=<html>To recieve InstaDisc notifications, you need to subscribe to a website's content. If a website supports InstaDisc it should be advertising a link to an "InstaDisc Subscription File". To subscribe to that website's content, copy the URL into the box below.
5jLabel3.text=Subscription File URL: 5jLabel3.text=Subscription File URL:
6jTextField1.text= 6jTextField1.text=
7jButton1.text=Done 7jButton1.text=Done
diff --git a/client/trunk/src/com/fourisland/instadisc/resources/AdvancedSettingsForm.properties b/client/trunk/src/com/fourisland/instadisc/resources/AdvancedSettingsForm.properties new file mode 100644 index 0000000..2f547b3 --- /dev/null +++ b/client/trunk/src/com/fourisland/instadisc/resources/AdvancedSettingsForm.properties
@@ -0,0 +1,9 @@
1jLabel1.text=Advanced Settings
2#NOI18N
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.
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.
7jLabel5.text=VerID Buffer Size:
8jLabel6.text=<HTML>If this is a higher value, less viral Items will get in, but there'd be more chance of re-contacting the server, and thus more Internet usage.
9jButton1.text=Done