Changed: position/size/state of the editor windows are now stored/applied in a uniform fashion.

Fixed: stored windows positions were not checked against current screen bounds, which may have resulted in windows being shown off-screen.
This commit is contained in:
MaxED 2016-09-10 11:24:03 +00:00
parent 7e622fa26d
commit 8aa355bafe
74 changed files with 240 additions and 529 deletions

View file

@ -234,7 +234,7 @@ namespace CodeImp.DoomBuilder.Windows
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "AboutForm"; this.Name = "AboutForm";
this.Opacity = 1; this.Opacity = 0;
this.ShowIcon = false; this.ShowIcon = false;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

View file

@ -502,7 +502,7 @@ namespace CodeImp.DoomBuilder.Windows
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "ActionBrowserForm"; this.Name = "ActionBrowserForm";
this.Opacity = 1; this.Opacity = 0;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Edit Action"; this.Text = "Edit Action";

View file

@ -78,6 +78,7 @@ namespace CodeImp.DoomBuilder.Windows
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "AngleForm"; this.Name = "AngleForm";
this.Opacity = 0;
this.ShowIcon = false; this.ShowIcon = false;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

View file

@ -126,7 +126,7 @@
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "BitFlagsAndOptionsForm"; this.Name = "BitFlagsAndOptionsForm";
this.Opacity = 1; this.Opacity = 0;
this.ShowIcon = false; this.ShowIcon = false;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

View file

@ -98,7 +98,7 @@ namespace CodeImp.DoomBuilder.Windows
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "BitFlagsForm"; this.Name = "BitFlagsForm";
this.Opacity = 1; this.Opacity = 0;
this.ShowIcon = false; this.ShowIcon = false;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

View file

@ -81,7 +81,10 @@
this.gotoy.AllowNegative = true; this.gotoy.AllowNegative = true;
this.gotoy.AllowRelative = false; this.gotoy.AllowRelative = false;
this.gotoy.ButtonStep = 1; this.gotoy.ButtonStep = 1;
this.gotoy.ButtonStepBig = 10F;
this.gotoy.ButtonStepFloat = 1F; this.gotoy.ButtonStepFloat = 1F;
this.gotoy.ButtonStepSmall = 0.1F;
this.gotoy.ButtonStepsUseModifierKeys = false;
this.gotoy.ButtonStepsWrapAround = false; this.gotoy.ButtonStepsWrapAround = false;
this.gotoy.Location = new System.Drawing.Point(32, 42); this.gotoy.Location = new System.Drawing.Point(32, 42);
this.gotoy.Name = "gotoy"; this.gotoy.Name = "gotoy";
@ -95,7 +98,10 @@
this.gotox.AllowNegative = true; this.gotox.AllowNegative = true;
this.gotox.AllowRelative = false; this.gotox.AllowRelative = false;
this.gotox.ButtonStep = 1; this.gotox.ButtonStep = 1;
this.gotox.ButtonStepBig = 10F;
this.gotox.ButtonStepFloat = 1F; this.gotox.ButtonStepFloat = 1F;
this.gotox.ButtonStepSmall = 0.1F;
this.gotox.ButtonStepsUseModifierKeys = false;
this.gotox.ButtonStepsWrapAround = false; this.gotox.ButtonStepsWrapAround = false;
this.gotox.Location = new System.Drawing.Point(32, 12); this.gotox.Location = new System.Drawing.Point(32, 12);
this.gotox.Name = "gotox"; this.gotox.Name = "gotox";
@ -120,7 +126,7 @@
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "CenterOnCoordinatesForm"; this.Name = "CenterOnCoordinatesForm";
this.Opacity = 1; this.Opacity = 0;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Go To Coordinates:"; this.Text = "Go To Coordinates:";

View file

@ -108,7 +108,7 @@
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "ChangeMapForm"; this.Name = "ChangeMapForm";
this.Opacity = 1; this.Opacity = 0;
this.ShowIcon = false; this.ShowIcon = false;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;

View file

@ -826,7 +826,7 @@ namespace CodeImp.DoomBuilder.Windows
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "ConfigForm"; this.Name = "ConfigForm";
this.Opacity = 1; this.Opacity = 0;
this.ShowIcon = false; this.ShowIcon = false;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

View file

@ -209,39 +209,6 @@
<metadata name="listtextures.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="listtextures.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="restoretexturesets.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="edittextureset.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="pastetexturesets.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="copytexturesets.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="removetextureset.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="addtextureset.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="tabmodes.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="listmodes.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="nodebuildertest.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="nodebuildersave.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="listtextures.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="smallimages.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="smallimages.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>159, 17</value> <value>159, 17</value>
</metadata> </metadata>
@ -306,6 +273,9 @@
<metadata name="addtextureset.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="addtextureset.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="tabmodes.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="listmodes.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="listmodes.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
@ -315,7 +285,4 @@
<metadata name="testprogramdialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="testprogramdialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value> <value>17, 17</value>
</metadata> </metadata>
<metadata name="tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>416, 17</value>
</metadata>
</root> </root>

View file

@ -46,6 +46,7 @@ namespace CodeImp.DoomBuilder.Windows
this.fieldslist.Name = "fieldslist"; this.fieldslist.Name = "fieldslist";
this.fieldslist.PropertyColumnVisible = true; this.fieldslist.PropertyColumnVisible = true;
this.fieldslist.PropertyColumnWidth = 150; this.fieldslist.PropertyColumnWidth = 150;
this.fieldslist.ShowFixedFields = true;
this.fieldslist.Size = new System.Drawing.Size(506, 310); this.fieldslist.Size = new System.Drawing.Size(506, 310);
this.fieldslist.TabIndex = 0; this.fieldslist.TabIndex = 0;
this.fieldslist.TypeColumnVisible = true; this.fieldslist.TypeColumnVisible = true;
@ -91,7 +92,7 @@ namespace CodeImp.DoomBuilder.Windows
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "CustomFieldsForm"; this.Name = "CustomFieldsForm";
this.Opacity = 1; this.Opacity = 0;
this.ShowIcon = false; this.ShowIcon = false;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

View file

