Skip to content

Commit

Permalink
fixed some form design issues
Browse files Browse the repository at this point in the history
  • Loading branch information
Wampa842 committed Oct 29, 2019
1 parent 43d3763 commit ed425c6
Show file tree
Hide file tree
Showing 11 changed files with 55 additions and 47 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.MD
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# 0.5.1
- Fixed some UI design issues
- Added PDB files for each assembly
# 0.5.0
- Added Selection Storage (WPlugins.SelectionStorage)
- Added automatic udpdate checking
Expand Down
2 changes: 2 additions & 0 deletions README.MD
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ Developed by Wampa842
- [Wavefront OBJ importer](#wavefront-obj-importer)
- [Wavefront OBJ exporter](#wavefront-obj-exporter)
- [Morph scale](#morph-scale)
- [Selection Storage](#selection-storage)
- [About & Update](#about-update)
2. [Installation](#installation)
3. [Requirements](#requirements)
4. [Links and download](#links-and-download)
Expand Down
1 change: 1 addition & 0 deletions WPlugins.Common/WPlugins.Common.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="SemanticVersion.cs" />
<Compile Include="Settings.cs" />
<Compile Include="SettingsData\SelectionStorageSettings.cs" />
<Compile Include="SettingsData\SettingsData.cs" />
<Compile Include="SettingsData\UpdateSettings.cs" />
<Compile Include="VersionCheck.cs" />
Expand Down
3 changes: 2 additions & 1 deletion WPlugins.MorphScale/WPlugins.MorphScale.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>xcopy "$(TargetPath)" "H:\MMD\PMX Editor\PmxEditor\_plugin\User\WPlugins" /Y /Q</PostBuildEvent>
<PostBuildEvent>xcopy "$(TargetPath)" "H:\MMD\PMX Editor\PmxEditor\_plugin\User\WPlugins" /Y /Q
xcopy "$(TargetDir)$(TargetName).pdb" "H:\MMD\PMX Editor\PmxEditor\_plugin\User\WPlugins" /Y /Q</PostBuildEvent>
</PropertyGroup>
</Project>
3 changes: 2 additions & 1 deletion WPlugins.ObjExport/WPlugins.ObjExport.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>xcopy "$(TargetPath)" "H:\MMD\PMX Editor\PmxEditor\_plugin\User\WPlugins" /Y /Q</PostBuildEvent>
<PostBuildEvent>xcopy "$(TargetPath)" "H:\MMD\PMX Editor\PmxEditor\_plugin\User\WPlugins" /Y /Q
xcopy "$(TargetDir)$(TargetName).pdb" "H:\MMD\PMX Editor\PmxEditor\_plugin\User\WPlugins" /Y /Q</PostBuildEvent>
</PropertyGroup>
</Project>
3 changes: 2 additions & 1 deletion WPlugins.ObjImport/WPlugins.ObjImport.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>xcopy "$(TargetPath)" "H:\MMD\PMX Editor\PmxEditor\_plugin\User\WPlugins" /Y /Q</PostBuildEvent>
<PostBuildEvent>xcopy "$(TargetPath)" "H:\MMD\PMX Editor\PmxEditor\_plugin\User\WPlugins" /Y /Q
xcopy "$(TargetDir)$(TargetName).pdb" "H:\MMD\PMX Editor\PmxEditor\_plugin\User\WPlugins" /Y /Q</PostBuildEvent>
</PropertyGroup>
</Project>
21 changes: 7 additions & 14 deletions WPlugins.SelectionStorage/SelectionStorageForm.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions WPlugins.SelectionStorage/SelectionStorageForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public SelectionStorageForm(IPERunArgs args)

public void AddSelection(Selection sel)
{
ListViewItem item = new ListViewItem(new string[] { storedList.Items.Count.ToString(), sel.Name, sel.Vertex.Length.ToString(), sel.Triangle.Length.ToString(), sel.Bone.Length.ToString(), sel.Rigidbody.Length.ToString(), sel.Joint.Length.ToString() });
ListViewItem item = new ListViewItem(new string[] { sel.Name, sel.Vertex.Length.ToString(), sel.Triangle.Length.ToString(), sel.Bone.Length.ToString(), sel.Rigidbody.Length.ToString(), sel.Joint.Length.ToString() });
item.Tag = sel;
storedList.Items.Add(item);
}
Expand Down Expand Up @@ -270,27 +270,27 @@ private void trimButton_Click(object sender, EventArgs e)
if (result.HasFlag(TrimOptions.Vertex))
{
sel.Vertex = new int[0];
item.SubItems[2].Text = "0";
item.SubItems[1].Text = "0";
}
if (result.HasFlag(TrimOptions.Triangle))
{
sel.Triangle = new int[0];
item.SubItems[3].Text = "0";
item.SubItems[2].Text = "0";
}
if (result.HasFlag(TrimOptions.Bone))
{
sel.Bone = new int[0];
item.SubItems[4].Text = "0";
item.SubItems[3].Text = "0";
}
if (result.HasFlag(TrimOptions.Rigidbody))
{
sel.Rigidbody = new int[0];
item.SubItems[5].Text = "0";
item.SubItems[4].Text = "0";
}
if (result.HasFlag(TrimOptions.Joint))
{
sel.Joint = new int[0];
item.SubItems[6].Text = "0";
item.SubItems[5].Text = "0";
}

if(result.HasFlag(TrimOptions.Clone))
Expand Down
3 changes: 0 additions & 3 deletions WPlugins.SelectionStorage/SelectionStorageForm.resx
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,6 @@
<metadata name="objectTypeToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>455, 17</value>
</metadata>
<metadata name="objectTypeToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>455, 17</value>
</metadata>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAEAgIAAAAEAIAAoCAEAFgAAACgAAACAAAAAAAEAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
Expand Down
46 changes: 25 additions & 21 deletions WPlugins.SelectionStorage/TrimForm.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions WPlugins.SelectionStorage/TrimForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -70,5 +70,10 @@ private void trimCloneButton_Click(object sender, EventArgs e)
if (removeJoints.Checked) _options |= TrimOptions.Joint;
Close();
}

private void TrimForm_FormClosing(object sender, FormClosingEventArgs e)
{
_options = TrimOptions.Cancel;
}
}
}

0 comments on commit ed425c6

Please sign in to comment.