stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2025-01-31 04:40:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

UDMF: Added "Comment" tab to Edit Sector / Linedef / Thing forms.

Browse source 
Sectors, Linedefs, Things modes: comment icons for appropriate map elements with comments are now rendered in these modes. This can be disabled using either the new "Toggle Comments" action, "View -> Show Comments" menu item, or "Show Comments" button on the main toolbar.
This commit is contained in:
MaxED 2015-07-14 23:34:31 +00:00
parent 70ea180b91
commit 0d4c2a8f32
31 changed files with 1025 additions and 147 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Source/Core/Builder.csproj
View file

@ -697,6 +697,12 @@
<Compile Include="Controls\ColoredComboBox.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Controls\CommentEditor.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Controls\CommentEditor.Designer.cs">
<DependentUpon>CommentEditor.cs</DependentUpon>
</Compile>
<Compile Include="Controls\DebugConsole.cs">
<SubType>UserControl</SubType>
</Compile>
@ -868,6 +874,7 @@
<Compile Include="Map\SelectionType.cs" />
<Compile Include="Map\MapElementCollection.cs" />
<Compile Include="Map\SplitLineBehavior.cs" />
<Compile Include="Rendering\CommentType.cs" />
<Compile Include="Rendering\SurfaceBufferSet.cs" />
<Compile Include="Rendering\SurfaceEntry.cs" />
<Compile Include="Rendering\SurfaceEntryCollection.cs" />
@ -974,6 +981,9 @@
<EmbeddedResource Include="Controls\ActionSpecialHelpButton.resx">
<DependentUpon>ActionSpecialHelpButton.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Controls\CommentEditor.resx">
<DependentUpon>CommentEditor.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Controls\DebugConsole.resx">
<DependentUpon>DebugConsole.cs</DependentUpon>
</EmbeddedResource>
@ -1039,6 +1049,12 @@
<None Include="Resources\Brightness.png" />
<None Include="Resources\Clear.png" />
<None Include="Resources\Collapse.png" />
<EmbeddedResource Include="Resources\CommentInfo.png" />
<EmbeddedResource Include="Resources\CommentProblem.png" />
<EmbeddedResource Include="Resources\CommentQuestion.png" />
<EmbeddedResource Include="Resources\CommentRegular.png" />
<EmbeddedResource Include="Resources\CommentSmile.png" />
<None Include="Resources\Comment.png" />
<Content Include="Resources\DB2.ico" />
<None Include="Resources\GZDB2.ico" />
<None Include="Resources\fog.png" />

4
Source/Core/Config/ProgramConfiguration.cs
View file

@ -116,6 +116,7 @@ namespace CodeImp.DoomBuilder.Config
private bool autoClearSideTextures;
private bool storeSelectedEditTab;
private bool checkforupdates;
private bool rendercomments;
// These are not stored in the configuration, only used at runtime
private int defaultbrightness;
@ -203,6 +204,7 @@ namespace CodeImp.DoomBuilder.Config
public bool AutoClearSidedefTextures { get { return autoClearSideTextures; } internal set { autoClearSideTextures = value; } }
public bool StoreSelectedEditTab { get { return storeSelectedEditTab; } internal set { storeSelectedEditTab = value; } }
internal bool CheckForUpdates { get { return checkforupdates; } set { checkforupdates = value; } } //mxd
public bool RenderComments { get { return rendercomments; } internal set { rendercomments = value; } } //mxd
//mxd. Left here for compatibility reasons...
public string DefaultTexture { get { return General.Map != null ? General.Map.Options.DefaultWallTexture : "-"; } set { if(General.Map != null) General.Map.Options.DefaultWallTexture = value; } }
@ -313,6 +315,7 @@ namespace CodeImp.DoomBuilder.Config
autoClearSideTextures = cfg.ReadSetting("autoclearsidetextures", true);
storeSelectedEditTab = cfg.ReadSetting("storeselectededittab", true);
checkforupdates = cfg.ReadSetting("checkforupdates", true); //mxd
rendercomments = cfg.ReadSetting("rendercomments", true); //mxd
//mxd. Sector defaults
defaultceilheight = cfg.ReadSetting("defaultceilheight", 128);
@ -407,6 +410,7 @@ namespace CodeImp.DoomBuilder.Config
cfg.WriteSetting("autoclearsidetextures", autoClearSideTextures);
cfg.WriteSetting("storeselectededittab", storeSelectedEditTab);
cfg.WriteSetting("checkforupdates", checkforupdates); //mxd
cfg.WriteSetting("rendercomments", rendercomments); //mxd
//mxd. Sector defaults
cfg.WriteSetting("defaultceilheight", defaultceilheight);

211
Source/Core/Controls/CommentEditor.Designer.cs generated Normal file
View file

@ -0,0 +1,211 @@
namespace CodeImp.DoomBuilder.Controls
{
partial class CommentEditor
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing) {
if(disposing && (components != null)) {
components.Dispose();
}
base.Dispose(disposing);
}
#region Component 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.textbox = new System.Windows.Forms.TextBox();
this.clear = new System.Windows.Forms.Button();
this.label1 = new System.Windows.Forms.Label();
this.radioButton1 = new System.Windows.Forms.RadioButton();
this.radioButton2 = new System.Windows.Forms.RadioButton();
this.radioButton3 = new System.Windows.Forms.RadioButton();
this.radioButton4 = new System.Windows.Forms.RadioButton();
this.radioButton5 = new System.Windows.Forms.RadioButton();
this.panel1 = new System.Windows.Forms.Panel();
this.tip = new System.Windows.Forms.PictureBox();
this.hintlabel = new System.Windows.Forms.Label();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.tip)).BeginInit();
this.SuspendLayout();
//
// textbox
//
this.textbox.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.textbox.Location = new System.Drawing.Point(3, 29);
this.textbox.Multiline = true;
this.textbox.Name = "textbox";
this.textbox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
this.textbox.Size = new System.Drawing.Size(481, 239);
this.textbox.TabIndex = 0;
this.textbox.TabStop = false;
this.textbox.TextChanged += new System.EventHandler(this.textbox_TextChanged);
this.textbox.Leave += new System.EventHandler(this.textbox_Leave);
this.textbox.Enter += new System.EventHandler(this.textbox_Enter);
//
// clear
//
this.clear.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.clear.Image = global::CodeImp.DoomBuilder.Properties.Resources.Clear;
this.clear.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.clear.Location = new System.Drawing.Point(394, 274);
this.clear.Name = "clear";
this.clear.Size = new System.Drawing.Size(90, 23);
this.clear.TabIndex = 1;
this.clear.Text = "Clear";
this.clear.UseVisualStyleBackColor = true;
this.clear.Click += new System.EventHandler(this.clear_Click);
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(6, 8);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(80, 13);
this.label1.TabIndex = 2;
this.label1.Text = "Comment type: ";
//
// radioButton1
//
this.radioButton1.Image = global::CodeImp.DoomBuilder.Properties.Resources.CommentRegular;
this.radioButton1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.radioButton1.Location = new System.Drawing.Point(3, -1);
this.radioButton1.Name = "radioButton1";
this.radioButton1.Size = new System.Drawing.Size(36, 24);
this.radioButton1.TabIndex = 3;
this.radioButton1.TabStop = true;
this.radioButton1.Tag = 0;
this.radioButton1.UseVisualStyleBackColor = true;
this.radioButton1.CheckedChanged += new System.EventHandler(this.radiobutton_CheckedChanged);
//
// radioButton2
//
this.radioButton2.Image = global::CodeImp.DoomBuilder.Properties.Resources.CommentInfo;
this.radioButton2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.radioButton2.Location = new System.Drawing.Point(45, -1);
this.radioButton2.Name = "radioButton2";
this.radioButton2.Size = new System.Drawing.Size(36, 24);
this.radioButton2.TabIndex = 4;
this.radioButton2.TabStop = true;
this.radioButton2.Tag = 1;
this.radioButton2.UseVisualStyleBackColor = true;
this.radioButton2.CheckedChanged += new System.EventHandler(this.radiobutton_CheckedChanged);
//
// radioButton3
//
this.radioButton3.Image = global::CodeImp.DoomBuilder.Properties.Resources.CommentQuestion;
this.radioButton3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.radioButton3.Location = new System.Drawing.Point(87, -1);
this.radioButton3.Name = "radioButton3";
this.radioButton3.Size = new System.Drawing.Size(36, 24);
this.radioButton3.TabIndex = 5;
this.radioButton3.TabStop = true;
this.radioButton3.Tag = 2;
this.radioButton3.UseVisualStyleBackColor = true;
this.radioButton3.CheckedChanged += new System.EventHandler(this.radiobutton_CheckedChanged);
//
// radioButton4
//
this.radioButton4.Image = global::CodeImp.DoomBuilder.Properties.Resources.CommentProblem;
this.radioButton4.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.radioButton4.Location = new System.Drawing.Point(129, -1);
this.radioButton4.Name = "radioButton4";
this.radioButton4.Size = new System.Drawing.Size(36, 24);
this.radioButton4.TabIndex = 6;
this.radioButton4.TabStop = true;
this.radioButton4.Tag = 3;
this.radioButton4.UseVisualStyleBackColor = true;
this.radioButton4.CheckedChanged += new System.EventHandler(this.radiobutton_CheckedChanged);
//
// radioButton5
//
this.radioButton5.Image = global::CodeImp.DoomBuilder.Properties.Resources.CommentSmile;
this.radioButton5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.radioButton5.Location = new System.Drawing.Point(171, -1);
this.radioButton5.Name = "radioButton5";
this.radioButton5.Size = new System.Drawing.Size(36, 24);
this.radioButton5.TabIndex = 7;
this.radioButton5.TabStop = true;
this.radioButton5.Tag = 4;
this.radioButton5.UseVisualStyleBackColor = true;
this.radioButton5.CheckedChanged += new System.EventHandler(this.radiobutton_CheckedChanged);
//
// panel1
//
this.panel1.Controls.Add(this.radioButton1);
this.panel1.Controls.Add(this.radioButton2);
this.panel1.Controls.Add(this.radioButton3);
this.panel1.Controls.Add(this.radioButton4);
this.panel1.Controls.Add(this.radioButton5);
this.panel1.Location = new System.Drawing.Point(88, 4);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(396, 23);
this.panel1.TabIndex = 8;
//
// tip
//
this.tip.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.tip.Image = global::CodeImp.DoomBuilder.Properties.Resources.Lightbulb;
this.tip.Location = new System.Drawing.Point(3, 277);
this.tip.Name = "tip";
this.tip.Size = new System.Drawing.Size(16, 16);
this.tip.TabIndex = 9;
this.tip.TabStop = false;
//
// hintlabel
//
this.hintlabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.hintlabel.AutoSize = true;
this.hintlabel.Location = new System.Drawing.Point(21, 279);
this.hintlabel.Name = "hintlabel";
this.hintlabel.Size = new System.Drawing.Size(170, 13);
this.hintlabel.TabIndex = 10;
this.hintlabel.Text = "Press Ctrl-Enter to add a line break";
//
// CommentEditor
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.hintlabel);
this.Controls.Add(this.tip);
this.Controls.Add(this.clear);
this.Controls.Add(this.panel1);
this.Controls.Add(this.label1);
this.Controls.Add(this.textbox);
this.Name = "CommentEditor";
this.Size = new System.Drawing.Size(487, 300);
this.panel1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.tip)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private System.Windows.Forms.TextBox textbox;
private System.Windows.Forms.Button clear;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.RadioButton radioButton1;
private System.Windows.Forms.RadioButton radioButton2;
private System.Windows.Forms.RadioButton radioButton3;
private System.Windows.Forms.RadioButton radioButton4;
private System.Windows.Forms.RadioButton radioButton5;
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.PictureBox tip;
private System.Windows.Forms.Label hintlabel;
}
}

