1
0
mirror of synced 2024-11-30 18:24:39 +01:00

Improve white theme

This commit is contained in:
KillzXGaming 2019-10-19 20:32:44 -04:00
parent 347fd412ce
commit a480afe31c
12 changed files with 244 additions and 139 deletions

View File

@ -8,6 +8,7 @@ using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using Toolbox.Library.Forms;
using Toolbox.Library;
namespace LayoutBXLYT
{
@ -92,5 +93,115 @@ namespace LayoutBXLYT
if (ActiveAnim != null)
ActiveAnim.FileInfo.CanSave = true;
}
public class GroupAnimWrapper : TreeNode, IContextMenuNode
{
public BxlanPaiEntry PaiEntry => (BxlanPaiEntry)Tag;
public GroupAnimWrapper(string text) {
Text = text;
}
public ToolStripItem[] GetContextMenuItems()
{
List<ToolStripItem> Items = new List<ToolStripItem>();
Items.Add(new ToolStripMenuItem("Add Animation Group", null, AddGroup, Keys.Control | Keys.A));
Items.Add(new ToolStripMenuItem("Clear Groups", null, ClearGroups, Keys.Control | Keys.C));
return Items.ToArray();
}
private void AddGroup(object sender, EventArgs e)
{
}
private void ClearGroups(object sender, EventArgs e)
{
PaiEntry.Tags.Clear();
Nodes.Clear();
}
}
public class GroupWrapper : TreeNode, IContextMenuNode
{
public BxlanPaiTag GroupTag => (BxlanPaiTag)Tag;
public GroupWrapper(string text) {
Text = text;
}
public ToolStripItem[] GetContextMenuItems()
{
List<ToolStripItem> Items = new List<ToolStripItem>();
Items.Add(new ToolStripMenuItem("Add Target", null, AddTarget, Keys.Control | Keys.A));
Items.Add(new ToolStripMenuItem("Clear Targets", null, ClearTargets, Keys.Control | Keys.C));
return Items.ToArray();
}
private void AddTarget(object sender, EventArgs e)
{
}
private void ClearTargets(object sender, EventArgs e)
{
}
}
public class GroupTargetWrapper : TreeNode, IContextMenuNode
{
public BxlanPaiTagEntry TypeTag => (BxlanPaiTagEntry)Tag;
public GroupTargetWrapper(string text) {
Text = text;
}
public ToolStripItem[] GetContextMenuItems()
{
List<ToolStripItem> Items = new List<ToolStripItem>();
Items.Add(new ToolStripMenuItem("Add Keyframe", null, AddeKey, Keys.Control | Keys.A));
Items.Add(new ToolStripMenuItem("Remove Target", null, RemoveTarget, Keys.Delete));
Items.Add(new ToolStripMenuItem("Clear Keys", null, RemoveKeys, Keys.Control | Keys.C));
return Items.ToArray();
}
private void AddeKey(object sender, EventArgs e)
{
}
private void RemoveKeys(object sender, EventArgs e)
{
}
private void RemoveTarget(object sender, EventArgs e)
{
}
}
public class KeyNodeWrapper : TreeNode, IContextMenuNode
{
public KeyFrame KeyFrame => (KeyFrame)Tag;
public KeyNodeWrapper(string text) {
Text = text;
}
public ToolStripItem[] GetContextMenuItems()
{
List<ToolStripItem> Items = new List<ToolStripItem>();
Items.Add(new ToolStripMenuItem("Rename Actor Files (Odyssey)", null, RemoveKey, Keys.Delete));
return Items.ToArray();
}
private void RemoveKey(object sender, EventArgs e)
{
}
}
}
}

View File

