corrade-vassal – Diff between revs 7 and 8

Subversion Repositories:
Rev:
Show entire fileIgnore whitespace
Rev 7 Rev 8
Line 98... Line 98...
98 this.SaveSettingsDialog = new System.Windows.Forms.SaveFileDialog(); 98 this.SaveSettingsDialog = new System.Windows.Forms.SaveFileDialog();
99 this.statusStrip1 = new System.Windows.Forms.StatusStrip(); 99 this.statusStrip1 = new System.Windows.Forms.StatusStrip();
100 this.StatusProgress = new System.Windows.Forms.ToolStripProgressBar(); 100 this.StatusProgress = new System.Windows.Forms.ToolStripProgressBar();
101 this.StatusText = new System.Windows.Forms.ToolStripStatusLabel(); 101 this.StatusText = new System.Windows.Forms.ToolStripStatusLabel();
102 this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); 102 this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
-   103 this.groupBox7 = new System.Windows.Forms.GroupBox();
-   104 this.groupBox8 = new System.Windows.Forms.GroupBox();
103 this.tabControl1.SuspendLayout(); 105 this.tabControl1.SuspendLayout();
104 this.tabPage1.SuspendLayout(); 106 this.tabPage1.SuspendLayout();
105 this.groupBox6.SuspendLayout(); 107 this.groupBox6.SuspendLayout();
106 ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).BeginInit(); 108 ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).BeginInit();
107 this.groupBox5.SuspendLayout(); 109 this.groupBox5.SuspendLayout();
Line 133... Line 135...
133 ((System.ComponentModel.ISupportInitialize)(this.pictureBox19)).BeginInit(); 135 ((System.ComponentModel.ISupportInitialize)(this.pictureBox19)).BeginInit();
134 this.groupBox36.SuspendLayout(); 136 this.groupBox36.SuspendLayout();
135 this.groupBox35.SuspendLayout(); 137 this.groupBox35.SuspendLayout();
136 this.groupBox34.SuspendLayout(); 138 this.groupBox34.SuspendLayout();
137 this.statusStrip1.SuspendLayout(); 139 this.statusStrip1.SuspendLayout();
-   140 this.groupBox7.SuspendLayout();
-   141 this.groupBox8.SuspendLayout();
138 this.SuspendLayout(); 142 this.SuspendLayout();
139 // 143 //
140 // tabControl1 144 // tabControl1
141 // 145 //
142 this.tabControl1.Controls.Add(this.tabPage1); 146 this.tabControl1.Controls.Add(this.tabPage1);
Line 148... Line 152...
148 this.tabControl1.Size = new System.Drawing.Size(679, 358); 152 this.tabControl1.Size = new System.Drawing.Size(679, 358);
149 this.tabControl1.TabIndex = 0; 153 this.tabControl1.TabIndex = 0;
150 // 154 //
151 // tabPage1 155 // tabPage1
152 // 156 //
153 this.tabPage1.Controls.Add(this.groupBox6); -  
154 this.tabPage1.Controls.Add(this.groupBox5); 157 this.tabPage1.Controls.Add(this.groupBox8);
155 this.tabPage1.Controls.Add(this.groupBox4); -  
156 this.tabPage1.Controls.Add(this.groupBox3); -  
157 this.tabPage1.Controls.Add(this.groupBox2); -  
158 this.tabPage1.Controls.Add(this.groupBox1); 158 this.tabPage1.Controls.Add(this.groupBox7);
159 this.tabPage1.Location = new System.Drawing.Point(4, 22); 159 this.tabPage1.Location = new System.Drawing.Point(4, 22);
160 this.tabPage1.Name = "tabPage1"; 160 this.tabPage1.Name = "tabPage1";
161 this.tabPage1.Padding = new System.Windows.Forms.Padding(3); 161 this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
162 this.tabPage1.Size = new System.Drawing.Size(671, 332); 162 this.tabPage1.Size = new System.Drawing.Size(671, 332);
163 this.tabPage1.TabIndex = 0; 163 this.tabPage1.TabIndex = 0;
Line 167... Line 167...
167 // groupBox6 167 // groupBox6
168 // 168 //
169 this.groupBox6.Controls.Add(this.pictureBox5); 169 this.groupBox6.Controls.Add(this.pictureBox5);
170 this.groupBox6.Controls.Add(this.RegionRestartDelay); 170 this.groupBox6.Controls.Add(this.RegionRestartDelay);
171 this.groupBox6.Font = new System.Drawing.Font("Palatino Linotype", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); 171 this.groupBox6.Font = new System.Drawing.Font("Palatino Linotype", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
172 this.groupBox6.Location = new System.Drawing.Point(6, 126); 172 this.groupBox6.Location = new System.Drawing.Point(7, 19);
173 this.groupBox6.Name = "groupBox6"; 173 this.groupBox6.Name = "groupBox6";
174 this.groupBox6.Size = new System.Drawing.Size(200, 50); 174 this.groupBox6.Size = new System.Drawing.Size(200, 50);
175 this.groupBox6.TabIndex = 5; 175 this.groupBox6.TabIndex = 5;
176 this.groupBox6.TabStop = false; 176 this.groupBox6.TabStop = false;
177 this.groupBox6.Text = "Region Restart Delay"; 177 this.groupBox6.Text = "Region Restart Delay";
Line 199... Line 199...
199 // groupBox5 199 // groupBox5
200 // 200 //
201 this.groupBox5.Controls.Add(this.pictureBox4); 201 this.groupBox5.Controls.Add(this.pictureBox4);
202 this.groupBox5.Controls.Add(this.DataTimeout); 202 this.groupBox5.Controls.Add(this.DataTimeout);
203 this.groupBox5.Font = new System.Drawing.Font("Palatino Linotype", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); 203 this.groupBox5.Font = new System.Drawing.Font("Palatino Linotype", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
204 this.groupBox5.Location = new System.Drawing.Point(460, 68); 204 this.groupBox5.Location = new System.Drawing.Point(213, 19);
205 this.groupBox5.Name = "groupBox5"; 205 this.groupBox5.Name = "groupBox5";
206 this.groupBox5.Size = new System.Drawing.Size(185, 53); 206 this.groupBox5.Size = new System.Drawing.Size(185, 53);
207 this.groupBox5.TabIndex = 4; 207 this.groupBox5.TabIndex = 4;
208 this.groupBox5.TabStop = false; 208 this.groupBox5.TabStop = false;
209 this.groupBox5.Text = "Data Timeout"; 209 this.groupBox5.Text = "Data Timeout";
Line 231... Line 231...
231 // groupBox4 231 // groupBox4
232 // 232 //
233 this.groupBox4.Controls.Add(this.pictureBox3); 233 this.groupBox4.Controls.Add(this.pictureBox3);
234 this.groupBox4.Controls.Add(this.TeleportTimeout); 234 this.groupBox4.Controls.Add(this.TeleportTimeout);
235 this.groupBox4.Font = new System.Drawing.Font("Palatino Linotype", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); 235 this.groupBox4.Font = new System.Drawing.Font("Palatino Linotype", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
236 this.groupBox4.Location = new System.Drawing.Point(269, 67); 236 this.groupBox4.Location = new System.Drawing.Point(404, 19);
237 this.groupBox4.Name = "groupBox4"; 237 this.groupBox4.Name = "groupBox4";
238 this.groupBox4.Size = new System.Drawing.Size(185, 53); 238 this.groupBox4.Size = new System.Drawing.Size(185, 53);
239 this.groupBox4.TabIndex = 3; 239 this.groupBox4.TabIndex = 3;
240 this.groupBox4.TabStop = false; 240 this.groupBox4.TabStop = false;
241 this.groupBox4.Text = "Teleport Timeout"; 241 this.groupBox4.Text = "Teleport Timeout";
Line 263... Line 263...
263 // groupBox3 263 // groupBox3
264 // 264 //
265 this.groupBox3.Controls.Add(this.pictureBox2); 265 this.groupBox3.Controls.Add(this.pictureBox2);
266 this.groupBox3.Controls.Add(this.HTTPServerURL); 266 this.groupBox3.Controls.Add(this.HTTPServerURL);
267 this.groupBox3.Font = new System.Drawing.Font("Palatino Linotype", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); 267 this.groupBox3.Font = new System.Drawing.Font("Palatino Linotype", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
268 this.groupBox3.Location = new System.Drawing.Point(338, 6); 268 this.groupBox3.Location = new System.Drawing.Point(7, 19);
269 this.groupBox3.Name = "groupBox3"; 269 this.groupBox3.Name = "groupBox3";
270 this.groupBox3.Size = new System.Drawing.Size(326, 56); 270 this.groupBox3.Size = new System.Drawing.Size(633, 56);
271 this.groupBox3.TabIndex = 2; 271 this.groupBox3.TabIndex = 2;
272 this.groupBox3.TabStop = false; 272 this.groupBox3.TabStop = false;
273 this.groupBox3.Text = "Corrade HTTP URL"; 273 this.groupBox3.Text = "Corrade HTTP URL";
274 // 274 //
275 // pictureBox2 275 // pictureBox2
276 // 276 //
277 this.pictureBox2.Cursor = System.Windows.Forms.Cursors.Help; 277 this.pictureBox2.Cursor = System.Windows.Forms.Cursors.Help;
278 this.pictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox2.Image"))); 278 this.pictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox2.Image")));
279 this.pictureBox2.Location = new System.Drawing.Point(300, 20); 279 this.pictureBox2.Location = new System.Drawing.Point(607, 21);
280 this.pictureBox2.Name = "pictureBox2"; 280 this.pictureBox2.Name = "pictureBox2";
281 this.pictureBox2.Size = new System.Drawing.Size(20, 20); 281 this.pictureBox2.Size = new System.Drawing.Size(20, 20);
282 this.pictureBox2.TabIndex = 13; 282 this.pictureBox2.TabIndex = 13;
283 this.pictureBox2.TabStop = false; 283 this.pictureBox2.TabStop = false;
284 this.toolTip1.SetToolTip(this.pictureBox2, "Enter the full address and port (prefix)\r\nthat Vassal will use to talk to Corrade" + 284 this.toolTip1.SetToolTip(this.pictureBox2, "Enter the full address and port (prefix)\r\nthat Vassal will use to talk to Corrade" +
285 "."); 285 ".");
286 // 286 //
287 // HTTPServerURL 287 // HTTPServerURL
288 // 288 //
289 this.HTTPServerURL.Font = new System.Drawing.Font("Consolas", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); 289 this.HTTPServerURL.Font = new System.Drawing.Font("Consolas", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
290 this.HTTPServerURL.Location = new System.Drawing.Point(7, 20); 290 this.HTTPServerURL.Location = new System.Drawing.Point(7, 21);
291 this.HTTPServerURL.Name = "HTTPServerURL"; 291 this.HTTPServerURL.Name = "HTTPServerURL";
292 this.HTTPServerURL.Size = new System.Drawing.Size(287, 20); 292 this.HTTPServerURL.Size = new System.Drawing.Size(594, 20);
293 this.HTTPServerURL.TabIndex = 0; 293 this.HTTPServerURL.TabIndex = 0;
294 // 294 //
295 // groupBox2 295 // groupBox2
296 // 296 //
297 this.groupBox2.Controls.Add(this.pictureBox1); 297 this.groupBox2.Controls.Add(this.pictureBox1);
298 this.groupBox2.Controls.Add(this.Password); 298 this.groupBox2.Controls.Add(this.Password);
299 this.groupBox2.Font = new System.Drawing.Font("Palatino Linotype", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); 299 this.groupBox2.Font = new System.Drawing.Font("Palatino Linotype", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
300 this.groupBox2.Location = new System.Drawing.Point(6, 66); 300 this.groupBox2.Location = new System.Drawing.Point(339, 81);
301 this.groupBox2.Name = "groupBox2"; 301 this.groupBox2.Name = "groupBox2";
302 this.groupBox2.Size = new System.Drawing.Size(257, 54); 302 this.groupBox2.Size = new System.Drawing.Size(307, 54);
303 this.groupBox2.TabIndex = 1; 303 this.groupBox2.TabIndex = 1;
304 this.groupBox2.TabStop = false; 304 this.groupBox2.TabStop = false;
305 this.groupBox2.Text = "Group Password"; 305 this.groupBox2.Text = "Group Password";
306 // 306 //
307 // pictureBox1 307 // pictureBox1
308 // 308 //
309 this.pictureBox1.Cursor = System.Windows.Forms.Cursors.Help; 309 this.pictureBox1.Cursor = System.Windows.Forms.Cursors.Help;
310 this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); 310 this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
311 this.pictureBox1.Location = new System.Drawing.Point(231, 20); 311 this.pictureBox1.Location = new System.Drawing.Point(275, 20);
312 this.pictureBox1.Name = "pictureBox1"; 312 this.pictureBox1.Name = "pictureBox1";
313 this.pictureBox1.Size = new System.Drawing.Size(20, 20); 313 this.pictureBox1.Size = new System.Drawing.Size(20, 20);
314 this.pictureBox1.TabIndex = 12; 314 this.pictureBox1.TabIndex = 12;
315 this.pictureBox1.TabStop = false; 315 this.pictureBox1.TabStop = false;
316 this.toolTip1.SetToolTip(this.pictureBox1, "Enter the group password that Vassal\r\nwill use to authenticate to Corrade."); 316 this.toolTip1.SetToolTip(this.pictureBox1, "Enter the group password that Vassal\r\nwill use to authenticate to Corrade.");
Line 318... Line 318...
318 // Password 318 // Password
319 // 319 //
320 this.Password.Font = new System.Drawing.Font("Consolas", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); 320 this.Password.Font = new System.Drawing.Font("Consolas", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
321 this.Password.Location = new System.Drawing.Point(7, 20); 321 this.Password.Location = new System.Drawing.Point(7, 20);
322 this.Password.Name = "Password"; 322 this.Password.Name = "Password";
323 this.Password.Size = new System.Drawing.Size(218, 20); 323 this.Password.Size = new System.Drawing.Size(262, 20);
324 this.Password.TabIndex = 0; 324 this.Password.TabIndex = 0;
325 // 325 //
326 // groupBox1 326 // groupBox1
327 // 327 //
328 this.groupBox1.Controls.Add(this.pictureBox6); 328 this.groupBox1.Controls.Add(this.pictureBox6);
329 this.groupBox1.Controls.Add(this.Group); 329 this.groupBox1.Controls.Add(this.Group);
330 this.groupBox1.Font = new System.Drawing.Font("Palatino Linotype", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); 330 this.groupBox1.Font = new System.Drawing.Font("Palatino Linotype", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
331 this.groupBox1.Location = new System.Drawing.Point(6, 6); 331 this.groupBox1.Location = new System.Drawing.Point(7, 81);
332 this.groupBox1.Name = "groupBox1"; 332 this.groupBox1.Name = "groupBox1";
333 this.groupBox1.Size = new System.Drawing.Size(326, 54); 333 this.groupBox1.Size = new System.Drawing.Size(326, 54);
334 this.groupBox1.TabIndex = 0; 334 this.groupBox1.TabIndex = 0;
335 this.groupBox1.TabStop = false; 335 this.groupBox1.TabStop = false;
336 this.groupBox1.Text = "Group"; 336 this.groupBox1.Text = "Group";
Line 879... Line 879...
879 this.button2.TabIndex = 2; 879 this.button2.TabIndex = 2;
880 this.button2.Text = "Save..."; 880 this.button2.Text = "Save...";
881 this.button2.UseVisualStyleBackColor = true; 881 this.button2.UseVisualStyleBackColor = true;
882 this.button2.Click += new System.EventHandler(this.SaveSettingsRequested); 882 this.button2.Click += new System.EventHandler(this.SaveSettingsRequested);
883 // 883 //
-   884 // LoadSettingsDialog
-   885 //
-   886 this.LoadSettingsDialog.Filter = "Vassal Configuration (*.ini)|*.ini|All files (*.*)|*.*";
-   887 //
884 // SaveSettingsDialog 888 // SaveSettingsDialog
885 // 889 //
886 this.SaveSettingsDialog.Filter = "Vassal Configuration (*.ini)|*.ini|All files (*.*)|*.*"; 890 this.SaveSettingsDialog.Filter = "Vassal Configuration (*.ini)|*.ini|All files (*.*)|*.*";
887 // 891 //
888 // statusStrip1 892 // statusStrip1
Line 911... Line 915...
911 // 915 //
912 this.toolTip1.AutoPopDelay = 32767; 916 this.toolTip1.AutoPopDelay = 32767;
913 this.toolTip1.InitialDelay = 500; 917 this.toolTip1.InitialDelay = 500;
914 this.toolTip1.ReshowDelay = 100; 918 this.toolTip1.ReshowDelay = 100;
915 // 919 //
-   920 // groupBox7
-   921 //
-   922 this.groupBox7.Controls.Add(this.groupBox6);
-   923 this.groupBox7.Controls.Add(this.groupBox4);
-   924 this.groupBox7.Controls.Add(this.groupBox5);
-   925 this.groupBox7.Font = new System.Drawing.Font("Palatino Linotype", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-   926 this.groupBox7.Location = new System.Drawing.Point(6, 183);
-   927 this.groupBox7.Name = "groupBox7";
-   928 this.groupBox7.Size = new System.Drawing.Size(652, 143);
-   929 this.groupBox7.TabIndex = 6;
-   930 this.groupBox7.TabStop = false;
-   931 this.groupBox7.Text = "Vassal Settings";
-   932 //
-   933 // groupBox8
-   934 //
-   935 this.groupBox8.Controls.Add(this.groupBox1);
-   936 this.groupBox8.Controls.Add(this.groupBox2);
-   937 this.groupBox8.Controls.Add(this.groupBox3);
-   938 this.groupBox8.Font = new System.Drawing.Font("Palatino Linotype", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-   939 this.groupBox8.Location = new System.Drawing.Point(6, 6);
-   940 this.groupBox8.Name = "groupBox8";
-   941 this.groupBox8.Size = new System.Drawing.Size(652, 171);
-   942 this.groupBox8.TabIndex = 7;
-   943 this.groupBox8.TabStop = false;
-   944 this.groupBox8.Text = "Corrade Settings";
-   945 //
916 // SettingsForm 946 // SettingsForm
917 // 947 //
918 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); 948 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
919 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; 949 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
920 this.ClientSize = new System.Drawing.Size(704, 431); 950 this.ClientSize = new System.Drawing.Size(704, 431);
Line 971... Line 1001...
971 this.groupBox36.ResumeLayout(false); 1001 this.groupBox36.ResumeLayout(false);
972 this.groupBox35.ResumeLayout(false); 1002 this.groupBox35.ResumeLayout(false);
973 this.groupBox34.ResumeLayout(false); 1003 this.groupBox34.ResumeLayout(false);
974 this.statusStrip1.ResumeLayout(false); 1004 this.statusStrip1.ResumeLayout(false);
975 this.statusStrip1.PerformLayout(); 1005 this.statusStrip1.PerformLayout();
-   1006 this.groupBox7.ResumeLayout(false);
-   1007 this.groupBox8.ResumeLayout(false);
976 this.ResumeLayout(false); 1008 this.ResumeLayout(false);
977 this.PerformLayout(); 1009 this.PerformLayout();
Line 978... Line 1010...
978   1010  
Line 1048... Line 1080...
1048 private System.Windows.Forms.PictureBox pictureBox2; 1080 private System.Windows.Forms.PictureBox pictureBox2;
1049 private System.Windows.Forms.PictureBox pictureBox1; 1081 private System.Windows.Forms.PictureBox pictureBox1;
1050 private System.Windows.Forms.GroupBox groupBox6; 1082 private System.Windows.Forms.GroupBox groupBox6;
1051 private System.Windows.Forms.PictureBox pictureBox5; 1083 private System.Windows.Forms.PictureBox pictureBox5;
1052 private System.Windows.Forms.TextBox RegionRestartDelay; 1084 private System.Windows.Forms.TextBox RegionRestartDelay;
-   1085 private System.Windows.Forms.GroupBox groupBox8;
-   1086 private System.Windows.Forms.GroupBox groupBox7;
1053 } 1087 }
1054 } 1088 }
1055   1089