135
Source/Core/Controls/CommentEditor.cs Normal file
View file

@ -0,0 +1,135 @@
#region ================== Copyright
/*
* Made by MaxED, mkay?
*/
#endregion
#region ================== Namespaces
using System;
using System.Drawing;
using System.Windows.Forms;
using CodeImp.DoomBuilder.Map;
using CodeImp.DoomBuilder.GZBuilder.Tools;
using CodeImp.DoomBuilder.Rendering;
#endregion
namespace CodeImp.DoomBuilder.Controls
{
public partial class CommentEditor : UserControl
{
#region ================== Variables
private const string DEFAULT_TEXT = "Click to enter a comment...";
private bool mixedvalues;
private int commenttype;
#endregion
#region ================== Constructor / Disposer
public CommentEditor()
{
InitializeComponent();
}
#endregion
#region ================== Methods
public void SetValues(UniFields fields, bool first)
{
if(mixedvalues) return;
string c = fields.GetValue("comment", string.Empty);
if(first)
{
textbox.Text = c;
}
else if(textbox.Text != c)
{
textbox.Clear();
mixedvalues = true;
}
}
public void FinishSetup()
{
if(mixedvalues) return;
if(string.IsNullOrEmpty(textbox.Text))
{
textbox.Text = DEFAULT_TEXT;
textbox.ForeColor = SystemColors.InactiveCaptionText;
radioButton1.Checked = true;
}
else if(textbox.Text.Length > 2)
{
string type = textbox.Text.Substring(0, 3);
int index = Array.IndexOf(CommentType.Types, type);
commenttype = (index > 0 ? index : 0);
if(commenttype > 0) textbox.Text = textbox.Text.TrimStart(type.ToCharArray());
// Isn't there a better way to do this?..
switch(commenttype)
{
case 0: radioButton1.Checked = true; break;
case 1: radioButton2.Checked = true; break;
case 2: radioButton3.Checked = true; break;
case 3: radioButton4.Checked = true; break;
case 4: radioButton5.Checked = true; break;
}
}
}
public void Apply(UniFields fields)
{
if(mixedvalues) return;
string text = (!string.IsNullOrEmpty(textbox.Text) && textbox.Text != DEFAULT_TEXT ? CommentType.Types[commenttype] + textbox.Text : String.Empty);
UDMFTools.SetString(fields, "comment", text, string.Empty);
}
#endregion
#region ================== Events
private void clear_Click(object sender, EventArgs e)
{
textbox.Text = DEFAULT_TEXT;
textbox.ForeColor = SystemColors.InactiveCaptionText;
mixedvalues = false;
}
private void textbox_Enter(object sender, EventArgs e)
{
if(textbox.Text == DEFAULT_TEXT)
{
textbox.Clear();
textbox.ForeColor = SystemColors.WindowText;
}
}
private void textbox_Leave(object sender, EventArgs e)
{
if(string.IsNullOrEmpty(textbox.Text) && !mixedvalues)
{
textbox.Text = DEFAULT_TEXT;
textbox.ForeColor = SystemColors.InactiveCaptionText;
}
}
private void textbox_TextChanged(object sender, EventArgs e)
{
mixedvalues = false;
}
private void radiobutton_CheckedChanged(object sender, EventArgs e)
{
commenttype = (int)((Control)sender).Tag;
}
#endregion
}
}

120
Source/Core/Controls/CommentEditor.resx Normal file
View file

@ -0,0 +1,120 @@
<?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>

22
Source/Core/Data/DataManager.cs
View file

@ -90,6 +90,9 @@ namespace CodeImp.DoomBuilder.Data
private ImageData crosshairbusy;
private Dictionary<string, ImageData> internalsprites;
private ImageData whitetexture;
//mxd. Comment icons
private ImageData[] commenttextures;
// Used images
private Dictionary<long, long> usedimages;
@ -131,6 +134,7 @@ namespace CodeImp.DoomBuilder.Data
public ImageData Crosshair3D { get { return crosshair; } }
public ImageData CrosshairBusy3D { get { return crosshairbusy; } }
public ImageData WhiteTexture { get { return whitetexture; } }
public ImageData[] CommentTextures { get { return commenttextures; } } //mxd
public List<ThingCategory> ThingCategories { get { return thingcategories; } }
public ICollection<ThingTypeInfo> ThingTypes { get { return thingtypes.Values; } }
public DecorateParser Decorate { get { return decorate; } }
@ -181,6 +185,23 @@ namespace CodeImp.DoomBuilder.Data
whitetexture.LoadImage();
whitetexture.CreateTexture();
unknownimage = new UnknownImage(Properties.Resources.UnknownImage); //mxd. There should be only one!
//mxd. Create comment icons
commenttextures = new ImageData[]
{
new ResourceImage("CodeImp.DoomBuilder.Resources.CommentRegular.png"),
new ResourceImage("CodeImp.DoomBuilder.Resources.CommentInfo.png"),
new ResourceImage("CodeImp.DoomBuilder.Resources.CommentQuestion.png"),
new ResourceImage("CodeImp.DoomBuilder.Resources.CommentProblem.png"),
new ResourceImage("CodeImp.DoomBuilder.Resources.CommentSmile.png"),
};
//mxd. Load comment icons
foreach (ImageData data in commenttextures)
{
data.LoadImage();
data.CreateTexture();
}
}
// Disposer
@ -205,6 +226,7 @@ namespace CodeImp.DoomBuilder.Data
whitetexture = null;
unknownimage.Dispose(); //mxd
unknownimage = null; //mxd
foreach (ImageData data in commenttextures) data.Dispose(); //mxd
modeldefentries = null;//mxd
mapinfo = null;

44
Source/Core/Properties/Resources.Designer.cs generated
View file

