Korero – Diff between revs 1 and 2

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 1 Rev 2
Line 103... Line 103...
103 this.newToolStripMenuItem, 103 this.newToolStripMenuItem,
104 this.toolStripSeparator2, 104 this.toolStripSeparator2,
105 this.setAutoResponseToolStripMenuItem, 105 this.setAutoResponseToolStripMenuItem,
106 this.toolStripSeparator3}); 106 this.toolStripSeparator3});
107 this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; 107 this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
108 this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 21); 108 this.fileToolStripMenuItem.Size = new System.Drawing.Size(35, 21);
109 this.fileToolStripMenuItem.Text = "File"; 109 this.fileToolStripMenuItem.Text = "File";
110 // 110 //
111 // toolStripSeparator1 111 // toolStripSeparator1
112 // 112 //
113 this.toolStripSeparator1.Name = "toolStripSeparator1"; 113 this.toolStripSeparator1.Name = "toolStripSeparator1";
Line 150... Line 150...
150 // 150 //
151 // openAllToolStripMenuItem 151 // openAllToolStripMenuItem
152 // 152 //
153 this.openAllToolStripMenuItem.Image = global::Korero.Properties.Resources.openfile; 153 this.openAllToolStripMenuItem.Image = global::Korero.Properties.Resources.openfile;
154 this.openAllToolStripMenuItem.Name = "openAllToolStripMenuItem"; 154 this.openAllToolStripMenuItem.Name = "openAllToolStripMenuItem";
155 this.openAllToolStripMenuItem.Size = new System.Drawing.Size(117, 22); 155 this.openAllToolStripMenuItem.Size = new System.Drawing.Size(113, 22);
156 this.openAllToolStripMenuItem.Text = "Open all"; 156 this.openAllToolStripMenuItem.Text = "Open all";
157 this.openAllToolStripMenuItem.Click += new System.EventHandler(this.OpenAllToolStripMenuItem_Click); 157 this.openAllToolStripMenuItem.Click += new System.EventHandler(this.OpenAllToolStripMenuItem_Click);
158 // 158 //
159 // closeAllToolStripMenuItem1 159 // closeAllToolStripMenuItem1
160 // 160 //
161 this.closeAllToolStripMenuItem1.Image = global::Korero.Properties.Resources.closefile; 161 this.closeAllToolStripMenuItem1.Image = global::Korero.Properties.Resources.closefile;
162 this.closeAllToolStripMenuItem1.Name = "closeAllToolStripMenuItem1"; 162 this.closeAllToolStripMenuItem1.Name = "closeAllToolStripMenuItem1";
163 this.closeAllToolStripMenuItem1.Size = new System.Drawing.Size(117, 22); 163 this.closeAllToolStripMenuItem1.Size = new System.Drawing.Size(113, 22);
164 this.closeAllToolStripMenuItem1.Text = "Close all"; 164 this.closeAllToolStripMenuItem1.Text = "Close all";
165 this.closeAllToolStripMenuItem1.Click += new System.EventHandler(this.CloseAllToolStripMenuItem1_Click); 165 this.closeAllToolStripMenuItem1.Click += new System.EventHandler(this.CloseAllToolStripMenuItem1_Click);
166 // 166 //
167 // toolStripComboBox2 167 // toolStripComboBox2
168 // 168 //
Line 351... Line 351...
351 this.offerTeleportToolStripMenuItem, 351 this.offerTeleportToolStripMenuItem,
352 this.addToFriendsToolStripMenuItem, 352 this.addToFriendsToolStripMenuItem,
353 this.toolStripSeparator5, 353 this.toolStripSeparator5,
354 this.closeToolStripMenuItem}); 354 this.closeToolStripMenuItem});
355 this.contextMenuStrip1.Name = "contextMenuStrip1"; 355 this.contextMenuStrip1.Name = "contextMenuStrip1";
356 this.contextMenuStrip1.Size = new System.Drawing.Size(150, 126); 356 this.contextMenuStrip1.Size = new System.Drawing.Size(145, 126);
357 // 357 //
358 // profileToolStripMenuItem 358 // profileToolStripMenuItem
359 // 359 //
360 this.profileToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("profileToolStripMenuItem.Image"))); 360 this.profileToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("profileToolStripMenuItem.Image")));
361 this.profileToolStripMenuItem.Name = "profileToolStripMenuItem"; 361 this.profileToolStripMenuItem.Name = "profileToolStripMenuItem";
362 this.profileToolStripMenuItem.Size = new System.Drawing.Size(149, 22); 362 this.profileToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
363 this.profileToolStripMenuItem.Text = "Profile..."; 363 this.profileToolStripMenuItem.Text = "Profile...";
364 this.profileToolStripMenuItem.Click += new System.EventHandler(this.ProfileToolStripMenuItem_Click); 364 this.profileToolStripMenuItem.Click += new System.EventHandler(this.ProfileToolStripMenuItem_Click);
365 // 365 //
366 // payToolStripMenuItem 366 // payToolStripMenuItem
367 // 367 //
368 this.payToolStripMenuItem.Image = global::Korero.Properties.Resources.salary; 368 this.payToolStripMenuItem.Image = global::Korero.Properties.Resources.salary;
369 this.payToolStripMenuItem.Name = "payToolStripMenuItem"; 369 this.payToolStripMenuItem.Name = "payToolStripMenuItem";
370 this.payToolStripMenuItem.Size = new System.Drawing.Size(149, 22); 370 this.payToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
371 this.payToolStripMenuItem.Text = "Pay..."; 371 this.payToolStripMenuItem.Text = "Pay...";
372 this.payToolStripMenuItem.Click += new System.EventHandler(this.PayToolStripMenuItem_Click); 372 this.payToolStripMenuItem.Click += new System.EventHandler(this.PayToolStripMenuItem_Click);
373 // 373 //
374 // toolStripSeparator4 374 // toolStripSeparator4
375 // 375 //
376 this.toolStripSeparator4.Name = "toolStripSeparator4"; 376 this.toolStripSeparator4.Name = "toolStripSeparator4";
377 this.toolStripSeparator4.Size = new System.Drawing.Size(146, 6); 377 this.toolStripSeparator4.Size = new System.Drawing.Size(141, 6);
378 // 378 //
379 // offerTeleportToolStripMenuItem 379 // offerTeleportToolStripMenuItem
380 // 380 //
381 this.offerTeleportToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("offerTeleportToolStripMenuItem.Image"))); 381 this.offerTeleportToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("offerTeleportToolStripMenuItem.Image")));
382 this.offerTeleportToolStripMenuItem.Name = "offerTeleportToolStripMenuItem"; 382 this.offerTeleportToolStripMenuItem.Name = "offerTeleportToolStripMenuItem";
383 this.offerTeleportToolStripMenuItem.Size = new System.Drawing.Size(149, 22); 383 this.offerTeleportToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
384 this.offerTeleportToolStripMenuItem.Text = "Offer Teleport"; 384 this.offerTeleportToolStripMenuItem.Text = "Offer Teleport";
385 this.offerTeleportToolStripMenuItem.Click += new System.EventHandler(this.OfferTeleportToolStripMenuItem_Click); 385 this.offerTeleportToolStripMenuItem.Click += new System.EventHandler(this.OfferTeleportToolStripMenuItem_Click);
386 // 386 //
387 // addToFriendsToolStripMenuItem 387 // addToFriendsToolStripMenuItem
388 // 388 //
389 this.addToFriendsToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("addToFriendsToolStripMenuItem.Image"))); 389 this.addToFriendsToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("addToFriendsToolStripMenuItem.Image")));
390 this.addToFriendsToolStripMenuItem.Name = "addToFriendsToolStripMenuItem"; 390 this.addToFriendsToolStripMenuItem.Name = "addToFriendsToolStripMenuItem";
391 this.addToFriendsToolStripMenuItem.Size = new System.Drawing.Size(149, 22); 391 this.addToFriendsToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
392 this.addToFriendsToolStripMenuItem.Text = "Add to Friends"; 392 this.addToFriendsToolStripMenuItem.Text = "Add to Friends";
393 this.addToFriendsToolStripMenuItem.Click += new System.EventHandler(this.AddToFriendsToolStripMenuItem_Click); 393 this.addToFriendsToolStripMenuItem.Click += new System.EventHandler(this.AddToFriendsToolStripMenuItem_Click);
394 // 394 //
395 // toolStripSeparator5 395 // toolStripSeparator5
396 // 396 //
397 this.toolStripSeparator5.Name = "toolStripSeparator5"; 397 this.toolStripSeparator5.Name = "toolStripSeparator5";
398 this.toolStripSeparator5.Size = new System.Drawing.Size(146, 6); 398 this.toolStripSeparator5.Size = new System.Drawing.Size(141, 6);
399 // 399 //
400 // closeToolStripMenuItem 400 // closeToolStripMenuItem
401 // 401 //
402 this.closeToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("closeToolStripMenuItem.Image"))); 402 this.closeToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("closeToolStripMenuItem.Image")));
403 this.closeToolStripMenuItem.Name = "closeToolStripMenuItem"; 403 this.closeToolStripMenuItem.Name = "closeToolStripMenuItem";
404 this.closeToolStripMenuItem.Size = new System.Drawing.Size(149, 22); 404 this.closeToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
405 this.closeToolStripMenuItem.Text = "Close"; 405 this.closeToolStripMenuItem.Text = "Close";
406 this.closeToolStripMenuItem.Click += new System.EventHandler(this.CloseToolStripMenuItem_Click); 406 this.closeToolStripMenuItem.Click += new System.EventHandler(this.CloseToolStripMenuItem_Click);
407 // 407 //
408 // ChatForm 408 // ChatForm
409 // 409 //
Line 413... Line 413...
413 this.Controls.Add(this.tableLayoutPanel1); 413 this.Controls.Add(this.tableLayoutPanel1);
414 this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); 414 this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
415 this.Name = "ChatForm"; 415 this.Name = "ChatForm";
416 this.Text = "Korero: Chat"; 416 this.Text = "Korero: Chat";
417 this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.ChatForm_FormClosing); 417 this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.ChatForm_FormClosing);
-   418 this.Load += new System.EventHandler(this.ChatForm_Load);
418 this.tableLayoutPanel1.ResumeLayout(false); 419 this.tableLayoutPanel1.ResumeLayout(false);
419 this.tableLayoutPanel1.PerformLayout(); 420 this.tableLayoutPanel1.PerformLayout();
420 this.menuStrip1.ResumeLayout(false); 421 this.menuStrip1.ResumeLayout(false);
421 this.menuStrip1.PerformLayout(); 422 this.menuStrip1.PerformLayout();
422 this.tableLayoutPanel3.ResumeLayout(false); 423 this.tableLayoutPanel3.ResumeLayout(false);