From 319948b096029194a0dc27d5319794433f487a7b Mon Sep 17 00:00:00 2001 From: Ian C Date: Sun, 15 May 2005 23:16:49 +0000 Subject: Added recent colour history to editor --- MainForm.cs | 86 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 43 insertions(+), 43 deletions(-) (limited to 'MainForm.cs') diff --git a/MainForm.cs b/MainForm.cs index 9e803d7..6f71c5e 100644 --- a/MainForm.cs +++ b/MainForm.cs @@ -35,20 +35,20 @@ namespace BitmapFontEd private System.Windows.Forms.GroupBox m_adjustGroup; private System.Windows.Forms.MainMenu m_menu; private System.Windows.Forms.ComboBox m_asciiSelect; - private System.Windows.Forms.MenuItem m_about; + private System.Windows.Forms.MenuItem m_fileMenu; private System.Windows.Forms.MenuItem m_open; private System.Windows.Forms.MenuItem menuItem6; private System.Windows.Forms.MenuItem m_saveAs; private System.Windows.Forms.TrackBar m_charSelect; - private System.Windows.Forms.MenuItem m_fileMenu; private System.Windows.Forms.MenuItem m_quit; private System.Windows.Forms.MenuItem m_new; + private System.Windows.Forms.GroupBox m_editGroup; + private System.Windows.Forms.Button m_revert; private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label1; private System.Windows.Forms.Button m_resize; - private System.Windows.Forms.GroupBox m_editGroup; + private System.Windows.Forms.MenuItem m_about; private System.Windows.Forms.MenuItem m_save; - private System.Windows.Forms.Button m_revert; private System.Windows.Forms.NumericUpDown m_codeSelect; private System.Windows.Forms.GroupBox m_globaladjustGroup; private System.Windows.Forms.MenuItem m_helpMenu; @@ -114,20 +114,20 @@ namespace BitmapFontEd this.m_helpMenu = new System.Windows.Forms.MenuItem(); this.m_globaladjustGroup = new System.Windows.Forms.GroupBox(); this.m_codeSelect = new System.Windows.Forms.NumericUpDown(); - this.m_revert = new System.Windows.Forms.Button(); this.m_save = new System.Windows.Forms.MenuItem(); - this.m_editGroup = new System.Windows.Forms.GroupBox(); + this.m_about = new System.Windows.Forms.MenuItem(); this.m_resize = new System.Windows.Forms.Button(); this.label1 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); + this.m_revert = new System.Windows.Forms.Button(); + this.m_editGroup = new System.Windows.Forms.GroupBox(); this.m_new = new System.Windows.Forms.MenuItem(); this.m_quit = new System.Windows.Forms.MenuItem(); - this.m_fileMenu = new System.Windows.Forms.MenuItem(); this.m_charSelect = new System.Windows.Forms.TrackBar(); this.m_saveAs = new System.Windows.Forms.MenuItem(); this.menuItem6 = new System.Windows.Forms.MenuItem(); this.m_open = new System.Windows.Forms.MenuItem(); - this.m_about = new System.Windows.Forms.MenuItem(); + this.m_fileMenu = new System.Windows.Forms.MenuItem(); this.m_asciiSelect = new System.Windows.Forms.ComboBox(); this.m_menu = new System.Windows.Forms.MainMenu(); this.m_adjustGroup = new System.Windows.Forms.GroupBox(); @@ -172,7 +172,7 @@ namespace BitmapFontEd 0}); this.m_codeSelect.Name = "m_codeSelect"; this.m_codeSelect.ReadOnly = true; - this.m_codeSelect.Size = new System.Drawing.Size(64, 20); + this.m_codeSelect.Size = new System.Drawing.Size(64, 21); this.m_codeSelect.TabIndex = 9; this.m_codeSelect.Value = new System.Decimal(new int[] { 32, @@ -181,15 +181,6 @@ namespace BitmapFontEd 0}); this.m_codeSelect.ValueChanged += new System.EventHandler(this.OnSelectByCode); // - // m_revert - // - this.m_revert.Location = new System.Drawing.Point(304, 64); - this.m_revert.Name = "m_revert"; - this.m_revert.Size = new System.Drawing.Size(88, 24); - this.m_revert.TabIndex = 6; - this.m_revert.Text = "Revert"; - this.m_revert.Click += new System.EventHandler(this.OnRevert); - // // m_save // this.m_save.Index = 2; @@ -197,14 +188,11 @@ namespace BitmapFontEd this.m_save.Text = "&Save"; this.m_save.Click += new System.EventHandler(this.OnSave); // - // m_editGroup + // m_about // - this.m_editGroup.Location = new System.Drawing.Point(8, 8); - this.m_editGroup.Name = "m_editGroup"; - this.m_editGroup.Size = new System.Drawing.Size(408, 328); - this.m_editGroup.TabIndex = 0; - this.m_editGroup.TabStop = false; - this.m_editGroup.Text = "Editor"; + this.m_about.Index = 0; + this.m_about.Text = "&About"; + this.m_about.Click += new System.EventHandler(this.OnAbout); // // m_resize // @@ -233,6 +221,24 @@ namespace BitmapFontEd this.label2.Text = "Character:"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // + // m_revert + // + this.m_revert.Location = new System.Drawing.Point(304, 64); + this.m_revert.Name = "m_revert"; + this.m_revert.Size = new System.Drawing.Size(88, 24); + this.m_revert.TabIndex = 6; + this.m_revert.Text = "Revert"; + this.m_revert.Click += new System.EventHandler(this.OnRevert); + // + // m_editGroup + // + this.m_editGroup.Location = new System.Drawing.Point(8, 8); + this.m_editGroup.Name = "m_editGroup"; + this.m_editGroup.Size = new System.Drawing.Size(408, 328); + this.m_editGroup.TabIndex = 0; + this.m_editGroup.TabStop = false; + this.m_editGroup.Text = "Editor"; + // // m_new // this.m_new.Index = 0; @@ -247,18 +253,6 @@ namespace BitmapFontEd this.m_quit.Text = "&Quit"; this.m_quit.Click += new System.EventHandler(this.OnQuit); // - // m_fileMenu - // - this.m_fileMenu.Index = 0; - this.m_fileMenu.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] { - this.m_new, - this.m_open, - this.m_save, - this.m_saveAs, - this.menuItem6, - this.m_quit}); - this.m_fileMenu.Text = "&File"; - // // m_charSelect // this.m_charSelect.Location = new System.Drawing.Point(8, 16); @@ -287,11 +281,17 @@ namespace BitmapFontEd this.m_open.Text = "&Open"; this.m_open.Click += new System.EventHandler(this.OnOpen); // - // m_about + // m_fileMenu // - this.m_about.Index = 0; - this.m_about.Text = "&About"; - this.m_about.Click += new System.EventHandler(this.OnAbout); + this.m_fileMenu.Index = 0; + this.m_fileMenu.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] { + this.m_new, + this.m_open, + this.m_save, + this.m_saveAs, + this.menuItem6, + this.m_quit}); + this.m_fileMenu.Text = "&File"; // // m_asciiSelect // @@ -317,7 +317,7 @@ namespace BitmapFontEd this.m_adjustGroup.Size = new System.Drawing.Size(216, 384); this.m_adjustGroup.TabIndex = 3; this.m_adjustGroup.TabStop = false; - this.m_adjustGroup.Text = "Character Adjustments"; + this.m_adjustGroup.Text = "Adjustments and Effects"; // // m_selectGroup // @@ -344,7 +344,7 @@ namespace BitmapFontEd // // MainForm // - this.AutoScaleBaseSize = new System.Drawing.Size(5, 13); + this.AutoScaleBaseSize = new System.Drawing.Size(5, 14); this.ClientSize = new System.Drawing.Size(650, 479); this.Controls.Add(this.m_adjustGroup); this.Controls.Add(this.m_globaladjustGroup); -- cgit v1.2.3