@ -8,6 +8,7 @@ using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using Toolbox.Library.Forms;
using Toolbox.Library;
namespace LayoutBXLYT
{
@ -76,16 +77,8 @@ namespace LayoutBXLYT
SetUIState();
nameTB.Bind(pane, "Name");
tranXUD.Value = pane.Translate.X;
tranYUD.Value = pane.Translate.Y;
tranZUD.Value = pane.Translate.Z;
rotXUD.Value = pane.Rotate.X;
rotYUD.Value = pane.Rotate.Y;
rotZUD.Value = pane.Rotate.Z;
scaleXUD.Value = pane.Scale.X;
scaleYUD.Value = pane.Scale.Y;
sizeXUD.Value = pane.Width;
sizeYUD.Value = pane.Height;
SetTransform();
alphaChildrenChk.Bind(pane, "InfluenceAlpha");
paneVisibleChk.Bind(pane, "Visible");
@ -100,7 +93,7 @@ namespace LayoutBXLYT
public override void SetUIState()
{
if (parentEditor.AnimationMode)
if (Runtime.LayoutEditor.AnimationEditMode)
{
//Change any UI that can be keyed or is keyed
tranXUD.ReloadTheme();
@ -149,14 +142,19 @@ namespace LayoutBXLYT
public void RefreshEditor()
{
Loaded = false;
SetTransform();
Loaded = true;
}
private void SetTransform()
{
var translate = ActivePane.Translate;
var rotate = ActivePane.Rotate;
var scale = ActivePane.Scale;
var sizeX = ActivePane.Width;
var sizeY = ActivePane.Height;
if (parentEditor.AnimationMode)
if (Runtime.LayoutEditor.AnimationEditMode)
{
translate = ActivePane.GetTranslation();
rotate = ActivePane.GetRotation();
@ -164,21 +162,17 @@ namespace LayoutBXLYT
sizeX = ActivePane.GetSize().X;
sizeY = ActivePane.GetSize().Y;
}
else
{
tranXUD.Value = translate.X;
tranYUD.Value = translate.Y;
tranZUD.Value = translate.Z;
rotXUD.Value = rotate.X;
rotYUD.Value = rotate.Y;
rotZUD.Value = rotate.Z;
scaleXUD.Value = scale.X;
scaleYUD.Value = scale.Y;
sizeXUD.Value = sizeX;
sizeYUD.Value = sizeY;
}
Loaded = true;
tranXUD.Value = translate.X;
tranYUD.Value = translate.Y;
tranZUD.Value = translate.Z;
rotXUD.Value = rotate.X;
rotYUD.Value = rotate.Y;
rotZUD.Value = rotate.Z;
scaleXUD.Value = scale.X;
scaleYUD.Value = scale.Y;
sizeXUD.Value = sizeX;
sizeYUD.Value = sizeY;
}
private void OnAlphaSliderChanged(object sender, EventArgs e) {
@ -309,17 +303,24 @@ namespace LayoutBXLYT
private void OnTransformChanged(object sender, EventArgs e) {
if (!Loaded) return;
ActivePane.Translate = new Syroot.Maths.Vector3F(
tranXUD.Value, tranYUD.Value, tranZUD.Value);
if (Runtime.LayoutEditor.AnimationEditMode)
{
ActivePane.Rotate = new Syroot.Maths.Vector3F(
rotXUD.Value, rotYUD.Value, rotZUD.Value);
}
else
{
ActivePane.Translate = new Syroot.Maths.Vector3F(
tranXUD.Value, tranYUD.Value, tranZUD.Value);
ActivePane.Scale = new Syroot.Maths.Vector2F(
scaleXUD.Value, scaleYUD.Value);
ActivePane.Rotate = new Syroot.Maths.Vector3F(
rotXUD.Value, rotYUD.Value, rotZUD.Value);
ActivePane.Width = sizeXUD.Value;
ActivePane.Height = sizeYUD.Value;
ActivePane.Scale = new Syroot.Maths.Vector2F(
scaleXUD.Value, scaleYUD.Value);
ActivePane.Width = sizeXUD.Value;
ActivePane.Height = sizeYUD.Value;
}
parentEditor.PropertyChanged?.Invoke(sender, e);
}

View File

@ -32,6 +32,7 @@
this.stFlowLayoutPanel1 = new Toolbox.Library.Forms.STFlowLayoutPanel();
this.stDropDownPanel1 = new Toolbox.Library.Forms.STDropDownPanel();
this.btnResetColors = new Toolbox.Library.Forms.STButton();
this.vertexColorBox1 = new Toolbox.Library.Forms.VertexColorBox();
this.stDropDownPanel3 = new Toolbox.Library.Forms.STDropDownPanel();
this.texCoordIndexCB = new Toolbox.Library.Forms.STComboBox();
this.bottomRightYUD = new BarSlider.BarSlider();
@ -46,7 +47,6 @@
this.topLeftYUD = new BarSlider.BarSlider();
this.topLeftXUD = new BarSlider.BarSlider();
this.stLabel6 = new Toolbox.Library.Forms.STLabel();
this.vertexColorBox1 = new Toolbox.Library.Forms.VertexColorBox();
this.stFlowLayoutPanel1.SuspendLayout();
this.stDropDownPanel1.SuspendLayout();
this.stDropDownPanel3.SuspendLayout();
@ -94,6 +94,20 @@
this.btnResetColors.UseVisualStyleBackColor = false;
this.btnResetColors.Click += new System.EventHandler(this.btnResetColors_Click);
//
// vertexColorBox1
//
this.vertexColorBox1.BackColor = System.Drawing.Color.Transparent;
this.vertexColorBox1.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("vertexColorBox1.BackgroundImage")));
this.vertexColorBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.vertexColorBox1.BottomLeftColor = System.Drawing.Color.Empty;
this.vertexColorBox1.BottomRightColor = System.Drawing.Color.Empty;
this.vertexColorBox1.Location = new System.Drawing.Point(22, 27);
this.vertexColorBox1.Name = "vertexColorBox1";
this.vertexColorBox1.Size = new System.Drawing.Size(100, 100);
this.vertexColorBox1.TabIndex = 1;
this.vertexColorBox1.TopLeftColor = System.Drawing.Color.Empty;
this.vertexColorBox1.TopRightColor = System.Drawing.Color.Empty;
//
// stDropDownPanel3
//
this.stDropDownPanel3.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
@ -140,18 +154,17 @@
//
this.bottomRightYUD.ActiveEditColor = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
this.bottomRightYUD.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.bottomRightYUD.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
this.bottomRightYUD.BarInnerColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(80)))), ((int)(((byte)(80)))));
this.bottomRightYUD.BarPenColorBottom = System.Drawing.Color.FromArgb(((int)(((byte)(50)))), ((int)(((byte)(50)))), ((int)(((byte)(50)))));
this.bottomRightYUD.BarPenColorMiddle = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45)))));
this.bottomRightYUD.BarPenColorTop = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
this.bottomRightYUD.BarPenColorBottom = System.Drawing.Color.Empty;
this.bottomRightYUD.BarPenColorMiddle = System.Drawing.Color.Empty;
this.bottomRightYUD.BarPenColorTop = System.Drawing.Color.Empty;
this.bottomRightYUD.BorderRoundRectSize = new System.Drawing.Size(32, 32);
this.bottomRightYUD.DataType = null;
this.bottomRightYUD.DrawSemitransparentThumb = false;
this.bottomRightYUD.ElapsedInnerColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
this.bottomRightYUD.ElapsedPenColorBottom = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
this.bottomRightYUD.ElapsedPenColorMiddle = System.Drawing.Color.FromArgb(((int)(((byte)(65)))), ((int)(((byte)(65)))), ((int)(((byte)(65)))));
this.bottomRightYUD.ElapsedPenColorTop = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
this.bottomRightYUD.ElapsedPenColorBottom = System.Drawing.Color.Empty;
this.bottomRightYUD.ElapsedPenColorMiddle = System.Drawing.Color.Empty;
this.bottomRightYUD.ElapsedPenColorTop = System.Drawing.Color.Empty;
this.bottomRightYUD.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F);
this.bottomRightYUD.ForeColor = System.Drawing.Color.White;
this.bottomRightYUD.IncrementAmount = 0.01F;
@ -185,18 +198,17 @@
//
this.bottomRightXUD.ActiveEditColor = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
this.bottomRightXUD.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.bottomRightXUD.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
this.bottomRightXUD.BarInnerColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(80)))), ((int)(((byte)(80)))));
this.bottomRightXUD.BarPenColorBottom = System.Drawing.Color.FromArgb(((int)(((byte)(50)))), ((int)(((byte)(50)))), ((int)(((byte)(50)))));
this.bottomRightXUD.BarPenColorMiddle = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45)))));
this.bottomRightXUD.BarPenColorTop = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
this.bottomRightXUD.BarPenColorBottom = System.Drawing.Color.Empty;
this.bottomRightXUD.BarPenColorMiddle = System.Drawing.Color.Empty;
this.bottomRightXUD.BarPenColorTop = System.Drawing.Color.Empty;
this.bottomRightXUD.BorderRoundRectSize = new System.Drawing.Size(32, 32);
this.bottomRightXUD.DataType = null;
this.bottomRightXUD.DrawSemitransparentThumb = false;
this.bottomRightXUD.ElapsedInnerColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
this.bottomRightXUD.ElapsedPenColorBottom = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
this.bottomRightXUD.ElapsedPenColorMiddle = System.Drawing.Color.FromArgb(((int)(((byte)(65)))), ((int)(((byte)(65)))), ((int)(((byte)(65)))));
this.bottomRightXUD.ElapsedPenColorTop = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
this.bottomRightXUD.ElapsedPenColorBottom = System.Drawing.Color.Empty;
this.bottomRightXUD.ElapsedPenColorMiddle = System.Drawing.Color.Empty;
this.bottomRightXUD.ElapsedPenColorTop = System.Drawing.Color.Empty;
this.bottomRightXUD.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F);
this.bottomRightXUD.ForeColor = System.Drawing.Color.White;
this.bottomRightXUD.IncrementAmount = 0.01F;
@ -239,18 +251,17 @@
//
this.bottomLeftYUD.ActiveEditColor = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
this.bottomLeftYUD.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.bottomLeftYUD.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
this.bottomLeftYUD.BarInnerColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(80)))), ((int)(((byte)(80)))));
this.bottomLeftYUD.BarPenColorBottom = System.Drawing.Color.FromArgb(((int)(((byte)(50)))), ((int)(((byte)(50)))), ((int)(((byte)(50)))));
this.bottomLeftYUD.BarPenColorMiddle = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45)))));
this.bottomLeftYUD.BarPenColorTop = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
this.bottomLeftYUD.BarPenColorBottom = System.Drawing.Color.Empty;
this.bottomLeftYUD.BarPenColorMiddle = System.Drawing.Color.Empty;
this.bottomLeftYUD.BarPenColorTop = System.Drawing.Color.Empty;
this.bottomLeftYUD.BorderRoundRectSize = new System.Drawing.Size(32, 32);
this.bottomLeftYUD.DataType = null;
this.bottomLeftYUD.DrawSemitransparentThumb = false;
this.bottomLeftYUD.ElapsedInnerColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
this.bottomLeftYUD.ElapsedPenColorBottom = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
this.bottomLeftYUD.ElapsedPenColorMiddle = System.Drawing.Color.FromArgb(((int)(((byte)(65)))), ((int)(((byte)(65)))), ((int)(((byte)(65)))));
this.bottomLeftYUD.ElapsedPenColorTop = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
this.bottomLeftYUD.ElapsedPenColorBottom = System.Drawing.Color.Empty;
this.bottomLeftYUD.ElapsedPenColorMiddle = System.Drawing.Color.Empty;
this.bottomLeftYUD.ElapsedPenColorTop = System.Drawing.Color.Empty;
this.bottomLeftYUD.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F);
this.bottomLeftYUD.ForeColor = System.Drawing.Color.White;
this.bottomLeftYUD.IncrementAmount = 0.01F;
@ -284,18 +295,17 @@
//
this.bottomLeftXUD.ActiveEditColor = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
this.bottomLeftXUD.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.bottomLeftXUD.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
this.bottomLeftXUD.BarInnerColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(80)))), ((int)(((byte)(80)))));
this.bottomLeftXUD.BarPenColorBottom = System.Drawing.Color.FromArgb(((int)(((byte)(50)))), ((int)(((byte)(50)))), ((int)(((byte)(50)))));
this.bottomLeftXUD.BarPenColorMiddle = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45)))));
this.bottomLeftXUD.BarPenColorTop = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
this.bottomLeftXUD.BarPenColorBottom = System.Drawing.Color.Empty;
this.bottomLeftXUD.BarPenColorMiddle = System.Drawing.Color.Empty;
this.bottomLeftXUD.BarPenColorTop = System.Drawing.Color.Empty;
this.bottomLeftXUD.BorderRoundRectSize = new System.Drawing.Size(32, 32);
this.bottomLeftXUD.DataType = null;
this.bottomLeftXUD.DrawSemitransparentThumb = false;
this.bottomLeftXUD.ElapsedInnerColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
this.bottomLeftXUD.ElapsedPenColorBottom = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
this.bottomLeftXUD.ElapsedPenColorMiddle = System.Drawing.Color.FromArgb(((int)(((byte)(65)))), ((int)(((byte)(65)))), ((int)(((byte)(65)))));
this.bottomLeftXUD.ElapsedPenColorTop = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
this.bottomLeftXUD.ElapsedPenColorBottom = System.Drawing.Color.Empty;
this.bottomLeftXUD.ElapsedPenColorMiddle = System.Drawing.Color.Empty;
this.bottomLeftXUD.ElapsedPenColorTop = System.Drawing.Color.Empty;
this.bottomLeftXUD.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F);
this.bottomLeftXUD.ForeColor = System.Drawing.Color.White;
this.bottomLeftXUD.IncrementAmount = 0.01F;
@ -338,18 +348,17 @@
//
this.topRightYUD.ActiveEditColor = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
this.topRightYUD.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.topRightYUD.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
this.topRightYUD.BarInnerColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(80)))), ((int)(((byte)(80)))));
this.topRightYUD.BarPenColorBottom = System.Drawing.Color.FromArgb(((int)(((byte)(50)))), ((int)(((byte)(50)))), ((int)(((byte)(50)))));
this.topRightYUD.BarPenColorMiddle = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45)))));
this.topRightYUD.BarPenColorTop = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
this.topRightYUD.BarPenColorBottom = System.Drawing.Color.Empty;
this.topRightYUD.BarPenColorMiddle = System.Drawing.Color.Empty;
this.topRightYUD.BarPenColorTop = System.Drawing.Color.Empty;
this.topRightYUD.BorderRoundRectSize = new System.Drawing.Size(32, 32);
this.topRightYUD.DataType = null;
this.topRightYUD.DrawSemitransparentThumb = false;
this.topRightYUD.ElapsedInnerColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
this.topRightYUD.ElapsedPenColorBottom = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
this.topRightYUD.ElapsedPenColorMiddle = System.Drawing.Color.FromArgb(((int)(((byte)(65)))), ((int)(((byte)(65)))), ((int)(((byte)(65)))));
this.topRightYUD.ElapsedPenColorTop = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
this.topRightYUD.ElapsedPenColorBottom = System.Drawing.Color.Empty;
this.topRightYUD.ElapsedPenColorMiddle = System.Drawing.Color.Empty;
this.topRightYUD.ElapsedPenColorTop = System.Drawing.Color.Empty;
this.topRightYUD.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F);
this.topRightYUD.ForeColor = System.Drawing.Color.White;
this.topRightYUD.IncrementAmount = 0.01F;
@ -383,18 +392,17 @@
//
this.topRightXUD.ActiveEditColor = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
this.topRightXUD.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.topRightXUD.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
this.topRightXUD.BarInnerColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(80)))), ((int)(((byte)(80)))));
this.topRightXUD.BarPenColorBottom = System.Drawing.Color.FromArgb(((int)(((byte)(50)))), ((int)(((byte)(50)))), ((int)(((byte)(50)))));
this.topRightXUD.BarPenColorMiddle = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45)))));
this.topRightXUD.BarPenColorTop = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
this.topRightXUD.BarPenColorBottom = System.Drawing.Color.Empty;
this.topRightXUD.BarPenColorMiddle = System.Drawing.Color.Empty;
this.topRightXUD.BarPenColorTop = System.Drawing.Color.Empty;
this.topRightXUD.BorderRoundRectSize = new System.Drawing.Size(32, 32);
this.topRightXUD.DataType = null;
this.topRightXUD.DrawSemitransparentThumb = false;
this.topRightXUD.ElapsedInnerColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
this.topRightXUD.ElapsedPenColorBottom = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
this.topRightXUD.ElapsedPenColorMiddle = System.Drawing.Color.FromArgb(((int)(((byte)(65)))), ((int)(((byte)(65)))), ((int)(((byte)(65)))));
this.topRightXUD.ElapsedPenColorTop = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
this.topRightXUD.ElapsedPenColorBottom = System.Drawing.Color.Empty;
this.topRightXUD.ElapsedPenColorMiddle = System.Drawing.Color.Empty;
this.topRightXUD.ElapsedPenColorTop = System.Drawing.Color.Empty;
this.topRightXUD.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F);
this.topRightXUD.ForeColor = System.Drawing.Color.White;
this.topRightXUD.IncrementAmount = 0.01F;
@ -437,18 +445,17 @@
//
this.topLeftYUD.ActiveEditColor = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
this.topLeftYUD.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.topLeftYUD.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
this.topLeftYUD.BarInnerColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(80)))), ((int)(((byte)(80)))));
this.topLeftYUD.BarPenColorBottom = System.Drawing.Color.FromArgb(((int)(((byte)(50)))), ((int)(((byte)(50)))), ((int)(((byte)(50)))));
this.topLeftYUD.BarPenColorMiddle = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45)))));
this.topLeftYUD.BarPenColorTop = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
this.topLeftYUD.BarPenColorBottom = System.Drawing.Color.Empty;
this.topLeftYUD.BarPenColorMiddle = System.Drawing.Color.Empty;
this.topLeftYUD.BarPenColorTop = System.Drawing.Color.Empty;
this.topLeftYUD.BorderRoundRectSize = new System.Drawing.Size(32, 32);
this.topLeftYUD.DataType = null;
this.topLeftYUD.DrawSemitransparentThumb = false;
this.topLeftYUD.ElapsedInnerColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
this.topLeftYUD.ElapsedPenColorBottom = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
this.topLeftYUD.ElapsedPenColorMiddle = System.Drawing.Color.FromArgb(((int)(((byte)(65)))), ((int)(((byte)(65)))), ((int)(((byte)(65)))));
this.topLeftYUD.ElapsedPenColorTop = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
this.topLeftYUD.ElapsedPenColorBottom = System.Drawing.Color.Empty;
this.topLeftYUD.ElapsedPenColorMiddle = System.Drawing.Color.Empty;
this.topLeftYUD.ElapsedPenColorTop = System.Drawing.Color.Empty;
this.topLeftYUD.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F);
this.topLeftYUD.ForeColor = System.Drawing.Color.White;
this.topLeftYUD.IncrementAmount = 0.01F;
@ -482,18 +489,17 @@
//
this.topLeftXUD.ActiveEditColor = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
this.topLeftXUD.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.topLeftXUD.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
this.topLeftXUD.BarInnerColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(80)))), ((int)(((byte)(80)))));
this.topLeftXUD.BarPenColorBottom = System.Drawing.Color.FromArgb(((int)(((byte)(50)))), ((int)(((byte)(50)))), ((int)(((byte)(50)))));
this.topLeftXUD.BarPenColorMiddle = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45)))));
this.topLeftXUD.BarPenColorTop = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
this.topLeftXUD.BarPenColorBottom = System.Drawing.Color.Empty;
this.topLeftXUD.BarPenColorMiddle = System.Drawing.Color.Empty;
this.topLeftXUD.BarPenColorTop = System.Drawing.Color.Empty;
this.topLeftXUD.BorderRoundRectSize = new System.Drawing.Size(32, 32);
this.topLeftXUD.DataType = null;
this.topLeftXUD.DrawSemitransparentThumb = false;
this.topLeftXUD.ElapsedInnerColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
this.topLeftXUD.ElapsedPenColorBottom = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
this.topLeftXUD.ElapsedPenColorMiddle = System.Drawing.Color.FromArgb(((int)(((byte)(65)))), ((int)(((byte)(65)))), ((int)(((byte)(65)))));
this.topLeftXUD.ElapsedPenColorTop = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
this.topLeftXUD.ElapsedPenColorBottom = System.Drawing.Color.Empty;
this.topLeftXUD.ElapsedPenColorMiddle = System.Drawing.Color.Empty;
this.topLeftXUD.ElapsedPenColorTop = System.Drawing.Color.Empty;
this.topLeftXUD.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F);
this.topLeftXUD.ForeColor = System.Drawing.Color.White;
this.topLeftXUD.IncrementAmount = 0.01F;
@ -532,19 +538,6 @@
this.stLabel6.TabIndex = 47;
this.stLabel6.Text = "Top Left:";
//
// vertexColorBox1
//
this.vertexColorBox1.BackColor = System.Drawing.Color.Transparent;
this.vertexColorBox1.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("vertexColorBox1.BackgroundImage")));
this.vertexColorBox1.BottomLeftColor = System.Drawing.Color.Empty;
this.vertexColorBox1.BottomRightColor = System.Drawing.Color.Empty;
this.vertexColorBox1.Location = new System.Drawing.Point(22, 27);
this.vertexColorBox1.Name = "vertexColorBox1";
this.vertexColorBox1.Size = new System.Drawing.Size(100, 100);
this.vertexColorBox1.TabIndex = 1;
this.vertexColorBox1.TopLeftColor = System.Drawing.Color.Empty;
this.vertexColorBox1.TopRightColor = System.Drawing.Color.Empty;
//
// BasePictureboxEditor
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