@ -17,6 +17,8 @@
#region ================== Namespaces #region ================== Namespaces
using System; using System;
using System.ComponentModel;
using System.Drawing;
using System.Windows.Forms; using System.Windows.Forms;
using CodeImp.DoomBuilder.Actions; using CodeImp.DoomBuilder.Actions;
using Action = CodeImp.DoomBuilder.Actions.Action; using Action = CodeImp.DoomBuilder.Actions.Action;
@ -34,12 +36,11 @@ namespace CodeImp.DoomBuilder.Windows
{ {
// Variables // Variables
private Timer formshowtimer; private Timer formshowtimer;
protected string configname; //mxd
// Constructor // Constructor
public DelayedForm() protected DelayedForm()
{ {
this.Opacity = 0; //mxd
//mxd. And now, let's hope this doesn't horribly break anything... //mxd. And now, let's hope this doesn't horribly break anything...
if(!(this is MainForm)) if(!(this is MainForm))
{ {
@ -48,14 +49,68 @@ namespace CodeImp.DoomBuilder.Windows
} }
// Create a timer that we need to show the form // Create a timer that we need to show the form
formshowtimer = new Timer(); formshowtimer = new Timer { Interval = 1 };
formshowtimer.Interval = 1;
formshowtimer.Tick += formshowtimer_Tick; formshowtimer.Tick += formshowtimer_Tick;
} }
// When form is shown // When form is shown
protected override void OnShown(EventArgs e) protected override void OnShown(EventArgs e)
{ {
//mxd. Restore location and size
this.SuspendLayout();
configname = this.Name.ToLowerInvariant();
// Restore location
Point validlocation = Point.Empty;
Point location = new Point(General.Settings.ReadSetting("windows." + configname + ".positionx", int.MaxValue),
General.Settings.ReadSetting("windows." + configname + ".positiony", int.MaxValue));
if(location.X < int.MaxValue && location.Y < int.MaxValue)
{
// Location withing screen bounds?
Rectangle bounds = new Rectangle(location, this.Size);
bounds.Inflate(16, 16); // Add some safety padding
if(SystemInformation.VirtualScreen.IntersectsWith(bounds))
{
validlocation = location;
}
}
if(validlocation == Point.Empty && !(this is MainForm))
{
// Do the manual CenterParent...
validlocation = new Point(General.MainWindow.Location.X + General.MainWindow.Width / 2 - this.Width / 2,
General.MainWindow.Location.Y + General.MainWindow.Height / 2 - this.Height / 2);
}
// Apply location
if(validlocation == Point.Empty)
{
this.StartPosition = FormStartPosition.CenterParent;
}
else
{
this.StartPosition = FormStartPosition.Manual;
this.Location = validlocation;
}
// Restore windowstate
if(this.MaximizeBox)
{
this.WindowState = (FormWindowState)General.Settings.ReadSetting("windows." + configname + ".windowstate", (int)FormWindowState.Normal);
}
// Form size matters?
if(this.WindowState == FormWindowState.Normal
&& (this.FormBorderStyle == FormBorderStyle.Sizable || this.FormBorderStyle == FormBorderStyle.SizableToolWindow))
{
this.Size = new Size(General.Settings.ReadSetting("windows." + configname + ".sizewidth", this.Size.Width),
General.Settings.ReadSetting("windows." + configname + ".sizeheight", this.Size.Height));
}
this.ResumeLayout();
//mxd end
// Let the base class know // Let the base class know
base.OnShown(e); base.OnShown(e);
@ -66,6 +121,38 @@ namespace CodeImp.DoomBuilder.Windows
if(!DesignMode) General.Actions.BindMethods(this); if(!DesignMode) General.Actions.BindMethods(this);
} }
//mxd. When form is closing
protected override void OnClosing(CancelEventArgs e)
{
if(e.Cancel) return;
// Let the base class know
base.OnClosing(e);
// Determine window state to save
if(this.MaximizeBox)
{
int windowstate;
if(this.WindowState != FormWindowState.Minimized)
windowstate = (int)this.WindowState;
else
windowstate = (int)FormWindowState.Normal;
General.Settings.WriteSetting("windows." + configname + ".windowstate", windowstate);
}
// Form size matters?
if(this.FormBorderStyle == FormBorderStyle.Sizable || this.FormBorderStyle == FormBorderStyle.SizableToolWindow)
{
General.Settings.WriteSetting("windows." + configname + ".sizewidth", this.Size.Width);
General.Settings.WriteSetting("windows." + configname + ".sizeheight", this.Size.Height);
}
// Save location
General.Settings.WriteSetting("windows." + configname + ".positionx", this.Location.X);
General.Settings.WriteSetting("windows." + configname + ".positiony", this.Location.Y);
}
// When the form is to be shown // When the form is to be shown
private void formshowtimer_Tick(object sender, EventArgs e) private void formshowtimer_Tick(object sender, EventArgs e)
{ {
@ -89,7 +176,7 @@ namespace CodeImp.DoomBuilder.Windows
} }
// mxd. Handle screenshot saving from any form // mxd. Handle screenshot saving from any form
internal static bool ProcessSaveScreenshotAction(int key) private static bool ProcessSaveScreenshotAction(int key)
{ {
Action[] actions = General.Actions.GetActionsByKey(key); Action[] actions = General.Actions.GetActionsByKey(key);
foreach(Action action in actions) foreach(Action action in actions)

View file

@ -398,7 +398,7 @@ namespace CodeImp.DoomBuilder.Windows
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "EffectBrowserForm"; this.Name = "EffectBrowserForm";
this.Opacity = 1; this.Opacity = 0;
this.ShowIcon = false; this.ShowIcon = false;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

View file

@ -162,6 +162,7 @@ namespace CodeImp.DoomBuilder.Windows
this.MinimizeBox = false; this.MinimizeBox = false;
this.MinimumSize = new System.Drawing.Size(680, 300); this.MinimumSize = new System.Drawing.Size(680, 300);
this.Name = "ErrorsForm"; this.Name = "ErrorsForm";
this.Opacity = 0;
this.ShowIcon = false; this.ShowIcon = false;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;

View file

@ -31,10 +31,6 @@ namespace CodeImp.DoomBuilder.Windows
{ {
#region ================== Variables #region ================== Variables
//mxd. Window setup stuff
private static Point location = Point.Empty;
private static Size size = Size.Empty;
#endregion #endregion
#region ================== Constructor / Disposer #region ================== Constructor / Disposer
@ -44,14 +40,6 @@ namespace CodeImp.DoomBuilder.Windows
{ {
InitializeComponent(); InitializeComponent();
//mxd. Apply window settings
if(location != Point.Empty)
{
this.StartPosition = FormStartPosition.Manual;
this.Location = location;
}
if(size != Size.Empty) this.Size = size;
FillList(); FillList();
checkerrors.Start(); checkerrors.Start();
checkshow.Checked = General.Settings.ShowErrorsWindow; checkshow.Checked = General.Settings.ShowErrorsWindow;
@ -99,10 +87,6 @@ namespace CodeImp.DoomBuilder.Windows
{ {
checkerrors.Stop(); checkerrors.Stop();
General.Settings.ShowErrorsWindow = checkshow.Checked; General.Settings.ShowErrorsWindow = checkshow.Checked;
//mxd. Save window settings
location = this.Location;
size = this.Size;
} }
// Checking for more errors // Checking for more errors

View file

@ -97,7 +97,7 @@
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "FlagsForm"; this.Name = "FlagsForm";
this.Opacity = 1; this.Opacity = 0;
this.ShowIcon = false; this.ShowIcon = false;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

View file

@ -72,7 +72,10 @@ namespace CodeImp.DoomBuilder.Windows
this.gridsize.AllowNegative = false; this.gridsize.AllowNegative = false;
this.gridsize.AllowRelative = true; this.gridsize.AllowRelative = true;
this.gridsize.ButtonStep = 8; this.gridsize.ButtonStep = 8;
this.gridsize.ButtonStepBig = 10F;
this.gridsize.ButtonStepFloat = 1F; this.gridsize.ButtonStepFloat = 1F;
this.gridsize.ButtonStepSmall = 0.1F;
this.gridsize.ButtonStepsUseModifierKeys = false;
this.gridsize.ButtonStepsWrapAround = false; this.gridsize.ButtonStepsWrapAround = false;
this.gridsize.Location = new System.Drawing.Point(146, 26); this.gridsize.Location = new System.Drawing.Point(146, 26);
this.gridsize.Name = "gridsize"; this.gridsize.Name = "gridsize";
@ -117,7 +120,10 @@ namespace CodeImp.DoomBuilder.Windows
this.backscaley.AllowNegative = false; this.backscaley.AllowNegative = false;
this.backscaley.AllowRelative = true; this.backscaley.AllowRelative = true;
this.backscaley.ButtonStep = 1; this.backscaley.ButtonStep = 1;
this.backscaley.ButtonStepBig = 10F;
this.backscaley.ButtonStepFloat = 1F; this.backscaley.ButtonStepFloat = 1F;
this.backscaley.ButtonStepSmall = 0.1F;
this.backscaley.ButtonStepsUseModifierKeys = false;
this.backscaley.ButtonStepsWrapAround = false; this.backscaley.ButtonStepsWrapAround = false;
this.backscaley.Enabled = false; this.backscaley.Enabled = false;
this.backscaley.Location = new System.Drawing.Point(197, 212); this.backscaley.Location = new System.Drawing.Point(197, 212);
@ -132,7 +138,10 @@ namespace CodeImp.DoomBuilder.Windows
this.backscalex.AllowNegative = false; this.backscalex.AllowNegative = false;
this.backscalex.AllowRelative = true; this.backscalex.AllowRelative = true;
this.backscalex.ButtonStep = 1; this.backscalex.ButtonStep = 1;
this.backscalex.ButtonStepBig = 10F;
this.backscalex.ButtonStepFloat = 1F; this.backscalex.ButtonStepFloat = 1F;
this.backscalex.ButtonStepSmall = 0.1F;
this.backscalex.ButtonStepsUseModifierKeys = false;
this.backscalex.ButtonStepsWrapAround = false; this.backscalex.ButtonStepsWrapAround = false;
this.backscalex.Enabled = false; this.backscalex.Enabled = false;
this.backscalex.Location = new System.Drawing.Point(124, 212); this.backscalex.Location = new System.Drawing.Point(124, 212);
@ -147,7 +156,10 @@ namespace CodeImp.DoomBuilder.Windows
this.backoffsety.AllowNegative = true; this.backoffsety.AllowNegative = true;
this.backoffsety.AllowRelative = true; this.backoffsety.AllowRelative = true;
this.backoffsety.ButtonStep = 1; this.backoffsety.ButtonStep = 1;
this.backoffsety.ButtonStepBig = 10F;
this.backoffsety.ButtonStepFloat = 1F; this.backoffsety.ButtonStepFloat = 1F;
this.backoffsety.ButtonStepSmall = 0.1F;
this.backoffsety.ButtonStepsUseModifierKeys = false;
this.backoffsety.ButtonStepsWrapAround = false; this.backoffsety.ButtonStepsWrapAround = false;
this.backoffsety.Enabled = false; this.backoffsety.Enabled = false;
this.backoffsety.Location = new System.Drawing.Point(197, 173); this.backoffsety.Location = new System.Drawing.Point(197, 173);
@ -162,7 +174,10 @@ namespace CodeImp.DoomBuilder.Windows
this.backoffsetx.AllowNegative = true; this.backoffsetx.AllowNegative = true;
this.backoffsetx.AllowRelative = true; this.backoffsetx.AllowRelative = true;
this.backoffsetx.ButtonStep = 1; this.backoffsetx.ButtonStep = 1;
this.backoffsetx.ButtonStepBig = 10F;
this.backoffsetx.ButtonStepFloat = 1F; this.backoffsetx.ButtonStepFloat = 1F;
this.backoffsetx.ButtonStepSmall = 0.1F;
this.backoffsetx.ButtonStepsUseModifierKeys = false;
this.backoffsetx.ButtonStepsWrapAround = false; this.backoffsetx.ButtonStepsWrapAround = false;
this.backoffsetx.Enabled = false; this.backoffsetx.Enabled = false;
this.backoffsetx.Location = new System.Drawing.Point(124, 173); this.backoffsetx.Location = new System.Drawing.Point(124, 173);
@ -289,7 +304,7 @@ namespace CodeImp.DoomBuilder.Windows
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "GridSetupForm"; this.Name = "GridSetupForm";
this.Opacity = 1; this.Opacity = 0;
this.ShowIcon = false; this.ShowIcon = false;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

View file

@ -577,12 +577,11 @@ namespace CodeImp.DoomBuilder.Windows
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "LinedefEditForm"; this.Name = "LinedefEditForm";
this.Opacity = 1; this.Opacity = 0;
this.ShowIcon = false; this.ShowIcon = false;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Edit Linedef"; this.Text = "Edit Linedef";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.LinedefEditForm_FormClosing);
this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.LinedefEditForm_HelpRequested); this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.LinedefEditForm_HelpRequested);
this.actiongroup.ResumeLayout(false); this.actiongroup.ResumeLayout(false);
this.actiongroup.PerformLayout(); this.actiongroup.PerformLayout();

View file

@ -43,9 +43,6 @@ namespace CodeImp.DoomBuilder.Windows
private bool preventchanges; private bool preventchanges;
private bool undocreated; //mxd private bool undocreated; //mxd
//mxd. Window setup stuff
private static Point location = Point.Empty;
private struct LinedefProperties //mxd private struct LinedefProperties //mxd
{ {
public readonly Dictionary<string, bool> Flags; public readonly Dictionary<string, bool> Flags;
@ -90,13 +87,6 @@ namespace CodeImp.DoomBuilder.Windows
{ {
// Initialize // Initialize
InitializeComponent(); InitializeComponent();
//mxd. Widow setup
if(location != Point.Empty)
{
this.StartPosition = FormStartPosition.Manual;
this.Location = location;
}
// Fill flags lists // Fill flags lists
foreach(KeyValuePair<string, string> lf in General.Map.Config.LinedefFlags) foreach(KeyValuePair<string, string> lf in General.Map.Config.LinedefFlags)
@ -526,13 +516,6 @@ namespace CodeImp.DoomBuilder.Windows
action.Value = ActionBrowserForm.BrowseAction(this, action.Value); action.Value = ActionBrowserForm.BrowseAction(this, action.Value);
} }
//mxd. Store window location
private void LinedefEditForm_FormClosing(object sender, FormClosingEventArgs e)
{
// Save location
location = this.Location;
}
// Help! // Help!
private void LinedefEditForm_HelpRequested(object sender, HelpEventArgs hlpevent) private void LinedefEditForm_HelpRequested(object sender, HelpEventArgs hlpevent)
{ {

View file

@ -1387,7 +1387,7 @@ namespace CodeImp.DoomBuilder.Windows
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "LinedefEditFormUDMF"; this.Name = "LinedefEditFormUDMF";
this.Opacity = 1; this.Opacity = 0;
this.ShowIcon = false; this.ShowIcon = false;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

View file

@ -58,7 +58,6 @@ namespace CodeImp.DoomBuilder.Windows
private readonly List<PairedFieldsControl> backUdmfControls; //mxd private readonly List<PairedFieldsControl> backUdmfControls; //mxd
//mxd. Window setup stuff //mxd. Window setup stuff
private static Point location = Point.Empty;
private static int activetab; private static int activetab;
private struct LinedefProperties //mxd private struct LinedefProperties //mxd
@ -150,18 +149,13 @@ namespace CodeImp.DoomBuilder.Windows
InitializeComponent(); InitializeComponent();
// Widow setup // Widow setup
if(location != Point.Empty) if(General.Settings.StoreSelectedEditTab && activetab > 0)
{ {
this.StartPosition = FormStartPosition.Manual; // When front or back tab was previously selected, switch to appropriate side (selectfront/selectback are set in BaseVisualGeometrySidedef.OnEditEnd)
this.Location = location; if((selectfront || selectback) && (activetab == 1 || activetab == 2))
if(General.Settings.StoreSelectedEditTab && activetab > 0) tabs.SelectTab(selectfront ? 1 : 2);
{ else
// When front or back tab was previously selected, switch to appropriate side (selectfront/selectback are set in BaseVisualGeometrySidedef.OnEditEnd) tabs.SelectTab(activetab);
if((selectfront || selectback) && (activetab == 1 || activetab == 2))
tabs.SelectTab(selectfront ? 1 : 2);
else
tabs.SelectTab(activetab);
}
} }
// Fill flags lists // Fill flags lists
@ -852,7 +846,6 @@ namespace CodeImp.DoomBuilder.Windows
private void LinedefEditForm_FormClosing(object sender, FormClosingEventArgs e) private void LinedefEditForm_FormClosing(object sender, FormClosingEventArgs e)
{ {
// Save location and active tab // Save location and active tab
location = this.Location;
activetab = tabs.SelectedIndex; activetab = tabs.SelectedIndex;
} }

View file

@ -186,7 +186,4 @@
BAAB/wKAAQEEAAH/AcECgQQAAf8B4wLDBAAC/wLnBAAE/wQACw== BAAB/wKAAQEEAAH/AcECgQQAAf8B4wLDBAAC/wLnBAAE/wQACw==
</value> </value>
</data> </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> </root>

View file

@ -2758,7 +2758,7 @@ namespace CodeImp.DoomBuilder.Windows
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MainMenuStrip = this.menumain; this.MainMenuStrip = this.menumain;
this.Name = "MainForm"; this.Name = "MainForm";
this.Opacity = 1; this.Opacity = 0;
this.StartPosition = System.Windows.Forms.FormStartPosition.Manual; this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
this.Text = "GZDoom Builder"; this.Text = "GZDoom Builder";
this.Deactivate += new System.EventHandler(this.MainForm_Deactivate); this.Deactivate += new System.EventHandler(this.MainForm_Deactivate);
@ -2766,10 +2766,7 @@ namespace CodeImp.DoomBuilder.Windows
this.Shown += new System.EventHandler(this.MainForm_Shown); this.Shown += new System.EventHandler(this.MainForm_Shown);
this.Activated += new System.EventHandler(this.MainForm_Activated); this.Activated += new System.EventHandler(this.MainForm_Activated);
this.KeyUp += new System.Windows.Forms.KeyEventHandler(this.MainForm_KeyUp); this.KeyUp += new System.Windows.Forms.KeyEventHandler(this.MainForm_KeyUp);
this.Move += new System.EventHandler(this.MainForm_Move);
this.Resize += new System.EventHandler(this.MainForm_Resize);
this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.MainForm_KeyDown); this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.MainForm_KeyDown);
this.ResizeEnd += new System.EventHandler(this.MainForm_ResizeEnd);
this.menumain.ResumeLayout(false); this.menumain.ResumeLayout(false);
this.menumain.PerformLayout(); this.menumain.PerformLayout();
this.toolbar.ResumeLayout(false); this.toolbar.ResumeLayout(false);

View file

@ -113,8 +113,6 @@ namespace CodeImp.DoomBuilder.Windows
#region ================== Variables #region ================== Variables
// Position/size // Position/size
private Point lastposition;
private Size lastsize;
private bool displayresized = true; private bool displayresized = true;
private bool windowactive; private bool windowactive;
@ -286,10 +284,6 @@ namespace CodeImp.DoomBuilder.Windows
// Show splash // Show splash
ShowSplashDisplay(); ShowSplashDisplay();
// Keep last position and size
lastposition = this.Location;
lastsize = this.Size;
//mxd //mxd
blinkTimer = new System.Timers.Timer {Interval = 500}; blinkTimer = new System.Timers.Timer {Interval = 500};
@ -600,34 +594,13 @@ namespace CodeImp.DoomBuilder.Windows
// Window is loaded // Window is loaded
private void MainForm_Load(object sender, EventArgs e) private void MainForm_Load(object sender, EventArgs e)
{ {
// Position window from configuration settings
this.SuspendLayout();
this.Size = new Size(General.Settings.ReadSetting("mainwindow.sizewidth", this.Size.Width),
General.Settings.ReadSetting("mainwindow.sizeheight", this.Size.Height));
this.Location = new Point(General.Clamp(General.Settings.ReadSetting("mainwindow.positionx", this.Location.X),
SystemInformation.VirtualScreen.Left - this.Size.Width + 128,
SystemInformation.VirtualScreen.Right - 128),
General.Clamp(General.Settings.ReadSetting("mainwindow.positiony", this.Location.Y),
SystemInformation.VirtualScreen.Top,
SystemInformation.VirtualScreen.Bottom - 128));
this.WindowState = (FormWindowState)General.Settings.ReadSetting("mainwindow.windowstate", (int)FormWindowState.Maximized);
this.ResumeLayout(true);
// Normal windowstate?
if(this.WindowState == FormWindowState.Normal)
{
// Keep last position and size
lastposition = this.Location;
lastsize = this.Size;
}
//mxd. Enable drag and drop //mxd. Enable drag and drop
this.AllowDrop = true; this.AllowDrop = true;
this.DragEnter += OnDragEnter; this.DragEnter += OnDragEnter;
this.DragDrop += OnDragDrop; this.DragDrop += OnDragDrop;
// Info panel state? // Info panel state?
bool expandedpanel = General.Settings.ReadSetting("mainwindow.expandedinfopanel", true); bool expandedpanel = General.Settings.ReadSetting("windows." + configname + ".expandedinfopanel", true);
if(expandedpanel != IsInfoPanelExpanded) ToggleInfoPanel(); if(expandedpanel != IsInfoPanelExpanded) ToggleInfoPanel();
} }
@ -658,38 +631,6 @@ namespace CodeImp.DoomBuilder.Windows
if(mouseexclusive && windowactive && mouseinside && Cursor.Clip != display.RectangleToScreen(display.ClientRectangle)) if(mouseexclusive && windowactive && mouseinside && Cursor.Clip != display.RectangleToScreen(display.ClientRectangle))
Cursor.Clip = display.RectangleToScreen(display.ClientRectangle); Cursor.Clip = display.RectangleToScreen(display.ClientRectangle);
} }
// Window is moved
private void MainForm_Move(object sender, EventArgs e)
{
// Normal windowstate?
if(this.WindowState == FormWindowState.Normal)
{
// Keep last position and size
lastposition = this.Location;
lastsize = this.Size;
}
}
// Window resizes
private void MainForm_Resize(object sender, EventArgs e)
{
// Resizing
//this.SuspendLayout();
//resized = true;
}
// Window was resized
private void MainForm_ResizeEnd(object sender, EventArgs e)
{
// Normal windowstate?
if(this.WindowState == FormWindowState.Normal)
{
// Keep last position and size
lastposition = this.Location;
lastsize = this.Size;
}
}
// Window is being closed // Window is being closed
protected override void OnFormClosing(FormClosingEventArgs e) protected override void OnFormClosing(FormClosingEventArgs e)
@ -715,19 +656,7 @@ namespace CodeImp.DoomBuilder.Windows
General.Actions.UnbindMethods(this); General.Actions.UnbindMethods(this);
// Determine window state to save // Determine window state to save
int windowstate; General.Settings.WriteSetting("windows." + configname + ".expandedinfopanel", IsInfoPanelExpanded);
if(this.WindowState != FormWindowState.Minimized)
windowstate = (int)this.WindowState;
else
windowstate = (int)FormWindowState.Normal;
// Save window settings
General.Settings.WriteSetting("mainwindow.positionx", lastposition.X);
General.Settings.WriteSetting("mainwindow.positiony", lastposition.Y);
General.Settings.WriteSetting("mainwindow.sizewidth", lastsize.Width);
General.Settings.WriteSetting("mainwindow.sizeheight", lastsize.Height);
General.Settings.WriteSetting("mainwindow.windowstate", windowstate);
General.Settings.WriteSetting("mainwindow.expandedinfopanel", IsInfoPanelExpanded);
// Save recent files // Save recent files
SaveRecentFiles(); SaveRecentFiles();

View file

@ -242,7 +242,7 @@ namespace CodeImp.DoomBuilder.Windows
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "MapOptionsForm"; this.Name = "MapOptionsForm";
this.Opacity = 1; this.Opacity = 0;
this.ShowIcon = false; this.ShowIcon = false;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

View file

@ -30,7 +30,7 @@ using CodeImp.DoomBuilder.Config;
namespace CodeImp.DoomBuilder.Windows namespace CodeImp.DoomBuilder.Windows
{ {
internal partial class OpenMapOptionsForm : Form internal partial class OpenMapOptionsForm : DelayedForm
{ {
// Variables // Variables
private Configuration mapsettings; private Configuration mapsettings;
@ -40,7 +40,7 @@ namespace CodeImp.DoomBuilder.Windows
private string selectedmapname; private string selectedmapname;
// Properties // Properties
public string FilePathName { get { return filepathname; } } //public string FilePathName { get { return filepathname; } }
public MapOptions Options { get { return options; } } public MapOptions Options { get { return options; } }
// Constructor // Constructor

View file

@ -79,7 +79,7 @@
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "PasteOptionsForm"; this.Name = "PasteOptionsForm";
this.Opacity = 1; this.Opacity = 0;
this.ShowIcon = false; this.ShowIcon = false;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

View file

@ -2418,7 +2418,7 @@ namespace CodeImp.DoomBuilder.Windows
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "PreferencesForm"; this.Name = "PreferencesForm";
this.Opacity = 1; this.Opacity = 0;
this.ShowIcon = false; this.ShowIcon = false;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

View file

@ -114,10 +114,10 @@ namespace CodeImp.DoomBuilder.Windows
this.wadfiletab.Controls.Add(this.wadlocation); this.wadfiletab.Controls.Add(this.wadlocation);
this.wadfiletab.Controls.Add(label1); this.wadfiletab.Controls.Add(label1);
this.wadfiletab.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.wadfiletab.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.wadfiletab.Location = new System.Drawing.Point(4, 23); this.wadfiletab.Location = new System.Drawing.Point(4, 22);
this.wadfiletab.Name = "wadfiletab"; this.wadfiletab.Name = "wadfiletab";
this.wadfiletab.Padding = new System.Windows.Forms.Padding(3); this.wadfiletab.Padding = new System.Windows.Forms.Padding(3);
this.wadfiletab.Size = new System.Drawing.Size(361, 184); this.wadfiletab.Size = new System.Drawing.Size(361, 185);
this.wadfiletab.TabIndex = 0; this.wadfiletab.TabIndex = 0;
this.wadfiletab.Text = "From WAD File"; this.wadfiletab.Text = "From WAD File";
this.wadfiletab.UseVisualStyleBackColor = true; this.wadfiletab.UseVisualStyleBackColor = true;
@ -169,10 +169,10 @@ namespace CodeImp.DoomBuilder.Windows
this.directorytab.Controls.Add(this.dirlocation); this.directorytab.Controls.Add(this.dirlocation);
this.directorytab.Controls.Add(label2); this.directorytab.Controls.Add(label2);
this.directorytab.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.directorytab.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.directorytab.Location = new System.Drawing.Point(4, 23); this.directorytab.Location = new System.Drawing.Point(4, 22);
this.directorytab.Name = "directorytab"; this.directorytab.Name = "directorytab";
this.directorytab.Padding = new System.Windows.Forms.Padding(3); this.directorytab.Padding = new System.Windows.Forms.Padding(3);
this.directorytab.Size = new System.Drawing.Size(361, 184); this.directorytab.Size = new System.Drawing.Size(361, 185);
this.directorytab.TabIndex = 1; this.directorytab.TabIndex = 1;
this.directorytab.Text = "From Directory"; this.directorytab.Text = "From Directory";
this.directorytab.UseVisualStyleBackColor = true; this.directorytab.UseVisualStyleBackColor = true;
@ -238,9 +238,9 @@ namespace CodeImp.DoomBuilder.Windows
this.pk3filetab.Controls.Add(this.pk3location); this.pk3filetab.Controls.Add(this.pk3location);
this.pk3filetab.Controls.Add(label3); this.pk3filetab.Controls.Add(label3);
this.pk3filetab.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.pk3filetab.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.pk3filetab.Location = new System.Drawing.Point(4, 23); this.pk3filetab.Location = new System.Drawing.Point(4, 22);
this.pk3filetab.Name = "pk3filetab"; this.pk3filetab.Name = "pk3filetab";
this.pk3filetab.Size = new System.Drawing.Size(361, 184); this.pk3filetab.Size = new System.Drawing.Size(361, 185);
this.pk3filetab.TabIndex = 2; this.pk3filetab.TabIndex = 2;
this.pk3filetab.Text = "From PK3/PK7"; this.pk3filetab.Text = "From PK3/PK7";
this.pk3filetab.UseVisualStyleBackColor = true; this.pk3filetab.UseVisualStyleBackColor = true;
@ -340,7 +340,7 @@ namespace CodeImp.DoomBuilder.Windows
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "ResourceOptionsForm"; this.Name = "ResourceOptionsForm";
this.Opacity = 1; this.Opacity = 0;
this.ShowIcon = false; this.ShowIcon = false;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

View file

@ -141,6 +141,9 @@
<metadata name="wadfiletab.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="wadfiletab.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<data name="label6.Text" xml:space="preserve">
<value>Use the option above to enforce strictly loading texture patches from between P_START and P_END marker lumps only. This can solve lump name conflicts, but old WAD files do not always adhere to this rule.</value>
</data>
<metadata name="strictpatches.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="strictpatches.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
@ -165,24 +168,6 @@
<metadata name="pk3location.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="pk3location.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<data name="label6.Text" xml:space="preserve">
<value>Use the option above to enforce strictly loading texture patches from between P_START and P_END marker lumps only. This can solve lump name conflicts, but old WAD files do not always adhere to this rule.</value>
</data>
<metadata name="strictpatches.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="wadlocation.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="dir_flats.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="dir_textures.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="dirlocation.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="wadfiledialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="wadfiledialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value> <value>17, 17</value>
</metadata> </metadata>

View file

@ -52,14 +52,13 @@ namespace CodeImp.DoomBuilder.Windows
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.KeyPreview = true; this.KeyPreview = true;
this.Name = "ScriptEditorForm"; this.Name = "ScriptEditorForm";
this.Opacity = 0;
this.StartPosition = System.Windows.Forms.FormStartPosition.Manual; this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
this.Text = "Script Editor"; this.Text = "Script Editor";
this.Load += new System.EventHandler(this.ScriptEditorForm_Load); this.Load += new System.EventHandler(this.ScriptEditorForm_Load);
this.Shown += new System.EventHandler(this.ScriptEditorForm_Shown); this.Shown += new System.EventHandler(this.ScriptEditorForm_Shown);
this.Move += new System.EventHandler(this.ScriptEditorForm_Move);
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.ScriptEditorForm_FormClosing); this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.ScriptEditorForm_FormClosing);
this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.ScriptEditorForm_HelpRequested); this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.ScriptEditorForm_HelpRequested);
this.ResizeEnd += new System.EventHandler(this.ScriptEditorForm_ResizeEnd);
this.ResumeLayout(false); this.ResumeLayout(false);
} }

View file

@ -29,10 +29,6 @@ namespace CodeImp.DoomBuilder.Windows
{ {
#region ================== Variables #region ================== Variables
// Position/size
private Point lastposition;
private Size lastsize;
// Closing? // Closing?
private bool appclose; private bool appclose;
@ -83,22 +79,6 @@ namespace CodeImp.DoomBuilder.Windows
// Window is loaded // Window is loaded
private void ScriptEditorForm_Load(object sender, EventArgs e) private void ScriptEditorForm_Load(object sender, EventArgs e)
{ {
this.SuspendLayout();
this.Location = new Point(General.Settings.ReadSetting("scriptswindow.positionx", this.Location.X),
General.Settings.ReadSetting("scriptswindow.positiony", this.Location.Y));
this.Size = new Size(General.Settings.ReadSetting("scriptswindow.sizewidth", this.Size.Width),
General.Settings.ReadSetting("scriptswindow.sizeheight", this.Size.Height));
this.WindowState = (FormWindowState)General.Settings.ReadSetting("scriptswindow.windowstate", (int)FormWindowState.Normal);
this.ResumeLayout(true);
// Normal windowstate?
if(this.WindowState == FormWindowState.Normal)
{
// Keep last position and size
lastposition = this.Location;
lastsize = this.Size;
}
// Apply panel settings // Apply panel settings
editor.ApplySettings(); editor.ApplySettings();
} }
@ -113,20 +93,6 @@ namespace CodeImp.DoomBuilder.Windows
// Window is closing // Window is closing
private void ScriptEditorForm_FormClosing(object sender, FormClosingEventArgs e) private void ScriptEditorForm_FormClosing(object sender, FormClosingEventArgs e)
{ {
int windowstate;
// Determine window state to save
if(this.WindowState != FormWindowState.Minimized)
windowstate = (int)this.WindowState;
else
windowstate = (int)FormWindowState.Normal;
// Save window settings
General.Settings.WriteSetting("scriptswindow.positionx", lastposition.X);
General.Settings.WriteSetting("scriptswindow.positiony", lastposition.Y);
General.Settings.WriteSetting("scriptswindow.sizewidth", lastsize.Width);
General.Settings.WriteSetting("scriptswindow.sizeheight", lastsize.Height);
General.Settings.WriteSetting("scriptswindow.windowstate", windowstate);
editor.SaveSettings(); editor.SaveSettings();
// Only when closed by the user // Only when closed by the user
@ -152,30 +118,6 @@ namespace CodeImp.DoomBuilder.Windows
if(!e.Cancel) editor.OnClose(); if(!e.Cancel) editor.OnClose();
} }
// Window resized
private void ScriptEditorForm_ResizeEnd(object sender, EventArgs e)
{
// Normal windowstate?
if(this.WindowState == FormWindowState.Normal)
{
// Keep last position and size
lastposition = this.Location;
lastsize = this.Size;
}
}
// Window moved
private void ScriptEditorForm_Move(object sender, EventArgs e)
{
// Normal windowstate?
if(this.WindowState == FormWindowState.Normal)
{
// Keep last position and size
lastposition = this.Location;
lastsize = this.Size;
}
}
// Help // Help
private void ScriptEditorForm_HelpRequested(object sender, HelpEventArgs hlpevent) private void ScriptEditorForm_HelpRequested(object sender, HelpEventArgs hlpevent)
{ {

View file

@ -167,7 +167,7 @@ namespace CodeImp.DoomBuilder.Windows
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "ScriptFindReplaceForm"; this.Name = "ScriptFindReplaceForm";
this.Opacity = 1; this.Opacity = 0;
this.ShowIcon = false; this.ShowIcon = false;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.Text = "Find and Replace"; this.Text = "Find and Replace";

View file

@ -415,12 +415,11 @@ namespace CodeImp.DoomBuilder.Windows
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "SectorEditForm"; this.Name = "SectorEditForm";
this.Opacity = 1; this.Opacity = 0;
this.ShowIcon = false; this.ShowIcon = false;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Edit Sector"; this.Text = "Edit Sector";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.SectorEditForm_FormClosing);
this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.SectorEditForm_HelpRequested); this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.SectorEditForm_HelpRequested);
groupeffect.ResumeLayout(false); groupeffect.ResumeLayout(false);
groupeffect.PerformLayout(); groupeffect.PerformLayout();

View file

@ -42,9 +42,6 @@ namespace CodeImp.DoomBuilder.Windows
private bool preventchanges; //mxd private bool preventchanges; //mxd
private bool undocreated; //mxd private bool undocreated; //mxd
//mxd. Window setup stuff
private static Point location = Point.Empty;
private struct SectorProperties //mxd private struct SectorProperties //mxd
{ {
public readonly int Brightness; public readonly int Brightness;
@ -73,13 +70,6 @@ namespace CodeImp.DoomBuilder.Windows
// Initialize // Initialize
InitializeComponent(); InitializeComponent();
//mxd. Widow setup
if(location != Point.Empty)
{
this.StartPosition = FormStartPosition.Manual;
this.Location = location;
}
// Fill effects list // Fill effects list
effect.GeneralizedOptions = General.Map.Config.GenEffectOptions; //mxd effect.GeneralizedOptions = General.Map.Config.GenEffectOptions; //mxd
effect.AddInfo(General.Map.Config.SortedSectorEffects.ToArray()); effect.AddInfo(General.Map.Config.SortedSectorEffects.ToArray());
@ -351,12 +341,6 @@ namespace CodeImp.DoomBuilder.Windows
effect.Value = EffectBrowserForm.BrowseEffect(this, effect.Value); effect.Value = EffectBrowserForm.BrowseEffect(this, effect.Value);
} }
//mxd
private void SectorEditForm_FormClosing(object sender, FormClosingEventArgs e)
{
location = this.Location;
}
// Help // Help
private void SectorEditForm_HelpRequested(object sender, HelpEventArgs hlpevent) private void SectorEditForm_HelpRequested(object sender, HelpEventArgs hlpevent)
{ {

View file

@ -800,8 +800,9 @@
// //
// floorAngleControl // floorAngleControl
// //
this.floorAngleControl.Angle = -1440; this.floorAngleControl.Angle = 0;
this.floorAngleControl.AngleOffset = 90; this.floorAngleControl.AngleOffset = 90;
this.floorAngleControl.DoomAngleClamping = false;
this.floorAngleControl.Location = new System.Drawing.Point(6, 156); this.floorAngleControl.Location = new System.Drawing.Point(6, 156);
this.floorAngleControl.Name = "floorAngleControl"; this.floorAngleControl.Name = "floorAngleControl";
this.floorAngleControl.Size = new System.Drawing.Size(44, 44); this.floorAngleControl.Size = new System.Drawing.Size(44, 44);
@ -1080,8 +1081,9 @@
// //
// ceilAngleControl // ceilAngleControl
// //
this.ceilAngleControl.Angle = -1440; this.ceilAngleControl.Angle = 0;
this.ceilAngleControl.AngleOffset = 90; this.ceilAngleControl.AngleOffset = 90;
this.ceilAngleControl.DoomAngleClamping = false;
this.ceilAngleControl.Location = new System.Drawing.Point(6, 156); this.ceilAngleControl.Location = new System.Drawing.Point(6, 156);
this.ceilAngleControl.Name = "ceilAngleControl"; this.ceilAngleControl.Name = "ceilAngleControl";
this.ceilAngleControl.Size = new System.Drawing.Size(44, 44); this.ceilAngleControl.Size = new System.Drawing.Size(44, 44);
@ -1405,7 +1407,7 @@
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "SectorEditFormUDMF"; this.Name = "SectorEditFormUDMF";
this.Opacity = 1; this.Opacity = 0;
this.ShowIcon = false; this.ShowIcon = false;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

View file

@ -138,36 +138,12 @@
<metadata name="label8.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="label8.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value> <value>False</value>
</metadata> </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"> <metadata name="groupfloorceiling.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value> <value>False</value>
</metadata> </metadata>
<metadata name="label15.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="label15.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value> <value>False</value>
</metadata> </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"> <metadata name="tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value> <value>17, 17</value>
</metadata> </metadata>
@ -192,16 +168,10 @@
<metadata name="tabproperties.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="tabproperties.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </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>
<metadata name="tabcustom.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="tabcustom.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="fieldslist.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="fieldslist.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="fieldslist.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
</root> </root>

View file

@ -187,7 +187,7 @@
this.MinimizeBox = false; this.MinimizeBox = false;
this.MinimumSize = new System.Drawing.Size(120, 80); this.MinimumSize = new System.Drawing.Size(120, 80);
this.Name = "TagStatisticsForm"; this.Name = "TagStatisticsForm";
this.Opacity = 1; this.Opacity = 0;
this.ShowIcon = false; this.ShowIcon = false;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.Text = "Tag statistics"; this.Text = "Tag statistics";

View file

@ -90,7 +90,7 @@ namespace CodeImp.DoomBuilder.Windows
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "TextEditForm"; this.Name = "TextEditForm";
this.Opacity = 1; this.Opacity = 0;
this.ShowIcon = false; this.ShowIcon = false;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

View file

@ -146,6 +146,7 @@ namespace CodeImp.DoomBuilder.Windows
this.splitter.Panel2MinSize = 100; this.splitter.Panel2MinSize = 100;
this.splitter.Size = new System.Drawing.Size(784, 442); this.splitter.Size = new System.Drawing.Size(784, 442);
this.splitter.SplitterDistance = 573; this.splitter.SplitterDistance = 573;
this.splitter.SplitterWidth = 8;
this.splitter.TabIndex = 0; this.splitter.TabIndex = 0;
this.splitter.TabStop = false; this.splitter.TabStop = false;
// //
@ -161,18 +162,15 @@ namespace CodeImp.DoomBuilder.Windows
this.Controls.Add(this.splitter); this.Controls.Add(this.splitter);
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "TextureBrowserForm"; this.Name = "TextureBrowserForm";
this.Opacity = 1; this.Opacity = 0;
this.ShowIcon = false; this.ShowIcon = false;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.Manual; this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
this.Text = "Browse Textures"; this.Text = "Browse Textures";
this.Load += new System.EventHandler(this.TextureBrowserForm_Load);
this.Shown += new System.EventHandler(this.TextureBrowserForm_Shown); this.Shown += new System.EventHandler(this.TextureBrowserForm_Shown);
this.Activated += new System.EventHandler(this.TextureBrowserForm_Activated); this.Activated += new System.EventHandler(this.TextureBrowserForm_Activated);
this.Move += new System.EventHandler(this.TextureBrowserForm_Move);
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.TextureBrowserForm_FormClosing); this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.TextureBrowserForm_FormClosing);
this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.TextureBrowserForm_HelpRequested); this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.TextureBrowserForm_HelpRequested);
this.ResizeEnd += new System.EventHandler(this.TextureBrowserForm_ResizeEnd);
this.panel.ResumeLayout(false); this.panel.ResumeLayout(false);
this.splitter.Panel1.ResumeLayout(false); this.splitter.Panel1.ResumeLayout(false);
this.splitter.Panel2.ResumeLayout(false); this.splitter.Panel2.ResumeLayout(false);

View file

@ -33,8 +33,6 @@ namespace CodeImp.DoomBuilder.Windows
{ {
// Variables // Variables
private string selectedname; private string selectedname;
private Point lastposition;
private Size lastsize;
private readonly ListViewGroup usedgroup; private readonly ListViewGroup usedgroup;
private readonly ListViewGroup availgroup; private readonly ListViewGroup availgroup;
private TreeNode selectedset; //mxd private TreeNode selectedset; //mxd
@ -66,7 +64,7 @@ namespace CodeImp.DoomBuilder.Windows
this.Text = "Browse " + imagetype; this.Text = "Browse " + imagetype;
// Setup texture browser // Setup texture browser
ImageBrowserControl.ShowTexturesFromSubDirectories = General.Settings.ReadSetting("browserwindow.showtexturesfromsubdirs", true); ImageBrowserControl.ShowTexturesFromSubDirectories = General.Settings.ReadSetting("windows." + configname + ".showtexturesfromsubdirs", true);
ImageBrowserControl.UseLongTextureNames = General.Map.Options.UseLongTextureNames; ImageBrowserControl.UseLongTextureNames = General.Map.Options.UseLongTextureNames;
browser.BrowseFlats = browseflats; browser.BrowseFlats = browseflats;
browser.ApplySettings(); browser.ApplySettings();
@ -84,7 +82,7 @@ namespace CodeImp.DoomBuilder.Windows
availgroup = browser.AddGroup("Available " + imagetype + ":"); availgroup = browser.AddGroup("Available " + imagetype + ":");
//mxd. Make "Used" group collapsible //mxd. Make "Used" group collapsible
usedgroupcollapsed = General.Settings.ReadSetting("browserwindow.usedgroupcollapsed", false); usedgroupcollapsed = General.Settings.ReadSetting("windows." + configname + ".usedgroupcollapsed", false);
browser.SetGroupCollapsed(usedgroup, usedgroupcollapsed); browser.SetGroupCollapsed(usedgroup, usedgroupcollapsed);
//mxd. Fill texture sets list with normal texture sets //mxd. Fill texture sets list with normal texture sets
@ -129,7 +127,7 @@ namespace CodeImp.DoomBuilder.Windows
if(General.Settings.LocateTextureGroup) if(General.Settings.LocateTextureGroup)
{ {
//mxd. Get the previously selected texture set //mxd. Get the previously selected texture set
string prevtextureset = General.Settings.ReadSetting("browserwindow.textureset", ""); string prevtextureset = General.Settings.ReadSetting("windows." + configname + ".textureset", "");
TreeNode match; TreeNode match;
// When texture set name is empty, select "All" texture set // When texture set name is empty, select "All" texture set
@ -180,38 +178,12 @@ namespace CodeImp.DoomBuilder.Windows
tvTextureSets.EndUpdate();//mxd tvTextureSets.EndUpdate();//mxd
// Keep last position and size
lastposition = this.Location;
lastsize = this.Size;
this.SuspendLayout();
// Position window from configuration settings
this.Size = new Size(General.Settings.ReadSetting("browserwindow.sizewidth", this.Size.Width),
General.Settings.ReadSetting("browserwindow.sizeheight", this.Size.Height));
this.WindowState = (FormWindowState)General.Settings.ReadSetting("browserwindow.windowstate", (int)FormWindowState.Normal);
//mxd
if(this.WindowState == FormWindowState.Normal)
{
Point location = new Point(General.Settings.ReadSetting("browserwindow.positionx", int.MaxValue), General.Settings.ReadSetting("browserwindow.positiony", int.MaxValue));
if(location.X < int.MaxValue && location.Y < int.MaxValue)
{
this.Location = location;
}
else
{
this.StartPosition = FormStartPosition.CenterParent;
}
}
this.ResumeLayout(true);
//mxd. Set splitter position and state (doesn't work when layout is suspended) //mxd. Set splitter position and state (doesn't work when layout is suspended)
if(General.Settings.ReadSetting("browserwindow.splittercollapsed", false)) splitter.IsCollapsed = true; if(General.Settings.ReadSetting("windows." + configname + ".splittercollapsed", false))
splitter.IsCollapsed = true;
//mxd. Looks like SplitterDistance is unaffected by DPI scaling. Let's fix that... //mxd. Looks like SplitterDistance is unaffected by DPI scaling. Let's fix that...
int splitterdistance = General.Settings.ReadSetting("browserwindow.splitterdistance", int.MinValue); int splitterdistance = General.Settings.ReadSetting("windows." + configname + ".splitterdistance", int.MinValue);
if(splitterdistance == int.MinValue) if(splitterdistance == int.MinValue)
{ {
splitterdistance = 210; splitterdistance = 210;
@ -234,7 +206,6 @@ namespace CodeImp.DoomBuilder.Windows
private TreeNode FindTextureByLongName(TreeNode node, long longname) private TreeNode FindTextureByLongName(TreeNode node, long longname)
{ {
//first search in child nodes //first search in child nodes
foreach(TreeNode n in node.Nodes) foreach(TreeNode n in node.Nodes)
{ {
TreeNode match = FindTextureByLongName(n, longname); TreeNode match = FindTextureByLongName(n, longname);
@ -274,7 +245,7 @@ namespace CodeImp.DoomBuilder.Windows
} }
int imageIndex = set.Location.type + 5; int imageIndex = set.Location.type + 5;
char[] separator = new[] { Path.AltDirectorySeparatorChar }; char[] separator = { Path.AltDirectorySeparatorChar };
ImageData[] images; ImageData[] images;
if(browseflats) if(browseflats)
@ -300,7 +271,6 @@ namespace CodeImp.DoomBuilder.Windows
string category = set.Name; string category = set.Name;
for(int i = 0; i < parts.Length - 1; i++) for(int i = 0; i < parts.Length - 1; i++)
{ {
//string category = parts[i];
category += (Path.DirectorySeparatorChar + parts[i]); category += (Path.DirectorySeparatorChar + parts[i]);
//already got such category? //already got such category?
@ -355,7 +325,6 @@ namespace CodeImp.DoomBuilder.Windows
ResourceTextureSet ts = node.Tag as ResourceTextureSet; ResourceTextureSet ts = node.Tag as ResourceTextureSet;
if(ts == null) throw new Exception("Expected IFilledTextureSet, but got null..."); if(ts == null) throw new Exception("Expected IFilledTextureSet, but got null...");
if(node.Parent != null && General.Map.Config.MixTexturesFlats) if(node.Parent != null && General.Map.Config.MixTexturesFlats)
{ {
ts.MixTexturesAndFlats(); ts.MixTexturesAndFlats();
@ -409,69 +378,20 @@ namespace CodeImp.DoomBuilder.Windows
General.Interface.EnableProcessing(); //mxd General.Interface.EnableProcessing(); //mxd
} }
// Loading
private void TextureBrowserForm_Load(object sender, EventArgs e)
{
// Normal windowstate?
if(this.WindowState == FormWindowState.Normal)
{
// Keep last position and size
lastposition = this.Location;
lastsize = this.Size;
}
}
// Resized
private void TextureBrowserForm_ResizeEnd(object sender, EventArgs e)
{
// Normal windowstate?
if(this.WindowState == FormWindowState.Normal)
{
// Keep last position and size
lastposition = this.Location;
lastsize = this.Size;
}
}
// Moved
private void TextureBrowserForm_Move(object sender, EventArgs e)
{
// Normal windowstate?
if(this.WindowState == FormWindowState.Normal)
{
// Keep last position and size
lastposition = this.Location;
lastsize = this.Size;
}
}
// Closing // Closing
private void TextureBrowserForm_FormClosing(object sender, FormClosingEventArgs e) private void TextureBrowserForm_FormClosing(object sender, FormClosingEventArgs e)
{ {
int windowstate;
// Determine window state to save
if(this.WindowState != FormWindowState.Minimized)
windowstate = (int)this.WindowState;
else
windowstate = (int)FormWindowState.Normal;
// Save window settings // Save window settings
General.Settings.WriteSetting("browserwindow.positionx", lastposition.X); General.Settings.WriteSetting("windows." + configname + ".splitterdistance", splitter.SplitPosition); //mxd
General.Settings.WriteSetting("browserwindow.positiony", lastposition.Y); General.Settings.WriteSetting("windows." + configname + ".splittercollapsed", splitter.IsCollapsed); //mxd
General.Settings.WriteSetting("browserwindow.sizewidth", lastsize.Width); General.Settings.WriteSetting("windows." + configname + ".usedgroupcollapsed", browser.IsGroupCollapsed(usedgroup)); //mxd
General.Settings.WriteSetting("browserwindow.sizeheight", lastsize.Height);
General.Settings.WriteSetting("browserwindow.windowstate", windowstate);
General.Settings.WriteSetting("browserwindow.splitterdistance", splitter.SplitPosition); //mxd
General.Settings.WriteSetting("browserwindow.splittercollapsed", splitter.IsCollapsed); //mxd
General.Settings.WriteSetting("browserwindow.usedgroupcollapsed", browser.IsGroupCollapsed(usedgroup)); //mxd
//mxd. Save last selected texture set //mxd. Save last selected texture set
if(this.DialogResult == DialogResult.OK && tvTextureSets.SelectedNodes.Count > 0) if(this.DialogResult == DialogResult.OK && tvTextureSets.SelectedNodes.Count > 0)
General.Settings.WriteSetting("browserwindow.textureset", tvTextureSets.SelectedNodes[0].Name); General.Settings.WriteSetting("windows." + configname + ".textureset", tvTextureSets.SelectedNodes[0].Name);
//mxd. Save ImageBrowserControl settings //mxd. Save ImageBrowserControl settings
General.Settings.WriteSetting("browserwindow.showtexturesfromsubdirs", ImageBrowserControl.ShowTexturesFromSubDirectories); General.Settings.WriteSetting("windows." + configname + ".showtexturesfromsubdirs", ImageBrowserControl.ShowTexturesFromSubDirectories);
if(General.Map.Config.UseLongTextureNames) General.Map.Options.UseLongTextureNames = ImageBrowserControl.UseLongTextureNames; if(General.Map.Config.UseLongTextureNames) General.Map.Options.UseLongTextureNames = ImageBrowserControl.UseLongTextureNames;
// Clean up // Clean up

View file

@ -284,7 +284,7 @@ namespace CodeImp.DoomBuilder.Windows
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "TextureSetForm"; this.Name = "TextureSetForm";
this.Opacity = 1; this.Opacity = 0;
this.ShowIcon = false; this.ShowIcon = false;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

View file

@ -82,7 +82,7 @@ namespace CodeImp.DoomBuilder.Windows
this.MinimizeBox = false; this.MinimizeBox = false;
this.MinimumSize = new System.Drawing.Size(264, 300); this.MinimumSize = new System.Drawing.Size(264, 300);
this.Name = "ThingBrowserForm"; this.Name = "ThingBrowserForm";
this.Opacity = 1; this.Opacity = 0;
this.ShowIcon = false; this.ShowIcon = false;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

View file

@ -219,6 +219,7 @@ namespace CodeImp.DoomBuilder.Windows
// //
this.anglecontrol.Angle = 0; this.anglecontrol.Angle = 0;
this.anglecontrol.AngleOffset = 0; this.anglecontrol.AngleOffset = 0;
this.anglecontrol.DoomAngleClamping = false;
this.anglecontrol.Location = new System.Drawing.Point(20, 40); this.anglecontrol.Location = new System.Drawing.Point(20, 40);
this.anglecontrol.Name = "anglecontrol"; this.anglecontrol.Name = "anglecontrol";
this.anglecontrol.Size = new System.Drawing.Size(69, 69); this.anglecontrol.Size = new System.Drawing.Size(69, 69);
@ -452,13 +453,12 @@ namespace CodeImp.DoomBuilder.Windows
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "ThingEditForm"; this.Name = "ThingEditForm";
this.Opacity = 1; this.Opacity = 0;
this.ShowIcon = false; this.ShowIcon = false;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Edit Thing"; this.Text = "Edit Thing";
this.Shown += new System.EventHandler(this.ThingEditForm_Shown); this.Shown += new System.EventHandler(this.ThingEditForm_Shown);
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.ThingEditForm_FormClosing);
this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.ThingEditForm_HelpRequested); this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.ThingEditForm_HelpRequested);
groupBox2.ResumeLayout(false); groupBox2.ResumeLayout(false);
groupBox2.PerformLayout(); groupBox2.PerformLayout();

View file

@ -52,9 +52,6 @@ namespace CodeImp.DoomBuilder.Windows
private List<ThingProperties> thingprops; //mxd private List<ThingProperties> thingprops; //mxd
private Dictionary<string, string> flagsrename; //mxd private Dictionary<string, string> flagsrename; //mxd
//mxd. Window setup stuff
private static Point location = Point.Empty;
private struct ThingProperties //mxd private struct ThingProperties //mxd
{ {
//public readonly int Type; //public readonly int Type;
@ -82,13 +79,6 @@ namespace CodeImp.DoomBuilder.Windows
{ {
// Initialize // Initialize
InitializeComponent(); InitializeComponent();
//mxd. Widow setup
if(location != Point.Empty)
{
this.StartPosition = FormStartPosition.Manual;
this.Location = location;
}
// Fill flags list // Fill flags list
foreach(KeyValuePair<string, string> tf in General.Map.Config.ThingFlags) foreach(KeyValuePair<string, string> tf in General.Map.Config.ThingFlags)
@ -526,12 +516,6 @@ namespace CodeImp.DoomBuilder.Windows
thingtype.FocusTextbox(); thingtype.FocusTextbox();
} }
//mxd
private void ThingEditForm_FormClosing(object sender, FormClosingEventArgs e)
{
location = this.Location;
}
// Help // Help
private void ThingEditForm_HelpRequested(object sender, HelpEventArgs hlpevent) private void ThingEditForm_HelpRequested(object sender, HelpEventArgs hlpevent)
{ {

View file

@ -275,6 +275,7 @@
// //
this.anglecontrol.Angle = 0; this.anglecontrol.Angle = 0;
this.anglecontrol.AngleOffset = 0; this.anglecontrol.AngleOffset = 0;
this.anglecontrol.DoomAngleClamping = false;
this.anglecontrol.Location = new System.Drawing.Point(7, 17); this.anglecontrol.Location = new System.Drawing.Point(7, 17);
this.anglecontrol.Name = "anglecontrol"; this.anglecontrol.Name = "anglecontrol";
this.anglecontrol.Size = new System.Drawing.Size(64, 64); this.anglecontrol.Size = new System.Drawing.Size(64, 64);
@ -389,6 +390,7 @@
// //
this.rollControl.Angle = -90; this.rollControl.Angle = -90;
this.rollControl.AngleOffset = 0; this.rollControl.AngleOffset = 0;
this.rollControl.DoomAngleClamping = false;
this.rollControl.Location = new System.Drawing.Point(7, 17); this.rollControl.Location = new System.Drawing.Point(7, 17);
this.rollControl.Name = "rollControl"; this.rollControl.Name = "rollControl";
this.rollControl.Size = new System.Drawing.Size(64, 64); this.rollControl.Size = new System.Drawing.Size(64, 64);
@ -409,6 +411,7 @@
// //
this.pitchControl.Angle = -90; this.pitchControl.Angle = -90;
this.pitchControl.AngleOffset = 0; this.pitchControl.AngleOffset = 0;
this.pitchControl.DoomAngleClamping = false;
this.pitchControl.Location = new System.Drawing.Point(7, 17); this.pitchControl.Location = new System.Drawing.Point(7, 17);
this.pitchControl.Name = "pitchControl"; this.pitchControl.Name = "pitchControl";
this.pitchControl.Size = new System.Drawing.Size(64, 64); this.pitchControl.Size = new System.Drawing.Size(64, 64);
@ -990,7 +993,7 @@
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "ThingEditFormUDMF"; this.Name = "ThingEditFormUDMF";
this.Opacity = 1; this.Opacity = 0;
this.ShowIcon = false; this.ShowIcon = false;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

View file

@ -54,7 +54,6 @@ namespace CodeImp.DoomBuilder.Windows
private Dictionary<string, string> flagsrename; //mxd private Dictionary<string, string> flagsrename; //mxd
//mxd. Window setup stuff //mxd. Window setup stuff
private static Point location = Point.Empty;
private static int activetab; private static int activetab;
//mxd. Persistent settings //mxd. Persistent settings
@ -101,12 +100,7 @@ namespace CodeImp.DoomBuilder.Windows
InitializeComponent(); InitializeComponent();
//mxd. Widow setup //mxd. Widow setup
if(location != Point.Empty) if(General.Settings.StoreSelectedEditTab && activetab > 0) tabs.SelectTab(activetab);
{
this.StartPosition = FormStartPosition.Manual;
this.Location = location;
if(General.Settings.StoreSelectedEditTab && activetab > 0) tabs.SelectTab(activetab);
}
// Fill flags list // Fill flags list
foreach(KeyValuePair<string, string> tf in General.Map.Config.ThingFlags) foreach(KeyValuePair<string, string> tf in General.Map.Config.ThingFlags)
@ -134,7 +128,7 @@ namespace CodeImp.DoomBuilder.Windows
fieldslist.ListFixedFields(General.Map.Config.ThingFields); fieldslist.ListFixedFields(General.Map.Config.ThingFields);
//mxd. Show fixed fields? //mxd. Show fixed fields?
hidefixedfields.Checked = !General.Settings.ReadSetting("customfieldsshowfixed", true); hidefixedfields.Checked = !General.Settings.ReadSetting("windows." + configname + ".customfieldsshowfixed", true);
// Thing height? // Thing height?
posZ.Visible = General.Map.FormatInterface.HasThingHeight; posZ.Visible = General.Map.FormatInterface.HasThingHeight;
@ -648,9 +642,8 @@ namespace CodeImp.DoomBuilder.Windows
//mxd //mxd
private void ThingEditForm_FormClosing(object sender, FormClosingEventArgs e) private void ThingEditForm_FormClosing(object sender, FormClosingEventArgs e)
{ {
location = this.Location;
activetab = tabs.SelectedIndex; activetab = tabs.SelectedIndex;
General.Settings.WriteSetting("customfieldsshowfixed", !hidefixedfields.Checked); General.Settings.WriteSetting("windows." + configname + ".customfieldsshowfixed", !hidefixedfields.Checked);
} }
// Help // Help

View file

@ -157,7 +157,7 @@
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "ThingStatisticsForm"; this.Name = "ThingStatisticsForm";
this.Opacity = 1; this.Opacity = 0;
this.ShowIcon = false; this.ShowIcon = false;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.Text = "Thing statistics"; this.Text = "Thing statistics";

View file

@ -629,6 +629,7 @@ namespace CodeImp.DoomBuilder.Windows
this.fieldslist.Name = "fieldslist"; this.fieldslist.Name = "fieldslist";
this.fieldslist.PropertyColumnVisible = true; this.fieldslist.PropertyColumnVisible = true;
this.fieldslist.PropertyColumnWidth = 150; this.fieldslist.PropertyColumnWidth = 150;
this.fieldslist.ShowFixedFields = true;
this.fieldslist.Size = new System.Drawing.Size(426, 251); this.fieldslist.Size = new System.Drawing.Size(426, 251);
this.fieldslist.TabIndex = 2; this.fieldslist.TabIndex = 2;
this.fieldslist.TypeColumnVisible = true; this.fieldslist.TypeColumnVisible = true;
@ -695,7 +696,7 @@ namespace CodeImp.DoomBuilder.Windows
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "ThingsFiltersForm"; this.Name = "ThingsFiltersForm";
this.Opacity = 1; this.Opacity = 0;
this.ShowIcon = false; this.ShowIcon = false;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

View file

@ -134,6 +134,7 @@
this.MinimizeBox = false; this.MinimizeBox = false;
this.MinimumSize = new System.Drawing.Size(667, 250); this.MinimumSize = new System.Drawing.Size(667, 250);
this.Name = "UpdateForm"; this.Name = "UpdateForm";
this.Opacity = 0;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Newsflash (R[rev])!"; this.Text = "Newsflash (R[rev])!";

View file

@ -3,7 +3,7 @@ using System.Windows.Forms;
namespace CodeImp.DoomBuilder.Windows namespace CodeImp.DoomBuilder.Windows
{ {
public partial class UpdateForm : Form public partial class UpdateForm : DelayedForm
{ {
public bool IgnoreThisUpdate { get { return ignorethisupdate.Checked; } } public bool IgnoreThisUpdate { get { return ignorethisupdate.Checked; } }

View file

@ -270,6 +270,7 @@ namespace CodeImp.DoomBuilder.Windows
this.fieldslist.Name = "fieldslist"; this.fieldslist.Name = "fieldslist";
this.fieldslist.PropertyColumnVisible = true; this.fieldslist.PropertyColumnVisible = true;
this.fieldslist.PropertyColumnWidth = 150; this.fieldslist.PropertyColumnWidth = 150;
this.fieldslist.ShowFixedFields = true;
this.fieldslist.Size = new System.Drawing.Size(406, 188); this.fieldslist.Size = new System.Drawing.Size(406, 188);
this.fieldslist.TabIndex = 2; this.fieldslist.TabIndex = 2;
this.fieldslist.TypeColumnVisible = true; this.fieldslist.TypeColumnVisible = true;
@ -313,7 +314,7 @@ namespace CodeImp.DoomBuilder.Windows
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "VertexEditForm"; this.Name = "VertexEditForm";
this.Opacity = 1; this.Opacity = 0;
this.ShowIcon = false; this.ShowIcon = false;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

View file

@ -141,12 +141,6 @@
<metadata name="label6.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="label6.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value> <value>False</value>
</metadata> </metadata>
<metadata name="label2.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label3.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="tabs.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="tabs.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
@ -156,7 +150,4 @@
<metadata name="fieldslist.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="fieldslist.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="fieldslist.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
</root> </root>

View file

@ -400,6 +400,7 @@
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "JitterSectorsForm"; this.Name = "JitterSectorsForm";
this.Opacity = 0;
this.ShowIcon = false; this.ShowIcon = false;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.Manual; this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;

View file

@ -544,7 +544,7 @@
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "JitterThingsForm"; this.Name = "JitterThingsForm";
this.Opacity = 1; this.Opacity = 0;
this.ShowIcon = false; this.ShowIcon = false;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.Manual; this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;

View file

@ -95,7 +95,7 @@
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "JitterVerticesForm"; this.Name = "JitterVerticesForm";
this.Opacity = 1; this.Opacity = 0;
this.ShowIcon = false; this.ShowIcon = false;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.Manual; this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;

View file

@ -214,7 +214,7 @@
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "ObjImportSettingsForm"; this.Name = "ObjImportSettingsForm";
this.Opacity = 1; this.Opacity = 0;
this.ShowIcon = false; this.ShowIcon = false;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.Text = "Import Wavefront .obj"; this.Text = "Import Wavefront .obj";

View file

@ -199,7 +199,7 @@
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "BridgeModeForm"; this.Name = "BridgeModeForm";
this.Opacity = 1; this.Opacity = 0;
this.ShowIcon = false; this.ShowIcon = false;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.Text = "Options"; this.Text = "Options";

View file

@ -225,6 +225,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "CurveLinedefsForm"; this.Name = "CurveLinedefsForm";
this.Opacity = 0;
this.ShowIcon = false; this.ShowIcon = false;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.Manual; this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;

View file

@ -286,7 +286,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "ErrorCheckForm"; this.Name = "ErrorCheckForm";
this.Opacity = 1; this.Opacity = 0;
this.ShowIcon = false; this.ShowIcon = false;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.Manual; this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;

View file

@ -28,9 +28,9 @@
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
this.cancel = new System.Windows.Forms.Button(); this.cancel = new System.Windows.Forms.Button();
this.apply = new System.Windows.Forms.Button(); this.apply = new System.Windows.Forms.Button();
this.textBox1 = new System.Windows.Forms.TextBox(); this.textBox1 = new System.Windows.Forms.TextBox();
@ -90,14 +90,14 @@
this.dataGridView.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; this.dataGridView.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.dataGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; this.dataGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None;
this.dataGridView.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; this.dataGridView.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control; dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); dataGridViewCellStyle1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText; dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False; dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4; this.dataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.ThingType, this.ThingType,
@ -115,8 +115,8 @@
// ThingType // ThingType
// //
this.ThingType.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader; this.ThingType.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader;
dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.ThingType.DefaultCellStyle = dataGridViewCellStyle5; this.ThingType.DefaultCellStyle = dataGridViewCellStyle2;
this.ThingType.HeaderText = "Type"; this.ThingType.HeaderText = "Type";
this.ThingType.Name = "ThingType"; this.ThingType.Name = "ThingType";
this.ThingType.ReadOnly = true; this.ThingType.ReadOnly = true;
@ -125,8 +125,8 @@
// ThingTitle // ThingTitle
// //
this.ThingTitle.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; this.ThingTitle.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True; dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.ThingTitle.DefaultCellStyle = dataGridViewCellStyle6; this.ThingTitle.DefaultCellStyle = dataGridViewCellStyle3;
this.ThingTitle.HeaderText = "Title"; this.ThingTitle.HeaderText = "Title";
this.ThingTitle.Name = "ThingTitle"; this.ThingTitle.Name = "ThingTitle";
this.ThingTitle.ReadOnly = true; this.ThingTitle.ReadOnly = true;
@ -153,7 +153,7 @@
this.Controls.Add(this.dataGridView); this.Controls.Add(this.dataGridView);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow;
this.Name = "FilterSelectedThingsForm"; this.Name = "FilterSelectedThingsForm";
this.Opacity = 1; this.Opacity = 0;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.Text = "Filter Selected Things"; this.Text = "Filter Selected Things";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FilterSelectedThingsForm_FormClosing); this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FilterSelectedThingsForm_FormClosing);

View file

@ -249,7 +249,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "FindReplaceForm"; this.Name = "FindReplaceForm";
this.Opacity = 1; this.Opacity = 0;
this.ShowIcon = false; this.ShowIcon = false;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.Manual; this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;

View file

@ -132,12 +132,6 @@
<metadata name="editbutton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="editbutton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="deletebutton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="editbutton.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"> <metadata name="tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value> <value>17, 17</value>
</metadata> </metadata>

View file

@ -223,7 +223,7 @@
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "FitTexturesForm"; this.Name = "FitTexturesForm";
this.Opacity = 1; this.Opacity = 0;
this.ShowIcon = false; this.ShowIcon = false;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

View file

@ -178,6 +178,7 @@ namespace CodeImp.DoomBuilder.BuilderModes.Interface
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "MakeDoorForm"; this.Name = "MakeDoorForm";
this.Opacity = 0;
this.ShowIcon = false; this.ShowIcon = false;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

View file

@ -232,7 +232,7 @@
this.MinimizeBox = false; this.MinimizeBox = false;
this.MinimumSize = new System.Drawing.Size(300, 200); this.MinimumSize = new System.Drawing.Size(300, 200);
this.Name = "PastePropertiesOptionsForm"; this.Name = "PastePropertiesOptionsForm";
this.Opacity = 1; this.Opacity = 0;
this.ShowIcon = false; this.ShowIcon = false;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

View file

@ -233,7 +233,7 @@
this.MinimizeBox = false; this.MinimizeBox = false;
this.MinimumSize = new System.Drawing.Size(396, 200); this.MinimumSize = new System.Drawing.Size(396, 200);
this.Name = "SelectSimilarElementOptionsPanel"; this.Name = "SelectSimilarElementOptionsPanel";
this.Opacity = 1; this.Opacity = 0;
this.ShowIcon = false; this.ShowIcon = false;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

View file

@ -168,7 +168,7 @@
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "WavefrontSettingsForm"; this.Name = "WavefrontSettingsForm";
this.Opacity = 1; this.Opacity = 0;
this.ShowIcon = false; this.ShowIcon = false;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.Text = "Export to Wavefront .obj"; this.Text = "Export to Wavefront .obj";

View file

@ -88,6 +88,7 @@
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "LightColorPicker"; this.Name = "LightColorPicker";
this.Opacity = 0;
this.ShowIcon = false; this.ShowIcon = false;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.Manual; this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;

View file

@ -86,6 +86,7 @@
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "SectorColorPicker"; this.Name = "SectorColorPicker";
this.Opacity = 0;
this.ShowIcon = false; this.ShowIcon = false;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.Manual; this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;

View file

@ -748,6 +748,7 @@
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "NodesForm"; this.Name = "NodesForm";
this.Opacity = 0;
this.ShowIcon = false; this.ShowIcon = false;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.Manual; this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;

View file

@ -300,36 +300,6 @@
<metadata name="label12.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="label12.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="rightindex.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="rightarea.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="righttype.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="label15.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="rightbutton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="leftindex.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="leftarea.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="lefttype.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="label7.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="leftbutton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="closebutton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="closebutton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>

View file

@ -147,7 +147,7 @@
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "ColorConfiguration"; this.Name = "ColorConfiguration";
this.Opacity = 1; this.Opacity = 0;
this.ShowIcon = false; this.ShowIcon = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Color Configuration"; this.Text = "Color Configuration";

View file

@ -106,6 +106,7 @@
this.MinimizeBox = false; this.MinimizeBox = false;
this.MinimumSize = new System.Drawing.Size(230, 200); this.MinimumSize = new System.Drawing.Size(230, 200);
this.Name = "ReverbsPickerForm"; this.Name = "ReverbsPickerForm";
this.Opacity = 0;
this.ShowIcon = false; this.ShowIcon = false;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

View file

@ -49,7 +49,10 @@ namespace CodeImp.DoomBuilder.TagRange
this.rangestart.AllowNegative = false; this.rangestart.AllowNegative = false;
this.rangestart.AllowRelative = false; this.rangestart.AllowRelative = false;
this.rangestart.ButtonStep = 1; this.rangestart.ButtonStep = 1;
this.rangestart.ButtonStepBig = 10F;
this.rangestart.ButtonStepFloat = 1F; this.rangestart.ButtonStepFloat = 1F;
this.rangestart.ButtonStepSmall = 0.1F;
this.rangestart.ButtonStepsUseModifierKeys = false;
this.rangestart.ButtonStepsWrapAround = false; this.rangestart.ButtonStepsWrapAround = false;
this.rangestart.Location = new System.Drawing.Point(76, 12); this.rangestart.Location = new System.Drawing.Point(76, 12);
this.rangestart.Name = "rangestart"; this.rangestart.Name = "rangestart";
@ -164,7 +167,10 @@ namespace CodeImp.DoomBuilder.TagRange
this.rangestep.AllowNegative = true; this.rangestep.AllowNegative = true;
this.rangestep.AllowRelative = false; this.rangestep.AllowRelative = false;
this.rangestep.ButtonStep = 1; this.rangestep.ButtonStep = 1;
this.rangestep.ButtonStepBig = 10F;
this.rangestep.ButtonStepFloat = 1F; this.rangestep.ButtonStepFloat = 1F;
this.rangestep.ButtonStepSmall = 0.1F;
this.rangestep.ButtonStepsUseModifierKeys = false;
this.rangestep.ButtonStepsWrapAround = false; this.rangestep.ButtonStepsWrapAround = false;
this.rangestep.Location = new System.Drawing.Point(76, 42); this.rangestep.Location = new System.Drawing.Point(76, 42);
this.rangestep.Name = "rangestep"; this.rangestep.Name = "rangestep";
@ -220,6 +226,7 @@ namespace CodeImp.DoomBuilder.TagRange
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "TagRangeForm"; this.Name = "TagRangeForm";
this.Opacity = 0;
this.ShowIcon = false; this.ShowIcon = false;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;