From 6733b2a9097ece9df16cee3e86a029468cb50c1b Mon Sep 17 00:00:00 2001 From: dexyfex Date: Sun, 4 Mar 2018 00:09:31 +1100 Subject: [PATCH] New ProjectForm, moved and renamed old ProjectForm --- CodeWalker.csproj | 20 +++++++++---------- MenuForm.cs | 2 +- Program.cs | 2 +- Project/Panels/EditProjectManifestPanel.cs | 4 ++-- Project/Panels/EditProjectPanel.cs | 4 ++-- Project/Panels/EditScenarioNodePanel.cs | 4 ++-- Project/Panels/EditScenarioYmtPanel.cs | 4 ++-- Project/Panels/EditTrainNodePanel.cs | 4 ++-- Project/Panels/EditTrainTrackPanel.cs | 4 ++-- Project/Panels/EditYmapCarGenPanel.cs | 4 ++-- Project/Panels/EditYmapEntityPanel.cs | 4 ++-- Project/Panels/EditYmapGrassPanel.cs | 4 ++-- Project/Panels/EditYmapPanel.cs | 4 ++-- Project/Panels/EditYndNodePanel.cs | 4 ++-- Project/Panels/EditYndPanel.cs | 4 ++-- Project/Panels/EditYnvPanel.cs | 4 ++-- Project/Panels/EditYnvPolyPanel.cs | 4 ++-- Project/Panels/EditYtypPanel.cs | 4 ++-- Project/Panels/ProjectExplorerPanel.cs | 4 ++-- ...m2.Designer.cs => ProjectForm.Designer.cs} | 4 ++-- Project/{ProjectForm2.cs => ProjectForm.cs} | 4 ++-- .../{ProjectForm2.resx => ProjectForm.resx} | 0 .../ProjectFormOLD.Designer.cs | 4 ++-- ProjectForm.cs => Project/ProjectFormOLD.cs | 4 ++-- .../ProjectFormOLD.resx | 0 WorldForm.cs | 4 ++-- 26 files changed, 54 insertions(+), 54 deletions(-) rename Project/{ProjectForm2.Designer.cs => ProjectForm.Designer.cs} (99%) rename Project/{ProjectForm2.cs => ProjectForm.cs} (99%) rename Project/{ProjectForm2.resx => ProjectForm.resx} (100%) rename ProjectForm.Designer.cs => Project/ProjectFormOLD.Designer.cs (99%) rename ProjectForm.cs => Project/ProjectFormOLD.cs (99%) rename ProjectForm.resx => Project/ProjectFormOLD.resx (100%) diff --git a/CodeWalker.csproj b/CodeWalker.csproj index 43c8dcd..c258d29 100644 --- a/CodeWalker.csproj +++ b/CodeWalker.csproj @@ -395,11 +395,11 @@ WelcomePanel.cs - + Form - - ProjectForm2.cs + + ProjectForm.cs @@ -457,11 +457,11 @@ - + Form - - ProjectForm.cs + + ProjectFormOLD.cs Form @@ -617,8 +617,8 @@ WelcomePanel.cs - - ProjectForm2.cs + + ProjectForm.cs ResXFileCodeGenerator @@ -636,8 +636,8 @@ SelectFolderForm.cs - - ProjectForm.cs + + ProjectFormOLD.cs SettingsForm.cs diff --git a/MenuForm.cs b/MenuForm.cs index bcd828b..2dc9edf 100644 --- a/MenuForm.cs +++ b/MenuForm.cs @@ -137,7 +137,7 @@ namespace CodeWalker private void ProjectButton_Click(object sender, EventArgs e) { - ProjectForm f = new ProjectForm(null); + Project.ProjectForm f = new Project.ProjectForm(null); f.Show(this); } } diff --git a/Program.cs b/Program.cs index 2d73862..50b889f 100644 --- a/Program.cs +++ b/Program.cs @@ -62,7 +62,7 @@ namespace CodeWalker } else if (projectmode) { - Application.Run(new Project.ProjectForm2()); + Application.Run(new Project.ProjectForm()); } else { diff --git a/Project/Panels/EditProjectManifestPanel.cs b/Project/Panels/EditProjectManifestPanel.cs index fd3a630..27e99b5 100644 --- a/Project/Panels/EditProjectManifestPanel.cs +++ b/Project/Panels/EditProjectManifestPanel.cs @@ -14,10 +14,10 @@ namespace CodeWalker.Project.Panels { public partial class EditProjectManifestPanel : ProjectPanel { - public ProjectForm2 ProjectForm { get; set; } + public ProjectForm ProjectForm { get; set; } public ProjectFile CurrentProjectFile { get; set; } - public EditProjectManifestPanel(ProjectForm2 projectForm) + public EditProjectManifestPanel(ProjectForm projectForm) { ProjectForm = projectForm; InitializeComponent(); diff --git a/Project/Panels/EditProjectPanel.cs b/Project/Panels/EditProjectPanel.cs index 5bbe015..d9e88cb 100644 --- a/Project/Panels/EditProjectPanel.cs +++ b/Project/Panels/EditProjectPanel.cs @@ -12,10 +12,10 @@ namespace CodeWalker.Project.Panels { public partial class EditProjectPanel : ProjectPanel { - public ProjectForm2 ProjectForm; + public ProjectForm ProjectForm; public ProjectFile Project { get; set; } - public EditProjectPanel(ProjectForm2 owner) + public EditProjectPanel(ProjectForm owner) { ProjectForm = owner; InitializeComponent(); diff --git a/Project/Panels/EditScenarioNodePanel.cs b/Project/Panels/EditScenarioNodePanel.cs index 2952a36..37cb042 100644 --- a/Project/Panels/EditScenarioNodePanel.cs +++ b/Project/Panels/EditScenarioNodePanel.cs @@ -15,14 +15,14 @@ namespace CodeWalker.Project.Panels { public partial class EditScenarioNodePanel : ProjectPanel { - public ProjectForm2 ProjectForm; + public ProjectForm ProjectForm; public ScenarioNode CurrentScenarioNode { get; set; } public YmtFile CurrentScenario { get; set; } public MCScenarioChainingEdge CurrentScenarioChainEdge { get; set; } private bool populatingui = false; - public EditScenarioNodePanel(ProjectForm2 projectForm) + public EditScenarioNodePanel(ProjectForm projectForm) { ProjectForm = projectForm; InitializeComponent(); diff --git a/Project/Panels/EditScenarioYmtPanel.cs b/Project/Panels/EditScenarioYmtPanel.cs index 745f014..f5af3c9 100644 --- a/Project/Panels/EditScenarioYmtPanel.cs +++ b/Project/Panels/EditScenarioYmtPanel.cs @@ -14,13 +14,13 @@ namespace CodeWalker.Project.Panels { public partial class EditScenarioYmtPanel : ProjectPanel { - public ProjectForm2 ProjectForm; + public ProjectForm ProjectForm; public YmtFile CurrentScenario { get; set; } private bool populatingui = false; private bool waschanged = false; - public EditScenarioYmtPanel(ProjectForm2 projectForm) + public EditScenarioYmtPanel(ProjectForm projectForm) { ProjectForm = projectForm; InitializeComponent(); diff --git a/Project/Panels/EditTrainNodePanel.cs b/Project/Panels/EditTrainNodePanel.cs index 2d95169..7ce86b5 100644 --- a/Project/Panels/EditTrainNodePanel.cs +++ b/Project/Panels/EditTrainNodePanel.cs @@ -15,12 +15,12 @@ namespace CodeWalker.Project.Panels { public partial class EditTrainNodePanel : ProjectPanel { - public ProjectForm2 ProjectForm; + public ProjectForm ProjectForm; public TrainTrackNode TrainNode { get; set; } private bool populatingui = false; - public EditTrainNodePanel(ProjectForm2 projectForm) + public EditTrainNodePanel(ProjectForm projectForm) { ProjectForm = projectForm; InitializeComponent(); diff --git a/Project/Panels/EditTrainTrackPanel.cs b/Project/Panels/EditTrainTrackPanel.cs index 90e067e..6b63d78 100644 --- a/Project/Panels/EditTrainTrackPanel.cs +++ b/Project/Panels/EditTrainTrackPanel.cs @@ -13,13 +13,13 @@ namespace CodeWalker.Project.Panels { public partial class EditTrainTrackPanel : ProjectPanel { - public ProjectForm2 ProjectForm; + public ProjectForm ProjectForm; public TrainTrack Track { get; set; } //private bool populatingui = false; private bool waschanged = false; - public EditTrainTrackPanel(ProjectForm2 projectForm) + public EditTrainTrackPanel(ProjectForm projectForm) { ProjectForm = projectForm; InitializeComponent(); diff --git a/Project/Panels/EditYmapCarGenPanel.cs b/Project/Panels/EditYmapCarGenPanel.cs index c9da213..4ca4057 100644 --- a/Project/Panels/EditYmapCarGenPanel.cs +++ b/Project/Panels/EditYmapCarGenPanel.cs @@ -14,12 +14,12 @@ namespace CodeWalker.Project.Panels { public partial class EditYmapCarGenPanel : ProjectPanel { - public ProjectForm2 ProjectForm; + public ProjectForm ProjectForm; public YmapCarGen CurrentCarGen { get; set; } private bool populatingui = false; - public EditYmapCarGenPanel(ProjectForm2 owner) + public EditYmapCarGenPanel(ProjectForm owner) { ProjectForm = owner; InitializeComponent(); diff --git a/Project/Panels/EditYmapEntityPanel.cs b/Project/Panels/EditYmapEntityPanel.cs index f89acd9..30f351b 100644 --- a/Project/Panels/EditYmapEntityPanel.cs +++ b/Project/Panels/EditYmapEntityPanel.cs @@ -14,12 +14,12 @@ namespace CodeWalker.Project.Panels { public partial class EditYmapEntityPanel : ProjectPanel { - public ProjectForm2 ProjectForm; + public ProjectForm ProjectForm; public YmapEntityDef CurrentEntity { get; set; } private bool populatingui = false; - public EditYmapEntityPanel(ProjectForm2 owner) + public EditYmapEntityPanel(ProjectForm owner) { ProjectForm = owner; InitializeComponent(); diff --git a/Project/Panels/EditYmapGrassPanel.cs b/Project/Panels/EditYmapGrassPanel.cs index a4d5a6f..702ecb1 100644 --- a/Project/Panels/EditYmapGrassPanel.cs +++ b/Project/Panels/EditYmapGrassPanel.cs @@ -13,12 +13,12 @@ namespace CodeWalker.Project.Panels { public partial class EditYmapGrassPanel : ProjectPanel { - public ProjectForm2 ProjectForm; + public ProjectForm ProjectForm; public YmapGrassInstanceBatch CurrentBatch { get; set; } //private bool populatingui = false; - public EditYmapGrassPanel(ProjectForm2 owner) + public EditYmapGrassPanel(ProjectForm owner) { ProjectForm = owner; InitializeComponent(); diff --git a/Project/Panels/EditYmapPanel.cs b/Project/Panels/EditYmapPanel.cs index e662c62..74a3832 100644 --- a/Project/Panels/EditYmapPanel.cs +++ b/Project/Panels/EditYmapPanel.cs @@ -16,13 +16,13 @@ namespace CodeWalker.Project.Panels { public partial class EditYmapPanel : ProjectPanel { - public ProjectForm2 ProjectForm; + public ProjectForm ProjectForm; public YmapFile Ymap { get; set; } private bool populatingui = false; private bool waschanged = false; - public EditYmapPanel(ProjectForm2 projectForm) + public EditYmapPanel(ProjectForm projectForm) { ProjectForm = projectForm; InitializeComponent(); diff --git a/Project/Panels/EditYndNodePanel.cs b/Project/Panels/EditYndNodePanel.cs index 34682c1..441c7aa 100644 --- a/Project/Panels/EditYndNodePanel.cs +++ b/Project/Panels/EditYndNodePanel.cs @@ -14,14 +14,14 @@ namespace CodeWalker.Project.Panels { public partial class EditYndNodePanel : ProjectPanel { - public ProjectForm2 ProjectForm; + public ProjectForm ProjectForm; public YndNode CurrentPathNode { get; set; } public YndLink CurrentPathLink { get; set; } public YndFile CurrentYndFile { get; set; } private bool populatingui = false; - public EditYndNodePanel(ProjectForm2 projectForm) + public EditYndNodePanel(ProjectForm projectForm) { ProjectForm = projectForm; InitializeComponent(); diff --git a/Project/Panels/EditYndPanel.cs b/Project/Panels/EditYndPanel.cs index 717b444..fa3299d 100644 --- a/Project/Panels/EditYndPanel.cs +++ b/Project/Panels/EditYndPanel.cs @@ -13,13 +13,13 @@ namespace CodeWalker.Project.Panels { public partial class EditYndPanel : ProjectPanel { - public ProjectForm2 ProjectForm; + public ProjectForm ProjectForm; public YndFile Ynd { get; set; } private bool populatingui = false; private bool waschanged = false; - public EditYndPanel(ProjectForm2 projectForm) + public EditYndPanel(ProjectForm projectForm) { ProjectForm = projectForm; InitializeComponent(); diff --git a/Project/Panels/EditYnvPanel.cs b/Project/Panels/EditYnvPanel.cs index 4307406..d4a4980 100644 --- a/Project/Panels/EditYnvPanel.cs +++ b/Project/Panels/EditYnvPanel.cs @@ -13,13 +13,13 @@ namespace CodeWalker.Project.Panels { public partial class EditYnvPanel : ProjectPanel { - public ProjectForm2 ProjectForm; + public ProjectForm ProjectForm; public YnvFile Ynv { get; set; } //private bool populatingui = false; private bool waschanged = false; - public EditYnvPanel(ProjectForm2 projectForm) + public EditYnvPanel(ProjectForm projectForm) { ProjectForm = projectForm; InitializeComponent(); diff --git a/Project/Panels/EditYnvPolyPanel.cs b/Project/Panels/EditYnvPolyPanel.cs index 168010b..b0eaf85 100644 --- a/Project/Panels/EditYnvPolyPanel.cs +++ b/Project/Panels/EditYnvPolyPanel.cs @@ -13,12 +13,12 @@ namespace CodeWalker.Project.Panels { public partial class EditYnvPolyPanel : ProjectPanel { - public ProjectForm2 ProjectForm; + public ProjectForm ProjectForm; public YnvPoly YnvPoly { get; set; } //private bool populatingui = false; - public EditYnvPolyPanel(ProjectForm2 projectForm) + public EditYnvPolyPanel(ProjectForm projectForm) { ProjectForm = projectForm; InitializeComponent(); diff --git a/Project/Panels/EditYtypPanel.cs b/Project/Panels/EditYtypPanel.cs index 0a34f1a..819cda0 100644 --- a/Project/Panels/EditYtypPanel.cs +++ b/Project/Panels/EditYtypPanel.cs @@ -13,13 +13,13 @@ namespace CodeWalker.Project.Panels { public partial class EditYtypPanel : ProjectPanel { - public ProjectForm2 ProjectForm; + public ProjectForm ProjectForm; public YtypFile Ytyp { get; set; } //private bool populatingui = false; private bool waschanged = false; - public EditYtypPanel(ProjectForm2 projectForm) + public EditYtypPanel(ProjectForm projectForm) { ProjectForm = projectForm; InitializeComponent(); diff --git a/Project/Panels/ProjectExplorerPanel.cs b/Project/Panels/ProjectExplorerPanel.cs index 93cf354..a838f57 100644 --- a/Project/Panels/ProjectExplorerPanel.cs +++ b/Project/Panels/ProjectExplorerPanel.cs @@ -16,12 +16,12 @@ namespace CodeWalker.Project.Panels { public partial class ProjectExplorerPanel : ProjectPanel { - public ProjectForm2 ProjectForm { get; set; } + public ProjectForm ProjectForm { get; set; } public ProjectFile CurrentProjectFile { get; set; } private bool inDoubleClick = false; //used in disabling double-click to expand tree nodes - public ProjectExplorerPanel(ProjectForm2 projectForm) + public ProjectExplorerPanel(ProjectForm projectForm) { ProjectForm = projectForm; InitializeComponent(); diff --git a/Project/ProjectForm2.Designer.cs b/Project/ProjectForm.Designer.cs similarity index 99% rename from Project/ProjectForm2.Designer.cs rename to Project/ProjectForm.Designer.cs index f11056b..be220cc 100644 --- a/Project/ProjectForm2.Designer.cs +++ b/Project/ProjectForm.Designer.cs @@ -1,6 +1,6 @@ namespace CodeWalker.Project { - partial class ProjectForm2 + partial class ProjectForm { /// /// Required designer variable. @@ -29,7 +29,7 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ProjectForm2)); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ProjectForm)); this.MainMenu = new System.Windows.Forms.MenuStrip(); this.FileMenu = new System.Windows.Forms.ToolStripMenuItem(); this.FileNewMenu = new System.Windows.Forms.ToolStripMenuItem(); diff --git a/Project/ProjectForm2.cs b/Project/ProjectForm.cs similarity index 99% rename from Project/ProjectForm2.cs rename to Project/ProjectForm.cs index 6ba0bab..df24ac5 100644 --- a/Project/ProjectForm2.cs +++ b/Project/ProjectForm.cs @@ -18,7 +18,7 @@ using WeifenLuo.WinFormsUI.Docking; namespace CodeWalker.Project { - public partial class ProjectForm2 : Form + public partial class ProjectForm : Form { public WorldForm WorldForm { get; private set; } public ThemeBase Theme { get; private set; } @@ -72,7 +72,7 @@ namespace CodeWalker.Project private bool ShowProjectItemInProcess = false; - public ProjectForm2(WorldForm worldForm = null) + public ProjectForm(WorldForm worldForm = null) { WorldForm = worldForm; diff --git a/Project/ProjectForm2.resx b/Project/ProjectForm.resx similarity index 100% rename from Project/ProjectForm2.resx rename to Project/ProjectForm.resx diff --git a/ProjectForm.Designer.cs b/Project/ProjectFormOLD.Designer.cs similarity index 99% rename from ProjectForm.Designer.cs rename to Project/ProjectFormOLD.Designer.cs index c13bc0a..b57d476 100644 --- a/ProjectForm.Designer.cs +++ b/Project/ProjectFormOLD.Designer.cs @@ -1,6 +1,6 @@ namespace CodeWalker { - partial class ProjectForm + partial class ProjectFormOLD { /// /// Required designer variable. @@ -29,7 +29,7 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ProjectForm)); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ProjectFormOLD)); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.ProjectTreeView = new System.Windows.Forms.TreeView(); this.MainTabControl = new System.Windows.Forms.TabControl(); diff --git a/ProjectForm.cs b/Project/ProjectFormOLD.cs similarity index 99% rename from ProjectForm.cs rename to Project/ProjectFormOLD.cs index 0f5d8c7..62300fb 100644 --- a/ProjectForm.cs +++ b/Project/ProjectFormOLD.cs @@ -18,7 +18,7 @@ using System.Windows.Forms; namespace CodeWalker { - public partial class ProjectForm : Form + public partial class ProjectFormOLD : Form { WorldForm WorldForm; GameFileCache GameFileCache; @@ -69,7 +69,7 @@ namespace CodeWalker } - public ProjectForm(WorldForm worldForm) + public ProjectFormOLD(WorldForm worldForm) { InitializeComponent(); diff --git a/ProjectForm.resx b/Project/ProjectFormOLD.resx similarity index 100% rename from ProjectForm.resx rename to Project/ProjectFormOLD.resx diff --git a/WorldForm.cs b/WorldForm.cs index 7f8ca5f..d016e75 100644 --- a/WorldForm.cs +++ b/WorldForm.cs @@ -163,7 +163,7 @@ namespace CodeWalker bool ShowWidget = true; - ProjectForm2 ProjectForm = null; + ProjectForm ProjectForm = null; Stack UndoSteps = new Stack(); Stack RedoSteps = new Stack(); @@ -3761,7 +3761,7 @@ namespace CodeWalker { if (ProjectForm == null) { - ProjectForm = new ProjectForm2(this); + ProjectForm = new ProjectForm(this); ProjectForm.Show(this); } else