@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.5420
// Runtime Version:2.0.50727.5485
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@ -144,6 +144,48 @@ namespace CodeImp.DoomBuilder.Properties {
}
}
internal static System.Drawing.Bitmap Comment {
get {
object obj = ResourceManager.GetObject("Comment", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
internal static System.Drawing.Bitmap CommentInfo {
get {
object obj = ResourceManager.GetObject("CommentInfo", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
internal static System.Drawing.Bitmap CommentProblem {
get {
object obj = ResourceManager.GetObject("CommentProblem", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
internal static System.Drawing.Bitmap CommentQuestion {
get {
object obj = ResourceManager.GetObject("CommentQuestion", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
internal static System.Drawing.Bitmap CommentRegular {
get {
object obj = ResourceManager.GetObject("CommentRegular", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
internal static System.Drawing.Bitmap CommentSmile {
get {
object obj = ResourceManager.GetObject("CommentSmile", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
internal static System.Drawing.Bitmap Copy {
get {
object obj = ResourceManager.GetObject("Copy", resourceCulture);

138
Source/Core/Properties/Resources.resx
View file

@ -118,6 +118,9 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="Zoom" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Zoom.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Clear" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Clear.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -127,8 +130,8 @@
<data name="ArrowUp" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ArrowUp.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ClearTextures" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ClearTextures.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="CommentQuestion" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\CommentQuestion.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Keyboard" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Keyboard.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -178,15 +181,12 @@
<data name="Marine" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Marine.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="InfoPanelCollapse" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\InfoPanelCollapse.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Splash3_small" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Splash3_small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="TagStatistics" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\TagStatistics.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Model" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Model.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Screenshot" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Screenshot.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -196,8 +196,14 @@
<data name="ScriptHelp" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ScriptHelp.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Search" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Search.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="Light_animate" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Light_animate.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="CommentSmile" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\CommentSmile.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="KnownTextureSet" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\KnownTextureSet.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Splash3_trans" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Splash3_trans.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -211,24 +217,24 @@
<data name="Expand" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Expand.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Unpin" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Unpin.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="Redo" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Redo.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Grid2_arrowup" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Grid2_arrowup.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="Grid2" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Grid2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Status0" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Status0.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ViewBrightness" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ViewBrightness.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Zoom" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Zoom.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="Model" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Model.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="mergegeometry" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\mergegeometry.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ScriptSnippet" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ScriptSnippet.xpm;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="CommentProblem" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\CommentProblem.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="List_Images" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\List_Images.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -271,6 +277,12 @@
<data name="Question" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Question.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="CommentInfo" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\CommentInfo.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="CommentRegular" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\CommentRegular.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Cursor" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Cursor.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -283,6 +295,9 @@
<data name="treeview" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\treeview.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Status1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Status1.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ArrowDown" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ArrowDown.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -319,6 +334,9 @@
<data name="ErrorLarge" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ErrorLarge.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Lightbulb" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Lightbulb.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="MCrash" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\MCrash.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -328,6 +346,9 @@
<data name="ModelDisabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ModelDisabled.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ModelFiltered" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ModelFiltered.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Zoom_arrowup" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Zoom_arrowup.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -358,17 +379,14 @@
<data name="Status10" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Status10.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Properties" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Properties.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ScreenshotActiveWindow" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ScreenshotActiveWindow.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="Status0" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Status0.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Script2" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Script2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Redo" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Redo.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="ClearTextures" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ClearTextures.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Prefab" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Prefab.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -385,6 +403,9 @@
<data name="Folder" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Folder.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="GZDB2" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\GZDB2.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="VisualVertices" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\VisualVertices.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -397,17 +418,17 @@
<data name="Status2" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Status2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Add" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Add.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Link" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Link.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Light" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Light.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="TagStatistics" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\TagStatistics.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ScriptSnippet" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ScriptSnippet.xpm;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="Add" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Add.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="Properties" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Properties.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Test" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Test.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -415,11 +436,11 @@
<data name="Undo" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Undo.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="SlimDX_small" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\SlimDX_small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="InfoPanelExpand" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\InfoPanelExpand.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="KnownTextureSet" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\KnownTextureSet.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="Unpin" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Unpin.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Angle" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Angle.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -427,8 +448,8 @@
<data name="ViewTextureFloor" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ViewTextureFloor.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Light_animate" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Light_animate.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="Grid2_arrowup" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Grid2_arrowup.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Pin" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Pin.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -439,6 +460,9 @@
<data name="ScriptKeyword" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ScriptKeyword.xpm;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="MissingThing" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\MissingThing.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Monster3" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Monster3.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -448,11 +472,11 @@
<data name="Copy" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Copy.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Grid2" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Grid2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="ViewBrightness" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ViewBrightness.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Lightbulb" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Lightbulb.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="Light" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Light.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Help" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Help.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -460,20 +484,20 @@
<data name="OpenScript" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\OpenScript.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="MissingThing" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\MissingThing.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="SlimDX_small" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\SlimDX_small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Status11" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Status11.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Status1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Status1.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="ScreenshotActiveWindow" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ScreenshotActiveWindow.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="WarningLarge" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\WarningLarge.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="GZDB2" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\GZDB2.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="Search" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Search.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Text" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Text.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -481,13 +505,7 @@
<data name="Check" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Check.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="InfoPanelCollapse" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\InfoPanelCollapse.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="InfoPanelExpand" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\InfoPanelExpand.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ModelFiltered" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ModelFiltered.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="Comment" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Comment.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

13
Source/Core/Rendering/CommentType.cs Normal file
View file

@ -0,0 +1,13 @@
namespace CodeImp.DoomBuilder.Rendering
{
public struct CommentType
{
private const string REGULAR = "";
private const string INFO = "[i]";
private const string QUESTION = "[?]";
private const string PROBLEM = "[!]";
private const string SMILE = "[:]";
public static readonly string[] Types = new[] { REGULAR, INFO, QUESTION, PROBLEM, SMILE };
}
}

4
Source/Core/Rendering/Renderer2D.cs
View file

@ -47,7 +47,7 @@ namespace CodeImp.DoomBuilder.Rendering
private const float FSAA_FACTOR = 0.6f;
private const float THING_ARROW_SIZE = 1.5f;
private const float THING_ARROW_SHRINK = 2f;
private const float THING_CIRCLE_SIZE = 1f;
//private const float THING_CIRCLE_SIZE = 1f;
private const float THING_SPRITE_SHRINK = 2f;
private const int THING_BUFFER_SIZE = 100;
private const float MINIMUM_THING_RADIUS = 1.5f; //mxd
@ -946,7 +946,7 @@ namespace CodeImp.DoomBuilder.Rendering
if(t.Size * scale < MINIMUM_THING_RADIUS) return false; //mxd. Don't render tiny little things
// Determine size
float circlesize = (t.FixedSize && (scale > 1.0f) ? t.Size * THING_CIRCLE_SIZE : t.Size * scale * THING_CIRCLE_SIZE);
float circlesize = (t.FixedSize && (scale > 1.0f) ? t.Size /* * THING_CIRCLE_SIZE*/ : t.Size * scale /* * THING_CIRCLE_SIZE*/);
// Transform to screen coordinates
Vector2D screenpos = ((Vector2D)t.Position).GetTransformed(translatex, translatey, scale, -scale);

10
Source/Core/Resources/Actions.cfg
View file

@ -982,6 +982,16 @@ viewmodeceilings
allowscroll = false;
}
togglecomments //mxd
{
title = "Toggle Comments";
category = "view";
description = "Toggles rendering of comment icons in Sectors, Things and Linedefs modes (UDMF only).";
allowkeys = true;
allowmouse = false;
allowscroll = false;
}
togglebrightness //mxd
{
title = "Toggle Full Brightness";

BIN
Source/Core/Resources/Comment.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 217 B

BIN
Source/Core/Resources/CommentInfo.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 207 B

BIN
Source/Core/Resources/CommentProblem.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 213 B

BIN
Source/Core/Resources/CommentQuestion.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 230 B

BIN
Source/Core/Resources/CommentRegular.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 200 B

BIN
Source/Core/Resources/CommentSmile.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 236 B

3
Source/Core/Resources/UDMF_UI.cfg
View file

@ -11,6 +11,7 @@ uifields
renderstyle = 2;
arg0str = 2;
locknumber = 0;
comment = 2;
}
sidedef
@ -56,6 +57,7 @@ uifields
fadecolor = 0;
desaturation = 1;
soundsequence = 2;
comment = 2;
}
thing
@ -68,5 +70,6 @@ uifields
alpha = 1;
score = 0;
renderstyle = 2;
comment = 2;
}
}

28
Source/Core/Windows/LinedefEditFormUDMF.Designer.cs generated
View file

@ -133,6 +133,8 @@ namespace CodeImp.DoomBuilder.Windows
this.fieldslist = new CodeImp.DoomBuilder.Controls.FieldsEditorControl();
this.imagelist = new System.Windows.Forms.ImageList(this.components);
this.tooltip = new System.Windows.Forms.ToolTip(this.components);
this.tabcomment = new System.Windows.Forms.TabPage();
this.commenteditor = new CodeImp.DoomBuilder.Controls.CommentEditor();
label2 = new System.Windows.Forms.Label();
label11 = new System.Windows.Forms.Label();
label12 = new System.Windows.Forms.Label();
@ -159,6 +161,7 @@ namespace CodeImp.DoomBuilder.Windows
this.backscalegroup.SuspendLayout();
this.groupBox1.SuspendLayout();
this.tabcustom.SuspendLayout();
this.tabcomment.SuspendLayout();
this.SuspendLayout();
//
// label2
@ -483,6 +486,7 @@ namespace CodeImp.DoomBuilder.Windows
this.tabs.Controls.Add(this.tabproperties);
this.tabs.Controls.Add(this.tabfront);
this.tabs.Controls.Add(this.tabback);
this.tabs.Controls.Add(this.tabcomment);
this.tabs.Controls.Add(this.tabcustom);
this.tabs.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
this.tabs.ImageList = this.imagelist;
@ -1467,6 +1471,27 @@ namespace CodeImp.DoomBuilder.Windows
this.imagelist.Images.SetKeyName(0, "Check.png");
this.imagelist.Images.SetKeyName(1, "SearchClear.png");
//
// tabcomment
//
this.tabcomment.Controls.Add(this.commenteditor);
this.tabcomment.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
this.tabcomment.Location = new System.Drawing.Point(4, 23);
this.tabcomment.Name = "tabcomment";
this.tabcomment.Size = new System.Drawing.Size(549, 621);
this.tabcomment.TabIndex = 4;
this.tabcomment.Text = "Comment";
this.tabcomment.UseVisualStyleBackColor = true;
//
// commenteditor
//
this.commenteditor.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.commenteditor.Location = new System.Drawing.Point(3, 3);
this.commenteditor.Name = "commenteditor";
this.commenteditor.Size = new System.Drawing.Size(543, 615);
this.commenteditor.TabIndex = 0;
//
// LinedefEditFormUDMF
//
this.AcceptButton = this.apply;
@ -1516,6 +1541,7 @@ namespace CodeImp.DoomBuilder.Windows
this.backscalegroup.ResumeLayout(false);
this.groupBox1.ResumeLayout(false);
this.tabcustom.ResumeLayout(false);
this.tabcomment.ResumeLayout(false);
this.ResumeLayout(false);
}
@ -1621,5 +1647,7 @@ namespace CodeImp.DoomBuilder.Windows
private System.Windows.Forms.Label labelBackOffsetBottom;
private System.Windows.Forms.Label labelBackOffsetMid;
private System.Windows.Forms.Label labelBackOffsetTop;
private System.Windows.Forms.TabPage tabcomment;
private CodeImp.DoomBuilder.Controls.CommentEditor commenteditor;
}
}

6
Source/Core/Windows/LinedefEditFormUDMF.cs
View file

@ -290,6 +290,7 @@ namespace CodeImp.DoomBuilder.Windows
}
fieldslist.SetValues(fl.Fields, true); // Custom fields
commenteditor.SetValues(fl.Fields, true); //mxd. Comments
renderStyle.SelectedIndex = Array.IndexOf(renderstyles, fl.Fields.GetValue("renderstyle", "translucent"));
alpha.Text = General.Clamp(fl.Fields.GetValue("alpha", 1.0f), 0f, 1f).ToString();
arg0str = fl.Fields.GetValue("arg0str", string.Empty);
@ -438,6 +439,9 @@ namespace CodeImp.DoomBuilder.Windows
// Custom fields
fieldslist.SetValues(l.Fields, false);
//mxd. Comments
commenteditor.SetValues(l.Fields, false);
// Action/tags
if(l.Action != action.Value) action.Empty = true;
if(General.Map.FormatInterface.HasLinedefTag && l.Tag != fl.Tag) tagSelector.ClearTag(); //mxd
@ -589,6 +593,7 @@ namespace CodeImp.DoomBuilder.Windows
UpdateScriptControls(); //mxd
CheckActivationFlagsRequired(); //mxd
actionhelp.UpdateAction(action.GetValue()); //mxd
commenteditor.FinishSetup(); //mxd
//mxd. Update some labels
if (frontside.CheckState != CheckState.Unchecked)
@ -906,6 +911,7 @@ namespace CodeImp.DoomBuilder.Windows
//mxd. UDMF Settings
fieldslist.Apply(l.Fields);
if(setlocknumber) UDMFTools.SetInteger(l.Fields, "locknumber", locknumber, 0);
commenteditor.Apply(l.Fields);
}
//mxd. Store value linking

8
Source/Core/Windows/LinedefEditFormUDMF.resx
View file

@ -135,9 +135,6 @@
<metadata name="argspanel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="argspanel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
@ -155,7 +152,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADM
CAAAAk1TRnQBSQFMAgEBAgEAAagBAAGoAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
CAAAAk1TRnQBSQFMAgEBAgEAAbABAAGwAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@ -195,7 +192,4 @@
BAAB/wKAAQEEAAH/AcECgQQAAf8B4wLDBAAC/wLnBAAE/wQACw==
</value>
</data>
<metadata name="tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>

110
Source/Core/Windows/MainForm.Designer.cs generated
View file

@ -98,6 +98,8 @@ namespace CodeImp.DoomBuilder.Windows
this.menufullbrightness = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
this.menuzoom = new System.Windows.Forms.ToolStripMenuItem();
this.item2zoom800 = new System.Windows.Forms.ToolStripMenuItem();
this.item2zoom400 = new System.Windows.Forms.ToolStripMenuItem();
this.item2zoom200 = new System.Windows.Forms.ToolStripMenuItem();
this.item2zoom100 = new System.Windows.Forms.ToolStripMenuItem();
this.item2zoom50 = new System.Windows.Forms.ToolStripMenuItem();
@ -134,9 +136,9 @@ namespace CodeImp.DoomBuilder.Windows
this.itemhelprefmanual = new System.Windows.Forms.ToolStripMenuItem();
this.itemShortcutReference = new System.Windows.Forms.ToolStripMenuItem();
this.itemhelpeditmode = new System.Windows.Forms.ToolStripMenuItem();
this.itemhelpcheckupdates = new System.Windows.Forms.ToolStripMenuItem();
this.seperatorhelpmanual = new System.Windows.Forms.ToolStripSeparator();
this.itemhelpabout = new System.Windows.Forms.ToolStripMenuItem();
this.itemhelpcheckupdates = new System.Windows.Forms.ToolStripMenuItem();
this.toolbar = new System.Windows.Forms.ToolStrip();
this.toolbarContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
this.toggleFile = new System.Windows.Forms.ToolStripMenuItem();
@ -173,6 +175,7 @@ namespace CodeImp.DoomBuilder.Windows
this.buttonsnaptogrid = new System.Windows.Forms.ToolStripButton();
this.buttonautomerge = new System.Windows.Forms.ToolStripButton();
this.buttonautoclearsidetextures = new System.Windows.Forms.ToolStripButton();
this.buttontogglecomments = new System.Windows.Forms.ToolStripButton();
this.seperatorgeometry = new System.Windows.Forms.ToolStripSeparator();
this.buttontogglefx = new System.Windows.Forms.ToolStripButton();
this.dynamiclightmode = new System.Windows.Forms.ToolStripSplitButton();
@ -208,6 +211,7 @@ namespace CodeImp.DoomBuilder.Windows
this.itemgridcustom = new System.Windows.Forms.ToolStripMenuItem();
this.zoomlabel = new System.Windows.Forms.ToolStripStatusLabel();
this.buttonzoom = new System.Windows.Forms.ToolStripDropDownButton();
this.itemzoom800 = new System.Windows.Forms.ToolStripMenuItem();
this.itemzoom400 = new System.Windows.Forms.ToolStripMenuItem();
this.itemzoom200 = new System.Windows.Forms.ToolStripMenuItem();
this.itemzoom100 = new System.Windows.Forms.ToolStripMenuItem();
@ -241,9 +245,7 @@ namespace CodeImp.DoomBuilder.Windows
this.dockerscollapser = new System.Windows.Forms.Timer(this.components);
this.flowLayoutPanel = new System.Windows.Forms.FlowLayoutPanel();
this.modecontrolsloolbar = new System.Windows.Forms.ToolStrip();
this.item2zoom400 = new System.Windows.Forms.ToolStripMenuItem();
this.item2zoom800 = new System.Windows.Forms.ToolStripMenuItem();
this.itemzoom800 = new System.Windows.Forms.ToolStripMenuItem();
this.itemtogglecomments = new System.Windows.Forms.ToolStripMenuItem();
toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator();
@ -722,6 +724,7 @@ namespace CodeImp.DoomBuilder.Windows
this.menugotocoords,
this.itemfittoscreen,
this.itemtoggleinfo,
this.itemtogglecomments,
this.seperatorviewzoom,
this.itemscripteditor});
this.menuview.Name = "menuview";
@ -815,6 +818,22 @@ namespace CodeImp.DoomBuilder.Windows
this.menuzoom.Size = new System.Drawing.Size(209, 22);
this.menuzoom.Text = "&Zoom";
//
// item2zoom800
//
this.item2zoom800.Name = "item2zoom800";
this.item2zoom800.Size = new System.Drawing.Size(102, 22);
this.item2zoom800.Tag = "800";
this.item2zoom800.Text = "800%";
this.item2zoom800.Click += new System.EventHandler(this.itemzoomto_Click);
//
// item2zoom400
//
this.item2zoom400.Name = "item2zoom400";
this.item2zoom400.Size = new System.Drawing.Size(102, 22);
this.item2zoom400.Tag = "400";
this.item2zoom400.Text = "400%";
this.item2zoom400.Click += new System.EventHandler(this.itemzoomto_Click);
//
// item2zoom200
//
this.item2zoom200.Name = "item2zoom200";
@ -1080,7 +1099,7 @@ namespace CodeImp.DoomBuilder.Windows
this.itemhelprefmanual,
this.itemShortcutReference,
this.itemhelpeditmode,
this.itemhelpcheckupdates,
this.itemhelpcheckupdates,
this.seperatorhelpmanual,
this.itemhelpabout});
this.menuhelp.Name = "menuhelp";
@ -1112,6 +1131,13 @@ namespace CodeImp.DoomBuilder.Windows
this.itemhelpeditmode.Text = "About this &Editing Mode";
this.itemhelpeditmode.Click += new System.EventHandler(this.itemhelpeditmode_Click);
//
// itemhelpcheckupdates
//
this.itemhelpcheckupdates.Name = "itemhelpcheckupdates";
this.itemhelpcheckupdates.Size = new System.Drawing.Size(232, 22);
this.itemhelpcheckupdates.Text = "&Check for updates...";
this.itemhelpcheckupdates.Click += new System.EventHandler(this.itemhelpcheckupdates_Click);
//
// seperatorhelpmanual
//
this.seperatorhelpmanual.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
@ -1125,13 +1151,6 @@ namespace CodeImp.DoomBuilder.Windows
this.itemhelpabout.Text = "&About GZDoom Builder...";
this.itemhelpabout.Click += new System.EventHandler(this.itemhelpabout_Click);
//
// itemhelpcheckupdates
//
this.itemhelpcheckupdates.Name = "itemhelpcheckupdates";
this.itemhelpcheckupdates.Size = new System.Drawing.Size(232, 22);
this.itemhelpcheckupdates.Text = "&Check for updates...";
this.itemhelpcheckupdates.Click += new System.EventHandler(this.itemhelpcheckupdates_Click);
//
// toolbar
//
this.toolbar.AutoSize = false;
@ -1165,6 +1184,7 @@ namespace CodeImp.DoomBuilder.Windows
this.buttonviewfloors,
this.buttonviewceilings,
this.seperatorviews,
this.buttontogglecomments,
this.buttonsnaptogrid,
this.buttonautomerge,
this.buttonautoclearsidetextures,
@ -1538,6 +1558,19 @@ namespace CodeImp.DoomBuilder.Windows
this.buttonautoclearsidetextures.Text = "Auto Clear Sidedef Textures";
this.buttonautoclearsidetextures.Click += new System.EventHandler(this.InvokeTaggedAction);
//
// buttontogglecomments
//
this.buttontogglecomments.Checked = true;
this.buttontogglecomments.CheckState = System.Windows.Forms.CheckState.Checked;
this.buttontogglecomments.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.buttontogglecomments.Image = global::CodeImp.DoomBuilder.Properties.Resources.Comment;
this.buttontogglecomments.ImageTransparentColor = System.Drawing.Color.Magenta;
this.buttontogglecomments.Name = "buttontogglecomments";
this.buttontogglecomments.Size = new System.Drawing.Size(23, 22);
this.buttontogglecomments.Tag = "builder_togglecomments";
this.buttontogglecomments.Text = "Show Comments";
this.buttontogglecomments.Click += new System.EventHandler(this.InvokeTaggedAction);
//
// seperatorgeometry
//
this.seperatorgeometry.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
@ -1608,7 +1641,7 @@ namespace CodeImp.DoomBuilder.Windows
this.modelrendermode.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.modelsdontshow,
this.modelsshowselection,
this.modelsshowfiltered,
this.modelsshowfiltered,
this.modelsshowall});
this.modelrendermode.Enabled = false;
this.modelrendermode.Image = global::CodeImp.DoomBuilder.Properties.Resources.Model;
@ -1624,7 +1657,7 @@ namespace CodeImp.DoomBuilder.Windows
this.modelsdontshow.CheckOnClick = true;
this.modelsdontshow.Image = global::CodeImp.DoomBuilder.Properties.Resources.ModelDisabled;
this.modelsdontshow.Name = "modelsdontshow";
this.modelsdontshow.Size = new System.Drawing.Size(271, 22);
this.modelsdontshow.Size = new System.Drawing.Size(293, 22);
this.modelsdontshow.Tag = 0;
this.modelsdontshow.Text = "Don\'t show models";
this.modelsdontshow.Click += new System.EventHandler(this.ChangeModelRenderingMode);
@ -1634,7 +1667,7 @@ namespace CodeImp.DoomBuilder.Windows
this.modelsshowselection.CheckOnClick = true;
this.modelsshowselection.Image = global::CodeImp.DoomBuilder.Properties.Resources.Model_selected;
this.modelsshowselection.Name = "modelsshowselection";
this.modelsshowselection.Size = new System.Drawing.Size(271, 22);
this.modelsshowselection.Size = new System.Drawing.Size(293, 22);
this.modelsshowselection.Tag = 1;
this.modelsshowselection.Text = "Show models for selected things only";
this.modelsshowselection.Click += new System.EventHandler(this.ChangeModelRenderingMode);
@ -1644,7 +1677,7 @@ namespace CodeImp.DoomBuilder.Windows
this.modelsshowfiltered.CheckOnClick = true;
this.modelsshowfiltered.Image = global::CodeImp.DoomBuilder.Properties.Resources.ModelFiltered;
this.modelsshowfiltered.Name = "modelsshowfiltered";
this.modelsshowfiltered.Size = new System.Drawing.Size(271, 22);
this.modelsshowfiltered.Size = new System.Drawing.Size(293, 22);
this.modelsshowfiltered.Tag = 2;
this.modelsshowfiltered.Text = "Show models for current things filter only";
this.modelsshowfiltered.Click += new System.EventHandler(this.ChangeModelRenderingMode);
@ -1654,7 +1687,7 @@ namespace CodeImp.DoomBuilder.Windows
this.modelsshowall.CheckOnClick = true;
this.modelsshowall.Image = global::CodeImp.DoomBuilder.Properties.Resources.Model;
this.modelsshowall.Name = "modelsshowall";
this.modelsshowall.Size = new System.Drawing.Size(271, 22);
this.modelsshowall.Size = new System.Drawing.Size(293, 22);
this.modelsshowall.Tag = 3;
this.modelsshowall.Text = "Always show models";
this.modelsshowall.Click += new System.EventHandler(this.ChangeModelRenderingMode);
@ -1923,6 +1956,14 @@ namespace CodeImp.DoomBuilder.Windows
this.buttonzoom.Size = new System.Drawing.Size(29, 21);
this.buttonzoom.Text = "Zoom";
//
// itemzoom800
//
this.itemzoom800.Name = "itemzoom800";
this.itemzoom800.Size = new System.Drawing.Size(156, 22);
this.itemzoom800.Tag = "800";
this.itemzoom800.Text = "800%";
this.itemzoom800.Click += new System.EventHandler(this.itemzoomto_Click);
//
// itemzoom400
//
this.itemzoom400.Name = "itemzoom400";
@ -2066,7 +2107,7 @@ namespace CodeImp.DoomBuilder.Windows
this.labelcollapsedinfo.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.labelcollapsedinfo.Location = new System.Drawing.Point(2, 2);
this.labelcollapsedinfo.Name = "labelcollapsedinfo";
this.labelcollapsedinfo.Size = new System.Drawing.Size(137, 13);
this.labelcollapsedinfo.Size = new System.Drawing.Size(155, 13);
this.labelcollapsedinfo.TabIndex = 6;
this.labelcollapsedinfo.Text = "Collapsed Descriptions";
this.labelcollapsedinfo.Visible = false;
@ -2078,7 +2119,7 @@ namespace CodeImp.DoomBuilder.Windows
this.modename.ForeColor = System.Drawing.SystemColors.GrayText;
this.modename.Location = new System.Drawing.Point(12, 20);
this.modename.Name = "modename";
this.modename.Size = new System.Drawing.Size(244, 59);
this.modename.Size = new System.Drawing.Size(476, 59);
this.modename.TabIndex = 8;
this.modename.Text = "Hi. I missed you.";
this.modename.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@ -2246,29 +2287,14 @@ namespace CodeImp.DoomBuilder.Windows
this.modecontrolsloolbar.Text = "toolStrip1";
this.modecontrolsloolbar.Visible = false;
//
// item2zoom400
// itemtogglecomments
//
this.item2zoom400.Name = "item2zoom400";
this.item2zoom400.Size = new System.Drawing.Size(102, 22);
this.item2zoom400.Tag = "400";
this.item2zoom400.Text = "400%";
this.item2zoom400.Click += new System.EventHandler(this.itemzoomto_Click);
//
// item2zoom800
//
this.item2zoom800.Name = "item2zoom800";
this.item2zoom800.Size = new System.Drawing.Size(102, 22);
this.item2zoom800.Tag = "800";
this.item2zoom800.Text = "800%";
this.item2zoom800.Click += new System.EventHandler(this.itemzoomto_Click);
//
// itemzoom800
//
this.itemzoom800.Name = "itemzoom800";
this.itemzoom800.Size = new System.Drawing.Size(156, 22);
this.itemzoom800.Tag = "800";
this.itemzoom800.Text = "800%";
this.itemzoom800.Click += new System.EventHandler(this.itemzoomto_Click);
this.itemtogglecomments.Name = "itemtogglecomments";
this.itemtogglecomments.Size = new System.Drawing.Size(209, 22);
this.itemtogglecomments.Tag = "builder_togglecomments";
this.itemtogglecomments.Text = "Show Comments";
this.itemtogglecomments.CheckOnClick = true;
this.itemtogglecomments.Click += new System.EventHandler(this.InvokeTaggedAction);
//
// MainForm
//
@ -2521,5 +2547,7 @@ namespace CodeImp.DoomBuilder.Windows
private ToolStripMenuItem item2zoom400;
private ToolStripMenuItem item2zoom800;
private ToolStripMenuItem itemzoom800;
private ToolStripButton buttontogglecomments;
private ToolStripMenuItem itemtogglecomments;
}
}

22
Source/Core/Windows/MainForm.cs
View file

@ -1872,7 +1872,7 @@ namespace CodeImp.DoomBuilder.Windows
preventupdateseperators = true;
// Show/hide items based on preferences
bool maploaded = General.Map != null; //mxd
bool maploaded = (General.Map != null); //mxd
buttonnewmap.Visible = General.Settings.ToolbarFile;
buttonopenmap.Visible = General.Settings.ToolbarFile;
buttonsavemap.Visible = General.Settings.ToolbarFile;
@ -1893,6 +1893,9 @@ namespace CodeImp.DoomBuilder.Windows
buttonviewceilings.Visible = General.Settings.ToolbarViewModes && maploaded;
buttonviewfloors.Visible = General.Settings.ToolbarViewModes && maploaded;
buttonviewnormal.Visible = General.Settings.ToolbarViewModes && maploaded;
buttontogglecomments.Visible = General.Settings.ToolbarViewModes && maploaded; //mxd
buttontogglecomments.Enabled = maploaded && General.Map.UDMF; //mxd
buttontogglecomments.Checked = General.Settings.RenderComments; //mxd
buttonsnaptogrid.Visible = General.Settings.ToolbarGeometry && maploaded;
buttonautomerge.Visible = General.Settings.ToolbarGeometry && maploaded;
buttonautoclearsidetextures.Visible = General.Settings.ToolbarGeometry && maploaded; //mxd
@ -2634,6 +2637,19 @@ namespace CodeImp.DoomBuilder.Windows
clearGroup.Enabled = clearGroup.DropDownItems.Count > 0;
}
//mxd. Action to toggle comments rendering
[BeginAction("togglecomments")]
internal void ToggleComments()
{
buttontogglecomments.Checked = !buttontogglecomments.Checked;
itemtogglecomments.Checked = buttontogglecomments.Checked;
General.Settings.RenderComments = buttontogglecomments.Checked;
DisplayStatus(StatusType.Action, "Comment icons are " + (buttontogglecomments.Checked ? "SHOWN" : "HIDDEN"));
// Redraw display to show changes
RedrawDisplay();
}
// Action to toggle snap to grid
[BeginAction("togglesnap")]
internal void ToggleSnapToGrid()
@ -2707,6 +2723,8 @@ namespace CodeImp.DoomBuilder.Windows
menufullbrightness.Enabled = (General.Map != null); //mxd
itemtoggleinfo.Enabled = (General.Map != null); //mxd
itemtoggleinfo.Checked = IsInfoPanelExpanded;
itemtogglecomments.Enabled = (General.Map != null && General.Map.UDMF); //mxd
itemtogglecomments.Checked = General.Settings.RenderComments; //mxd
// View mode items
for(int i = 0; i < Renderer2D.NUM_VIEW_MODES; i++)
@ -2888,7 +2906,7 @@ namespace CodeImp.DoomBuilder.Windows
//open file
DisplayStatus(StatusType.Info, "Shortcut reference saved to '" + path + "'");
System.Diagnostics.Process.Start(path);
Process.Start(path);
}
#endregion

47
Source/Core/Windows/SectorEditFormUDMF.Designer.cs generated
View file

@ -41,6 +41,7 @@
System.Windows.Forms.Label label6;
System.Windows.Forms.Label label5;
this.tagSelector = new CodeImp.DoomBuilder.GZBuilder.Controls.TagSelector();
this.soundsequence = new System.Windows.Forms.ComboBox();
this.resetsoundsequence = new System.Windows.Forms.Button();
this.fadeColor = new CodeImp.DoomBuilder.GZBuilder.Controls.ColorFieldsControl();
this.lightColor = new CodeImp.DoomBuilder.GZBuilder.Controls.ColorFieldsControl();
@ -98,12 +99,13 @@
this.floorslopecontrol = new CodeImp.DoomBuilder.Controls.SectorSlopeControl();
this.groupBox4 = new System.Windows.Forms.GroupBox();
this.ceilingslopecontrol = new CodeImp.DoomBuilder.Controls.SectorSlopeControl();
this.tabcomment = new System.Windows.Forms.TabPage();
this.tabcustom = new System.Windows.Forms.TabPage();
this.fieldslist = new CodeImp.DoomBuilder.Controls.FieldsEditorControl();
this.cancel = new System.Windows.Forms.Button();
this.apply = new System.Windows.Forms.Button();
this.tooltip = new System.Windows.Forms.ToolTip(this.components);
this.soundsequence = new System.Windows.Forms.ComboBox();
this.commenteditor = new CodeImp.DoomBuilder.Controls.CommentEditor();
groupaction = new System.Windows.Forms.GroupBox();
groupeffect = new System.Windows.Forms.GroupBox();
label14 = new System.Windows.Forms.Label();
@ -127,6 +129,7 @@
this.tabslopes.SuspendLayout();
this.groupBox5.SuspendLayout();
this.groupBox4.SuspendLayout();
this.tabcomment.SuspendLayout();
this.tabcustom.SuspendLayout();
this.SuspendLayout();
//
@ -174,6 +177,16 @@
groupeffect.TabStop = false;
groupeffect.Text = " Effects ";
//
// soundsequence
//
this.soundsequence.FormattingEnabled = true;
this.soundsequence.Location = new System.Drawing.Point(125, 54);
this.soundsequence.Name = "soundsequence";
this.soundsequence.Size = new System.Drawing.Size(325, 21);
this.soundsequence.TabIndex = 32;
this.soundsequence.MouseDown += new System.Windows.Forms.MouseEventHandler(this.soundsequence_MouseDown);
this.soundsequence.TextChanged += new System.EventHandler(this.soundsequence_TextChanged);
//
// resetsoundsequence
//
this.resetsoundsequence.Image = global::CodeImp.DoomBuilder.Properties.Resources.Reset;
@ -458,6 +471,7 @@
this.tabs.Controls.Add(this.tabproperties);
this.tabs.Controls.Add(this.tabSurfaces);
this.tabs.Controls.Add(this.tabslopes);
this.tabs.Controls.Add(this.tabcomment);
this.tabs.Controls.Add(this.tabcustom);
this.tabs.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
this.tabs.Location = new System.Drawing.Point(10, 10);
@ -576,7 +590,7 @@
//
// floorAngleControl
//
this.floorAngleControl.Angle = 0;
this.floorAngleControl.Angle = -180;
this.floorAngleControl.AngleOffset = 90;
this.floorAngleControl.Location = new System.Drawing.Point(6, 132);
this.floorAngleControl.Name = "floorAngleControl";
@ -810,7 +824,7 @@
//
// ceilAngleControl
//
this.ceilAngleControl.Angle = 0;
this.ceilAngleControl.Angle = -180;
this.ceilAngleControl.AngleOffset = 90;
this.ceilAngleControl.Location = new System.Drawing.Point(6, 132);
this.ceilAngleControl.Name = "ceilAngleControl";
@ -1040,6 +1054,17 @@
this.ceilingslopecontrol.OnAnglesChanged += new System.EventHandler(this.ceilingslopecontrol_OnAnglesChanged);
this.ceilingslopecontrol.OnPivotModeChanged += new System.EventHandler(this.ceilingslopecontrol_OnPivotModeChanged);
//
// tabcomment
//
this.tabcomment.Controls.Add(this.commenteditor);
this.tabcomment.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
this.tabcomment.Location = new System.Drawing.Point(4, 22);
this.tabcomment.Name = "tabcomment";
this.tabcomment.Size = new System.Drawing.Size(503, 419);
this.tabcomment.TabIndex = 4;
this.tabcomment.Text = "Comment";
this.tabcomment.UseVisualStyleBackColor = true;
//
// tabcustom
//
this.tabcustom.Controls.Add(this.fieldslist);
@ -1102,15 +1127,12 @@
this.tooltip.InitialDelay = 10;
this.tooltip.ReshowDelay = 100;
//
// soundsequence
// commenteditor
//
this.soundsequence.FormattingEnabled = true;
this.soundsequence.Location = new System.Drawing.Point(125, 54);
this.soundsequence.Name = "soundsequence";
this.soundsequence.Size = new System.Drawing.Size(325, 21);
this.soundsequence.TabIndex = 32;
this.soundsequence.MouseDown += new System.Windows.Forms.MouseEventHandler(this.soundsequence_MouseDown);
this.soundsequence.TextChanged += new System.EventHandler(this.soundsequence_TextChanged);
this.commenteditor.Location = new System.Drawing.Point(3, 3);
this.commenteditor.Name = "commenteditor";
this.commenteditor.Size = new System.Drawing.Size(497, 413);
this.commenteditor.TabIndex = 0;
//
// SectorEditFormUDMF
//
@ -1149,6 +1171,7 @@
this.tabslopes.ResumeLayout(false);
this.groupBox5.ResumeLayout(false);
this.groupBox4.ResumeLayout(false);
this.tabcomment.ResumeLayout(false);
this.tabcustom.ResumeLayout(false);
this.ResumeLayout(false);
@ -1220,5 +1243,7 @@
private System.Windows.Forms.Label labelCeilScale;
private System.Windows.Forms.Button resetsoundsequence;
private System.Windows.Forms.ComboBox soundsequence;
private System.Windows.Forms.TabPage tabcomment;
private CodeImp.DoomBuilder.Controls.CommentEditor commenteditor;
}
}

