From 095c1154ee7550f745bfdac1fb11d9ab1e9faa25 Mon Sep 17 00:00:00 2001 From: MaxED <j.maxed@gmail.com> Date: Fri, 11 May 2012 12:34:11 +0000 Subject: [PATCH] Removed some unused files. --- .../Windows/ColorChangedEventArgs.cs | 16 - .../GZBuilder/Windows/ColorChooserForm.cs | 493 ------------------ .../GZBuilder/Windows/ColorChooserForm.resx | 120 ----- Source/Core/GZBuilder/Windows/ColorHandler.cs | 210 -------- Source/Core/GZBuilder/Windows/ColorWheel.cs | 469 ----------------- Source/Core/GZBuilder/Windows/DebugForm.cs | 26 - .../GZBuilder/Windows/DebugForm.designer.cs | 62 --- Source/Core/GZBuilder/Windows/DebugForm.resx | 120 ----- 8 files changed, 1516 deletions(-) delete mode 100644 Source/Core/GZBuilder/Windows/ColorChangedEventArgs.cs delete mode 100644 Source/Core/GZBuilder/Windows/ColorChooserForm.cs delete mode 100644 Source/Core/GZBuilder/Windows/ColorChooserForm.resx delete mode 100644 Source/Core/GZBuilder/Windows/ColorHandler.cs delete mode 100644 Source/Core/GZBuilder/Windows/ColorWheel.cs delete mode 100644 Source/Core/GZBuilder/Windows/DebugForm.cs delete mode 100644 Source/Core/GZBuilder/Windows/DebugForm.designer.cs delete mode 100644 Source/Core/GZBuilder/Windows/DebugForm.resx diff --git a/Source/Core/GZBuilder/Windows/ColorChangedEventArgs.cs b/Source/Core/GZBuilder/Windows/ColorChangedEventArgs.cs deleted file mode 100644 index ff218e905..000000000 --- a/Source/Core/GZBuilder/Windows/ColorChangedEventArgs.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; - -namespace CodeImp.DoomBuilder.GZBuilder.Windows { - public class ColorChangedEventArgs : EventArgs { - private ColorHandler.RGB mRGB; - private ColorHandler.HSV mHSV; - - public ColorChangedEventArgs(ColorHandler.RGB RGB, ColorHandler.HSV HSV) { - mRGB = RGB; - mHSV = HSV; - } - - public ColorHandler.RGB RGB { get { return mRGB; } } - public ColorHandler.HSV HSV { get { return mHSV; } } - } -} \ No newline at end of file diff --git a/Source/Core/GZBuilder/Windows/ColorChooserForm.cs b/Source/Core/GZBuilder/Windows/ColorChooserForm.cs deleted file mode 100644 index 3a30dc7ab..000000000 --- a/Source/Core/GZBuilder/Windows/ColorChooserForm.cs +++ /dev/null @@ -1,493 +0,0 @@ -using System; -using System.Drawing; -using System.Collections; -using System.Collections.Generic; -using System.ComponentModel; -using System.Windows.Forms; - -using CodeImp.DoomBuilder.Map; -using CodeImp.DoomBuilder.Windows; - -namespace CodeImp.DoomBuilder.GZBuilder.Windows { - public class ColorChooserForm : DelayedForm { - internal System.Windows.Forms.Button btnCancel; - internal System.Windows.Forms.Button btnOK; - internal System.Windows.Forms.Label Label3; - internal System.Windows.Forms.NumericUpDown nudRed; - internal System.Windows.Forms.Panel pnlColor; - internal System.Windows.Forms.Label Label1; - internal System.Windows.Forms.Panel pnlBrightness; - internal System.Windows.Forms.NumericUpDown nudBlue; - internal System.Windows.Forms.NumericUpDown nudGreen; - internal System.Windows.Forms.Label Label2; - private Dotnetrix.Controls.TrackBar trackBar1; - internal Label labelName1; - internal Label labelName2; - private Dotnetrix.Controls.TrackBar trackBar2; - internal NumericUpDown numericUpDown1; - internal NumericUpDown numericUpDown2; - /// <summary> - /// Required designer variable. - /// </summary> - private System.ComponentModel.Container components = null; - - public ColorChooserForm() { - InitializeComponent(); - - - } - - /// <summary> - /// Clean up any resources being used. - /// </summary> - protected override void Dispose(bool disposing) { - if (disposing) { - if (components != null) { - components.Dispose(); - } - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - /// <summary> - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// </summary> - private void InitializeComponent() { - this.btnCancel = new System.Windows.Forms.Button(); - this.btnOK = new System.Windows.Forms.Button(); - this.Label3 = new System.Windows.Forms.Label(); - this.nudRed = new System.Windows.Forms.NumericUpDown(); - this.pnlColor = new System.Windows.Forms.Panel(); - this.Label1 = new System.Windows.Forms.Label(); - this.pnlBrightness = new System.Windows.Forms.Panel(); - this.nudBlue = new System.Windows.Forms.NumericUpDown(); - this.nudGreen = new System.Windows.Forms.NumericUpDown(); - this.Label2 = new System.Windows.Forms.Label(); - this.trackBar1 = new Dotnetrix.Controls.TrackBar(); - this.labelName1 = new System.Windows.Forms.Label(); - this.labelName2 = new System.Windows.Forms.Label(); - this.trackBar2 = new Dotnetrix.Controls.TrackBar(); - this.numericUpDown1 = new System.Windows.Forms.NumericUpDown(); - this.numericUpDown2 = new System.Windows.Forms.NumericUpDown(); - ((System.ComponentModel.ISupportInitialize)(this.nudRed)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.nudBlue)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.nudGreen)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.trackBar1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.trackBar2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).BeginInit(); - this.SuspendLayout(); - // - // btnCancel - // - this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.btnCancel.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.btnCancel.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnCancel.Location = new System.Drawing.Point(219, 49); - this.btnCancel.Name = "btnCancel"; - this.btnCancel.Size = new System.Drawing.Size(94, 42); - this.btnCancel.TabIndex = 11; - this.btnCancel.Text = "Cancel"; - this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click); - // - // btnOK - // - this.btnOK.BackColor = System.Drawing.SystemColors.Control; - this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK; - this.btnOK.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.btnOK.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnOK.ForeColor = System.Drawing.SystemColors.ControlText; - this.btnOK.Location = new System.Drawing.Point(219, 8); - this.btnOK.Name = "btnOK"; - this.btnOK.Size = new System.Drawing.Size(94, 42); - this.btnOK.TabIndex = 10; - this.btnOK.Text = "OK"; - this.btnOK.UseVisualStyleBackColor = true; - this.btnOK.Click += new System.EventHandler(this.btnOK_Click); - // - // Label3 - // - this.Label3.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Label3.Location = new System.Drawing.Point(219, 152); - this.Label3.Name = "Label3"; - this.Label3.Size = new System.Drawing.Size(40, 23); - this.Label3.TabIndex = 45; - this.Label3.Text = "Blue:"; - this.Label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // nudRed - // - this.nudRed.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.nudRed.Location = new System.Drawing.Point(265, 106); - this.nudRed.Maximum = new decimal(new int[] { - 255, - 0, - 0, - 0}); - this.nudRed.Name = "nudRed"; - this.nudRed.Size = new System.Drawing.Size(48, 20); - this.nudRed.TabIndex = 38; - this.nudRed.ValueChanged += new System.EventHandler(this.HandleRGBChange); - // - // pnlColor - // - this.pnlColor.Location = new System.Drawing.Point(8, 8); - this.pnlColor.Name = "pnlColor"; - this.pnlColor.Size = new System.Drawing.Size(176, 176); - this.pnlColor.TabIndex = 51; - this.pnlColor.Visible = false; - this.pnlColor.MouseUp += new System.Windows.Forms.MouseEventHandler(this.frmMain_MouseUp); - // - // Label1 - // - this.Label1.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Label1.Location = new System.Drawing.Point(219, 104); - this.Label1.Name = "Label1"; - this.Label1.Size = new System.Drawing.Size(40, 23); - this.Label1.TabIndex = 43; - this.Label1.Text = "Red:"; - this.Label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // pnlBrightness - // - this.pnlBrightness.Location = new System.Drawing.Point(190, 8); - this.pnlBrightness.Name = "pnlBrightness"; - this.pnlBrightness.Size = new System.Drawing.Size(16, 176); - this.pnlBrightness.TabIndex = 52; - this.pnlBrightness.Visible = false; - // - // nudBlue - // - this.nudBlue.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.nudBlue.Location = new System.Drawing.Point(265, 154); - this.nudBlue.Maximum = new decimal(new int[] { - 255, - 0, - 0, - 0}); - this.nudBlue.Name = "nudBlue"; - this.nudBlue.Size = new System.Drawing.Size(48, 20); - this.nudBlue.TabIndex = 40; - this.nudBlue.ValueChanged += new System.EventHandler(this.HandleRGBChange); - // - // nudGreen - // - this.nudGreen.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.nudGreen.Location = new System.Drawing.Point(265, 130); - this.nudGreen.Maximum = new decimal(new int[] { - 255, - 0, - 0, - 0}); - this.nudGreen.Name = "nudGreen"; - this.nudGreen.Size = new System.Drawing.Size(48, 20); - this.nudGreen.TabIndex = 39; - this.nudGreen.ValueChanged += new System.EventHandler(this.HandleRGBChange); - // - // Label2 - // - this.Label2.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Label2.Location = new System.Drawing.Point(219, 128); - this.Label2.Name = "Label2"; - this.Label2.Size = new System.Drawing.Size(40, 23); - this.Label2.TabIndex = 44; - this.Label2.Text = "Green:"; - this.Label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // trackBar1 - // - this.trackBar1.LargeChange = 64; - this.trackBar1.Location = new System.Drawing.Point(91, 190); - this.trackBar1.Maximum = 512; - this.trackBar1.Name = "trackBar1"; - this.trackBar1.Size = new System.Drawing.Size(166, 45); - this.trackBar1.SmallChange = 8; - this.trackBar1.TabIndex = 56; - this.trackBar1.TickFrequency = 16; - this.trackBar1.TickStyle = System.Windows.Forms.TickStyle.Both; - this.trackBar1.ValueChanged += new System.EventHandler(this.trackBar1_ValueChanged); - // - // labelName1 - // - this.labelName1.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelName1.Location = new System.Drawing.Point(5, 199); - this.labelName1.Name = "labelName1"; - this.labelName1.Size = new System.Drawing.Size(80, 23); - this.labelName1.TabIndex = 57; - this.labelName1.Text = "Start intensity:"; - this.labelName1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // labelName2 - // - this.labelName2.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelName2.Location = new System.Drawing.Point(5, 250); - this.labelName2.Name = "labelName2"; - this.labelName2.Size = new System.Drawing.Size(80, 23); - this.labelName2.TabIndex = 60; - this.labelName2.Text = "Start intensity:"; - this.labelName2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // trackBar2 - // - this.trackBar2.LargeChange = 64; - this.trackBar2.Location = new System.Drawing.Point(91, 241); - this.trackBar2.Maximum = 512; - this.trackBar2.Name = "trackBar2"; - this.trackBar2.Size = new System.Drawing.Size(166, 45); - this.trackBar2.SmallChange = 8; - this.trackBar2.TabIndex = 59; - this.trackBar2.TickFrequency = 16; - this.trackBar2.TickStyle = System.Windows.Forms.TickStyle.Both; - this.trackBar2.ValueChanged += new System.EventHandler(this.trackBar2_ValueChanged); - // - // numericUpDown1 - // - this.numericUpDown1.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.numericUpDown1.Location = new System.Drawing.Point(257, 200); - this.numericUpDown1.Maximum = new decimal(new int[] { - 9000, - 0, - 0, - 0}); - this.numericUpDown1.Name = "numericUpDown1"; - this.numericUpDown1.Size = new System.Drawing.Size(56, 20); - this.numericUpDown1.TabIndex = 57; - this.numericUpDown1.ValueChanged += new System.EventHandler(this.numericUpDown1_ValueChanged); - // - // numericUpDown2 - // - this.numericUpDown2.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.numericUpDown2.Location = new System.Drawing.Point(257, 250); - this.numericUpDown2.Maximum = new decimal(new int[] { - 9000, - 0, - 0, - 0}); - this.numericUpDown2.Name = "numericUpDown2"; - this.numericUpDown2.Size = new System.Drawing.Size(56, 20); - this.numericUpDown2.TabIndex = 62; - this.numericUpDown2.ValueChanged += new System.EventHandler(this.numericUpDown2_ValueChanged); - // - // ColorChooserForm - // - this.AutoScaleBaseSize = new System.Drawing.Size(5, 13); - this.ClientSize = new System.Drawing.Size(319, 286); - this.Controls.Add(this.numericUpDown2); - this.Controls.Add(this.numericUpDown1); - this.Controls.Add(this.labelName2); - this.Controls.Add(this.trackBar2); - this.Controls.Add(this.labelName1); - this.Controls.Add(this.trackBar1); - this.Controls.Add(this.btnCancel); - this.Controls.Add(this.btnOK); - this.Controls.Add(this.Label3); - this.Controls.Add(this.nudRed); - this.Controls.Add(this.pnlColor); - this.Controls.Add(this.Label1); - this.Controls.Add(this.pnlBrightness); - this.Controls.Add(this.nudBlue); - this.Controls.Add(this.nudGreen); - this.Controls.Add(this.Label2); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Name = "ColorChooserForm"; - this.Opacity = 0; - this.Text = "Select Color"; - this.Load += new System.EventHandler(this.ColorChooser1_Load); - this.MouseUp += new System.Windows.Forms.MouseEventHandler(this.frmMain_MouseUp); - this.Paint += new System.Windows.Forms.PaintEventHandler(this.ColorChooser1_Paint); - this.MouseDown += new System.Windows.Forms.MouseEventHandler(this.HandleMouse); - this.MouseMove += new System.Windows.Forms.MouseEventHandler(this.HandleMouse); - ((System.ComponentModel.ISupportInitialize)(this.nudRed)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.nudBlue)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.nudGreen)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.trackBar1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.trackBar2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).EndInit(); - this.ResumeLayout(false); - this.PerformLayout(); - - } - #endregion - - private enum ChangeStyle { - MouseMove, - RGB, - None - } - - private ChangeStyle changeType = ChangeStyle.None; - private Point selectedPoint; - - private ColorWheel colorWheel; - private ColorHandler.RGB RGB; - private bool isInUpdate = false; - - - private List<Thing> selectedLights; - private List<Sector> selectedLights; - - //private Color startColor; - - /*public void SetData(Color startColor, string[] labels) { - btnCancel.BackColor = startColor; - btnOK.BackColor = startColor; - if (startColor.R < 128 && startColor.G < 128 && startColor.B < 128) { - btnCancel.ForeColor = Color.White; - btnOK.ForeColor = Color.White; - } - this.startColor = startColor; - - if (labels == null || labels.Length == 0) { - numericUpDown1.Visible = false; - numericUpDown2.Visible = false; - labelName1.Visible = false; - labelName2.Visible = false; - trackBar1.Visible = false; - trackBar2.Visible = false; - this.ClientSize = new Size(this.ClientSize.Width, trackBar1.Location.Y); - } else if (labels.Length == 1) { - labelName1.Text = labels[0] + ":"; - - numericUpDown2.Visible = false; - labelName2.Visible = false; - trackBar2.Visible = false; - this.ClientSize = new Size(this.ClientSize.Width, trackBar2.Location.Y); - } else { - labelName1.Text = labels[0] + ":"; - labelName2.Text = labels[1] + ":"; - } - }*/ - - private void ColorChooser1_Load(object sender, System.EventArgs e) { - // Turn on double-buffering, so the form looks better. - this.SetStyle(ControlStyles.AllPaintingInWmPaint, true); - this.SetStyle(ControlStyles.UserPaint, true); - this.SetStyle(ControlStyles.DoubleBuffer, true); - - Rectangle BrightnessRectangle = new Rectangle(pnlBrightness.Location, pnlBrightness.Size); - Rectangle ColorRectangle = new Rectangle(pnlColor.Location, pnlColor.Size); - - // Create the new ColorWheel class, indicating the locations of the color wheel itself, the - // brightness area, and the position of the selected color. - colorWheel = new ColorWheel(ColorRectangle, BrightnessRectangle); - colorWheel.ColorChanged += new ColorWheel.ColorChangedEventHandler(this.myColorWheel_ColorChanged); - - //set initial color - - - - isInUpdate = true; - changeType = ChangeStyle.RGB; - RGB = new ColorHandler.RGB(startColor.R, startColor.G, startColor.B); - - RefreshValue(nudRed, RGB.Red); - RefreshValue(nudBlue, RGB.Blue); - RefreshValue(nudGreen, RGB.Green); - isInUpdate = false; - this.Invalidate(); - } - - private void HandleMouse(object sender, MouseEventArgs e) { - if (e.Button == MouseButtons.Left) { - changeType = ChangeStyle.MouseMove; - selectedPoint = new Point(e.X, e.Y); - this.Invalidate(); - } - } - - private void frmMain_MouseUp(object sender, MouseEventArgs e) { - colorWheel.SetMouseUp(); - changeType = ChangeStyle.None; - } - - private void HandleRGBChange(object sender, System.EventArgs e) { - - // If the R, G, or B values change, use this code to update the HSV values and invalidate - // the color wheel (so it updates the pointers). - // Check the isInUpdate flag to avoid recursive events when you update the NumericUpdownControls. - if (!isInUpdate) { - changeType = ChangeStyle.RGB; - RGB = new ColorHandler.RGB((int)nudRed.Value, (int)nudGreen.Value, (int)nudBlue.Value); - this.Invalidate(); - } - } - - private void SetRGB(ColorHandler.RGB RGB) { - // Update the RGB values on the form, but don't trigger the ValueChanged event of the form. The isInUpdate - // variable ensures that the event procedures exit without doing anything. - isInUpdate = true; - RefreshValue(nudRed, RGB.Red); - RefreshValue(nudBlue, RGB.Blue); - RefreshValue(nudGreen, RGB.Green); - - btnOK.BackColor = ColorHandler.RGBtoColor(RGB); - if (RGB.Red < 128 && RGB.Green < 128 && RGB.Blue < 128) - btnOK.ForeColor = Color.White; - else - btnOK.ForeColor = Color.Black; - isInUpdate = false; - } - - private void RefreshValue(NumericUpDown nud, int value) { - // Update the value of the NumericUpDown control, if the value is different than the current value. - // Refresh the control, causing an immediate repaint. - if (nud.Value != value) { - nud.Value = value; - nud.Refresh(); - } - } - -//Properties - public Color Color { get { return colorWheel.Color; } } - public int Value1 { get { return (int)numericUpDown1.Value; } } - public int Value2 { get { return (int)numericUpDown2.Value; } } - -//Events - private void myColorWheel_ColorChanged(object sender, ColorChangedEventArgs e) { - SetRGB(e.RGB); - } - - private void ColorChooser1_Paint(object sender, System.Windows.Forms.PaintEventArgs e) { - // Depending on the circumstances, force a repaint of the color wheel passing different information. - switch (changeType) { - case ChangeStyle.MouseMove: - case ChangeStyle.None: - colorWheel.Draw(e.Graphics, selectedPoint); - break; - case ChangeStyle.RGB: - colorWheel.Draw(e.Graphics, RGB); - break; - } - } - - private void trackBar1_ValueChanged(object sender, EventArgs e) { - numericUpDown1.Value = trackBar1.Value; - } - - private void trackBar2_ValueChanged(object sender, EventArgs e) { - numericUpDown2.Value = trackBar2.Value; - } - - private void numericUpDown1_ValueChanged(object sender, EventArgs e) { - trackBar1.Value = (int)numericUpDown1.Value > trackBar1.Maximum ? trackBar1.Maximum : (int)numericUpDown1.Value; - } - - private void numericUpDown2_ValueChanged(object sender, EventArgs e) { - trackBar2.Value = (int)numericUpDown2.Value > trackBar2.Maximum ? trackBar2.Maximum : (int)numericUpDown2.Value; - } - -//buttons - private void btnOK_Click(object sender, EventArgs e) { - this.Close(); - } - - private void btnCancel_Click(object sender, EventArgs e) { - this.Close(); - } - } -} diff --git a/Source/Core/GZBuilder/Windows/ColorChooserForm.resx b/Source/Core/GZBuilder/Windows/ColorChooserForm.resx deleted file mode 100644 index ff31a6db5..000000000 --- a/Source/Core/GZBuilder/Windows/ColorChooserForm.resx +++ /dev/null @@ -1,120 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<root> - <!-- - Microsoft ResX Schema - - Version 2.0 - - The primary goals of this format is to allow a simple XML format - that is mostly human readable. The generation and parsing of the - various data types are done through the TypeConverter classes - associated with the data types. - - Example: - - ... ado.net/XML headers & schema ... - <resheader name="resmimetype">text/microsoft-resx</resheader> - <resheader name="version">2.0</resheader> - <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> - <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> - <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> - <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> - <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> - <value>[base64 mime encoded serialized .NET Framework object]</value> - </data> - <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> - <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> - <comment>This is a comment</comment> - </data> - - There are any number of "resheader" rows that contain simple - name/value pairs. - - Each data row contains a name, and value. The row also contains a - type or mimetype. Type corresponds to a .NET class that support - text/value conversion through the TypeConverter architecture. - Classes that don't support this are serialized and stored with the - mimetype set. - - The mimetype is used for serialized objects, and tells the - ResXResourceReader how to depersist the object. This is currently not - extensible. For a given mimetype the value must be set accordingly: - - Note - application/x-microsoft.net.object.binary.base64 is the format - that the ResXResourceWriter will generate, however the reader can - read any of the formats listed below. - - mimetype: application/x-microsoft.net.object.binary.base64 - value : The object must be serialized with - : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter - : and then encoded with base64 encoding. - - mimetype: application/x-microsoft.net.object.soap.base64 - value : The object must be serialized with - : System.Runtime.Serialization.Formatters.Soap.SoapFormatter - : and then encoded with base64 encoding. - - mimetype: application/x-microsoft.net.object.bytearray.base64 - value : The object must be serialized into a byte array - : using a System.ComponentModel.TypeConverter - : and then encoded with base64 encoding. - --> - <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> - <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> - <xsd:element name="root" msdata:IsDataSet="true"> - <xsd:complexType> - <xsd:choice maxOccurs="unbounded"> - <xsd:element name="metadata"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="value" type="xsd:string" minOccurs="0" /> - </xsd:sequence> - <xsd:attribute name="name" use="required" type="xsd:string" /> - <xsd:attribute name="type" type="xsd:string" /> - <xsd:attribute name="mimetype" type="xsd:string" /> - <xsd:attribute ref="xml:space" /> - </xsd:complexType> - </xsd:element> - <xsd:element name="assembly"> - <xsd:complexType> - <xsd:attribute name="alias" type="xsd:string" /> - <xsd:attribute name="name" type="xsd:string" /> - </xsd:complexType> - </xsd:element> - <xsd:element name="data"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> - <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> - </xsd:sequence> - <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> - <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> - <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> - <xsd:attribute ref="xml:space" /> - </xsd:complexType> - </xsd:element> - <xsd:element name="resheader"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> - </xsd:sequence> - <xsd:attribute name="name" type="xsd:string" use="required" /> - </xsd:complexType> - </xsd:element> - </xsd:choice> - </xsd:complexType> - </xsd:element> - </xsd:schema> - <resheader name="resmimetype"> - <value>text/microsoft-resx</value> - </resheader> - <resheader name="version"> - <value>2.0</value> - </resheader> - <resheader name="reader"> - <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </resheader> - <resheader name="writer"> - <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </resheader> -</root> \ No newline at end of file diff --git a/Source/Core/GZBuilder/Windows/ColorHandler.cs b/Source/Core/GZBuilder/Windows/ColorHandler.cs deleted file mode 100644 index 0c3a77ed3..000000000 --- a/Source/Core/GZBuilder/Windows/ColorHandler.cs +++ /dev/null @@ -1,210 +0,0 @@ -using System; -using System.Drawing; - -namespace CodeImp.DoomBuilder.GZBuilder.Windows { - public class ColorHandler { - // Handle conversions between RGB and HSV - // (and Color types, as well). - public struct RGB { - // All values are between 0 and 255. - public int Red; - public int Green; - public int Blue; - - public RGB(int R, int G, int B) { - Red = R; - Green = G; - Blue = B; - } - - } - - public struct HSV { - // All values are between 0 and 255. - public int Hue; - public int Saturation; - public int value; - - public HSV(int H, int S, int V) { - Hue = H; - Saturation = S; - value = V; - } - - public override string ToString() { - return String.Format("({0}, {1}, {2})", Hue, Saturation, value); - } - } - - public static RGB HSVtoRGB(int H, int S, int V) { - // H, S, and V must all be between 0 and 255. - return HSVtoRGB(new HSV(H, S, V)); - } - - public static Color HSVtoColor(HSV hsv) { - RGB RGB = HSVtoRGB(hsv); - return Color.FromArgb(RGB.Red, RGB.Green, RGB.Blue); - } - - public static Color HSVtoColor(int H, int S, int V) { - return HSVtoColor(new HSV(H, S, V)); - } - - public static Color RGBtoColor(RGB rgb) { - return Color.FromArgb(rgb.Red, rgb.Green, rgb.Blue); - } - - public static RGB HSVtoRGB(HSV HSV) { - // HSV contains values scaled as in the color wheel: - // that is, all from 0 to 255. - - // for ( this code to work, HSV.Hue needs - // to be scaled from 0 to 360 (it//s the angle of the selected - // point within the circle). HSV.Saturation and HSV.value must be - // scaled to be between 0 and 1. - - double h; - double s; - double v; - - double r = 0; - double g = 0; - double b = 0; - - // Scale Hue to be between 0 and 360. Saturation - // and value scale to be between 0 and 1. - h = ((double)HSV.Hue / 255 * 360) % 360; - s = (double)HSV.Saturation / 255; - v = (double)HSV.value / 255; - - if (s == 0) { - // If s is 0, all colors are the same. - // This is some flavor of gray. - r = v; - g = v; - b = v; - } else { - double p; - double q; - double t; - - double fractionalSector; - int sectorNumber; - double sectorPos; - - // The color wheel consists of 6 sectors. - // Figure out which sector you//re in. - sectorPos = h / 60; - sectorNumber = (int)(Math.Floor(sectorPos)); - - // get the fractional part of the sector. - // That is, how many degrees into the sector - // are you? - fractionalSector = sectorPos - sectorNumber; - - // Calculate values for the three axes - // of the color. - p = v * (1 - s); - q = v * (1 - (s * fractionalSector)); - t = v * (1 - (s * (1 - fractionalSector))); - - // Assign the fractional colors to r, g, and b - // based on the sector the angle is in. - switch (sectorNumber) { - case 0: - r = v; - g = t; - b = p; - break; - - case 1: - r = q; - g = v; - b = p; - break; - - case 2: - r = p; - g = v; - b = t; - break; - - case 3: - r = p; - g = q; - b = v; - break; - - case 4: - r = t; - g = p; - b = v; - break; - - case 5: - r = v; - g = p; - b = q; - break; - } - } - // return an RGB structure, with values scaled - // to be between 0 and 255. - return new RGB((int)(r * 255), (int)(g * 255), (int)(b * 255)); - } - - public static HSV RGBtoHSV(RGB RGB) { - // In this function, R, G, and B values must be scaled - // to be between 0 and 1. - // HSV.Hue will be a value between 0 and 360, and - // HSV.Saturation and value are between 0 and 1. - // The code must scale these to be between 0 and 255 for - // the purposes of this application. - - double min; - double max; - double delta; - - double r = (double)RGB.Red / 255; - double g = (double)RGB.Green / 255; - double b = (double)RGB.Blue / 255; - - double h; - double s; - double v; - - min = Math.Min(Math.Min(r, g), b); - max = Math.Max(Math.Max(r, g), b); - v = max; - delta = max - min; - if (max == 0 || delta == 0) { - // R, G, and B must be 0, or all the same. In this case, S is 0, and H is undefined. - // Using H = 0 is as good as any... - s = 0; - h = 0; - } else { - s = delta / max; - if (r == max) { - // Between Yellow and Magenta - h = (g - b) / delta; - } else if (g == max) { - // Between Cyan and Yellow - h = 2 + (b - r) / delta; - } else { - // Between Magenta and Cyan - h = 4 + (r - g) / delta; - } - - } - // Scale h to be between 0 and 360. - // This may require adding 360, if the value is negative. - h *= 60; - if (h < 0) { - h += 360; - } - - // Scale to the requirements of this application. All values are between 0 and 255. - return new HSV((int)(h / 360 * 255), (int)(s * 255), (int)(v * 255)); - } - } -} diff --git a/Source/Core/GZBuilder/Windows/ColorWheel.cs b/Source/Core/GZBuilder/Windows/ColorWheel.cs deleted file mode 100644 index df42e2076..000000000 --- a/Source/Core/GZBuilder/Windows/ColorWheel.cs +++ /dev/null @@ -1,469 +0,0 @@ -using System; -using System.Drawing; -using System.Drawing.Drawing2D; -using System.Drawing.Imaging; - -namespace CodeImp.DoomBuilder.GZBuilder.Windows { - public class ColorWheel : IDisposable { - - // These resources should be disposed - // of when you're done with them. - private Graphics g; - private Region colorRegion; - private Region brightnessRegion; - private Bitmap colorImage; - - public delegate void ColorChangedEventHandler(object sender, ColorChangedEventArgs e); - public ColorChangedEventHandler ColorChanged; - - // Keep track of the current mouse state. - public enum MouseState { - MouseUp, - ClickOnColor, - DragInColor, - ClickOnBrightness, - DragInBrightness, - ClickOutsideRegion, - DragOutsideRegion, - } - private MouseState currentState = MouseState.MouseUp; - - // The code needs to convert back and forth between - // degrees and radians. There are 2*PI radians in a - // full circle, and 360 degrees. This constant allows - // you to convert back and forth. - private const double DEGREES_PER_RADIAN = 180.0 / Math.PI; - - // COLOR_COUNT represents the number of distinct colors - // used to create the circular gradient. Its value - // is somewhat arbitrary -- change this to 6, for - // example, to see what happens. 1536 (6 * 256) seems - // a good compromise -- it's enough to get a full - // range of colors, but it doesn't overwhelm the processor - // attempting to generate the image. The color wheel - // contains 6 sections, and each section displays - // 256 colors. Seems like a reasonable compromise. - private const int COLOR_COUNT = 6 * 256; - - private Point centerPoint; - private int radius; - - private Rectangle colorRectangle; - private Rectangle brightnessRectangle; - private int brightnessX; - private double brightnessScaling; - - // selectedColor is the actual value selected - // by the user. fullColor is the same color, - // with its brightness set to 255. - private Color selectedColor = Color.White; - private Color fullColor; - - private ColorHandler.RGB RGB; - private ColorHandler.HSV HSV; - - // Locations for the two "pointers" on the form. - private Point colorPoint; - private Point brightnessPoint; - - private int brightness; - private int brightnessMin; - private int brightnessMax; - - public Color Color { get { return selectedColor; } } - - public ColorWheel(Rectangle colorRectangle, Rectangle brightnessRectangle) { - - // Caller must provide locations for color wheel - // (colorRectangle), brightness "strip" (brightnessRectangle) - // and location to display selected color (selectedColorRectangle). - - using (GraphicsPath path = new GraphicsPath()) { - // Store away locations for later use. - this.colorRectangle = colorRectangle; - this.brightnessRectangle = brightnessRectangle; - //this.selectedColorRectangle = selectedColorRectangle; - - // Calculate the center of the circle. - // Start with the location, then offset - // the point by the radius. - // Use the smaller of the width and height of - // the colorRectangle value. - this.radius = (int)Math.Min(colorRectangle.Width, colorRectangle.Height) / 2; - this.centerPoint = colorRectangle.Location; - this.centerPoint.Offset(radius, radius); - - // Start the pointer in the center. - this.colorPoint = this.centerPoint; - - // Create a region corresponding to the color circle. - // Code uses this later to determine if a specified - // point is within the region, using the IsVisible - // method. - path.AddEllipse(colorRectangle); - colorRegion = new Region(path); - - // set { the range for the brightness selector. - this.brightnessMin = this.brightnessRectangle.Top; - this.brightnessMax = this.brightnessRectangle.Bottom; - - // Create a region corresponding to the - // brightness rectangle, with a little extra - // "breathing room". - - path.AddRectangle(new Rectangle(brightnessRectangle.Left, brightnessRectangle.Top - 10, brightnessRectangle.Width + 10, brightnessRectangle.Height + 20)); - // Create region corresponding to brightness - // rectangle. Later code uses this to - // determine if a specified point is within - // the region, using the IsVisible method. - brightnessRegion = new Region(path); - - // Set the location for the brightness indicator "marker". - // Also calculate the scaling factor, scaling the height - // to be between 0 and 255. - brightnessX = brightnessRectangle.Left + brightnessRectangle.Width; - brightnessScaling = (double)255 / (brightnessMax - brightnessMin); - - // Calculate the location of the brightness - // pointer. Assume it's at the highest position. - brightnessPoint = new Point(brightnessX, brightnessMax); - - // Create the bitmap that contains the circular gradient. - CreateGradient(); - } - } - - protected void OnColorChanged(ColorHandler.RGB RGB, ColorHandler.HSV HSV) { - ColorChangedEventArgs e = new ColorChangedEventArgs(RGB, HSV); - ColorChanged(this, e); - } - - void IDisposable.Dispose() { - // Dispose of graphic resources - if (colorImage != null) - colorImage.Dispose(); - if (colorRegion != null) - colorRegion.Dispose(); - if (brightnessRegion != null) - brightnessRegion.Dispose(); - if (g != null) - g.Dispose(); - } - - public void SetMouseUp() { - // Indicate that the user has - // released the mouse. - currentState = MouseState.MouseUp; - } - - public void Draw(Graphics g, ColorHandler.RGB RGB) { - // Given RGB values, calculate HSV and then update the screen. - this.g = g; - this.HSV = ColorHandler.RGBtoHSV(RGB); - CalcCoordsAndUpdate(this.HSV); - UpdateDisplay(); - } - - public void Draw(Graphics g, Point mousePoint) { - // You've moved the mouse. - // Now update the screen to match. - - double distance; - int degrees; - Point delta; - Point newColorPoint; - Point newBrightnessPoint; - Point newPoint; - - // Keep track of the previous color pointer point, - // so you can put the mouse there in case the - // user has clicked outside the circle. - newColorPoint = colorPoint; - newBrightnessPoint = brightnessPoint; - - // Store this away for later use. - this.g = g; - - if (currentState == MouseState.MouseUp) { - if (!mousePoint.IsEmpty) { - if (colorRegion.IsVisible(mousePoint)) { - // Is the mouse point within the color circle? - // If so, you just clicked on the color wheel. - currentState = MouseState.ClickOnColor; - } else if (brightnessRegion.IsVisible(mousePoint)) { - // Is the mouse point within the brightness area? - // You clicked on the brightness area. - currentState = MouseState.ClickOnBrightness; - } else { - // Clicked outside the color and the brightness - // regions. In that case, just put the - // pointers back where they were. - currentState = MouseState.ClickOutsideRegion; - } - } - } - - switch (currentState) { - case MouseState.ClickOnBrightness: - case MouseState.DragInBrightness: - // Calculate new color information - // based on the brightness, which may have changed. - newPoint = mousePoint; - if (newPoint.Y < brightnessMin) { - newPoint.Y = brightnessMin; - } else if (newPoint.Y > brightnessMax) { - newPoint.Y = brightnessMax; - } - newBrightnessPoint = new Point(brightnessX, newPoint.Y); - brightness = (int)((brightnessMax - newPoint.Y) * brightnessScaling); - HSV.value = brightness; - RGB = ColorHandler.HSVtoRGB(HSV); - break; - - case MouseState.ClickOnColor: - case MouseState.DragInColor: - // Calculate new color information - // based on selected color, which may have changed. - newColorPoint = mousePoint; - - // Calculate x and y distance from the center, - // and then calculate the angle corresponding to the - // new location. - delta = new Point( - mousePoint.X - centerPoint.X, mousePoint.Y - centerPoint.Y); - degrees = CalcDegrees(delta); - - // Calculate distance from the center to the new point - // as a fraction of the radius. Use your old friend, - // the Pythagorean theorem, to calculate this value. - distance = Math.Sqrt(delta.X * delta.X + delta.Y * delta.Y) / radius; - - if (currentState == MouseState.DragInColor) { - if (distance > 1) { - // Mouse is down, and outside the circle, but you - // were previously dragging in the color circle. - // What to do? - // In that case, move the point to the edge of the - // circle at the correct angle. - distance = 1; - newColorPoint = GetPoint(degrees, radius, centerPoint); - } - } - - // Calculate the new HSV and RGB values. - HSV.Hue = (int)(degrees * 255 / 360); - HSV.Saturation = (int)(distance * 255); - HSV.value = brightness; - RGB = ColorHandler.HSVtoRGB(HSV); - fullColor = ColorHandler.HSVtoColor(HSV.Hue, HSV.Saturation, 255); - break; - } - selectedColor = ColorHandler.HSVtoColor(HSV); - - // Raise an event back to the parent form, - // so the form can update any UI it's using - // to display selected color values. - OnColorChanged(RGB, HSV); - - // On the way out, set the new state. - switch (currentState) { - case MouseState.ClickOnBrightness: - currentState = MouseState.DragInBrightness; - break; - case MouseState.ClickOnColor: - currentState = MouseState.DragInColor; - break; - case MouseState.ClickOutsideRegion: - currentState = MouseState.DragOutsideRegion; - break; - } - - // Store away the current points for next time. - colorPoint = newColorPoint; - brightnessPoint = newBrightnessPoint; - - // Draw the gradients and points. - UpdateDisplay(); - } - - private Point CalcBrightnessPoint(int brightness) { - // Take the value for brightness (0 to 255), scale to the - // scaling used in the brightness bar, then add the value - // to the bottom of the bar. return the correct point at which - // to display the brightness pointer. - return new Point(brightnessX, (int)(brightnessMax - brightness / brightnessScaling)); - } - - /*public void SetColor(Color c) { - fullColor = c; - UpdateDisplay(); - }*/ - - private void UpdateDisplay() { - // Update the gradients, and place the pointers correctly based on colors and - // brightness. - - using (Brush selectedBrush = new SolidBrush(selectedColor)) { - // Draw the saved color wheel image. - g.DrawImage(colorImage, colorRectangle); - - // Draw the "brightness" rectangle. - DrawLinearGradient(fullColor); - // Draw the two pointers. - DrawColorPointer(colorPoint); - DrawBrightnessPointer(brightnessPoint); - } - } - - private void CalcCoordsAndUpdate(ColorHandler.HSV HSV) { - // Convert color to real-world coordinates and then calculate - // the various points. HSV.Hue represents the degrees (0 to 360), - // HSV.Saturation represents the radius. - // This procedure doesn't draw anything--it simply - // updates class-level variables. The UpdateDisplay - // procedure uses these values to update the screen. - - // Given the angle (HSV.Hue), and distance from - // the center (HSV.Saturation), and the center, - // calculate the point corresponding to - // the selected color, on the color wheel. - colorPoint = GetPoint((double)HSV.Hue / 255 * 360, - (double)HSV.Saturation / 255 * radius, - centerPoint); - - // Given the brightness (HSV.value), calculate the - // point corresponding to the brightness indicator. - brightnessPoint = CalcBrightnessPoint(HSV.value); - - // Store information about the selected color. - brightness = HSV.value; - selectedColor = ColorHandler.HSVtoColor(HSV); - RGB = ColorHandler.HSVtoRGB(HSV); - - // The full color is the same as HSV, except that the - // brightness is set to full (255). This is the top-most - // color in the brightness gradient. - fullColor = ColorHandler.HSVtoColor(HSV.Hue, HSV.Saturation, 255); - } - - private void DrawLinearGradient(Color TopColor) { - // Given the top color, draw a linear gradient - // ranging from black to the top color. Use the - // brightness rectangle as the area to fill. - using (LinearGradientBrush lgb = - new LinearGradientBrush(brightnessRectangle, TopColor, - Color.Black, LinearGradientMode.Vertical)) { - g.FillRectangle(lgb, brightnessRectangle); - } - } - - private int CalcDegrees(Point pt) { - int degrees; - - if (pt.X == 0) { - // The point is on the y-axis. Determine whether it's above or below the x-axis, and return the - // corresponding angle. Note that the orientation of the y-coordinate is backwards. That is, - // A positive Y value indicates a point BELOW the x-axis. - if (pt.Y > 0) { - degrees = 270; - } else { - degrees = 90; - } - } else { - // This value needs to be multiplied by -1 because the y-coordinate - // is opposite from the normal direction here. - // That is, a y-coordinate that's "higher" on the form has a lower y-value, in this coordinate - // system. So everything's off by a factor of -1 when performing the ratio calculations. - degrees = (int)(-Math.Atan((double)pt.Y / pt.X) * DEGREES_PER_RADIAN); - - // If the x-coordinate of the selected point is to the left of the center of the circle, you - // need to add 180 degrees to the angle. ArcTan only gives you a value on the right-hand side - // of the circle. - if (pt.X < 0) { - degrees += 180; - } - - // Ensure that the return value is between 0 and 360. - degrees = (degrees + 360) % 360; - } - return degrees; - } - - private void CreateGradient() { - // Create a new PathGradientBrush, supplying an array of points created by calling - // the GetPoints method. - using (PathGradientBrush pgb = - new PathGradientBrush(GetPoints(radius, new Point(radius, radius)))) { - // Set the various properties. Note the SurroundColors property, which contains an array of points, - // in a one-to-one relationship with the points that created the gradient. - pgb.CenterColor = Color.White; - pgb.CenterPoint = new PointF(radius, radius); - pgb.SurroundColors = GetColors(); - - // Create a new bitmap containing the color wheel gradient, so the - // code only needs to do all this work once. Later code uses the bitmap - // rather than recreating the gradient. - colorImage = new Bitmap( - colorRectangle.Width, colorRectangle.Height, - PixelFormat.Format32bppArgb); - - using (Graphics newGraphics = - Graphics.FromImage(colorImage)) { - newGraphics.FillEllipse(pgb, 0, 0, - colorRectangle.Width, colorRectangle.Height); - } - } - } - - private Color[] GetColors() { - // Create an array of COLOR_COUNT colors, looping through all the hues between 0 and 255, broken - // into COLOR_COUNT intervals. HSV is particularly well-suited for this, because the only value - // that changes as you create colors is the Hue. - Color[] Colors = new Color[COLOR_COUNT]; - - for (int i = 0; i <= COLOR_COUNT - 1; i++) - Colors[i] = ColorHandler.HSVtoColor((int)((double)(i * 255) / COLOR_COUNT), 255, 255); - return Colors; - } - - private Point[] GetPoints(double radius, Point centerPoint) { - // Generate the array of points that describe the locations of the COLOR_COUNT colors to be - // displayed on the color wheel. - Point[] Points = new Point[COLOR_COUNT]; - - for (int i = 0; i <= COLOR_COUNT - 1; i++) - Points[i] = GetPoint((double)(i * 360) / COLOR_COUNT, radius, centerPoint); - return Points; - } - - private Point GetPoint(double degrees, double radius, Point centerPoint) { - // Given the center of a circle and its radius, along - // with the angle corresponding to the point, find the coordinates. - // In other words, conver t from polar to rectangular coordinates. - double radians = degrees / DEGREES_PER_RADIAN; - - return new Point((int)(centerPoint.X + Math.Floor(radius * Math.Cos(radians))), - (int)(centerPoint.Y - Math.Floor(radius * Math.Sin(radians)))); - } - - private void DrawColorPointer(Point pt) { - // Given a point, draw the color selector. The constant SIZE represents half - // the width -- the square will be twice this value in width and height. - const int SIZE = 3; - g.DrawRectangle(Pens.Black, - pt.X - SIZE, pt.Y - SIZE, SIZE * 2, SIZE * 2); - } - - private void DrawBrightnessPointer(Point pt) { - // Draw a triangle for the brightness indicator that "points" at the provided point. - const int HEIGHT = 10; - const int WIDTH = 7; - - Point[] Points = new Point[3]; - Points[0] = pt; - Points[1] = new Point(pt.X + WIDTH, pt.Y + HEIGHT / 2); - Points[2] = new Point(pt.X + WIDTH, pt.Y - HEIGHT / 2); - g.FillPolygon(Brushes.Black, Points); - } - } -} diff --git a/Source/Core/GZBuilder/Windows/DebugForm.cs b/Source/Core/GZBuilder/Windows/DebugForm.cs deleted file mode 100644 index 42d1ea0bf..000000000 --- a/Source/Core/GZBuilder/Windows/DebugForm.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Windows.Forms; - -namespace CodeImp.DoomBuilder.GZBuilder.Windows -{ - public partial class DebugForm : Form - { - public TextBox TextPannel; - public string Title { set{ Text = value; }} - - public DebugForm() { - InitializeComponent(); - TextPannel = textBox1; - } - - private void textBox1_TextChanged(object sender, EventArgs e) { - - } - } -} diff --git a/Source/Core/GZBuilder/Windows/DebugForm.designer.cs b/Source/Core/GZBuilder/Windows/DebugForm.designer.cs deleted file mode 100644 index 082ff8329..000000000 --- a/Source/Core/GZBuilder/Windows/DebugForm.designer.cs +++ /dev/null @@ -1,62 +0,0 @@ -namespace CodeImp.DoomBuilder.GZBuilder.Windows -{ - partial class DebugForm - { - /// <summary> - /// ТребуетÑÑ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ ÐºÐ¾Ð½Ñтруктора. - /// </summary> - private System.ComponentModel.IContainer components = null; - - /// <summary> - /// ОÑвободить вÑе иÑпользуемые реÑурÑÑ‹. - /// </summary> - /// <param name="disposing">иÑтинно, еÑли управлÑемый реÑÑƒÑ€Ñ Ð´Ð¾Ð»Ð¶ÐµÐ½ быть удален; иначе ложно.</param> - protected override void Dispose(bool disposing) { - if (disposing && (components != null)) { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Код, автоматичеÑки Ñозданный конÑтруктором форм Windows - - /// <summary> - /// ОбÑзательный метод Ð´Ð»Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ¸ конÑтруктора - не изменÑйте - /// Ñодержимое данного метода при помощи редактора кода. - /// </summary> - private void InitializeComponent() { - this.textBox1 = new System.Windows.Forms.TextBox(); - this.SuspendLayout(); - // - // textBox1 - // - this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.textBox1.Location = new System.Drawing.Point(12, 12); - this.textBox1.Multiline = true; - this.textBox1.Name = "textBox1"; - this.textBox1.ReadOnly = true; - this.textBox1.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.textBox1.Size = new System.Drawing.Size(260, 426); - this.textBox1.TabIndex = 0; - this.textBox1.TextChanged += new System.EventHandler(this.textBox1_TextChanged); - // - // DebugForm - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(284, 450); - this.Controls.Add(this.textBox1); - this.Name = "DebugForm"; - this.Text = "Console"; - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private System.Windows.Forms.TextBox textBox1; - } -} \ No newline at end of file diff --git a/Source/Core/GZBuilder/Windows/DebugForm.resx b/Source/Core/GZBuilder/Windows/DebugForm.resx deleted file mode 100644 index ff31a6db5..000000000 --- a/Source/Core/GZBuilder/Windows/DebugForm.resx +++ /dev/null @@ -1,120 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<root> - <!-- - Microsoft ResX Schema - - Version 2.0 - - The primary goals of this format is to allow a simple XML format - that is mostly human readable. The generation and parsing of the - various data types are done through the TypeConverter classes - associated with the data types. - - Example: - - ... ado.net/XML headers & schema ... - <resheader name="resmimetype">text/microsoft-resx</resheader> - <resheader name="version">2.0</resheader> - <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> - <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> - <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> - <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> - <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> - <value>[base64 mime encoded serialized .NET Framework object]</value> - </data> - <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> - <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> - <comment>This is a comment</comment> - </data> - - There are any number of "resheader" rows that contain simple - name/value pairs. - - Each data row contains a name, and value. The row also contains a - type or mimetype. Type corresponds to a .NET class that support - text/value conversion through the TypeConverter architecture. - Classes that don't support this are serialized and stored with the - mimetype set. - - The mimetype is used for serialized objects, and tells the - ResXResourceReader how to depersist the object. This is currently not - extensible. For a given mimetype the value must be set accordingly: - - Note - application/x-microsoft.net.object.binary.base64 is the format - that the ResXResourceWriter will generate, however the reader can - read any of the formats listed below. - - mimetype: application/x-microsoft.net.object.binary.base64 - value : The object must be serialized with - : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter - : and then encoded with base64 encoding. - - mimetype: application/x-microsoft.net.object.soap.base64 - value : The object must be serialized with - : System.Runtime.Serialization.Formatters.Soap.SoapFormatter - : and then encoded with base64 encoding. - - mimetype: application/x-microsoft.net.object.bytearray.base64 - value : The object must be serialized into a byte array - : using a System.ComponentModel.TypeConverter - : and then encoded with base64 encoding. - --> - <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> - <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> - <xsd:element name="root" msdata:IsDataSet="true"> - <xsd:complexType> - <xsd:choice maxOccurs="unbounded"> - <xsd:element name="metadata"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="value" type="xsd:string" minOccurs="0" /> - </xsd:sequence> - <xsd:attribute name="name" use="required" type="xsd:string" /> - <xsd:attribute name="type" type="xsd:string" /> - <xsd:attribute name="mimetype" type="xsd:string" /> - <xsd:attribute ref="xml:space" /> - </xsd:complexType> - </xsd:element> - <xsd:element name="assembly"> - <xsd:complexType> - <xsd:attribute name="alias" type="xsd:string" /> - <xsd:attribute name="name" type="xsd:string" /> - </xsd:complexType> - </xsd:element> - <xsd:element name="data"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> - <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> - </xsd:sequence> - <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> - <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> - <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> - <xsd:attribute ref="xml:space" /> - </xsd:complexType> - </xsd:element> - <xsd:element name="resheader"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> - </xsd:sequence> - <xsd:attribute name="name" type="xsd:string" use="required" /> - </xsd:complexType> - </xsd:element> - </xsd:choice> - </xsd:complexType> - </xsd:element> - </xsd:schema> - <resheader name="resmimetype"> - <value>text/microsoft-resx</value> - </resheader> - <resheader name="version"> - <value>2.0</value> - </resheader> - <resheader name="reader"> - <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </resheader> - <resheader name="writer"> - <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </resheader> -</root> \ No newline at end of file -- GitLab