corrade-vassal – Diff between revs 5 and 8

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 5 Rev 8
Line 41... Line 41...
41 this.button3 = new System.Windows.Forms.Button(); 41 this.button3 = new System.Windows.Forms.Button();
42 this.button4 = new System.Windows.Forms.Button(); 42 this.button4 = new System.Windows.Forms.Button();
43 this.RegionName = new System.Windows.Forms.TextBox(); 43 this.RegionName = new System.Windows.Forms.TextBox();
44 this.RegionPosition = new System.Windows.Forms.TextBox(); 44 this.RegionPosition = new System.Windows.Forms.TextBox();
45 this.groupBox1 = new System.Windows.Forms.GroupBox(); 45 this.groupBox1 = new System.Windows.Forms.GroupBox();
-   46 this.pictureBox6 = new System.Windows.Forms.PictureBox();
46 this.groupBox2 = new System.Windows.Forms.GroupBox(); 47 this.groupBox2 = new System.Windows.Forms.GroupBox();
-   48 this.pictureBox1 = new System.Windows.Forms.PictureBox();
47 this.groupBox3 = new System.Windows.Forms.GroupBox(); 49 this.groupBox3 = new System.Windows.Forms.GroupBox();
48 this.groupBox4 = new System.Windows.Forms.GroupBox(); 50 this.groupBox4 = new System.Windows.Forms.GroupBox();
-   51 this.pictureBox3 = new System.Windows.Forms.PictureBox();
-   52 this.pictureBox2 = new System.Windows.Forms.PictureBox();
49 this.groupBox5 = new System.Windows.Forms.GroupBox(); 53 this.groupBox5 = new System.Windows.Forms.GroupBox();
50 this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); 54 this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
51 this.pictureBox6 = new System.Windows.Forms.PictureBox(); -  
52 this.pictureBox1 = new System.Windows.Forms.PictureBox(); -  
53 this.pictureBox2 = new System.Windows.Forms.PictureBox(); -  
54 this.pictureBox3 = new System.Windows.Forms.PictureBox(); -  
55 this.statusStrip1.SuspendLayout(); 55 this.statusStrip1.SuspendLayout();
56 this.groupBox1.SuspendLayout(); 56 this.groupBox1.SuspendLayout();
-   57 ((System.ComponentModel.ISupportInitialize)(this.pictureBox6)).BeginInit();
57 this.groupBox2.SuspendLayout(); 58 this.groupBox2.SuspendLayout();
-   59 ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
58 this.groupBox3.SuspendLayout(); 60 this.groupBox3.SuspendLayout();
59 this.groupBox4.SuspendLayout(); 61 this.groupBox4.SuspendLayout();
60 this.groupBox5.SuspendLayout(); -  
61 ((System.ComponentModel.ISupportInitialize)(this.pictureBox6)).BeginInit(); -  
62 ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); -  
63 ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); -  
64 ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit(); 62 ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit();
-   63 ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
-   64 this.groupBox5.SuspendLayout();
65 this.SuspendLayout(); 65 this.SuspendLayout();
66 // 66 //
67 // Regions 67 // Regions
68 // 68 //
69 this.Regions.DisplayMember = "Text"; 69 this.Regions.DisplayMember = "Text";
Line 116... Line 116...
116 this.button2.TabIndex = 4; 116 this.button2.TabIndex = 4;
117 this.button2.Text = "Load..."; 117 this.button2.Text = "Load...";
118 this.button2.UseVisualStyleBackColor = true; 118 this.button2.UseVisualStyleBackColor = true;
119 this.button2.Click += new System.EventHandler(this.LoadRegionsRequested); 119 this.button2.Click += new System.EventHandler(this.LoadRegionsRequested);
120 // 120 //
-   121 // LoadRegionsDialog
-   122 //
-   123 this.LoadRegionsDialog.Filter = "CSV (*.csv)|*.csv|All files (*.*)|*.*";
-   124 //
121 // SaveRegionsDialog 125 // SaveRegionsDialog
122 // 126 //
123 this.SaveRegionsDialog.Filter = "CSV (*.csv)|*.csv|All files (*.*)|*.*"; 127 this.SaveRegionsDialog.Filter = "CSV (*.csv)|*.csv|All files (*.*)|*.*";
124 // 128 //
125 // button3 129 // button3
Line 169... Line 173...
169 this.groupBox1.Size = new System.Drawing.Size(233, 48); 173 this.groupBox1.Size = new System.Drawing.Size(233, 48);
170 this.groupBox1.TabIndex = 9; 174 this.groupBox1.TabIndex = 9;
171 this.groupBox1.TabStop = false; 175 this.groupBox1.TabStop = false;
172 this.groupBox1.Text = "Region Name"; 176 this.groupBox1.Text = "Region Name";
173 // 177 //
-   178 // pictureBox6
-   179 //
-   180 this.pictureBox6.Cursor = System.Windows.Forms.Cursors.Help;
-   181 this.pictureBox6.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox6.Image")));
-   182 this.pictureBox6.Location = new System.Drawing.Point(206, 19);
-   183 this.pictureBox6.Name = "pictureBox6";
-   184 this.pictureBox6.Size = new System.Drawing.Size(20, 20);
-   185 this.pictureBox6.TabIndex = 14;
-   186 this.pictureBox6.TabStop = false;
-   187 this.toolTip1.SetToolTip(this.pictureBox6, "This must be set to the exact name of a\r\nregion or simulator.");
-   188 //
174 // groupBox2 189 // groupBox2
175 // 190 //
176 this.groupBox2.Controls.Add(this.pictureBox1); 191 this.groupBox2.Controls.Add(this.pictureBox1);
177 this.groupBox2.Controls.Add(this.RegionPosition); 192 this.groupBox2.Controls.Add(this.RegionPosition);
178 this.groupBox2.Location = new System.Drawing.Point(7, 74); 193 this.groupBox2.Location = new System.Drawing.Point(7, 74);
Line 180... Line 195...
180 this.groupBox2.Size = new System.Drawing.Size(232, 49); 195 this.groupBox2.Size = new System.Drawing.Size(232, 49);
181 this.groupBox2.TabIndex = 10; 196 this.groupBox2.TabIndex = 10;
182 this.groupBox2.TabStop = false; 197 this.groupBox2.TabStop = false;
183 this.groupBox2.Text = "Region Position"; 198 this.groupBox2.Text = "Region Position";
184 // 199 //
-   200 // pictureBox1
-   201 //
-   202 this.pictureBox1.Cursor = System.Windows.Forms.Cursors.Help;
-   203 this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
-   204 this.pictureBox1.Location = new System.Drawing.Point(206, 19);
-   205 this.pictureBox1.Name = "pictureBox1";
-   206 this.pictureBox1.Size = new System.Drawing.Size(20, 20);
-   207 this.pictureBox1.TabIndex = 15;
-   208 this.pictureBox1.TabStop = false;
-   209 this.toolTip1.SetToolTip(this.pictureBox1, resources.GetString("pictureBox1.ToolTip"));
-   210 //
185 // groupBox3 211 // groupBox3
186 // 212 //
187 this.groupBox3.Controls.Add(this.groupBox1); 213 this.groupBox3.Controls.Add(this.groupBox1);
188 this.groupBox3.Controls.Add(this.button4); 214 this.groupBox3.Controls.Add(this.button4);
189 this.groupBox3.Controls.Add(this.groupBox2); 215 this.groupBox3.Controls.Add(this.groupBox2);
Line 208... Line 234...
208 this.groupBox4.Size = new System.Drawing.Size(326, 55); 234 this.groupBox4.Size = new System.Drawing.Size(326, 55);
209 this.groupBox4.TabIndex = 12; 235 this.groupBox4.TabIndex = 12;
210 this.groupBox4.TabStop = false; 236 this.groupBox4.TabStop = false;
211 this.groupBox4.Text = "Region File"; 237 this.groupBox4.Text = "Region File";
212 // 238 //
-   239 // pictureBox3
-   240 //
-   241 this.pictureBox3.Cursor = System.Windows.Forms.Cursors.Help;
-   242 this.pictureBox3.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox3.Image")));
-   243 this.pictureBox3.Location = new System.Drawing.Point(128, 23);
-   244 this.pictureBox3.Name = "pictureBox3";
-   245 this.pictureBox3.Size = new System.Drawing.Size(20, 20);
-   246 this.pictureBox3.TabIndex = 17;
-   247 this.pictureBox3.TabStop = false;
-   248 this.toolTip1.SetToolTip(this.pictureBox3, "You can load any previously exported\r\nregions from a file containing a CSV\r\nlist " +
-   249 "of region names by local region\r\npositions line-by-line for each region.");
-   250 //
-   251 // pictureBox2
-   252 //
-   253 this.pictureBox2.Cursor = System.Windows.Forms.Cursors.Help;
-   254 this.pictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox2.Image")));
-   255 this.pictureBox2.Location = new System.Drawing.Point(272, 23);
-   256 this.pictureBox2.Name = "pictureBox2";
-   257 this.pictureBox2.Size = new System.Drawing.Size(20, 20);
-   258 this.pictureBox2.TabIndex = 16;
-   259 this.pictureBox2.TabStop = false;
-   260 this.toolTip1.SetToolTip(this.pictureBox2, "Vassal exports regions to a CSV file\r\nwhere each column contains the region\r\nname" +
-   261 " and the local region position.");
-   262 //
213 // groupBox5 263 // groupBox5
214 // 264 //
215 this.groupBox5.Controls.Add(this.Regions); 265 this.groupBox5.Controls.Add(this.Regions);
216 this.groupBox5.Font = new System.Drawing.Font("Palatino Linotype", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); 266 this.groupBox5.Font = new System.Drawing.Font("Palatino Linotype", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
217 this.groupBox5.Location = new System.Drawing.Point(12, 3); 267 this.groupBox5.Location = new System.Drawing.Point(12, 3);
Line 225... Line 275...
225 // 275 //
226 this.toolTip1.AutoPopDelay = 32767; 276 this.toolTip1.AutoPopDelay = 32767;
227 this.toolTip1.InitialDelay = 500; 277 this.toolTip1.InitialDelay = 500;
228 this.toolTip1.ReshowDelay = 100; 278 this.toolTip1.ReshowDelay = 100;
229 // 279 //
230 // pictureBox6 -  
231 // -  
232 this.pictureBox6.Cursor = System.Windows.Forms.Cursors.Help; -  
233 this.pictureBox6.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox6.Image"))); -  
234 this.pictureBox6.Location = new System.Drawing.Point(206, 19); -  
235 this.pictureBox6.Name = "pictureBox6"; -  
236 this.pictureBox6.Size = new System.Drawing.Size(20, 20); -  
237 this.pictureBox6.TabIndex = 14; -  
238 this.pictureBox6.TabStop = false; -  
239 this.toolTip1.SetToolTip(this.pictureBox6, "This must be set to the exact name of a\r\nregion or simulator."); -  
240 // -  
241 // pictureBox1 -  
242 // -  
243 this.pictureBox1.Cursor = System.Windows.Forms.Cursors.Help; -  
244 this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); -  
245 this.pictureBox1.Location = new System.Drawing.Point(206, 19); -  
246 this.pictureBox1.Name = "pictureBox1"; -  
247 this.pictureBox1.Size = new System.Drawing.Size(20, 20); -  
248 this.pictureBox1.TabIndex = 15; -  
249 this.pictureBox1.TabStop = false; -  
250 this.toolTip1.SetToolTip(this.pictureBox1, resources.GetString("pictureBox1.ToolTip")); -  
251 // -  
252 // pictureBox2 -  
253 // -  
254 this.pictureBox2.Cursor = System.Windows.Forms.Cursors.Help; -  
255 this.pictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox2.Image"))); -  
256 this.pictureBox2.Location = new System.Drawing.Point(272, 23); -  
257 this.pictureBox2.Name = "pictureBox2"; -  
258 this.pictureBox2.Size = new System.Drawing.Size(20, 20); -  
259 this.pictureBox2.TabIndex = 16; -  
260 this.pictureBox2.TabStop = false; -  
261 this.toolTip1.SetToolTip(this.pictureBox2, "Vassal exports regions to a CSV file\r\nwhere each column contains the region\r\nname" + -  
262 " and the local region position."); -  
263 // -  
264 // pictureBox3 -  
265 // -  
266 this.pictureBox3.Cursor = System.Windows.Forms.Cursors.Help; -  
267 this.pictureBox3.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox3.Image"))); -  
268 this.pictureBox3.Location = new System.Drawing.Point(128, 23); -  
269 this.pictureBox3.Name = "pictureBox3"; -  
270 this.pictureBox3.Size = new System.Drawing.Size(20, 20); -  
271 this.pictureBox3.TabIndex = 17; -  
272 this.pictureBox3.TabStop = false; -  
273 this.toolTip1.SetToolTip(this.pictureBox3, "You can load any previously exported\r\nregions from a file containing a CSV\r\nlist " + -  
274 "of region names by local region\r\npositions line-by-line for each region."); -  
275 // -  
276 // RegionEditForm 280 // RegionEditForm
277 // 281 //
278 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); 282 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
279 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; 283 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
280 this.ClientSize = new System.Drawing.Size(704, 399); 284 this.ClientSize = new System.Drawing.Size(704, 399);
Line 291... Line 295...
291 this.Shown += new System.EventHandler(this.RegionEditShown); 295 this.Shown += new System.EventHandler(this.RegionEditShown);
292 this.statusStrip1.ResumeLayout(false); 296 this.statusStrip1.ResumeLayout(false);
293 this.statusStrip1.PerformLayout(); 297 this.statusStrip1.PerformLayout();
294 this.groupBox1.ResumeLayout(false); 298 this.groupBox1.ResumeLayout(false);
295 this.groupBox1.PerformLayout(); 299 this.groupBox1.PerformLayout();
-   300 ((System.ComponentModel.ISupportInitialize)(this.pictureBox6)).EndInit();
296 this.groupBox2.ResumeLayout(false); 301 this.groupBox2.ResumeLayout(false);
297 this.groupBox2.PerformLayout(); 302 this.groupBox2.PerformLayout();
-   303 ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
298 this.groupBox3.ResumeLayout(false); 304 this.groupBox3.ResumeLayout(false);
299 this.groupBox4.ResumeLayout(false); 305 this.groupBox4.ResumeLayout(false);
300 this.groupBox5.ResumeLayout(false); -  
301 ((System.ComponentModel.ISupportInitialize)(this.pictureBox6)).EndInit(); -  
302 ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); -  
303 ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); -  
304 ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit(); 306 ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit();
-   307 ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
-   308 this.groupBox5.ResumeLayout(false);
305 this.ResumeLayout(false); 309 this.ResumeLayout(false);
306 this.PerformLayout(); 310 this.PerformLayout();
Line 307... Line 311...
307   311