merlin/quro-animation-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FINALLY renamed Form1 in AnimationEditor and SpriteMapEditor to be more desciptive

Browse Source
This commit is contained in:
quinnvoker
2019-01-01 19:54:47 -08:00
parent c8adb29d73
commit 12138a2807
11 changed files with 27 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AnimationEditor/Form1.Designer.cs → AnimationEditor/AnimationEditor.Designer.cs
Generated
+3 -3
View File
@@ -1,6 +1,6 @@
namespace AnimationEditor namespace AnimationEditor
{ {
partial class Form1 partial class AnimationEditor
{ {
/// <summary> /// <summary>
/// Required designer variable. /// Required designer variable.
@@ -29,7 +29,7 @@
private void InitializeComponent() private void InitializeComponent()
{ {
this.components = new System.ComponentModel.Container(); this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AnimationEditor));
this.loadSpriteSheetDialog = new System.Windows.Forms.OpenFileDialog(); this.loadSpriteSheetDialog = new System.Windows.Forms.OpenFileDialog();
this.loadSpriteMapDialog = new System.Windows.Forms.OpenFileDialog(); this.loadSpriteMapDialog = new System.Windows.Forms.OpenFileDialog();
this.spriteMapListBox = new System.Windows.Forms.ListBox(); this.spriteMapListBox = new System.Windows.Forms.ListBox();
@@ -81,7 +81,7 @@
this.animationPanel = new System.Windows.Forms.Panel(); this.animationPanel = new System.Windows.Forms.Panel();
this.animationNameLabel = new System.Windows.Forms.Label(); this.animationNameLabel = new System.Windows.Forms.Label();
this.animationLabel = new System.Windows.Forms.Label(); this.animationLabel = new System.Windows.Forms.Label();
this.animationPreview = new AnimationEditor.AnimationPreview(); this.animationPreview = new global::AnimationEditor.AnimationPreview();
this.loadAnimationSetDialog = new System.Windows.Forms.OpenFileDialog(); this.loadAnimationSetDialog = new System.Windows.Forms.OpenFileDialog();
this.toolTip = new System.Windows.Forms.ToolTip(this.components); this.toolTip = new System.Windows.Forms.ToolTip(this.components);
this.addAnimationButton = new System.Windows.Forms.Button(); this.addAnimationButton = new System.Windows.Forms.Button();
AnimationEditor/Form1.cs → AnimationEditor/AnimationEditor.cs
+2 -2
View File
@@ -32,7 +32,7 @@ using Microsoft.Xna.Framework.Content.Pipeline.Serialization.Intermediate;
*/ */
namespace AnimationEditor namespace AnimationEditor
{ {
public partial class Form1 : Form public partial class AnimationEditor : Form
{ {
private History undoHistory; private History undoHistory;
@@ -62,7 +62,7 @@ namespace AnimationEditor
private bool reading; private bool reading;
private float importDelay = 0; private float importDelay = 0;
public Form1() public AnimationEditor()
{ {
InitializeComponent(); InitializeComponent();
undoHistory = new History(); undoHistory = new History();
AnimationEditor/AnimationEditor.csproj
+8 -11
View File
@@ -38,6 +38,9 @@
<Reference Include="MonoGame.Framework, Version=3.7.0.1114, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="MonoGame.Framework, Version=3.7.0.1114, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MonoGame.Forms.DX.2.1.0.2\lib\net451\MonoGame.Framework.dll</HintPath> <HintPath>..\packages\MonoGame.Forms.DX.2.1.0.2\lib\net451\MonoGame.Framework.dll</HintPath>
</Reference> </Reference>
<Reference Include="QURO">
<HintPath>..\..\QURO\QURO\bin\Release\QURO.dll</HintPath>
</Reference>
<Reference Include="SharpDX, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL"> <Reference Include="SharpDX, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
<HintPath>..\packages\SharpDX.4.0.1\lib\net45\SharpDX.dll</HintPath> <HintPath>..\packages\SharpDX.4.0.1\lib\net45\SharpDX.dll</HintPath>
</Reference> </Reference>
@@ -85,11 +88,11 @@
<Compile Include="AnimationPreview.cs"> <Compile Include="AnimationPreview.cs">
<SubType>Component</SubType> <SubType>Component</SubType>
</Compile> </Compile>
<Compile Include="Form1.cs"> <Compile Include="AnimationEditor.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
<Compile Include="Form1.Designer.cs"> <Compile Include="AnimationEditor.Designer.cs">
<DependentUpon>Form1.cs</DependentUpon> <DependentUpon>AnimationEditor.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="Modifications\ModHelper.cs" /> <Compile Include="Modifications\ModHelper.cs" />
<Compile Include="Modifications\SelectionState.cs" /> <Compile Include="Modifications\SelectionState.cs" />
@@ -144,8 +147,8 @@
<Compile Include="Program.cs" /> <Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Texture2DRegionExtractor.cs" /> <Compile Include="Texture2DRegionExtractor.cs" />
<EmbeddedResource Include="Form1.resx"> <EmbeddedResource Include="AnimationEditor.resx">
<DependentUpon>Form1.cs</DependentUpon> <DependentUpon>AnimationEditor.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx"> <EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator> <Generator>ResXFileCodeGenerator</Generator>
@@ -171,12 +174,6 @@
<ItemGroup> <ItemGroup>
<None Include="App.config" /> <None Include="App.config" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\QURO\QURO.csproj">
<Project>{4581e0c8-b14a-454d-9a7b-52d37535e7e9}</Project>
<Name>QURO</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup> <ItemGroup>
<EmbeddedResource Include="Resources\createnew.png" /> <EmbeddedResource Include="Resources\createnew.png" />
</ItemGroup> </ItemGroup>
AnimationEditor/Form1.resx → AnimationEditor/AnimationEditor.resx
View File
AnimationEditor/Program.cs
+1 -1
View File
@@ -16,7 +16,7 @@ namespace AnimationEditor
{ {
Application.EnableVisualStyles(); Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false); Application.SetCompatibleTextRenderingDefault(false);
Application.Run(new Form1()); Application.Run(new AnimationEditor());
} }
} }
} }
QURO.AnimationTools.sln
-6
View File
@@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15 # Visual Studio 15
VisualStudioVersion = 15.0.27703.2047 VisualStudioVersion = 15.0.27703.2047
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QURO", "QURO\QURO.csproj", "{4581E0C8-B14A-454D-9A7B-52D37535E7E9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpriteMapEditor", "SpriteMapEditor\SpriteMapEditor.csproj", "{2AF6999F-93F0-4096-9BC1-863CEE5E7791}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpriteMapEditor", "SpriteMapEditor\SpriteMapEditor.csproj", "{2AF6999F-93F0-4096-9BC1-863CEE5E7791}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AnimationEditor", "AnimationEditor\AnimationEditor.csproj", "{01280C24-6439-4186-ABA3-5686A2B66C45}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AnimationEditor", "AnimationEditor\AnimationEditor.csproj", "{01280C24-6439-4186-ABA3-5686A2B66C45}"
@@ -15,10 +13,6 @@ Global
Release|Any CPU = Release|Any CPU Release|Any CPU = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{4581E0C8-B14A-454D-9A7B-52D37535E7E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4581E0C8-B14A-454D-9A7B-52D37535E7E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4581E0C8-B14A-454D-9A7B-52D37535E7E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4581E0C8-B14A-454D-9A7B-52D37535E7E9}.Release|Any CPU.Build.0 = Release|Any CPU
{2AF6999F-93F0-4096-9BC1-863CEE5E7791}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2AF6999F-93F0-4096-9BC1-863CEE5E7791}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2AF6999F-93F0-4096-9BC1-863CEE5E7791}.Debug|Any CPU.Build.0 = Debug|Any CPU {2AF6999F-93F0-4096-9BC1-863CEE5E7791}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2AF6999F-93F0-4096-9BC1-863CEE5E7791}.Release|Any CPU.ActiveCfg = Release|Any CPU {2AF6999F-93F0-4096-9BC1-863CEE5E7791}.Release|Any CPU.ActiveCfg = Release|Any CPU
SpriteMapEditor/Program.cs
+1 -1
View File
@@ -16,7 +16,7 @@ namespace SpriteMapEditor
{ {
Application.EnableVisualStyles(); Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false); Application.SetCompatibleTextRenderingDefault(false);
Application.Run(new Form1()); Application.Run(new SpriteMapEditor());
} }
} }
} }
SpriteMapEditor/Form1.Designer.cs → SpriteMapEditor/SpriteMapEditor.Designer.cs
Generated
+2 -2
View File
@@ -1,6 +1,6 @@
namespace SpriteMapEditor namespace SpriteMapEditor
{ {
partial class Form1 partial class SpriteMapEditor
{ {
/// <summary> /// <summary>
/// Required designer variable. /// Required designer variable.
@@ -60,7 +60,7 @@
this.loadMapDialog = new System.Windows.Forms.OpenFileDialog(); this.loadMapDialog = new System.Windows.Forms.OpenFileDialog();
this.saveMapDialog = new System.Windows.Forms.SaveFileDialog(); this.saveMapDialog = new System.Windows.Forms.SaveFileDialog();
this.spriteViewerPanel = new System.Windows.Forms.Panel(); this.spriteViewerPanel = new System.Windows.Forms.Panel();
this.spriteSheetViewer = new SpriteMapEditor.PictureBoxWithInterpolationMode(); this.spriteSheetViewer = new global::SpriteMapEditor.PictureBoxWithInterpolationMode();
this.zoomInButton = new System.Windows.Forms.Button(); this.zoomInButton = new System.Windows.Forms.Button();
this.zoomOutButton = new System.Windows.Forms.Button(); this.zoomOutButton = new System.Windows.Forms.Button();
this.zoomLabel = new System.Windows.Forms.Label(); this.zoomLabel = new System.Windows.Forms.Label();
SpriteMapEditor/Form1.cs → SpriteMapEditor/SpriteMapEditor.cs
+2 -2
View File
@@ -19,7 +19,7 @@ using SpriteMapEditor.SpriteMapModifications;
namespace SpriteMapEditor namespace SpriteMapEditor
{ {
public partial class Form1 : Form public partial class SpriteMapEditor : Form
{ {
private History undoHistory; private History undoHistory;
@@ -84,7 +84,7 @@ namespace SpriteMapEditor
private List<Microsoft.Xna.Framework.Rectangle> preDragBounds; private List<Microsoft.Xna.Framework.Rectangle> preDragBounds;
public Form1() public SpriteMapEditor()
{ {
InitializeComponent(); InitializeComponent();
FormBorderStyle = FormBorderStyle.Sizable; FormBorderStyle = FormBorderStyle.Sizable;
SpriteMapEditor/SpriteMapEditor.csproj
+8 -11
View File
@@ -38,6 +38,9 @@
<Reference Include="MonoGame.Framework.Content.Pipeline"> <Reference Include="MonoGame.Framework.Content.Pipeline">
<HintPath>C:\Program Files (x86)\MSBuild\MonoGame\v3.0\Tools\MonoGame.Framework.Content.Pipeline.dll</HintPath> <HintPath>C:\Program Files (x86)\MSBuild\MonoGame\v3.0\Tools\MonoGame.Framework.Content.Pipeline.dll</HintPath>
</Reference> </Reference>
<Reference Include="QURO">
<HintPath>..\..\QURO\QURO\bin\Release\QURO.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
@@ -52,11 +55,11 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="DirectBitmap.cs" /> <Compile Include="DirectBitmap.cs" />
<Compile Include="Form1.cs"> <Compile Include="SpriteMapEditor.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
<Compile Include="Form1.Designer.cs"> <Compile Include="SpriteMapEditor.Designer.cs">
<DependentUpon>Form1.cs</DependentUpon> <DependentUpon>SpriteMapEditor.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="SpriteMapModifications\ApplyOriginPreset.cs" /> <Compile Include="SpriteMapModifications\ApplyOriginPreset.cs" />
<Compile Include="SpriteMapModifications\ModHelper.cs" /> <Compile Include="SpriteMapModifications\ModHelper.cs" />
@@ -76,8 +79,8 @@
<Compile Include="SpriteMapModifications\RemoveSprite.cs" /> <Compile Include="SpriteMapModifications\RemoveSprite.cs" />
<Compile Include="SpriteMapModifications\RenameSprite.cs" /> <Compile Include="SpriteMapModifications\RenameSprite.cs" />
<Compile Include="SpriteMapProject.cs" /> <Compile Include="SpriteMapProject.cs" />
<EmbeddedResource Include="Form1.resx"> <EmbeddedResource Include="SpriteMapEditor.resx">
<DependentUpon>Form1.cs</DependentUpon> <DependentUpon>SpriteMapEditor.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx"> <EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator> <Generator>ResXFileCodeGenerator</Generator>
@@ -102,12 +105,6 @@
<ItemGroup> <ItemGroup>
<None Include="App.config" /> <None Include="App.config" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\QURO\QURO.csproj">
<Project>{4581e0c8-b14a-454d-9a7b-52d37535e7e9}</Project>
<Name>QURO</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="Resources\originPointer_black.png" /> <None Include="Resources\originPointer_black.png" />
</ItemGroup> </ItemGroup>
SpriteMapEditor/Form1.resx → SpriteMapEditor/SpriteMapEditor.resx
View File