corrade-vassal – Diff between revs 3 and 4

Subversion Repositories:
Rev:
Show entire fileIgnore whitespace
Rev 3 Rev 4
Line 26... Line 26...
26 /// Required method for Designer support - do not modify 26 /// Required method for Designer support - do not modify
27 /// the contents of this method with the code editor. 27 /// the contents of this method with the code editor.
28 /// </summary> 28 /// </summary>
29 private void InitializeComponent() 29 private void InitializeComponent()
30 { 30 {
-   31 this.components = new System.ComponentModel.Container();
31 System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RegionEditForm)); 32 System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RegionEditForm));
32 this.Regions = new System.Windows.Forms.ListBox(); 33 this.Regions = new System.Windows.Forms.ListBox();
33 this.statusStrip1 = new System.Windows.Forms.StatusStrip(); 34 this.statusStrip1 = new System.Windows.Forms.StatusStrip();
34 this.StatusProgress = new System.Windows.Forms.ToolStripProgressBar(); 35 this.StatusProgress = new System.Windows.Forms.ToolStripProgressBar();
35 this.StatusText = new System.Windows.Forms.ToolStripStatusLabel(); 36 this.StatusText = new System.Windows.Forms.ToolStripStatusLabel();
Line 44... Line 45...
44 this.groupBox1 = new System.Windows.Forms.GroupBox(); 45 this.groupBox1 = new System.Windows.Forms.GroupBox();
45 this.groupBox2 = new System.Windows.Forms.GroupBox(); 46 this.groupBox2 = new System.Windows.Forms.GroupBox();
46 this.groupBox3 = new System.Windows.Forms.GroupBox(); 47 this.groupBox3 = new System.Windows.Forms.GroupBox();
47 this.groupBox4 = new System.Windows.Forms.GroupBox(); 48 this.groupBox4 = new System.Windows.Forms.GroupBox();
48 this.groupBox5 = new System.Windows.Forms.GroupBox(); 49 this.groupBox5 = new System.Windows.Forms.GroupBox();
-   50 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();
49 this.statusStrip1.SuspendLayout(); 55 this.statusStrip1.SuspendLayout();
50 this.groupBox1.SuspendLayout(); 56 this.groupBox1.SuspendLayout();
51 this.groupBox2.SuspendLayout(); 57 this.groupBox2.SuspendLayout();
52 this.groupBox3.SuspendLayout(); 58 this.groupBox3.SuspendLayout();
53 this.groupBox4.SuspendLayout(); 59 this.groupBox4.SuspendLayout();
54 this.groupBox5.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();
55 this.SuspendLayout(); 65 this.SuspendLayout();
56 // 66 //
57 // Regions 67 // Regions
58 // 68 //
59 this.Regions.DisplayMember = "Text"; 69 this.Regions.DisplayMember = "Text";
Line 98... Line 108...
98 this.button1.UseVisualStyleBackColor = true; 108 this.button1.UseVisualStyleBackColor = true;
99 this.button1.Click += new System.EventHandler(this.SaveRegionsRequested); 109 this.button1.Click += new System.EventHandler(this.SaveRegionsRequested);
100 // 110 //
101 // button2 111 // button2
102 // 112 //
103 this.button2.Location = new System.Drawing.Point(78, 21); 113 this.button2.Location = new System.Drawing.Point(47, 21);
104 this.button2.Name = "button2"; 114 this.button2.Name = "button2";
105 this.button2.Size = new System.Drawing.Size(75, 23); 115 this.button2.Size = new System.Drawing.Size(75, 23);
106 this.button2.TabIndex = 4; 116 this.button2.TabIndex = 4;
107 this.button2.Text = "Load..."; 117 this.button2.Text = "Load...";
108 this.button2.UseVisualStyleBackColor = true; 118 this.button2.UseVisualStyleBackColor = true;
Line 135... Line 145...
135 // RegionName 145 // RegionName
136 // 146 //
137 this.RegionName.Font = new System.Drawing.Font("Consolas", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); 147 this.RegionName.Font = new System.Drawing.Font("Consolas", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
138 this.RegionName.Location = new System.Drawing.Point(6, 19); 148 this.RegionName.Location = new System.Drawing.Point(6, 19);
139 this.RegionName.Name = "RegionName"; 149 this.RegionName.Name = "RegionName";
140 this.RegionName.Size = new System.Drawing.Size(221, 20); 150 this.RegionName.Size = new System.Drawing.Size(194, 20);
141 this.RegionName.TabIndex = 7; 151 this.RegionName.TabIndex = 7;
142 this.RegionName.TextChanged += new System.EventHandler(this.RegionSettingChanged); 152 this.RegionName.TextChanged += new System.EventHandler(this.RegionSettingChanged);
143 // 153 //
144 // RegionPosition 154 // RegionPosition
145 // 155 //
146 this.RegionPosition.Font = new System.Drawing.Font("Consolas", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); 156 this.RegionPosition.Font = new System.Drawing.Font("Consolas", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
147 this.RegionPosition.Location = new System.Drawing.Point(5, 19); 157 this.RegionPosition.Location = new System.Drawing.Point(5, 19);
148 this.RegionPosition.Name = "RegionPosition"; 158 this.RegionPosition.Name = "RegionPosition";
149 this.RegionPosition.Size = new System.Drawing.Size(221, 20); 159 this.RegionPosition.Size = new System.Drawing.Size(194, 20);
150 this.RegionPosition.TabIndex = 8; 160 this.RegionPosition.TabIndex = 8;
151 this.RegionPosition.TextChanged += new System.EventHandler(this.RegionSettingChanged); 161 this.RegionPosition.TextChanged += new System.EventHandler(this.RegionSettingChanged);
152 // 162 //
153 // groupBox1 163 // groupBox1
154 // 164 //
-   165 this.groupBox1.Controls.Add(this.pictureBox6);
155 this.groupBox1.Controls.Add(this.RegionName); 166 this.groupBox1.Controls.Add(this.RegionName);
156 this.groupBox1.Location = new System.Drawing.Point(6, 19); 167 this.groupBox1.Location = new System.Drawing.Point(6, 19);
157 this.groupBox1.Name = "groupBox1"; 168 this.groupBox1.Name = "groupBox1";
158 this.groupBox1.Size = new System.Drawing.Size(233, 48); 169 this.groupBox1.Size = new System.Drawing.Size(233, 48);
159 this.groupBox1.TabIndex = 9; 170 this.groupBox1.TabIndex = 9;
160 this.groupBox1.TabStop = false; 171 this.groupBox1.TabStop = false;
161 this.groupBox1.Text = "Region Name"; 172 this.groupBox1.Text = "Region Name";
162 // 173 //
163 // groupBox2 174 // groupBox2
164 // 175 //
-   176 this.groupBox2.Controls.Add(this.pictureBox1);
165 this.groupBox2.Controls.Add(this.RegionPosition); 177 this.groupBox2.Controls.Add(this.RegionPosition);
166 this.groupBox2.Location = new System.Drawing.Point(7, 74); 178 this.groupBox2.Location = new System.Drawing.Point(7, 74);
167 this.groupBox2.Name = "groupBox2"; 179 this.groupBox2.Name = "groupBox2";
168 this.groupBox2.Size = new System.Drawing.Size(232, 49); 180 this.groupBox2.Size = new System.Drawing.Size(232, 49);
169 this.groupBox2.TabIndex = 10; 181 this.groupBox2.TabIndex = 10;
Line 184... Line 196...
184 this.groupBox3.TabStop = false; 196 this.groupBox3.TabStop = false;
185 this.groupBox3.Text = "Region Edit"; 197 this.groupBox3.Text = "Region Edit";
186 // 198 //
187 // groupBox4 199 // groupBox4
188 // 200 //
-   201 this.groupBox4.Controls.Add(this.pictureBox3);
-   202 this.groupBox4.Controls.Add(this.pictureBox2);
189 this.groupBox4.Controls.Add(this.button2); 203 this.groupBox4.Controls.Add(this.button2);
190 this.groupBox4.Controls.Add(this.button1); 204 this.groupBox4.Controls.Add(this.button1);
191 this.groupBox4.Font = new System.Drawing.Font("Palatino Linotype", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); 205 this.groupBox4.Font = new System.Drawing.Font("Palatino Linotype", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
192 this.groupBox4.Location = new System.Drawing.Point(366, 156); 206 this.groupBox4.Location = new System.Drawing.Point(366, 156);
193 this.groupBox4.Name = "groupBox4"; 207 this.groupBox4.Name = "groupBox4";
Line 205... Line 219...
205 this.groupBox5.Size = new System.Drawing.Size(348, 371); 219 this.groupBox5.Size = new System.Drawing.Size(348, 371);
206 this.groupBox5.TabIndex = 13; 220 this.groupBox5.TabIndex = 13;
207 this.groupBox5.TabStop = false; 221 this.groupBox5.TabStop = false;
208 this.groupBox5.Text = "Configured Regions"; 222 this.groupBox5.Text = "Configured Regions";
209 // 223 //
-   224 // pictureBox6
-   225 //
-   226 this.pictureBox6.Cursor = System.Windows.Forms.Cursors.Help;
-   227 this.pictureBox6.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox6.Image")));
-   228 this.pictureBox6.Location = new System.Drawing.Point(206, 19);
-   229 this.pictureBox6.Name = "pictureBox6";
-   230 this.pictureBox6.Size = new System.Drawing.Size(20, 20);
-   231 this.pictureBox6.TabIndex = 14;
-   232 this.pictureBox6.TabStop = false;
-   233 this.toolTip1.SetToolTip(this.pictureBox6, "This must be set to the exact name of a\r\nregion or simulator.");
-   234 //
-   235 // pictureBox1
-   236 //
-   237 this.pictureBox1.Cursor = System.Windows.Forms.Cursors.Help;
-   238 this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
-   239 this.pictureBox1.Location = new System.Drawing.Point(206, 19);
-   240 this.pictureBox1.Name = "pictureBox1";
-   241 this.pictureBox1.Size = new System.Drawing.Size(20, 20);
-   242 this.pictureBox1.TabIndex = 15;
-   243 this.pictureBox1.TabStop = false;
-   244 this.toolTip1.SetToolTip(this.pictureBox1, resources.GetString("pictureBox1.ToolTip"));
-   245 //
-   246 // pictureBox2
-   247 //
-   248 this.pictureBox2.Cursor = System.Windows.Forms.Cursors.Help;
-   249 this.pictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox2.Image")));
-   250 this.pictureBox2.Location = new System.Drawing.Point(272, 23);
-   251 this.pictureBox2.Name = "pictureBox2";
-   252 this.pictureBox2.Size = new System.Drawing.Size(20, 20);
-   253 this.pictureBox2.TabIndex = 16;
-   254 this.pictureBox2.TabStop = false;
-   255 this.toolTip1.SetToolTip(this.pictureBox2, "Vassal exports regions to a CSV file\r\nwhere each column contains the region\r\nname" +
-   256 " and the local region position.");
-   257 //
-   258 // pictureBox3
-   259 //
-   260 this.pictureBox3.Cursor = System.Windows.Forms.Cursors.Help;
-   261 this.pictureBox3.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox3.Image")));
-   262 this.pictureBox3.Location = new System.Drawing.Point(128, 23);
-   263 this.pictureBox3.Name = "pictureBox3";
-   264 this.pictureBox3.Size = new System.Drawing.Size(20, 20);
-   265 this.pictureBox3.TabIndex = 17;
-   266 this.pictureBox3.TabStop = false;
-   267 this.toolTip1.SetToolTip(this.pictureBox3, "You can load any previously exported\r\nregions from a file containing a CSV\r\nlist " +
-   268 "of region names by local region\r\npositions line-by-line for each region.");
-   269 //
210 // RegionEditForm 270 // RegionEditForm
211 // 271 //
212 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); 272 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
213 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; 273 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
214 this.ClientSize = new System.Drawing.Size(704, 399); 274 this.ClientSize = new System.Drawing.Size(704, 399);
Line 230... Line 290...
230 this.groupBox2.ResumeLayout(false); 290 this.groupBox2.ResumeLayout(false);
231 this.groupBox2.PerformLayout(); 291 this.groupBox2.PerformLayout();
232 this.groupBox3.ResumeLayout(false); 292 this.groupBox3.ResumeLayout(false);
233 this.groupBox4.ResumeLayout(false); 293 this.groupBox4.ResumeLayout(false);
234 this.groupBox5.ResumeLayout(false); 294 this.groupBox5.ResumeLayout(false);
-   295 ((System.ComponentModel.ISupportInitialize)(this.pictureBox6)).EndInit();
-   296 ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
-   297 ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
-   298 ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit();
235 this.ResumeLayout(false); 299 this.ResumeLayout(false);
236 this.PerformLayout(); 300 this.PerformLayout();
Line 237... Line 301...
237   301  
Line 254... Line 318...
254 private System.Windows.Forms.GroupBox groupBox1; 318 private System.Windows.Forms.GroupBox groupBox1;
255 private System.Windows.Forms.GroupBox groupBox2; 319 private System.Windows.Forms.GroupBox groupBox2;
256 private System.Windows.Forms.GroupBox groupBox3; 320 private System.Windows.Forms.GroupBox groupBox3;
257 private System.Windows.Forms.GroupBox groupBox4; 321 private System.Windows.Forms.GroupBox groupBox4;
258 private System.Windows.Forms.GroupBox groupBox5; 322 private System.Windows.Forms.GroupBox groupBox5;
-   323 private System.Windows.Forms.ToolTip toolTip1;
-   324 private System.Windows.Forms.PictureBox pictureBox6;
-   325 private System.Windows.Forms.PictureBox pictureBox1;
-   326 private System.Windows.Forms.PictureBox pictureBox3;
-   327 private System.Windows.Forms.PictureBox pictureBox2;
259 } 328 }
260 } 329 }
261   330