12
Source/Core/Windows/SectorEditFormUDMF.cs
View file

@ -329,6 +329,9 @@ namespace CodeImp.DoomBuilder.Windows
// Custom fields
fieldslist.SetValues(sc.Fields, true);
//mxd. Comments
commenteditor.SetValues(sc.Fields, true);
anglesteps = new StepsList();
////////////////////////////////////////////////////////////////////////
@ -432,6 +435,9 @@ namespace CodeImp.DoomBuilder.Windows
// Custom fields
fieldslist.SetValues(s.Fields, false);
//mxd. Comments
commenteditor.SetValues(s.Fields, false);
//mxd. Angle steps
int angle;
foreach(Sidedef side in s.Sidedefs)
@ -465,6 +471,9 @@ namespace CodeImp.DoomBuilder.Windows
if(useCeilSlopeLineAngles) ceilingslopecontrol.StepValues = anglesteps;
if(useFloorSlopeLineAngles) floorslopecontrol.StepValues = anglesteps;
//mxd. Comments
commenteditor.FinishSetup();
preventchanges = false; //mxd
}
@ -678,6 +687,9 @@ namespace CodeImp.DoomBuilder.Windows
// Fields
fieldslist.Apply(s.Fields);
//mxd. Comments
commenteditor.Apply(s.Fields);
// Alpha
if(!string.IsNullOrEmpty(ceilAlpha.Text))
{

27
Source/Core/Windows/SectorEditFormUDMF.resx
View file

@ -138,12 +138,36 @@
<metadata name="label8.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label14.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label9.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label13.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label2.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label8.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="groupfloorceiling.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label15.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label6.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label5.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label15.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
@ -162,4 +186,7 @@
<metadata name="fieldslist.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>

29
Source/Core/Windows/ThingEditFormUDMF.Designer.cs generated
View file

@ -106,6 +106,8 @@
this.hint = new System.Windows.Forms.PictureBox();
this.hintlabel = new System.Windows.Forms.Label();
this.tooltip = new System.Windows.Forms.ToolTip(this.components);
this.tabcomment = new System.Windows.Forms.TabPage();
this.commenteditor = new CodeImp.DoomBuilder.Controls.CommentEditor();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
this.tabs.SuspendLayout();
@ -124,6 +126,7 @@
this.groupBox3.SuspendLayout();
this.tabcustom.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.hint)).BeginInit();
this.tabcomment.SuspendLayout();
this.SuspendLayout();
//
// groupBox1
@ -314,6 +317,7 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.tabs.Controls.Add(this.tabproperties);
this.tabs.Controls.Add(this.tabeffects);
this.tabs.Controls.Add(this.tabcomment);
this.tabs.Controls.Add(this.tabcustom);
this.tabs.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.tabs.ItemSize = new System.Drawing.Size(120, 19);
@ -698,6 +702,7 @@
this.scale.ButtonStepSmall = 0.01F;
this.scale.ButtonStepsUseModifierKeys = true;
this.scale.DefaultValue = 1F;
this.scale.LinkValues = false;
this.scale.Location = new System.Drawing.Point(89, 22);
this.scale.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.scale.Name = "scale";
@ -1042,6 +1047,27 @@
this.hintlabel.TabIndex = 4;
this.hintlabel.Text = "Select categories or several thing types to randomly assign them to selection";
//
// tabcomment
//
this.tabcomment.Controls.Add(this.commenteditor);
this.tabcomment.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.tabcomment.Location = new System.Drawing.Point(4, 23);
this.tabcomment.Name = "tabcomment";
this.tabcomment.Size = new System.Drawing.Size(627, 402);
this.tabcomment.TabIndex = 3;
this.tabcomment.Text = "Comment";
this.tabcomment.UseVisualStyleBackColor = true;
//
// commenteditor
//
this.commenteditor.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.commenteditor.Location = new System.Drawing.Point(3, 3);
this.commenteditor.Name = "commenteditor";
this.commenteditor.Size = new System.Drawing.Size(621, 396);
this.commenteditor.TabIndex = 0;
//
// ThingEditFormUDMF
//
this.AcceptButton = this.apply;
@ -1087,6 +1113,7 @@
this.groupBox3.ResumeLayout(false);
this.tabcustom.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.hint)).EndInit();
this.tabcomment.ResumeLayout(false);
this.ResumeLayout(false);
this.PerformLayout();
@ -1171,5 +1198,7 @@
private System.Windows.Forms.CheckBox cbrandomangle;
private System.Windows.Forms.CheckBox cbrandomroll;
private System.Windows.Forms.CheckBox cbrandompitch;
private System.Windows.Forms.TabPage tabcomment;
private CodeImp.DoomBuilder.Controls.CommentEditor commenteditor;
}
}