View File

@ -16,11 +16,6 @@ namespace LayoutBXLYT
{
public EventHandler PropertyChanged;
public bool AnimationMode
{
get { return ParentEditor.AnimationMode; }
}
public PaneEditor()
{
InitializeComponent();

View File

@ -25,8 +25,6 @@ namespace LayoutBXLYT
/// </summary>
public static bool UseLegacyGL = true;
public bool AnimationMode = false;
public LayoutViewer GamePreviewWindow;
private LayoutCustomPaneMapper CustomMapper;
@ -536,7 +534,7 @@ namespace LayoutBXLYT
{
if (LayoutAnimEditor != null)
LayoutAnimEditor.OnAnimationPlaying();
if (AnimationMode && LayoutPaneEditor != null)
if (Runtime.LayoutEditor.AnimationEditMode && LayoutPaneEditor != null)
LayoutPaneEditor.ReloadEditor();
}
@ -1122,8 +1120,8 @@ namespace LayoutBXLYT
private void editorModeCB_SelectedIndexChanged(object sender, EventArgs e)
{
AnimationMode = editorModeCB.SelectedIndex == 1;
if (AnimationMode)
Runtime.LayoutEditor.AnimationEditMode = editorModeCB.SelectedIndex == 1;
if (Runtime.LayoutEditor.AnimationEditMode)
chkAutoKey.Show();
else
chkAutoKey.Hide();

View File

@ -431,24 +431,9 @@ namespace LayoutBXLYT
}
var translate = pane.Translate;
var rotate = pane.Rotate;
var scale = pane.Scale;
foreach (var animItem in pane.animController.PaneSRT)
{
switch (animItem.Key)
{
case LPATarget.RotateX: rotate.X = animItem.Value; break;
case LPATarget.RotateY: rotate.Y = animItem.Value; break;
case LPATarget.RotateZ: rotate.Z = animItem.Value; break;
case LPATarget.ScaleX: scale.X = animItem.Value; break;
case LPATarget.ScaleY: scale.Y = animItem.Value; break;
case LPATarget.TranslateX: translate.X = animItem.Value; break;
case LPATarget.TranslateY: translate.Y = animItem.Value; break;
case LPATarget.TranslateZ: translate.Z = animItem.Value; break;
}
}
var translate = pane.GetTranslation();
var rotate = pane.GetRotation();
var scale = pane.GetScale();
if (partPane != null)
{

View File

@ -70,6 +70,19 @@ namespace Toolbox.Library.Forms
BaseTheme.TimelineThumbColor = Color.Yellow;
BaseTheme.ComboBoxArrowColor = Color.Black;
BaseTheme.ValueBarSliderElapseTopColor = Color.FromArgb(140, 140, 140);
BaseTheme.ValueBarSliderElapseMiddleColor = Color.FromArgb(140, 140, 140);
BaseTheme.ValueBarSliderElapseBottmColor = Color.FromArgb(140, 140, 140);
BaseTheme.ValueBarSliderTopColor = Color.FromArgb(140, 140, 140);
BaseTheme.ValueBarSliderMiddleColor = Color.FromArgb(140, 140, 140);
BaseTheme.ValueBarSliderBottmColor = Color.FromArgb(140, 140, 140);
BaseTheme.ValueBarSliderElapseTopColor = Color.FromArgb(140, 140, 140);
BaseTheme.ValueBarSliderElapseMiddleColor = Color.FromArgb(140, 140, 140);
BaseTheme.ValueBarSliderElapseBottmColor = Color.FromArgb(140, 140, 140);
}
private static void SetDarkTheme()
{

View File

@ -1094,6 +1094,9 @@ namespace BarSlider
set
{
base.ForeColor = value;
ReloadTheme();
Invalidate();
OnForeColorChanged(EventArgs.Empty);
}

View File

@ -47,8 +47,6 @@ namespace Toolbox.Library.Forms
public STToolStrip()
{
this.BackColor = titlebarBackColor;
if (FormThemes.ActivePreset != FormThemes.Preset.White)
{
this.BackColor = titlebarBackColor;

View File

@ -64,6 +64,8 @@ namespace Toolbox.Library
public class LayoutEditor
{
public static bool AnimationEditMode = false;
public static bool TransformChidlren = false;
public static bool PartsAsNullPanes = false;

View File

@ -49,8 +49,6 @@ namespace Toolbox
public MainForm()
{
FormThemes.ActivePreset = FormThemes.Preset.Dark;
InitializeComponent();
}
@ -68,8 +66,6 @@ namespace Toolbox
private void Form1_Load(object sender, EventArgs e)
{
FormThemes.ActivePreset = FormThemes.Preset.Dark;
Runtime.MainForm = this;
compressionToolStripMenuItem.DropDownItems.AddRange(CompressionMenus.GetMenuItems().ToArray());
@ -117,7 +113,6 @@ namespace Toolbox
LoadPLugins();
UpdateToolbar(HasVersionFile);
LoadConfig();
LoadMDITheme();
LoadRecentList();
ReloadFiles();

View File

@ -7,6 +7,7 @@ using System.IO;
using System.Runtime.InteropServices;
using System.Reflection;
using Microsoft.VisualBasic.ApplicationServices;
using Toolbox.Library;
namespace Toolbox
{
@ -33,6 +34,16 @@ namespace Toolbox
Files.Add(arg);
}
try
{
Config.StartupFromFile(Runtime.ExecutableDir + "\\config.xml");
Config.GamePathsFromFile(Runtime.ExecutableDir + "\\config_paths.xml");
}
catch (Exception ex)
{
MessageBox.Show($"Failed to load config file! {ex}");
}
var domain = AppDomain.CurrentDomain;
domain.AssemblyResolve += LoadAssembly;