stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2025-02-17 01:22:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed Action.cs filename, binded some file menu actions

Browse source
This commit is contained in:
codeimp 2007-06-25 14:42:23 +00:00
parent 84ecd61577
commit c9de7d72f3
5 changed files with 112 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Source/Builder.csproj
View file

@ -48,7 +48,7 @@
<Compile Include="Editing\FrozenOverviewMode.cs" />
<Compile Include="Editing\ViewClassicMode.cs" />
<Compile Include="Controls\ActionDelegate.cs" />
<Compile Include="Controls\Actions.cs" />
<Compile Include="Controls\Action.cs" />
<Compile Include="Controls\ActionManager.cs" />
<Compile Include="General\ConfigurationInfo.cs" />
<Compile Include="General\MapManager.cs" />

1
Source/Controls/Actions.cs → Source/Controls/Action.cs
View file

@ -33,6 +33,7 @@ namespace CodeImp.DoomBuilder.Controls
public const string NEWMAP = "newmap";
public const string OPENMAP = "openmap";
public const string CLOSEMAP = "closemap";
public const string SAVEMAP = "savemap";
public const string SAVEMAPAS = "savemapas";
public const string SHOWOVERVIEW = "showoverview";

192
Source/General/General.cs
View file

@ -198,6 +198,11 @@ namespace CodeImp.DoomBuilder
// Create action manager
actions = new ActionManager();
// Bind my methods to actions
actions[Action.NEWMAP].Bind(new ActionDelegate(NewMap));
actions[Action.OPENMAP].Bind(new ActionDelegate(OpenMap));
actions[Action.CLOSEMAP].Bind(new ActionDelegate(CloseMap));
// Create main window
mainwindow = new MainForm();
mainwindow.UpdateMenus();
@ -221,6 +226,11 @@ namespace CodeImp.DoomBuilder
// This terminates the program
public static void Terminate()
{
// Unbind my methods to actions
actions[Action.NEWMAP].Unbind(new ActionDelegate(NewMap));
actions[Action.OPENMAP].Unbind(new ActionDelegate(OpenMap));
actions[Action.CLOSEMAP].Unbind(new ActionDelegate(CloseMap));
// Clean up
mainwindow.Dispose();
actions.Dispose();
@ -237,94 +247,20 @@ namespace CodeImp.DoomBuilder
#region ================== Management
// This creates a new map
public static bool NewMap()
public static void NewMap()
{
MapOptions newoptions;
MapOptions newoptions = new MapOptions();
MapOptionsForm optionswindow;
// Empty options
newoptions = new MapOptions();
// Open map options dialog
optionswindow = new MapOptionsForm(newoptions);
if(optionswindow.ShowDialog(mainwindow) == DialogResult.OK)
// Ask the user to save changes (if any)
if(General.AskSaveMap())
{
// Display status
mainwindow.DisplayStatus("Creating new map...");
// Clear the display
mainwindow.ClearDisplay();
// Trash the current map, if any
if(map != null) map.Dispose();
// Create map manager with given options
map = new MapManager();
if(!map.InitializeNewMap(newoptions))
{
// Unable to create map manager
map.Dispose();
map = null;
// Show splash logo on display
mainwindow.ShowSplashDisplay();
// Failed
mainwindow.UpdateMenus();
mainwindow.DisplayReady();
return false;
}
// Done
mainwindow.UpdateMenus();
mainwindow.DisplayReady();
return true;
}
// Cancelled
return false;
}
// This closes the current map
public static bool CloseMap()
{
// Display status
mainwindow.DisplayStatus("Closing map...");
// Trash the current map
if(map != null) map.Dispose();
map = null;
// Show splash logo on display
mainwindow.ShowSplashDisplay();
// Done
mainwindow.UpdateMenus();
mainwindow.DisplayReady();
return true;
}
// This loads a map from file
public static bool OpenMap()
{
OpenFileDialog openfile;
OpenMapOptionsForm openmapwindow;
// Open map file dialog
openfile = new OpenFileDialog();
openfile.Filter = "Doom WAD Files (*.wad)|*.wad";
openfile.Title = "Open Map";
if(openfile.ShowDialog(mainwindow) == DialogResult.OK)
{
// Update main window
mainwindow.Update();
// Open map options dialog
openmapwindow = new OpenMapOptionsForm(openfile.FileName);
if(openmapwindow.ShowDialog(mainwindow) == DialogResult.OK)
optionswindow = new MapOptionsForm(newoptions);
if(optionswindow.ShowDialog(mainwindow) == DialogResult.OK)
{
// Display status
mainwindow.DisplayStatus("Opening map file...");
mainwindow.DisplayStatus("Creating new map...");
// Clear the display
mainwindow.ClearDisplay();
@ -334,7 +270,13 @@ namespace CodeImp.DoomBuilder
// Create map manager with given options
map = new MapManager();
if(!map.InitializeOpenMap(openfile.FileName, openmapwindow.Options))
if(map.InitializeNewMap(newoptions))
{
// Done
mainwindow.UpdateMenus();
mainwindow.DisplayReady();
}
else
{
// Unable to create map manager
map.Dispose();
@ -346,18 +288,88 @@ namespace CodeImp.DoomBuilder
// Failed
mainwindow.UpdateMenus();
mainwindow.DisplayReady();
return false;
}
// Done
mainwindow.UpdateMenus();
mainwindow.DisplayReady();
return true;
}
}
}
// Cancelled
return false;
// This closes the current map
public static void CloseMap()
{
// Ask the user to save changes (if any)
if(General.AskSaveMap())
{
// Display status
mainwindow.DisplayStatus("Closing map...");
// Trash the current map
if(map != null) map.Dispose();
map = null;
// Show splash logo on display
mainwindow.ShowSplashDisplay();
// Done
mainwindow.UpdateMenus();
mainwindow.DisplayReady();
}
}
// This loads a map from file
public static void OpenMap()
{
OpenFileDialog openfile;
OpenMapOptionsForm openmapwindow;
// Ask the user to save changes (if any)
if(General.AskSaveMap())
{
// Open map file dialog
openfile = new OpenFileDialog();
openfile.Filter = "Doom WAD Files (*.wad)|*.wad";
openfile.Title = "Open Map";
if(openfile.ShowDialog(mainwindow) == DialogResult.OK)
{
// Update main window
mainwindow.Update();
// Open map options dialog
openmapwindow = new OpenMapOptionsForm(openfile.FileName);
if(openmapwindow.ShowDialog(mainwindow) == DialogResult.OK)
{
// Display status
mainwindow.DisplayStatus("Opening map file...");
// Clear the display
mainwindow.ClearDisplay();
// Trash the current map, if any
if(map != null) map.Dispose();
// Create map manager with given options
map = new MapManager();
if(map.InitializeOpenMap(openfile.FileName, openmapwindow.Options))
{
// Done
mainwindow.UpdateMenus();
mainwindow.DisplayReady();
}
else
{
// Unable to create map manager
map.Dispose();
map = null;
// Show splash logo on display
mainwindow.ShowSplashDisplay();
// Failed
mainwindow.UpdateMenus();
mainwindow.DisplayReady();
}
}
}
}
}
// This asks to save the map if needed

6
Source/Interface/MainForm.cs
View file

@ -332,13 +332,13 @@ namespace CodeImp.DoomBuilder.Interface
#region ================== File Menu
// New map clicked
private void itemnewmap_Click(object sender, EventArgs e) { if(General.AskSaveMap()) General.NewMap(); }
private void itemnewmap_Click(object sender, EventArgs e) { General.Actions[Action.NEWMAP].Invoke(); }
// Open map clicked
private void itemopenmap_Click(object sender, EventArgs e) { if(General.AskSaveMap()) General.OpenMap(); }
private void itemopenmap_Click(object sender, EventArgs e) { General.Actions[Action.OPENMAP].Invoke(); }
// Close map clicked
private void itemclosemap_Click(object sender, EventArgs e) { if(General.AskSaveMap()) General.CloseMap(); }
private void itemclosemap_Click(object sender, EventArgs e) { General.Actions[Action.CLOSEMAP].Invoke(); }
// Exit clicked
private void itemexit_Click(object sender, EventArgs e) { this.Close(); }

5
Source/Resources/Actions.cfg
View file

@ -17,3 +17,8 @@ openmap
description = "Opens an existing map from WAD file for viewing or modifying.";
}
closemap
{
title = "File: Close Map";
description = "Closes the current map and the WAD file in which it exits.";
}