6
Source/Core/Windows/ThingEditFormUDMF.cs
View file

@ -211,6 +211,7 @@ namespace CodeImp.DoomBuilder.Windows
// Custom fields
fieldslist.SetValues(ft.Fields, true);
commenteditor.SetValues(ft.Fields, true); //mxd. Comments
conversationID.Text = ft.Fields.GetValue("conversation", 0).ToString();
gravity.Text = ft.Fields.GetValue("gravity", 1.0f).ToString();
score.Text = ft.Fields.GetValue("score", 0).ToString();
@ -288,6 +289,7 @@ namespace CodeImp.DoomBuilder.Windows
//mxd. Custom fields
fieldslist.SetValues(t.Fields, false);
commenteditor.SetValues(t.Fields, false); //mxd. Comments
if (t.Fields.GetValue("conversation", 0).ToString() != conversationID.Text) conversationID.Text = "";
if (t.Fields.GetValue("gravity", 1.0f).ToString() != gravity.Text) gravity.Text = "";
if (t.Fields.GetValue("score", 0).ToString() != score.Text) score.Text = "";
@ -337,6 +339,7 @@ namespace CodeImp.DoomBuilder.Windows
UpdateScriptControls(); //mxd
actionhelp.UpdateAction(action.GetValue()); //mxd
labelScale.Enabled = scale.NonDefaultValue; //mxd
commenteditor.FinishSetup(); //mxd
//mxd. Set intial script-related values, if required
if(Array.IndexOf(GZBuilder.GZGeneral.ACS_SPECIALS, action.Value) != -1)
@ -670,6 +673,9 @@ namespace CodeImp.DoomBuilder.Windows
color.ApplyTo(t.Fields, t.Fields.GetValue("fillcolor", 0));
//mxd. Comments
commenteditor.Apply(t.Fields);
// Update settings
t.UpdateConfiguration();
}

