From caa606af715e68580219bd2593946b9bf1afbf66 Mon Sep 17 00:00:00 2001 From: jxq2000 Date: Thu, 26 Jul 2012 00:48:19 +0000 Subject: [PATCH] Lua writer color config is now functional, with default button; small fix to default library color; reverted introduction of redundant "Emulua..." value. --- BizHawk.MultiClient/Config.cs | 3 +- BizHawk.MultiClient/tools/LuaWriter.cs | 9 +- .../tools/LuaWriterColorConfig.Designer.cs | 321 ++++++++++-------- .../tools/LuaWriterColorConfig.cs | 87 ++++- 4 files changed, 246 insertions(+), 174 deletions(-) diff --git a/BizHawk.MultiClient/Config.cs b/BizHawk.MultiClient/Config.cs index 4cc94e192b..43c23ce965 100644 --- a/BizHawk.MultiClient/Config.cs +++ b/BizHawk.MultiClient/Config.cs @@ -556,8 +556,7 @@ namespace BizHawk.MultiClient public int LuaCommentColor = -16744448; public int LuaStringColor = -8355712; public int LuaSymbolColor = -16777216; - public int EmuluaLibraryColor = 10349567; - public int LuaLibraryColor = -8388480; + public int LuaLibraryColor = -6427649; } public class SMSControllerTemplate diff --git a/BizHawk.MultiClient/tools/LuaWriter.cs b/BizHawk.MultiClient/tools/LuaWriter.cs index 4bf2075bf4..c86e1f2eef 100644 --- a/BizHawk.MultiClient/tools/LuaWriter.cs +++ b/BizHawk.MultiClient/tools/LuaWriter.cs @@ -271,7 +271,7 @@ namespace BizHawk.MultiClient if (after == '.') { LuaText.Select(libraryWordMatch.Index, libraryWordMatch.Length); - LuaText.SelectionColor = Color.FromArgb(Global.Config.EmuluaLibraryColor); + LuaText.SelectionColor = Color.FromArgb(Global.Config.LuaLibraryColor); } } } @@ -453,8 +453,11 @@ namespace BizHawk.MultiClient private void syntaxHighlightingToolStripMenuItem_Click(object sender, EventArgs e) { LuaWriterColorConfig l = new LuaWriterColorConfig(); - // l.Load(); - l.ShowDialog(); + if (l.ShowDialog() == DialogResult.OK) + { + ProcessText(); //Update display with new settings + } + } private void fontToolStripMenuItem_Click(object sender, EventArgs e) diff --git a/BizHawk.MultiClient/tools/LuaWriterColorConfig.Designer.cs b/BizHawk.MultiClient/tools/LuaWriterColorConfig.Designer.cs index 26eced9c01..74f19f097d 100644 --- a/BizHawk.MultiClient/tools/LuaWriterColorConfig.Designer.cs +++ b/BizHawk.MultiClient/tools/LuaWriterColorConfig.Designer.cs @@ -28,157 +28,175 @@ /// private void InitializeComponent() { - this.OK = new System.Windows.Forms.Button(); - this.Cancel = new System.Windows.Forms.Button(); - this.panelKeyWord = new System.Windows.Forms.Panel(); - this.lblKeyWords = new System.Windows.Forms.Label(); - this.lblComments = new System.Windows.Forms.Label(); - this.panelComment = new System.Windows.Forms.Panel(); - this.panelString = new System.Windows.Forms.Panel(); - this.lblStrings = new System.Windows.Forms.Label(); - this.panelSymbol = new System.Windows.Forms.Panel(); - this.lblSymbols = new System.Windows.Forms.Label(); - this.panelLibrary = new System.Windows.Forms.Panel(); - this.lblLibraries = new System.Windows.Forms.Label(); - this.KeyWordColorDialog = new System.Windows.Forms.ColorDialog(); - this.CommentColorDialog = new System.Windows.Forms.ColorDialog(); - this.StringColorDialog = new System.Windows.Forms.ColorDialog(); - this.SymbolColorDialog = new System.Windows.Forms.ColorDialog(); - this.LibraryColorDialog = new System.Windows.Forms.ColorDialog(); - this.SuspendLayout(); - // - // OK - // - this.OK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.OK.Location = new System.Drawing.Point(116, 227); - this.OK.Name = "OK"; - this.OK.Size = new System.Drawing.Size(75, 23); - this.OK.TabIndex = 10; - this.OK.Text = "&OK"; - this.OK.UseVisualStyleBackColor = true; - this.OK.Click += new System.EventHandler(this.OK_Click); - // - // Cancel - // - this.Cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.Cancel.Location = new System.Drawing.Point(197, 227); - this.Cancel.Name = "Cancel"; - this.Cancel.Size = new System.Drawing.Size(75, 23); - this.Cancel.TabIndex = 11; - this.Cancel.Text = "&Cancel"; - this.Cancel.UseVisualStyleBackColor = true; - // - // panelKeyWord - // - this.panelKeyWord.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.panelKeyWord.Location = new System.Drawing.Point(105, 10); - this.panelKeyWord.Name = "panelKeyWord"; - this.panelKeyWord.Size = new System.Drawing.Size(20, 20); - this.panelKeyWord.TabIndex = 1; - // - // lblKeyWords - // - this.lblKeyWords.AutoSize = true; - this.lblKeyWords.Location = new System.Drawing.Point(40, 17); - this.lblKeyWords.Name = "lblKeyWords"; - this.lblKeyWords.Size = new System.Drawing.Size(59, 13); - this.lblKeyWords.TabIndex = 0; - this.lblKeyWords.Text = "Key Words"; - // - // lblComments - // - this.lblComments.AutoSize = true; - this.lblComments.Location = new System.Drawing.Point(43, 57); - this.lblComments.Name = "lblComments"; - this.lblComments.Size = new System.Drawing.Size(56, 13); - this.lblComments.TabIndex = 2; - this.lblComments.Text = "Comments"; - // - // panelComment - // - this.panelComment.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.panelComment.Location = new System.Drawing.Point(105, 50); - this.panelComment.Name = "panelComment"; - this.panelComment.Size = new System.Drawing.Size(20, 20); - this.panelComment.TabIndex = 3; - // - // panelString - // - this.panelString.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.panelString.Location = new System.Drawing.Point(105, 90); - this.panelString.Name = "panelString"; - this.panelString.Size = new System.Drawing.Size(20, 20); - this.panelString.TabIndex = 5; - // - // lblStrings - // - this.lblStrings.AutoSize = true; - this.lblStrings.Location = new System.Drawing.Point(60, 97); - this.lblStrings.Name = "lblStrings"; - this.lblStrings.Size = new System.Drawing.Size(39, 13); - this.lblStrings.TabIndex = 4; - this.lblStrings.Text = "Strings"; - // - // panelSymbol - // - this.panelSymbol.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.panelSymbol.Location = new System.Drawing.Point(105, 130); - this.panelSymbol.Name = "panelSymbol"; - this.panelSymbol.Size = new System.Drawing.Size(20, 20); - this.panelSymbol.TabIndex = 7; - // - // lblSymbols - // - this.lblSymbols.AutoSize = true; - this.lblSymbols.Location = new System.Drawing.Point(53, 137); - this.lblSymbols.Name = "lblSymbols"; - this.lblSymbols.Size = new System.Drawing.Size(46, 13); - this.lblSymbols.TabIndex = 6; - this.lblSymbols.Text = "Symbols"; - // - // panelLibrary - // - this.panelLibrary.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.panelLibrary.Location = new System.Drawing.Point(105, 170); - this.panelLibrary.Name = "panelLibrary"; - this.panelLibrary.Size = new System.Drawing.Size(20, 20); - this.panelLibrary.TabIndex = 9; - // - // lblLibraries - // - this.lblLibraries.AutoSize = true; - this.lblLibraries.Location = new System.Drawing.Point(53, 177); - this.lblLibraries.Name = "lblLibraries"; - this.lblLibraries.Size = new System.Drawing.Size(46, 13); - this.lblLibraries.TabIndex = 8; - this.lblLibraries.Text = "Libraries"; - // - // LuaWriterColorConfig - // - this.AcceptButton = this.OK; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.CancelButton = this.Cancel; - this.ClientSize = new System.Drawing.Size(284, 262); - this.Controls.Add(this.panelLibrary); - this.Controls.Add(this.lblLibraries); - this.Controls.Add(this.panelSymbol); - this.Controls.Add(this.lblSymbols); - this.Controls.Add(this.panelString); - this.Controls.Add(this.lblStrings); - this.Controls.Add(this.panelComment); - this.Controls.Add(this.lblComments); - this.Controls.Add(this.lblKeyWords); - this.Controls.Add(this.panelKeyWord); - this.Controls.Add(this.Cancel); - this.Controls.Add(this.OK); - this.Name = "LuaWriterColorConfig"; - this.ShowIcon = false; - this.Text = "Syntax Highlight Config"; - this.Load += new System.EventHandler(this.LuaWriterColorConfig_Load); - this.ResumeLayout(false); - this.PerformLayout(); + this.OK = new System.Windows.Forms.Button(); + this.Cancel = new System.Windows.Forms.Button(); + this.panelKeyWord = new System.Windows.Forms.Panel(); + this.lblKeyWords = new System.Windows.Forms.Label(); + this.lblComments = new System.Windows.Forms.Label(); + this.panelComment = new System.Windows.Forms.Panel(); + this.panelString = new System.Windows.Forms.Panel(); + this.lblStrings = new System.Windows.Forms.Label(); + this.panelSymbol = new System.Windows.Forms.Panel(); + this.lblSymbols = new System.Windows.Forms.Label(); + this.panelLibrary = new System.Windows.Forms.Panel(); + this.lblLibraries = new System.Windows.Forms.Label(); + this.KeyWordColorDialog = new System.Windows.Forms.ColorDialog(); + this.CommentColorDialog = new System.Windows.Forms.ColorDialog(); + this.StringColorDialog = new System.Windows.Forms.ColorDialog(); + this.SymbolColorDialog = new System.Windows.Forms.ColorDialog(); + this.LibraryColorDialog = new System.Windows.Forms.ColorDialog(); + this.buttonDefaults = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // OK + // + this.OK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.OK.Location = new System.Drawing.Point(116, 227); + this.OK.Name = "OK"; + this.OK.Size = new System.Drawing.Size(75, 23); + this.OK.TabIndex = 10; + this.OK.Text = "&OK"; + this.OK.UseVisualStyleBackColor = true; + this.OK.Click += new System.EventHandler(this.OK_Click); + // + // Cancel + // + this.Cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.Cancel.Location = new System.Drawing.Point(197, 227); + this.Cancel.Name = "Cancel"; + this.Cancel.Size = new System.Drawing.Size(75, 23); + this.Cancel.TabIndex = 11; + this.Cancel.Text = "&Cancel"; + this.Cancel.UseVisualStyleBackColor = true; + // + // panelKeyWord + // + this.panelKeyWord.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.panelKeyWord.Location = new System.Drawing.Point(105, 10); + this.panelKeyWord.Name = "panelKeyWord"; + this.panelKeyWord.Size = new System.Drawing.Size(20, 20); + this.panelKeyWord.TabIndex = 1; + this.panelKeyWord.DoubleClick += new System.EventHandler(this.panelKeyWord_DoubleClick); + // + // lblKeyWords + // + this.lblKeyWords.AutoSize = true; + this.lblKeyWords.Location = new System.Drawing.Point(40, 17); + this.lblKeyWords.Name = "lblKeyWords"; + this.lblKeyWords.Size = new System.Drawing.Size(59, 13); + this.lblKeyWords.TabIndex = 0; + this.lblKeyWords.Text = "Key Words"; + // + // lblComments + // + this.lblComments.AutoSize = true; + this.lblComments.Location = new System.Drawing.Point(43, 57); + this.lblComments.Name = "lblComments"; + this.lblComments.Size = new System.Drawing.Size(56, 13); + this.lblComments.TabIndex = 2; + this.lblComments.Text = "Comments"; + // + // panelComment + // + this.panelComment.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.panelComment.Location = new System.Drawing.Point(105, 50); + this.panelComment.Name = "panelComment"; + this.panelComment.Size = new System.Drawing.Size(20, 20); + this.panelComment.TabIndex = 3; + this.panelComment.DoubleClick += new System.EventHandler(this.panelComment_DoubleClick); + // + // panelString + // + this.panelString.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.panelString.Location = new System.Drawing.Point(105, 90); + this.panelString.Name = "panelString"; + this.panelString.Size = new System.Drawing.Size(20, 20); + this.panelString.TabIndex = 5; + this.panelString.DoubleClick += new System.EventHandler(this.panelString_DoubleClick); + // + // lblStrings + // + this.lblStrings.AutoSize = true; + this.lblStrings.Location = new System.Drawing.Point(60, 97); + this.lblStrings.Name = "lblStrings"; + this.lblStrings.Size = new System.Drawing.Size(39, 13); + this.lblStrings.TabIndex = 4; + this.lblStrings.Text = "Strings"; + // + // panelSymbol + // + this.panelSymbol.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.panelSymbol.Location = new System.Drawing.Point(105, 130); + this.panelSymbol.Name = "panelSymbol"; + this.panelSymbol.Size = new System.Drawing.Size(20, 20); + this.panelSymbol.TabIndex = 7; + this.panelSymbol.DoubleClick += new System.EventHandler(this.panelSymbol_DoubleClick); + // + // lblSymbols + // + this.lblSymbols.AutoSize = true; + this.lblSymbols.Location = new System.Drawing.Point(53, 137); + this.lblSymbols.Name = "lblSymbols"; + this.lblSymbols.Size = new System.Drawing.Size(46, 13); + this.lblSymbols.TabIndex = 6; + this.lblSymbols.Text = "Symbols"; + // + // panelLibrary + // + this.panelLibrary.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.panelLibrary.Location = new System.Drawing.Point(105, 170); + this.panelLibrary.Name = "panelLibrary"; + this.panelLibrary.Size = new System.Drawing.Size(20, 20); + this.panelLibrary.TabIndex = 9; + this.panelLibrary.DoubleClick += new System.EventHandler(this.panelLibrary_DoubleClick); + // + // lblLibraries + // + this.lblLibraries.AutoSize = true; + this.lblLibraries.Location = new System.Drawing.Point(53, 177); + this.lblLibraries.Name = "lblLibraries"; + this.lblLibraries.Size = new System.Drawing.Size(46, 13); + this.lblLibraries.TabIndex = 8; + this.lblLibraries.Text = "Libraries"; + // + // buttonDefaults + // + this.buttonDefaults.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonDefaults.Location = new System.Drawing.Point(12, 227); + this.buttonDefaults.Name = "buttonDefaults"; + this.buttonDefaults.Size = new System.Drawing.Size(75, 23); + this.buttonDefaults.TabIndex = 12; + this.buttonDefaults.Text = "&Deafults"; + this.buttonDefaults.UseVisualStyleBackColor = true; + this.buttonDefaults.Click += new System.EventHandler(this.buttonDefaults_Click); + // + // LuaWriterColorConfig + // + this.AcceptButton = this.OK; + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.CancelButton = this.Cancel; + this.ClientSize = new System.Drawing.Size(284, 262); + this.Controls.Add(this.buttonDefaults); + this.Controls.Add(this.panelLibrary); + this.Controls.Add(this.lblLibraries); + this.Controls.Add(this.panelSymbol); + this.Controls.Add(this.lblSymbols); + this.Controls.Add(this.panelString); + this.Controls.Add(this.lblStrings); + this.Controls.Add(this.panelComment); + this.Controls.Add(this.lblComments); + this.Controls.Add(this.lblKeyWords); + this.Controls.Add(this.panelKeyWord); + this.Controls.Add(this.Cancel); + this.Controls.Add(this.OK); + this.Name = "LuaWriterColorConfig"; + this.ShowIcon = false; + this.Text = "Syntax Highlight Config"; + this.Load += new System.EventHandler(this.LuaWriterColorConfig_Load); + this.ResumeLayout(false); + this.PerformLayout(); } @@ -201,5 +219,6 @@ private System.Windows.Forms.ColorDialog StringColorDialog; private System.Windows.Forms.ColorDialog SymbolColorDialog; private System.Windows.Forms.ColorDialog LibraryColorDialog; + private System.Windows.Forms.Button buttonDefaults; } } \ No newline at end of file diff --git a/BizHawk.MultiClient/tools/LuaWriterColorConfig.cs b/BizHawk.MultiClient/tools/LuaWriterColorConfig.cs index dbba073ad9..34118c97bd 100644 --- a/BizHawk.MultiClient/tools/LuaWriterColorConfig.cs +++ b/BizHawk.MultiClient/tools/LuaWriterColorConfig.cs @@ -26,61 +26,112 @@ namespace BizHawk.MultiClient.tools private void LuaWriterColorConfig_Load(object sender, EventArgs e) { //Set the initial colors into the panels - KeyWordColorDialog.Color = Color.FromArgb(KeyWordColor); - CommentColorDialog.Color = Color.FromArgb(CommentColor); - StringColorDialog.Color = Color.FromArgb(StringColor); - SymbolColorDialog.Color = Color.FromArgb(SymbolColor); - LibraryColorDialog.Color = Color.FromArgb(LibraryColor); + SetKeyWordColor(KeyWordColor); + SetCommentColor(CommentColor); + SetStringColor(StringColor); + SetSymbolColor(SymbolColor); + SetLibraryColor(LibraryColor); } + private void SetKeyWordColor(int color) + { + KeyWordColor = color; //Set new color + panelKeyWord.BackColor = Color.FromArgb(color); //Update panel color with new selection + } + + private void SetCommentColor(int color) + { + CommentColor = color; //Set new color + panelComment.BackColor = Color.FromArgb(color); //Update panel color with new selection + } + + private void SetStringColor(int color) + { + StringColor = color; //Set new color + panelString.BackColor = Color.FromArgb(color); //Update panel color with new selection + } + + private void SetSymbolColor(int color) + { + SymbolColor = color; //Set new color + panelSymbol.BackColor = Color.FromArgb(color); //Update panel color with new selection + } + + private void SetLibraryColor(int color) + { + LibraryColor = color; //Set new color + panelLibrary.BackColor = Color.FromArgb(color); //Update panel color with new selection + } + + //Pop up color dialog when double-clicked private void panelKeyWord_DoubleClick(object sender, EventArgs e) { if (KeyWordColorDialog.ShowDialog() == DialogResult.OK) { - KeyWordColor = KeyWordColorDialog.Color.ToArgb(); //Set new color - panelKeyWord.BackColor = KeyWordColorDialog.Color; //Update panel color with selection + SetKeyWordColor(KeyWordColorDialog.Color.ToArgb()); } } + //Pop up color dialog when double-clicked private void panelComment_DoubleClick(object sender, EventArgs e) { if (CommentColorDialog.ShowDialog() == DialogResult.OK) { - CommentColor = CommentColorDialog.Color.ToArgb(); //Set new color - panelComment.BackColor = CommentColorDialog.Color; //Update panel color with selection + SetCommentColor(CommentColorDialog.Color.ToArgb()); } } + //Pop up color dialog when double-clicked private void panelString_DoubleClick(object sender, EventArgs e) { if (StringColorDialog.ShowDialog() == DialogResult.OK) { - StringColor = StringColorDialog.Color.ToArgb(); //Set new color - panelString.BackColor = StringColorDialog.Color; //Update panel color with selection + SetStringColor(StringColorDialog.Color.ToArgb()); } } - + + //Pop up color dialog when double-clicked private void panelSymbol_DoubleClick(object sender, EventArgs e) { if (SymbolColorDialog.ShowDialog() == DialogResult.OK) { - SymbolColor = SymbolColorDialog.Color.ToArgb(); //Set new color - panelSymbol.BackColor = SymbolColorDialog.Color; //Update panel color with selection + SetSymbolColor(SymbolColorDialog.Color.ToArgb()); } } + //Pop up color dialog when double-clicked private void panelLibrary_DoubleClick(object sender, EventArgs e) { if (LibraryColorDialog.ShowDialog() == DialogResult.OK) { - LibraryColor = LibraryColorDialog.Color.ToArgb(); //Set new color - panelLibrary.BackColor = LibraryColorDialog.Color; //Update panel color with selection + SetLibraryColor(LibraryColorDialog.Color.ToArgb()); + LibraryColorDialog.Color = Color.FromArgb(10349567); } } - private void OK_Click(object sender, EventArgs e) + private void OK_Click(object sender, EventArgs e) { - + SaveData(); //Save the chosen settings + this.DialogResult = DialogResult.OK; + this.Close(); } + + private void SaveData() + { + Global.Config.LuaKeyWordColor = KeyWordColor; + Global.Config.LuaCommentColor = CommentColor; + Global.Config.LuaStringColor = StringColor; + Global.Config.LuaSymbolColor = SymbolColor; + Global.Config.LuaLibraryColor = LibraryColor; + } + + private void buttonDefaults_Click(object sender, EventArgs e) + { + SetKeyWordColor(-16776961); + SetCommentColor(-16744448); + SetStringColor(-8355712); + SetSymbolColor(-16777216); + SetLibraryColor(-6427649); + } } }