stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2024-11-22 20:02:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Reverted anotak's PR: it causes 'Cancel' button in Edit windows to automatically do undo or something similar, breaking maps completely

Browse source
This commit is contained in:
ZZYZX 2017-02-07 20:02:31 +02:00
parent 2821149a48
commit 34d1af9446
8 changed files with 726 additions and 816 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1296
Source/Core/Actions/ActionManager.cs
View file

File diff suppressed because it is too large Load diff

17
Source/Core/Controls/PairedFieldsControl.cs
View file

@ -108,18 +108,11 @@ namespace CodeImp.DoomBuilder.Controls
private void CheckValues()
{
if (blockUpdate)
{
changed = string.IsNullOrEmpty(value1.Text) || string.IsNullOrEmpty(value2.Text);
bReset.Visible = changed;
}
else
{
changed = string.IsNullOrEmpty(value1.Text) || string.IsNullOrEmpty(value2.Text)
|| value1.GetResultFloat(defaultValue, 0) != defaultValue || value2.GetResultFloat(defaultValue, 0) != defaultValue;
bReset.Visible = changed;
if (OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
}
changed = string.IsNullOrEmpty(value1.Text) || string.IsNullOrEmpty(value2.Text)
|| value1.GetResultFloat(defaultValue, 0) != defaultValue || value2.GetResultFloat(defaultValue, 0) != defaultValue;
bReset.Visible = changed;
if(!blockUpdate && OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
}
private void UpdateButtons()

29
Source/Core/General/General.cs
View file

@ -627,8 +627,7 @@ namespace CodeImp.DoomBuilder
mainwindow = new MainForm();
mainwindow.SetupInterface();
mainwindow.UpdateInterface();
mainwindow.UpdateSkills(); // ano
mainwindow.UpdateThingsFilters();
mainwindow.UpdateThingsFilters();
if(!delaymainwindow)
{
@ -1103,8 +1102,7 @@ namespace CodeImp.DoomBuilder
mainwindow.UpdateThingsFilters();
mainwindow.UpdateLinedefColorPresets(); //mxd
mainwindow.UpdateInterface();
mainwindow.UpdateSkills(); // ano
mainwindow.AddHintsDocker(); //mxd
mainwindow.AddHintsDocker(); //mxd
mainwindow.UpdateGZDoomPanel(); //mxd
mainwindow.HideInfo(); //mxd
}
@ -1178,8 +1176,7 @@ namespace CodeImp.DoomBuilder
mainwindow.RemoveHintsDocker();
mainwindow.UpdateGZDoomPanel();
mainwindow.UpdateInterface();
mainwindow.UpdateSkills(); // ano
mainwindow.DisplayReady();
mainwindow.DisplayReady();
WriteLogLine("Map unload done");
return true;
}
@ -1282,8 +1279,7 @@ namespace CodeImp.DoomBuilder
mainwindow.UpdateThingsFilters();
mainwindow.UpdateLinedefColorPresets(); //mxd
mainwindow.UpdateInterface();
mainwindow.UpdateSkills(); // ano
mainwindow.HideInfo();
mainwindow.HideInfo();
mainwindow.AddHintsDocker(); //mxd
mainwindow.UpdateGZDoomPanel(); //mxd
@ -1359,8 +1355,7 @@ namespace CodeImp.DoomBuilder
mainwindow.UpdateThingsFilters();
mainwindow.UpdateLinedefColorPresets(); //mxd
mainwindow.UpdateInterface();
mainwindow.UpdateSkills(); // ano
mainwindow.HideInfo();
mainwindow.HideInfo();
mainwindow.AddHintsDocker(); //mxd
//mxd. Center map in screen or on stored coordinates. Done here to avoid the view jerking around when updating the interface.
@ -1428,8 +1423,7 @@ namespace CodeImp.DoomBuilder
// All done
mainwindow.UpdateInterface();
mainwindow.UpdateSkills(); // ano
return result;
return result;
}
// Display status
@ -1451,9 +1445,8 @@ namespace CodeImp.DoomBuilder
// All done
mainwindow.UpdateInterface();
mainwindow.UpdateSkills(); // ano
if (errorlogger.IsErrorAdded)
if(errorlogger.IsErrorAdded)
{
// Show any errors if preferred
mainwindow.DisplayStatus(StatusType.Warning, "There were errors during saving!");
@ -1537,9 +1530,8 @@ namespace CodeImp.DoomBuilder
// All done
mainwindow.UpdateInterface();
mainwindow.UpdateSkills(); // ano
if (errorlogger.IsErrorAdded)
if(errorlogger.IsErrorAdded)
{
// Show any errors if preferred
mainwindow.DisplayStatus(StatusType.Warning, "There were errors during saving!");
@ -1608,9 +1600,8 @@ namespace CodeImp.DoomBuilder
// All done
mainwindow.UpdateInterface();
mainwindow.UpdateSkills(); // ano
if (errorlogger.IsErrorAdded)
if(errorlogger.IsErrorAdded)
{
// Show any errors if preferred
mainwindow.DisplayStatus(StatusType.Warning, "There were errors during saving!");

5
Source/Core/General/MapManager.cs
View file

@ -2393,10 +2393,9 @@ namespace CodeImp.DoomBuilder
General.MainWindow.UpdateThingsFilters();
General.MainWindow.UpdateLinedefColorPresets(); //mxd
General.MainWindow.UpdateInterface();
General.MainWindow.UpdateSkills(); // ano
// Done
General.MainWindow.DisplayReady();
// Done
General.MainWindow.DisplayReady();
General.MainWindow.RedrawDisplay(); //mxd
}

4
Source/Core/Properties/AssemblyInfo.cs
View file

@ -30,6 +30,6 @@ using CodeImp.DoomBuilder;
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.3.0.2861")]
[assembly: AssemblyVersion("2.3.0.2859")]
[assembly: NeutralResourcesLanguageAttribute("en")]
[assembly: AssemblyHash("a3ff16c")]
[assembly: AssemblyHash("5a5c6d0")]

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

@ -131,10 +131,22 @@ namespace CodeImp.DoomBuilder.Windows
#region ================== Constructor
public LinedefEditFormUDMF()
public LinedefEditFormUDMF(bool selectfront, bool selectback)
{
// Initialize
InitializeComponent();
// Widow setup
if(General.Settings.StoreSelectedEditTab)
{
int activetab = General.Settings.ReadSetting("windows." + configname + ".activetab", 0);
// When front or back tab was previously selected, switch to appropriate side (selectfront/selectback are set in BaseVisualGeometrySidedef.OnEditEnd)
if((selectfront || selectback) && (activetab == 1 || activetab == 2))
tabs.SelectTab(selectfront ? 1 : 2);
else
tabs.SelectTab(activetab);
}
// Fill flags lists
foreach(KeyValuePair<string, string> lf in General.Map.Config.LinedefFlags)
@ -231,22 +243,9 @@ namespace CodeImp.DoomBuilder.Windows
#region ================== Methods
// This sets up the form to edit the given lines
public void Setup(ICollection<Linedef> lines, bool selectfront, bool selectback)
public void Setup(ICollection<Linedef> lines)
{
// Window setup
// ano - moved this here because we don't reinstantiate the thing every time anymore
if (General.Settings.StoreSelectedEditTab)
{
int activetab = General.Settings.ReadSetting("windows." + configname + ".activetab", 0);
// When front or back tab was previously selected, switch to appropriate side (selectfront/selectback are set in BaseVisualGeometrySidedef.OnEditEnd)
if ((selectfront || selectback) && (activetab == 1 || activetab == 2))
tabs.SelectTab(selectfront ? 1 : 2);
else
tabs.SelectTab(activetab);
}
preventchanges = true;
preventchanges = true;
// Keep this list
this.lines = lines;

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

@ -176,17 +176,12 @@ namespace CodeImp.DoomBuilder.Windows
//mxd. Misc drawing
private Graphics graphics;
#endregion
//ano, pool for windows
private DelayedForm sectorEditWindow;
private DelayedForm linedefEditWindow;
private DelayedForm thingEditWindow;
#region ================== Properties
#endregion
#region ================== Properties
public bool ShiftState { get { return shift; } }
public bool ShiftState { get { return shift; } }
public bool CtrlState { get { return ctrl; } }
public bool AltState { get { return alt; } }
new public MouseButtons MouseButtons { get { return mousebuttons; } }
@ -402,50 +397,7 @@ namespace CodeImp.DoomBuilder.Windows
if(General.Settings.CollapseDockers) dockerspanel.Collapse();
UnlockUpdate();
// ano - create windows on level load instead of whenever you click on something
if (sectorEditWindow != null)
{
sectorEditWindow.Dispose();
}
if (linedefEditWindow != null)
{
linedefEditWindow.Dispose();
}
if (thingEditWindow != null)
{
thingEditWindow.Dispose();
}
if (General.Map.UDMF)
{
SectorEditFormUDMF s = new SectorEditFormUDMF();
s.OnValuesChanged += EditForm_OnValuesChanged;
sectorEditWindow = s;
LinedefEditFormUDMF l = new LinedefEditFormUDMF();
l.OnValuesChanged += EditForm_OnValuesChanged;
linedefEditWindow = l;
ThingEditFormUDMF t = new ThingEditFormUDMF();
t.OnValuesChanged += EditForm_OnValuesChanged;
thingEditWindow = t;
}
else
{
SectorEditForm s = new SectorEditForm();
s.OnValuesChanged += EditForm_OnValuesChanged;
sectorEditWindow = s;
LinedefEditForm l = new LinedefEditForm();
l.OnValuesChanged += EditForm_OnValuesChanged;
linedefEditWindow = l;
ThingEditForm t = new ThingEditForm();
t.OnValuesChanged += EditForm_OnValuesChanged;
thingEditWindow = t;
}
}
}
else
{
dockerspanel.Visible = false;
@ -480,7 +432,7 @@ namespace CodeImp.DoomBuilder.Windows
UpdatePrefabsMenu();
UpdateToolsMenu();
UpdateToolbar();
//UpdateSkills(); // ano - moved to places where level is loaded and etc
UpdateSkills();
UpdateHelpMenu();
}
@ -1263,9 +1215,9 @@ namespace CodeImp.DoomBuilder.Windows
case MouseButtons.XButton1: key = (int)Keys.XButton1; break;
case MouseButtons.XButton2: key = (int)Keys.XButton2; break;
}
// Invoke any actions associated with this key
General.Actions.KeyReleased(key | mod);
General.Actions.KeyReleased(key | mod);
// Invoke on editing mode
if((General.Map != null) && (General.Editing.Mode != null))
@ -1526,25 +1478,20 @@ namespace CodeImp.DoomBuilder.Windows
#region ================== Toolbar
// This updates the skills list
// ano - made public in order to only call when map/prefs/gameconfigs are changed
// previously was called by undomanager which caused sluggishness
public void UpdateSkills()
private void UpdateSkills()
{
// Clear list
buttontest.DropDownItems.Clear();
// Clear list
buttontest.DropDownItems.Clear();
// Map loaded?
if(General.Map != null)
{
toolbar.SuspendLayout();
// Make the new items list
List<ToolStripItem> items = new List<ToolStripItem>(General.Map.Config.Skills.Count * 2 + General.Map.ConfigSettings.TestEngines.Count + 2);
// Positive skills are with monsters
int skillCount = General.Map.Config.Skills.Count;
for (int i = 0; i < skillCount; i++)
// Positive skills are with monsters
foreach(SkillInfo si in General.Map.Config.Skills)
{
SkillInfo si = General.Map.Config.Skills[i];
ToolStripMenuItem menuitem = new ToolStripMenuItem(si.ToString());
menuitem.Image = Resources.Monster2;
menuitem.Click += TestSkill_Click;
@ -1556,11 +1503,10 @@ namespace CodeImp.DoomBuilder.Windows
// Add seperator
items.Add(new ToolStripSeparator { Padding = new Padding(0, 3, 0, 3) });
// Negative skills are without monsters
for (int i = 0; i < skillCount; i++)
{
SkillInfo si = General.Map.Config.Skills[i];
ToolStripMenuItem menuitem = new ToolStripMenuItem(si.ToString());
// Negative skills are without monsters
foreach(SkillInfo si in General.Map.Config.Skills)
{
ToolStripMenuItem menuitem = new ToolStripMenuItem(si.ToString());
menuitem.Image = Resources.Monster3;
menuitem.Click += TestSkill_Click;
menuitem.Tag = -si.Index;
@ -1585,8 +1531,7 @@ namespace CodeImp.DoomBuilder.Windows
// Add to list
buttontest.DropDownItems.AddRange(items.ToArray());
toolbar.ResumeLayout(false);
}
}
}
//mxd
@ -3371,9 +3316,7 @@ namespace CodeImp.DoomBuilder.Windows
// Update stuff
SetupInterface();
UpdateInterface();
UpdateSkills();
General.Editing.UpdateCurrentEditModes();
General.Editing.UpdateCurrentEditModes();
General.Plugins.ProgramReconfigure();
// Reload resources if a map is open
@ -3398,8 +3341,7 @@ namespace CodeImp.DoomBuilder.Windows
// Update stuff
SetupInterface();
UpdateInterface();
UpdateSkills();
ApplyShortcutKeys();
ApplyShortcutKeys();
General.Colors.CreateCorrectionTable();
General.Plugins.ProgramReconfigure();
@ -3982,27 +3924,27 @@ namespace CodeImp.DoomBuilder.Windows
// Show line edit dialog
if(General.Map.UDMF) //mxd
{
LinedefEditFormUDMF f = (LinedefEditFormUDMF)linedefEditWindow;
f.OnValuesChanged -= EditForm_OnValuesChanged;
DisableProcessing(); //mxd
f.Setup(lines, selectfront, selectback);
EnableProcessing(); //mxd
f.OnValuesChanged += EditForm_OnValuesChanged;
editformopen = true; //mxd
result = f.ShowDialog(this);
editformopen = false; //mxd
}
else
{
LinedefEditForm f = (LinedefEditForm)linedefEditWindow;
f.OnValuesChanged -= EditForm_OnValuesChanged;
DisableProcessing(); //mxd
LinedefEditFormUDMF f = new LinedefEditFormUDMF(selectfront, selectback);
DisableProcessing(); //mxd
f.Setup(lines);
EnableProcessing(); //mxd
f.OnValuesChanged += EditForm_OnValuesChanged;
editformopen = true; //mxd
result = f.ShowDialog(this);
editformopen = false; //mxd
f.Dispose();
}
else
{
LinedefEditForm f = new LinedefEditForm();
DisableProcessing(); //mxd
f.Setup(lines);
EnableProcessing(); //mxd
f.OnValuesChanged += EditForm_OnValuesChanged;
editformopen = true; //mxd
result = f.ShowDialog(this);
editformopen = false; //mxd
f.Dispose();
}
return result;
@ -4016,30 +3958,27 @@ namespace CodeImp.DoomBuilder.Windows
// Show sector edit dialog
if(General.Map.UDMF) //mxd
{
// ano - preinit sector edit windows to save time
SectorEditFormUDMF f = (SectorEditFormUDMF)sectorEditWindow;
f.OnValuesChanged -= EditForm_OnValuesChanged;
DisableProcessing(); //mxd
SectorEditFormUDMF f = new SectorEditFormUDMF();
DisableProcessing(); //mxd
f.Setup(sectors);
EnableProcessing(); //mxd
f.OnValuesChanged += EditForm_OnValuesChanged;
editformopen = true; //mxd
result = f.ShowDialog(this);
editformopen = false; //mxd
//f.Dispose();
f.Dispose();
}
else
{
SectorEditForm f = (SectorEditForm)sectorEditWindow;
f.OnValuesChanged -= EditForm_OnValuesChanged;
DisableProcessing(); //mxd
SectorEditForm f = new SectorEditForm();
DisableProcessing(); //mxd
f.Setup(sectors);
EnableProcessing(); //mxd
f.OnValuesChanged += EditForm_OnValuesChanged;
editformopen = true; //mxd
result = f.ShowDialog(this);
editformopen = false; //mxd
//f.Dispose();
f.Dispose();
}
return result;
@ -4053,28 +3992,27 @@ namespace CodeImp.DoomBuilder.Windows
// Show thing edit dialog
if(General.Map.UDMF)
{
ThingEditFormUDMF f = (ThingEditFormUDMF)thingEditWindow;
f.OnValuesChanged -= EditForm_OnValuesChanged;
DisableProcessing(); //mxd
ThingEditFormUDMF f = new ThingEditFormUDMF();
DisableProcessing(); //mxd
f.Setup(things);
EnableProcessing(); //mxd
f.OnValuesChanged += EditForm_OnValuesChanged;
editformopen = true; //mxd
result = f.ShowDialog(this);
editformopen = false; //mxd
f.Dispose();
}
else
{
ThingEditForm f = (ThingEditForm)thingEditWindow;
f.OnValuesChanged -= EditForm_OnValuesChanged;
DisableProcessing(); //mxd
ThingEditForm f = new ThingEditForm();
DisableProcessing(); //mxd
f.Setup(things);
EnableProcessing(); //mxd
f.OnValuesChanged += EditForm_OnValuesChanged;
editformopen = true; //mxd
result = f.ShowDialog(this);
editformopen = false; //mxd
f.Dispose();
}
return result;

2
Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs
View file

@ -29,5 +29,5 @@ using System.Resources;
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.3.0.2861")]
[assembly: AssemblyVersion("2.3.0.2859")]
[assembly: NeutralResourcesLanguageAttribute("en")]