44
Source/Plugins/BuilderModes/ClassicModes/LinedefsMode.cs
View file

@ -150,6 +150,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
if(renderer.StartPlotter(false))
{
// Undraw previous highlight
Linedef possiblecommentline = l ?? highlighted; //mxd
if((highlighted != null) && !highlighted.IsDisposed)
{
renderer.PlotLinedef(highlighted, renderer.DetermineLinedefColor(highlighted));
@ -168,8 +169,18 @@ namespace CodeImp.DoomBuilder.BuilderModes
renderer.PlotVertex(highlighted.End, renderer.DetermineVertexColor(highlighted.End));
}
// Done
// Done with highlight
renderer.Finish();
//mxd. Update comment highlight?
if(General.Map.UDMF && General.Settings.RenderComments
&& possiblecommentline != null && !possiblecommentline.IsDisposed
&& renderer.StartOverlay(false))
{
RenderComment(possiblecommentline);
renderer.Finish();
}
renderer.Present();
}
}
@ -417,6 +428,10 @@ namespace CodeImp.DoomBuilder.BuilderModes
}
renderer.RenderArrows(eventlines); //mxd
//mxd. Render comments
if(General.Map.UDMF && General.Settings.RenderComments) foreach(Linedef l in General.Map.Map.Linedefs) RenderComment(l);
renderer.Finish();
}
@ -648,6 +663,12 @@ namespace CodeImp.DoomBuilder.BuilderModes
if(General.Map.UDMF && mouselastpos != mousepos && highlighted != null && !highlighted.IsDisposed && highlighted.Fields.ContainsKey("comment"))
{
string comment = highlighted.Fields.GetValue("comment", string.Empty);
if(comment.Length > 2)
{
string type = comment.Substring(0, 3);
int index = Array.IndexOf(CommentType.Types, type);
if(index > 0) comment = comment.TrimStart(type.ToCharArray());
}
General.Interface.Display.ShowToolTip("Comment:", comment, (int)(mousepos.x + 32 * MainForm.DPIScaler.Width), (int)(mousepos.y + 8 * MainForm.DPIScaler.Height));
}
}
@ -839,6 +860,27 @@ namespace CodeImp.DoomBuilder.BuilderModes
General.Interface.DisplayStatus(StatusType.Selection, string.Empty);
}
//mxd
private void RenderComment(Linedef l)
{
if(l.Fields.ContainsKey("comment"))
{
int iconindex = 0;
string comment = l.Fields.GetValue("comment", string.Empty);
if(comment.Length > 2)
{
string type = comment.Substring(0, 3);
int index = Array.IndexOf(CommentType.Types, type);
if(index != -1) iconindex = index;
}
Vector2D center = l.GetCenterPoint();
RectangleF rect = new RectangleF(center.x - 8 / renderer.Scale, center.y + 18 / renderer.Scale, 16 / renderer.Scale, -16 / renderer.Scale);
PixelColor c = (l == highlighted ? General.Colors.Highlight : (l.Selected ? General.Colors.Selection : PixelColor.FromColor(Color.White)));
renderer.RenderRectangleFilled(rect, c, true, General.Map.Data.CommentTextures[iconindex]);
}
}
#endregion
#region ================== Actions

