ZeroDream/CodeWalker
2
0
Fork 0
mirror of https://mirror.ghproxy.com/https://github.com/dexyfex/CodeWalker synced 2024-07-03 00:11:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

New ProjectForm, moved and renamed old ProjectForm

Browse Source
This commit is contained in:
dexyfex 2018-03-04 00:09:31 +11:00
parent 69ea4d5c35
commit 6733b2a909
26 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
CodeWalker.csproj
View File

@ -395,11 +395,11 @@
<DependentUpon>WelcomePanel.cs</DependentUpon>
</Compile>
<Compile Include="Project\ProjectFile.cs" />
<Compile Include="Project\ProjectForm2.cs">
<Compile Include="Project\ProjectForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Project\ProjectForm2.Designer.cs">
<DependentUpon>ProjectForm2.cs</DependentUpon>
<Compile Include="Project\ProjectForm.Designer.cs">
<DependentUpon>ProjectForm.cs</DependentUpon>
</Compile>
<Compile Include="Project\UndoStep.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
@ -457,11 +457,11 @@
<Compile Include="Utils\MapUtils.cs" />
<Compile Include="GameFiles\TextureFormats.cs" />
<Compile Include="Utils\TextureLoader.cs" />
<Compile Include="ProjectForm.cs">
<Compile Include="Project\ProjectFormOLD.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="ProjectForm.Designer.cs">
<DependentUpon>ProjectForm.cs</DependentUpon>
<Compile Include="Project\ProjectFormOLD.Designer.cs">
<DependentUpon>ProjectFormOLD.cs</DependentUpon>
</Compile>
<Compile Include="WorldInfoForm.cs">
<SubType>Form</SubType>
@ -617,8 +617,8 @@
<EmbeddedResource Include="Project\Panels\WelcomePanel.resx">
<DependentUpon>WelcomePanel.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Project\ProjectForm2.resx">
<DependentUpon>ProjectForm2.cs</DependentUpon>
<EmbeddedResource Include="Project\ProjectForm.resx">
<DependentUpon>ProjectForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
@ -636,8 +636,8 @@
<EmbeddedResource Include="SelectFolderForm.resx">
<DependentUpon>SelectFolderForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="ProjectForm.resx">
<DependentUpon>ProjectForm.cs</DependentUpon>
<EmbeddedResource Include="Project\ProjectFormOLD.resx">
<DependentUpon>ProjectFormOLD.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="SettingsForm.resx">
<DependentUpon>SettingsForm.cs</DependentUpon>

2
MenuForm.cs
View File

@ -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);
}
}

2
Program.cs
View File

@ -62,7 +62,7 @@ namespace CodeWalker
}
else if (projectmode)
{
Application.Run(new Project.ProjectForm2());
Application.Run(new Project.ProjectForm());
}
else
{

4
Project/Panels/EditProjectManifestPanel.cs
View File

@ -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();

4
Project/Panels/EditProjectPanel.cs
View File

@ -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();

4
Project/Panels/EditScenarioNodePanel.cs
View File

@ -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();

4
Project/Panels/EditScenarioYmtPanel.cs
View File

@ -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();

4
Project/Panels/EditTrainNodePanel.cs
View File

@ -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();

4
Project/Panels/EditTrainTrackPanel.cs
View File

@ -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();

4
Project/Panels/EditYmapCarGenPanel.cs
View File

@ -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();

4
Project/Panels/EditYmapEntityPanel.cs
View File

@ -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();

4
Project/Panels/EditYmapGrassPanel.cs
View File

@ -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();

4
Project/Panels/EditYmapPanel.cs
View File

@ -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();

4
Project/Panels/EditYndNodePanel.cs
View File

@ -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();

4
Project/Panels/EditYndPanel.cs
View File

@ -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();

4
Project/Panels/EditYnvPanel.cs
View File

@ -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();

4
Project/Panels/EditYnvPolyPanel.cs
View File

@ -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();

4
Project/Panels/EditYtypPanel.cs
View File

@ -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();

4
Project/Panels/ProjectExplorerPanel.cs
View File

@ -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();

4
Project/ProjectForm2.Designer.cs → Project/ProjectForm.Designer.cs generated
View File

@ -1,6 +1,6 @@
namespace CodeWalker.Project
{
partial class ProjectForm2
partial class ProjectForm
{
/// <summary>
/// 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();

4
Project/ProjectForm2.cs → Project/ProjectForm.cs
View File

@ -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;

0
Project/ProjectForm2.resx → Project/ProjectForm.resx
View File

4
ProjectForm.Designer.cs → Project/ProjectFormOLD.Designer.cs generated
View File

@ -1,6 +1,6 @@
namespace CodeWalker
{
partial class ProjectForm
partial class ProjectFormOLD
{
/// <summary>
/// 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();

4
ProjectForm.cs → Project/ProjectFormOLD.cs
View File

@ -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();

0
ProjectForm.resx → Project/ProjectFormOLD.resx
View File

4
WorldForm.cs
View File

@ -163,7 +163,7 @@ namespace CodeWalker
bool ShowWidget = true;
ProjectForm2 ProjectForm = null;
ProjectForm ProjectForm = null;
Stack<UndoStep> UndoSteps = new Stack<UndoStep>();
Stack<UndoStep> RedoSteps = new Stack<UndoStep>();
@ -3761,7 +3761,7 @@ namespace CodeWalker
{
if (ProjectForm == null)
{
ProjectForm = new ProjectForm2(this);
ProjectForm = new ProjectForm(this);
ProjectForm.Show(this);
}
else