HamBook – Diff between revs 1 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 1 Rev 3
Line 29... Line 29...
29 private void InitializeComponent() 29 private void InitializeComponent()
30 { 30 {
31 System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SettingsForm)); 31 System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SettingsForm));
32 this.tabControl1 = new System.Windows.Forms.TabControl(); 32 this.tabControl1 = new System.Windows.Forms.TabControl();
33 this.tabPage1 = new System.Windows.Forms.TabPage(); 33 this.tabPage1 = new System.Windows.Forms.TabPage();
34 this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); -  
35 this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); -  
36 this.button1 = new System.Windows.Forms.Button(); 34 this.groupBox2 = new System.Windows.Forms.GroupBox();
37 this.button2 = new System.Windows.Forms.Button(); 35 this.comboBox7 = new System.Windows.Forms.ComboBox();
38 this.groupBox1 = new System.Windows.Forms.GroupBox(); 36 this.groupBox1 = new System.Windows.Forms.GroupBox();
39 this.comboBox1 = new System.Windows.Forms.ComboBox(); -  
40 this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); 37 this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
-   38 this.comboBox1 = new System.Windows.Forms.ComboBox();
41 this.label1 = new System.Windows.Forms.Label(); 39 this.label1 = new System.Windows.Forms.Label();
42 this.label2 = new System.Windows.Forms.Label(); 40 this.label2 = new System.Windows.Forms.Label();
43 this.comboBox2 = new System.Windows.Forms.ComboBox(); 41 this.comboBox2 = new System.Windows.Forms.ComboBox();
44 this.comboBox3 = new System.Windows.Forms.ComboBox(); 42 this.comboBox3 = new System.Windows.Forms.ComboBox();
45 this.comboBox4 = new System.Windows.Forms.ComboBox(); 43 this.comboBox4 = new System.Windows.Forms.ComboBox();
46 this.comboBox5 = new System.Windows.Forms.ComboBox(); 44 this.comboBox5 = new System.Windows.Forms.ComboBox();
47 this.label3 = new System.Windows.Forms.Label(); 45 this.label3 = new System.Windows.Forms.Label();
48 this.label4 = new System.Windows.Forms.Label(); 46 this.label4 = new System.Windows.Forms.Label();
49 this.label5 = new System.Windows.Forms.Label(); 47 this.label5 = new System.Windows.Forms.Label();
-   48 this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
-   49 this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
50 this.groupBox2 = new System.Windows.Forms.GroupBox(); 50 this.button1 = new System.Windows.Forms.Button();
51 this.comboBox7 = new System.Windows.Forms.ComboBox(); 51 this.button2 = new System.Windows.Forms.Button();
52 this.tabControl1.SuspendLayout(); 52 this.tabControl1.SuspendLayout();
53 this.tabPage1.SuspendLayout(); 53 this.tabPage1.SuspendLayout();
54 this.tableLayoutPanel1.SuspendLayout(); -  
55 this.tableLayoutPanel2.SuspendLayout(); 54 this.groupBox2.SuspendLayout();
56 this.groupBox1.SuspendLayout(); 55 this.groupBox1.SuspendLayout();
57 this.tableLayoutPanel3.SuspendLayout(); 56 this.tableLayoutPanel3.SuspendLayout();
-   57 this.tableLayoutPanel1.SuspendLayout();
58 this.groupBox2.SuspendLayout(); 58 this.tableLayoutPanel2.SuspendLayout();
59 this.SuspendLayout(); 59 this.SuspendLayout();
60 // 60 //
61 // tabControl1 61 // tabControl1
62 // 62 //
63 this.tabControl1.Controls.Add(this.tabPage1); 63 this.tabControl1.Controls.Add(this.tabPage1);
Line 78... Line 78...
78 this.tabPage1.Size = new System.Drawing.Size(610, 313); 78 this.tabPage1.Size = new System.Drawing.Size(610, 313);
79 this.tabPage1.TabIndex = 0; 79 this.tabPage1.TabIndex = 0;
80 this.tabPage1.Text = "Connection"; 80 this.tabPage1.Text = "Connection";
81 this.tabPage1.UseVisualStyleBackColor = true; 81 this.tabPage1.UseVisualStyleBackColor = true;
82 // 82 //
83 // tableLayoutPanel1 -  
84 // -  
85 this.tableLayoutPanel1.ColumnCount = 1; -  
86 this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); -  
87 this.tableLayoutPanel1.Controls.Add(this.tabControl1, 0, 0); -  
88 this.tableLayoutPanel1.Controls.Add(this.tableLayoutPanel2, 0, 1); -  
89 this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; -  
90 this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); -  
91 this.tableLayoutPanel1.Name = "tableLayoutPanel1"; -  
92 this.tableLayoutPanel1.RowCount = 2; -  
93 this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); -  
94 this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 36F)); -  
95 this.tableLayoutPanel1.Size = new System.Drawing.Size(624, 381); -  
96 this.tableLayoutPanel1.TabIndex = 1; -  
97 // -  
98 // tableLayoutPanel2 -  
99 // -  
100 this.tableLayoutPanel2.ColumnCount = 3; -  
101 this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); -  
102 this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 77F)); -  
103 this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 77F)); -  
104 this.tableLayoutPanel2.Controls.Add(this.button1, 1, 0); -  
105 this.tableLayoutPanel2.Controls.Add(this.button2, 2, 0); -  
106 this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill; -  
107 this.tableLayoutPanel2.Location = new System.Drawing.Point(3, 348); -  
108 this.tableLayoutPanel2.Name = "tableLayoutPanel2"; -  
109 this.tableLayoutPanel2.RowCount = 1; -  
110 this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); -  
111 this.tableLayoutPanel2.Size = new System.Drawing.Size(618, 30); -  
112 this.tableLayoutPanel2.TabIndex = 1; -  
113 // -  
114 // button1 83 // groupBox2
115 // 84 //
-   85 this.groupBox2.Controls.Add(this.comboBox7);
116 this.button1.Location = new System.Drawing.Point(467, 3); 86 this.groupBox2.Location = new System.Drawing.Point(239, 7);
117 this.button1.Name = "button1"; 87 this.groupBox2.Name = "groupBox2";
118 this.button1.Size = new System.Drawing.Size(71, 23); 88 this.groupBox2.Size = new System.Drawing.Size(200, 100);
119 this.button1.TabIndex = 0; 89 this.groupBox2.TabIndex = 1;
120 this.button1.Text = "Save"; 90 this.groupBox2.TabStop = false;
121 this.button1.UseVisualStyleBackColor = true; 91 this.groupBox2.Text = "Radio";
122 this.button1.Click += new System.EventHandler(this.button1_Click); -  
123 // 92 //
124 // button2 93 // comboBox7
125 // 94 //
126 this.button2.Location = new System.Drawing.Point(544, 3); 95 this.comboBox7.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
127 this.button2.Name = "button2"; 96 this.comboBox7.FormattingEnabled = true;
128 this.button2.Size = new System.Drawing.Size(71, 23); 97 this.comboBox7.Items.AddRange(new object[] {
129 this.button2.TabIndex = 1; 98 "Yaesu FT-891"});
130 this.button2.Text = "Cancel"; 99 this.comboBox7.Location = new System.Drawing.Point(38, 41);
131 this.button2.UseVisualStyleBackColor = true; 100 this.comboBox7.Name = "comboBox7";
132 this.button2.Click += new System.EventHandler(this.button2_Click); 101 this.comboBox7.Size = new System.Drawing.Size(121, 21);
-   102 this.comboBox7.TabIndex = 0;
133 // 103 //
134 // groupBox1 104 // groupBox1
135 // 105 //
136 this.groupBox1.Controls.Add(this.tableLayoutPanel3); 106 this.groupBox1.Controls.Add(this.tableLayoutPanel3);
137 this.groupBox1.Location = new System.Drawing.Point(6, 6); 107 this.groupBox1.Location = new System.Drawing.Point(6, 6);
Line 139... Line 109...
139 this.groupBox1.Size = new System.Drawing.Size(226, 223); 109 this.groupBox1.Size = new System.Drawing.Size(226, 223);
140 this.groupBox1.TabIndex = 0; 110 this.groupBox1.TabIndex = 0;
141 this.groupBox1.TabStop = false; 111 this.groupBox1.TabStop = false;
142 this.groupBox1.Text = "Serial"; 112 this.groupBox1.Text = "Serial";
143 // 113 //
144 // comboBox1 -  
145 // -  
146 this.comboBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); -  
147 this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; -  
148 this.comboBox1.FormattingEnabled = true; -  
149 this.comboBox1.Location = new System.Drawing.Point(66, 9); -  
150 this.comboBox1.Name = "comboBox1"; -  
151 this.comboBox1.Size = new System.Drawing.Size(151, 21); -  
152 this.comboBox1.TabIndex = 0; -  
153 // -  
154 // tableLayoutPanel3 114 // tableLayoutPanel3
155 // 115 //
156 this.tableLayoutPanel3.ColumnCount = 2; 116 this.tableLayoutPanel3.ColumnCount = 2;
157 this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); 117 this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
158 this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); 118 this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
Line 176... Line 136...
176 this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); 136 this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));
177 this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); 137 this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));
178 this.tableLayoutPanel3.Size = new System.Drawing.Size(220, 204); 138 this.tableLayoutPanel3.Size = new System.Drawing.Size(220, 204);
179 this.tableLayoutPanel3.TabIndex = 0; 139 this.tableLayoutPanel3.TabIndex = 0;
180 // 140 //
-   141 // comboBox1
-   142 //
-   143 this.comboBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-   144 this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-   145 this.comboBox1.FormattingEnabled = true;
-   146 this.comboBox1.Location = new System.Drawing.Point(66, 9);
-   147 this.comboBox1.Name = "comboBox1";
-   148 this.comboBox1.Size = new System.Drawing.Size(151, 21);
-   149 this.comboBox1.TabIndex = 0;
-   150 //
181 // label1 151 // label1
182 // 152 //
183 this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); 153 this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
184 this.label1.AutoSize = true; 154 this.label1.AutoSize = true;
185 this.label1.Location = new System.Drawing.Point(3, 13); 155 this.label1.Location = new System.Drawing.Point(3, 13);
Line 252... Line 222...
252 // 222 //
253 this.comboBox5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); 223 this.comboBox5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
254 this.comboBox5.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; 224 this.comboBox5.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
255 this.comboBox5.FormattingEnabled = true; 225 this.comboBox5.FormattingEnabled = true;
256 this.comboBox5.Items.AddRange(new object[] { 226 this.comboBox5.Items.AddRange(new object[] {
257 "1", 227 "None",
258 "1.5", 228 "One",
259 "2"}); 229 "Two",
-   230 "OnePointFive"});
260 this.comboBox5.Location = new System.Drawing.Point(66, 171); 231 this.comboBox5.Location = new System.Drawing.Point(66, 171);
261 this.comboBox5.Name = "comboBox5"; 232 this.comboBox5.Name = "comboBox5";
262 this.comboBox5.Size = new System.Drawing.Size(151, 21); 233 this.comboBox5.Size = new System.Drawing.Size(151, 21);
263 this.comboBox5.TabIndex = 6; 234 this.comboBox5.TabIndex = 6;
264 // 235 //
Line 290... Line 261...
290 this.label5.Name = "label5"; 261 this.label5.Name = "label5";
291 this.label5.Size = new System.Drawing.Size(57, 13); 262 this.label5.Size = new System.Drawing.Size(57, 13);
292 this.label5.TabIndex = 10; 263 this.label5.TabIndex = 10;
293 this.label5.Text = "Stop bits:"; 264 this.label5.Text = "Stop bits:";
294 // 265 //
295 // groupBox2 266 // tableLayoutPanel1
296 // 267 //
-   268 this.tableLayoutPanel1.ColumnCount = 1;
-   269 this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
297 this.groupBox2.Controls.Add(this.comboBox7); 270 this.tableLayoutPanel1.Controls.Add(this.tabControl1, 0, 0);
298 this.groupBox2.Location = new System.Drawing.Point(239, 7); 271 this.tableLayoutPanel1.Controls.Add(this.tableLayoutPanel2, 0, 1);
299 this.groupBox2.Name = "groupBox2"; 272 this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
300 this.groupBox2.Size = new System.Drawing.Size(200, 100); 273 this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
301 this.groupBox2.TabIndex = 1; 274 this.tableLayoutPanel1.Name = "tableLayoutPanel1";
302 this.groupBox2.TabStop = false; 275 this.tableLayoutPanel1.RowCount = 2;
-   276 this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
-   277 this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 36F));
-   278 this.tableLayoutPanel1.Size = new System.Drawing.Size(624, 381);
303 this.groupBox2.Text = "Radio"; 279 this.tableLayoutPanel1.TabIndex = 1;
304 // 280 //
305 // comboBox7 281 // tableLayoutPanel2
306 // 282 //
-   283 this.tableLayoutPanel2.ColumnCount = 3;
-   284 this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
-   285 this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 77F));
-   286 this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 77F));
-   287 this.tableLayoutPanel2.Controls.Add(this.button1, 1, 0);
-   288 this.tableLayoutPanel2.Controls.Add(this.button2, 2, 0);
307 this.comboBox7.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; 289 this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
-   290 this.tableLayoutPanel2.Location = new System.Drawing.Point(3, 348);
-   291 this.tableLayoutPanel2.Name = "tableLayoutPanel2";
-   292 this.tableLayoutPanel2.RowCount = 1;
-   293 this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
-   294 this.tableLayoutPanel2.Size = new System.Drawing.Size(618, 30);
308 this.comboBox7.FormattingEnabled = true; 295 this.tableLayoutPanel2.TabIndex = 1;
-   296 //
-   297 // button1
-   298 //
-   299 this.button1.Location = new System.Drawing.Point(467, 3);
-   300 this.button1.Name = "button1";
-   301 this.button1.Size = new System.Drawing.Size(71, 23);
-   302 this.button1.TabIndex = 0;
-   303 this.button1.Text = "Save";
309 this.comboBox7.Items.AddRange(new object[] { 304 this.button1.UseVisualStyleBackColor = true;
-   305 this.button1.Click += new System.EventHandler(this.button1_Click);
-   306 //
310 "Yaesu FT-891"}); 307 // button2
-   308 //
311 this.comboBox7.Location = new System.Drawing.Point(38, 41); 309 this.button2.Location = new System.Drawing.Point(544, 3);
312 this.comboBox7.Name = "comboBox7"; 310 this.button2.Name = "button2";
313 this.comboBox7.Size = new System.Drawing.Size(121, 21); 311 this.button2.Size = new System.Drawing.Size(71, 23);
314 this.comboBox7.TabIndex = 0; 312 this.button2.TabIndex = 1;
-   313 this.button2.Text = "Cancel";
-   314 this.button2.UseVisualStyleBackColor = true;
-   315 this.button2.Click += new System.EventHandler(this.button2_Click);
315 // 316 //
316 // SettingsForm 317 // SettingsForm
317 // 318 //
318 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); 319 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
319 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; 320 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
Line 326... Line 327...
326 this.Name = "SettingsForm"; 327 this.Name = "SettingsForm";
327 this.Text = "HamBook: Settings"; 328 this.Text = "HamBook: Settings";
328 this.Load += new System.EventHandler(this.SettingsForm_Load); 329 this.Load += new System.EventHandler(this.SettingsForm_Load);
329 this.tabControl1.ResumeLayout(false); 330 this.tabControl1.ResumeLayout(false);
330 this.tabPage1.ResumeLayout(false); 331 this.tabPage1.ResumeLayout(false);
331 this.tableLayoutPanel1.ResumeLayout(false); -  
332 this.tableLayoutPanel2.ResumeLayout(false); 332 this.groupBox2.ResumeLayout(false);
333 this.groupBox1.ResumeLayout(false); 333 this.groupBox1.ResumeLayout(false);
334 this.tableLayoutPanel3.ResumeLayout(false); 334 this.tableLayoutPanel3.ResumeLayout(false);
335 this.tableLayoutPanel3.PerformLayout(); 335 this.tableLayoutPanel3.PerformLayout();
-   336 this.tableLayoutPanel1.ResumeLayout(false);
336 this.groupBox2.ResumeLayout(false); 337 this.tableLayoutPanel2.ResumeLayout(false);
337 this.ResumeLayout(false); 338 this.ResumeLayout(false);
Line 338... Line 339...
338   339  
Line 339... Line 340...
339 } 340 }