57
Source/Plugins/BuilderModes/ClassicModes/SectorsMode.cs
View file

@ -213,6 +213,9 @@ namespace CodeImp.DoomBuilder.BuilderModes
if(!BuilderPlug.Me.ViewSelectionNumbers) RenderEffectLabels(selectedEffectLabels);
RenderEffectLabels(unselectedEffectLabels);
}
//mxd. Render comments
if(General.Map.UDMF && General.Settings.RenderComments) foreach(Sector s in General.Map.Map.Sectors) RenderComment(s);
renderer.Finish();
}
@ -422,18 +425,12 @@ namespace CodeImp.DoomBuilder.BuilderModes
else
{
// Update display
Sector possiblecommentsector = s ?? highlighted; //mxd
if(renderer.StartPlotter(false))
{
// Undraw previous highlight
if((highlighted != null) && !highlighted.IsDisposed)
renderer.PlotSector(highlighted);
/*
// Undraw highlighted things
if(highlighted != null)
foreach(Thing t in highlighted.Things)
renderer.RenderThing(t, renderer.DetermineThingColor(t));
*/
// Set new highlight
highlighted = s;
@ -441,19 +438,22 @@ namespace CodeImp.DoomBuilder.BuilderModes
// Render highlighted item
if((highlighted != null) && !highlighted.IsDisposed)
renderer.PlotSector(highlighted, General.Colors.Highlight);
/*
// Render highlighted things
if(highlighted != null)
foreach(Thing t in highlighted.Things)
renderer.RenderThing(t, General.Colors.Highlight);
*/
// Done
renderer.Finish();
}
UpdateOverlay();
//mxd. Update comment highlight?
if(General.Map.UDMF && General.Settings.RenderComments
&& possiblecommentsector != null && !possiblecommentsector.IsDisposed
&& renderer.StartOverlay(false))
{
RenderComment(possiblecommentsector);
renderer.Finish();
}
renderer.Present();
}
@ -1038,6 +1038,12 @@ namespace CodeImp.DoomBuilder.BuilderModes
if(General.Map.UDMF && mouselastpos != mousepos && highlighted != null && !highlighted.IsDisposed && highlighted.Fields.ContainsKey("comment"))
{
string comment = highlighted.Fields.GetValue("comment", string.Empty);
if(comment.Length > 2)
{
string type = comment.Substring(0, 3);
int index = Array.IndexOf(CommentType.Types, type);
if(index > 0) comment = comment.TrimStart(type.ToCharArray());
}
General.Interface.Display.ShowToolTip("Comment:", comment, (int)(mousepos.x + 32 * MainForm.DPIScaler.Width), (int)(mousepos.y + 8 * MainForm.DPIScaler.Height));
}
}
@ -1326,6 +1332,27 @@ namespace CodeImp.DoomBuilder.BuilderModes
else
General.Interface.DisplayStatus(StatusType.Selection, string.Empty);
}
//mxd
private void RenderComment(Sector s)
{
if(s.Fields.ContainsKey("comment"))
{
int iconindex = 0;
string comment = s.Fields.GetValue("comment", string.Empty);
if(comment.Length > 2)
{
string type = comment.Substring(0, 3);
int index = Array.IndexOf(CommentType.Types, type);
if(index != -1) iconindex = index;
}
Vector2D center = new Vector2D(s.BBox.Left + s.BBox.Width / 2, s.BBox.Top + s.BBox.Height / 2);
RectangleF rect = new RectangleF(center.x - 8 / renderer.Scale, center.y + 16 * renderer.Scale + 16 / renderer.Scale, 16 / renderer.Scale, -16 / renderer.Scale);
PixelColor c = (s == highlighted ? General.Colors.Highlight : (s.Selected ? General.Colors.Selection : PixelColor.FromColor(Color.White)));
renderer.RenderRectangleFilled(rect, c, true, General.Map.Data.CommentTextures[iconindex]);
}
}
#endregion

