Spring – Diff between revs 1 and 2

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 1 Rev 2
Line 100... Line 100...
100 // 100 //
101 this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { 101 this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
102 this.importToolStripMenuItem, 102 this.importToolStripMenuItem,
103 this.exportToolStripMenuItem}); 103 this.exportToolStripMenuItem});
104 this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; 104 this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
105 this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20); 105 this.fileToolStripMenuItem.Size = new System.Drawing.Size(35, 20);
106 this.fileToolStripMenuItem.Text = "File"; 106 this.fileToolStripMenuItem.Text = "File";
107 // 107 //
108 // importToolStripMenuItem 108 // importToolStripMenuItem
109 // 109 //
110 this.importToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("importToolStripMenuItem.Image"))); 110 this.importToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("importToolStripMenuItem.Image")));
111 this.importToolStripMenuItem.Name = "importToolStripMenuItem"; 111 this.importToolStripMenuItem.Name = "importToolStripMenuItem";
112 this.importToolStripMenuItem.Size = new System.Drawing.Size(119, 22); 112 this.importToolStripMenuItem.Size = new System.Drawing.Size(118, 22);
113 this.importToolStripMenuItem.Text = "Import..."; 113 this.importToolStripMenuItem.Text = "Import...";
114 this.importToolStripMenuItem.Click += new System.EventHandler(this.ImportToolStripMenuItem_Click); 114 this.importToolStripMenuItem.Click += new System.EventHandler(this.ImportToolStripMenuItem_Click);
115 // 115 //
116 // exportToolStripMenuItem 116 // exportToolStripMenuItem
117 // 117 //
118 this.exportToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("exportToolStripMenuItem.Image"))); 118 this.exportToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("exportToolStripMenuItem.Image")));
119 this.exportToolStripMenuItem.Name = "exportToolStripMenuItem"; 119 this.exportToolStripMenuItem.Name = "exportToolStripMenuItem";
120 this.exportToolStripMenuItem.Size = new System.Drawing.Size(119, 22); 120 this.exportToolStripMenuItem.Size = new System.Drawing.Size(118, 22);
121 this.exportToolStripMenuItem.Text = "Export..."; 121 this.exportToolStripMenuItem.Text = "Export...";
122 this.exportToolStripMenuItem.Click += new System.EventHandler(this.ExportToolStripMenuItem_Click); 122 this.exportToolStripMenuItem.Click += new System.EventHandler(this.ExportToolStripMenuItem_Click);
123 // 123 //
124 // editToolStripMenuItem 124 // editToolStripMenuItem
125 // 125 //
126 this.editToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { 126 this.editToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
127 this.undoToolStripMenuItem, 127 this.undoToolStripMenuItem,
128 this.redoToolStripMenuItem}); 128 this.redoToolStripMenuItem});
129 this.editToolStripMenuItem.Name = "editToolStripMenuItem"; 129 this.editToolStripMenuItem.Name = "editToolStripMenuItem";
130 this.editToolStripMenuItem.Size = new System.Drawing.Size(39, 20); 130 this.editToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
131 this.editToolStripMenuItem.Text = "Edit"; 131 this.editToolStripMenuItem.Text = "Edit";
132 // 132 //
133 // undoToolStripMenuItem 133 // undoToolStripMenuItem
134 // 134 //
135 this.undoToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("undoToolStripMenuItem.Image"))); 135 this.undoToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("undoToolStripMenuItem.Image")));
136 this.undoToolStripMenuItem.Name = "undoToolStripMenuItem"; 136 this.undoToolStripMenuItem.Name = "undoToolStripMenuItem";
137 this.undoToolStripMenuItem.Size = new System.Drawing.Size(103, 22); 137 this.undoToolStripMenuItem.Size = new System.Drawing.Size(99, 22);
138 this.undoToolStripMenuItem.Text = "Undo"; 138 this.undoToolStripMenuItem.Text = "Undo";
139 this.undoToolStripMenuItem.Click += new System.EventHandler(this.UndoToolStripMenuItem_Click); 139 this.undoToolStripMenuItem.Click += new System.EventHandler(this.UndoToolStripMenuItem_Click);
140 // 140 //
141 // redoToolStripMenuItem 141 // redoToolStripMenuItem
142 // 142 //
143 this.redoToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("redoToolStripMenuItem.Image"))); 143 this.redoToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("redoToolStripMenuItem.Image")));
144 this.redoToolStripMenuItem.Name = "redoToolStripMenuItem"; 144 this.redoToolStripMenuItem.Name = "redoToolStripMenuItem";
145 this.redoToolStripMenuItem.Size = new System.Drawing.Size(103, 22); 145 this.redoToolStripMenuItem.Size = new System.Drawing.Size(99, 22);
146 this.redoToolStripMenuItem.Text = "Redo"; 146 this.redoToolStripMenuItem.Text = "Redo";
147 this.redoToolStripMenuItem.Click += new System.EventHandler(this.RedoToolStripMenuItem_Click); 147 this.redoToolStripMenuItem.Click += new System.EventHandler(this.RedoToolStripMenuItem_Click);
148 // 148 //
149 // toolsToolStripMenuItem 149 // toolsToolStripMenuItem
150 // 150 //
Line 153... Line 153...
153 this.pauseToolStripMenuItem, 153 this.pauseToolStripMenuItem,
154 this.keyToolStripMenuItem, 154 this.keyToolStripMenuItem,
155 this.mouseToolStripMenuItem, 155 this.mouseToolStripMenuItem,
156 this.repeatsToolStripMenuItem}); 156 this.repeatsToolStripMenuItem});
157 this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem"; 157 this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem";
158 this.toolsToolStripMenuItem.Size = new System.Drawing.Size(48, 20); 158 this.toolsToolStripMenuItem.Size = new System.Drawing.Size(44, 20);
159 this.toolsToolStripMenuItem.Text = "Tools"; 159 this.toolsToolStripMenuItem.Text = "Tools";
160 // 160 //
161 // reverseToolStripMenuItem 161 // reverseToolStripMenuItem
162 // 162 //
163 this.reverseToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("reverseToolStripMenuItem.Image"))); 163 this.reverseToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("reverseToolStripMenuItem.Image")));
164 this.reverseToolStripMenuItem.Name = "reverseToolStripMenuItem"; 164 this.reverseToolStripMenuItem.Name = "reverseToolStripMenuItem";
165 this.reverseToolStripMenuItem.Size = new System.Drawing.Size(133, 22); 165 this.reverseToolStripMenuItem.Size = new System.Drawing.Size(132, 22);
166 this.reverseToolStripMenuItem.Text = "Reverse"; 166 this.reverseToolStripMenuItem.Text = "Reverse";
167 this.reverseToolStripMenuItem.Click += new System.EventHandler(this.ReverseToolStripMenuItem_Click); 167 this.reverseToolStripMenuItem.Click += new System.EventHandler(this.ReverseToolStripMenuItem_Click);
168 // 168 //
169 // pauseToolStripMenuItem 169 // pauseToolStripMenuItem
170 // 170 //
Line 172... Line 172...
172 this.adjustFuzzmsToolStripMenuItem, 172 this.adjustFuzzmsToolStripMenuItem,
173 this.equateToolStripMenuItem, 173 this.equateToolStripMenuItem,
174 this.removeToolStripMenuItem}); 174 this.removeToolStripMenuItem});
175 this.pauseToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("pauseToolStripMenuItem.Image"))); 175 this.pauseToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("pauseToolStripMenuItem.Image")));
176 this.pauseToolStripMenuItem.Name = "pauseToolStripMenuItem"; 176 this.pauseToolStripMenuItem.Name = "pauseToolStripMenuItem";
177 this.pauseToolStripMenuItem.Size = new System.Drawing.Size(133, 22); 177 this.pauseToolStripMenuItem.Size = new System.Drawing.Size(132, 22);
178 this.pauseToolStripMenuItem.Text = "Pause..."; 178 this.pauseToolStripMenuItem.Text = "Pause...";
179 // 179 //
180 // adjustFuzzmsToolStripMenuItem 180 // adjustFuzzmsToolStripMenuItem
181 // 181 //
182 this.adjustFuzzmsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { 182 this.adjustFuzzmsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
183 this.fuzzToolStripTextBox}); 183 this.fuzzToolStripTextBox});
184 this.adjustFuzzmsToolStripMenuItem.Name = "adjustFuzzmsToolStripMenuItem"; 184 this.adjustFuzzmsToolStripMenuItem.Name = "adjustFuzzmsToolStripMenuItem";
185 this.adjustFuzzmsToolStripMenuItem.Size = new System.Drawing.Size(170, 22); 185 this.adjustFuzzmsToolStripMenuItem.Size = new System.Drawing.Size(166, 22);
186 this.adjustFuzzmsToolStripMenuItem.Text = "Adjust Fuzz (ms)..."; 186 this.adjustFuzzmsToolStripMenuItem.Text = "Adjust Fuzz (ms)...";
187 // 187 //
188 // fuzzToolStripTextBox 188 // fuzzToolStripTextBox
189 // 189 //
190 this.fuzzToolStripTextBox.Name = "fuzzToolStripTextBox"; 190 this.fuzzToolStripTextBox.Name = "fuzzToolStripTextBox";
191 this.fuzzToolStripTextBox.Size = new System.Drawing.Size(100, 23); 191 this.fuzzToolStripTextBox.Size = new System.Drawing.Size(100, 21);
192 // 192 //
193 // equateToolStripMenuItem 193 // equateToolStripMenuItem
194 // 194 //
195 this.equateToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { 195 this.equateToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
196 this.equateToolStripTextBox}); 196 this.equateToolStripTextBox});
197 this.equateToolStripMenuItem.Name = "equateToolStripMenuItem"; 197 this.equateToolStripMenuItem.Name = "equateToolStripMenuItem";
198 this.equateToolStripMenuItem.Size = new System.Drawing.Size(170, 22); 198 this.equateToolStripMenuItem.Size = new System.Drawing.Size(166, 22);
199 this.equateToolStripMenuItem.Text = "Equate (ms)..."; 199 this.equateToolStripMenuItem.Text = "Equate (ms)...";
200 // 200 //
201 // equateToolStripTextBox 201 // equateToolStripTextBox
202 // 202 //
203 this.equateToolStripTextBox.Name = "equateToolStripTextBox"; 203 this.equateToolStripTextBox.Name = "equateToolStripTextBox";
204 this.equateToolStripTextBox.Size = new System.Drawing.Size(100, 23); 204 this.equateToolStripTextBox.Size = new System.Drawing.Size(100, 21);
205 this.equateToolStripTextBox.TextChanged += new System.EventHandler(this.EquateToolStripTextBox_TextChanged); 205 this.equateToolStripTextBox.TextChanged += new System.EventHandler(this.EquateToolStripTextBox_TextChanged);
206 // 206 //
207 // removeToolStripMenuItem 207 // removeToolStripMenuItem
208 // 208 //
209 this.removeToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("removeToolStripMenuItem.Image"))); 209 this.removeToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("removeToolStripMenuItem.Image")));
210 this.removeToolStripMenuItem.Name = "removeToolStripMenuItem"; 210 this.removeToolStripMenuItem.Name = "removeToolStripMenuItem";
211 this.removeToolStripMenuItem.Size = new System.Drawing.Size(170, 22); 211 this.removeToolStripMenuItem.Size = new System.Drawing.Size(166, 22);
212 this.removeToolStripMenuItem.Text = "Remove All"; 212 this.removeToolStripMenuItem.Text = "Remove All";
213 this.removeToolStripMenuItem.Click += new System.EventHandler(this.PauseRemoveToolStripMenuItem_Click); 213 this.removeToolStripMenuItem.Click += new System.EventHandler(this.PauseRemoveToolStripMenuItem_Click);
214 // 214 //
215 // keyToolStripMenuItem 215 // keyToolStripMenuItem
216 // 216 //
217 this.keyToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { 217 this.keyToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
218 this.keyRemoveToolStripMenuItem}); 218 this.keyRemoveToolStripMenuItem});
219 this.keyToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("keyToolStripMenuItem.Image"))); 219 this.keyToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("keyToolStripMenuItem.Image")));
220 this.keyToolStripMenuItem.Name = "keyToolStripMenuItem"; 220 this.keyToolStripMenuItem.Name = "keyToolStripMenuItem";
221 this.keyToolStripMenuItem.Size = new System.Drawing.Size(133, 22); 221 this.keyToolStripMenuItem.Size = new System.Drawing.Size(132, 22);
222 this.keyToolStripMenuItem.Text = "Keyboard..."; 222 this.keyToolStripMenuItem.Text = "Keyboard...";
223 // 223 //
224 // keyRemoveToolStripMenuItem 224 // keyRemoveToolStripMenuItem
225 // 225 //
226 this.keyRemoveToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("keyRemoveToolStripMenuItem.Image"))); 226 this.keyRemoveToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("keyRemoveToolStripMenuItem.Image")));
227 this.keyRemoveToolStripMenuItem.Name = "keyRemoveToolStripMenuItem"; 227 this.keyRemoveToolStripMenuItem.Name = "keyRemoveToolStripMenuItem";
228 this.keyRemoveToolStripMenuItem.Size = new System.Drawing.Size(134, 22); 228 this.keyRemoveToolStripMenuItem.Size = new System.Drawing.Size(127, 22);
229 this.keyRemoveToolStripMenuItem.Text = "Remove All"; 229 this.keyRemoveToolStripMenuItem.Text = "Remove All";
230 this.keyRemoveToolStripMenuItem.Click += new System.EventHandler(this.KeyRemoveToolStripMenuItem_Click); 230 this.keyRemoveToolStripMenuItem.Click += new System.EventHandler(this.KeyRemoveToolStripMenuItem_Click);
231 // 231 //
232 // mouseToolStripMenuItem 232 // mouseToolStripMenuItem
233 // 233 //
234 this.mouseToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { 234 this.mouseToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
235 this.mouseRemoveToolStripMenuItem}); 235 this.mouseRemoveToolStripMenuItem});
236 this.mouseToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("mouseToolStripMenuItem.Image"))); 236 this.mouseToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("mouseToolStripMenuItem.Image")));
237 this.mouseToolStripMenuItem.Name = "mouseToolStripMenuItem"; 237 this.mouseToolStripMenuItem.Name = "mouseToolStripMenuItem";
238 this.mouseToolStripMenuItem.Size = new System.Drawing.Size(133, 22); 238 this.mouseToolStripMenuItem.Size = new System.Drawing.Size(132, 22);
239 this.mouseToolStripMenuItem.Text = "Mouse..."; 239 this.mouseToolStripMenuItem.Text = "Mouse...";
240 // 240 //
241 // mouseRemoveToolStripMenuItem 241 // mouseRemoveToolStripMenuItem
242 // 242 //
243 this.mouseRemoveToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("mouseRemoveToolStripMenuItem.Image"))); 243 this.mouseRemoveToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("mouseRemoveToolStripMenuItem.Image")));
244 this.mouseRemoveToolStripMenuItem.Name = "mouseRemoveToolStripMenuItem"; 244 this.mouseRemoveToolStripMenuItem.Name = "mouseRemoveToolStripMenuItem";
245 this.mouseRemoveToolStripMenuItem.Size = new System.Drawing.Size(134, 22); 245 this.mouseRemoveToolStripMenuItem.Size = new System.Drawing.Size(127, 22);
246 this.mouseRemoveToolStripMenuItem.Text = "Remove All"; 246 this.mouseRemoveToolStripMenuItem.Text = "Remove All";
247 this.mouseRemoveToolStripMenuItem.Click += new System.EventHandler(this.MouseRemoveToolStripMenuItem_Click); 247 this.mouseRemoveToolStripMenuItem.Click += new System.EventHandler(this.MouseRemoveToolStripMenuItem_Click);
248 // 248 //
249 // repeatsToolStripMenuItem 249 // repeatsToolStripMenuItem
250 // 250 //
251 this.repeatsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { 251 this.repeatsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
252 this.repeatsToolStripTextBox, 252 this.repeatsToolStripTextBox,
253 this.infinityToolStripMenuItem}); 253 this.infinityToolStripMenuItem});
254 this.repeatsToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("repeatsToolStripMenuItem.Image"))); 254 this.repeatsToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("repeatsToolStripMenuItem.Image")));
255 this.repeatsToolStripMenuItem.Name = "repeatsToolStripMenuItem"; 255 this.repeatsToolStripMenuItem.Name = "repeatsToolStripMenuItem";
256 this.repeatsToolStripMenuItem.Size = new System.Drawing.Size(133, 22); 256 this.repeatsToolStripMenuItem.Size = new System.Drawing.Size(132, 22);
257 this.repeatsToolStripMenuItem.Text = "Repeats..."; 257 this.repeatsToolStripMenuItem.Text = "Repeats...";
258 // 258 //
259 // repeatsToolStripTextBox 259 // repeatsToolStripTextBox
260 // 260 //
261 this.repeatsToolStripTextBox.Name = "repeatsToolStripTextBox"; 261 this.repeatsToolStripTextBox.Name = "repeatsToolStripTextBox";
262 this.repeatsToolStripTextBox.Size = new System.Drawing.Size(100, 23); 262 this.repeatsToolStripTextBox.Size = new System.Drawing.Size(100, 21);
263 // 263 //
264 // infinityToolStripMenuItem 264 // infinityToolStripMenuItem
265 // 265 //
266 this.infinityToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("infinityToolStripMenuItem.Image"))); 266 this.infinityToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("infinityToolStripMenuItem.Image")));
267 this.infinityToolStripMenuItem.Name = "infinityToolStripMenuItem"; 267 this.infinityToolStripMenuItem.Name = "infinityToolStripMenuItem";
Line 292... Line 292...
292 this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); 292 this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
293 this.MainMenuStrip = this.menuStrip1; 293 this.MainMenuStrip = this.menuStrip1;
294 this.Name = "EditorForm"; 294 this.Name = "EditorForm";
295 this.Text = "Editor"; 295 this.Text = "Editor";
296 this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.EditorForm_Closing); 296 this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.EditorForm_Closing);
-   297 this.Load += new System.EventHandler(this.EditorForm_Load);
297 this.Shown += new System.EventHandler(this.EditorForm_Shown); 298 this.Shown += new System.EventHandler(this.EditorForm_Shown);
298 this.statusStrip1.ResumeLayout(false); 299 this.statusStrip1.ResumeLayout(false);
299 this.statusStrip1.PerformLayout(); 300 this.statusStrip1.PerformLayout();
300 this.menuStrip1.ResumeLayout(false); 301 this.menuStrip1.ResumeLayout(false);
301 this.menuStrip1.PerformLayout(); 302 this.menuStrip1.PerformLayout();