56
Source/Plugins/BuilderModes/ClassicModes/ThingsMode.cs
View file

@ -18,6 +18,7 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Windows.Forms;
using CodeImp.DoomBuilder.Actions;
using CodeImp.DoomBuilder.Config;
@ -198,14 +199,15 @@ namespace CodeImp.DoomBuilder.BuilderModes
}
// Selecting?
if(selecting)
if(renderer.StartOverlay(true))
{
// Render selection
if(renderer.StartOverlay(true))
{
RenderMultiSelection();
renderer.Finish();
}
if(selecting) RenderMultiSelection();
//mxd. Render comments
if(General.Map.UDMF && General.Settings.RenderComments) foreach(Thing t in General.Map.Map.Things) RenderComment(t);
renderer.Finish();
}
renderer.Present();
@ -274,6 +276,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
if(renderer.StartThings(false))
{
// Undraw previous highlight
Thing possiblecommentthing = t ?? highlighted; //mxd
if((highlighted != null) && !highlighted.IsDisposed)
renderer.RenderThing(highlighted, renderer.DetermineThingColor(highlighted), 1.0f);
@ -284,8 +287,18 @@ namespace CodeImp.DoomBuilder.BuilderModes
if((highlighted != null) && !highlighted.IsDisposed)
renderer.RenderThing(highlighted, General.Colors.Highlight, 1.0f);
// Done
// Done with highlight
renderer.Finish();
//mxd. Update comment highlight?
if(General.Map.UDMF && General.Settings.RenderComments
&& possiblecommentthing != null && !possiblecommentthing.IsDisposed
&& renderer.StartOverlay(false))
{
RenderComment(possiblecommentthing);
renderer.Finish();
}
renderer.Present();
}
}
@ -537,6 +550,12 @@ namespace CodeImp.DoomBuilder.BuilderModes
if(General.Map.UDMF && mouselastpos != mousepos && highlighted != null && !highlighted.IsDisposed && highlighted.Fields.ContainsKey("comment"))
{
string comment = highlighted.Fields.GetValue("comment", string.Empty);
if(comment.Length > 2)
{
string type = comment.Substring(0, 3);
int index = Array.IndexOf(CommentType.Types, type);
if(index > 0) comment = comment.TrimStart(type.ToCharArray());
}
General.Interface.Display.ShowToolTip("Comment:", comment, (int)(mousepos.x + 32 * MainForm.DPIScaler.Width), (int)(mousepos.y + 8 * MainForm.DPIScaler.Height));
}
@ -716,6 +735,29 @@ namespace CodeImp.DoomBuilder.BuilderModes
General.Interface.DisplayStatus(StatusType.Selection, string.Empty);
}
//mxd
private void RenderComment(Thing t)
{
if(t.Fields.ContainsKey("comment"))
{
float size = ((t.FixedSize && renderer.Scale > 1.0f) ? t.Size / renderer.Scale : t.Size);
if(size * renderer.Scale < 1.5f) return; // Thing is too small to render
int iconindex = 0;
string comment = t.Fields.GetValue("comment", string.Empty);
if(comment.Length > 2)
{
string type = comment.Substring(0, 3);
int index = Array.IndexOf(CommentType.Types, type);
if(index != -1) iconindex = index;
}
RectangleF rect = new RectangleF(t.Position.x + size - 10 / renderer.Scale, t.Position.y + size + 18 / renderer.Scale, 16 / renderer.Scale, -16 / renderer.Scale);
PixelColor c = (t == highlighted ? General.Colors.Highlight : (t.Selected ? General.Colors.Selection : PixelColor.FromColor(Color.White)));
renderer.RenderRectangleFilled(rect, c, true, General.Map.Data.CommentTextures[iconindex]);
}
}
#endregion
#region ================== Actions