mirror of
https://git.alee14.me/shiftos-archive/ShiftOS_TheReturn.git
synced 2025-01-22 18:02:16 +00:00
Add more features to TriPresent
yoy!
This commit is contained in:
AShifter
parent
64dbc45739
commit
328f62b67c
2 changed files with 124 additions and 86 deletions
178
ShiftOS.WinForms/Applications/TriPresent.Designer.cs
generated
178
ShiftOS.WinForms/Applications/TriPresent.Designer.cs
generated
|
|
@ -35,22 +35,27 @@
|
|||
this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.addToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.addLabelToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.AddItem = new System.Windows.Forms.Panel();
|
||||
this.cancelAdd = new System.Windows.Forms.Button();
|
||||
this.placeAdd = new System.Windows.Forms.Button();
|
||||
this.addLabel = new System.Windows.Forms.Panel();
|
||||
this.checkBox2 = new System.Windows.Forms.CheckBox();
|
||||
this.checkBox1 = new System.Windows.Forms.CheckBox();
|
||||
this.label1 = new System.Windows.Forms.Label();
|
||||
this.panel1 = new System.Windows.Forms.Panel();
|
||||
this.yLabel = new System.Windows.Forms.Label();
|
||||
this.xLabel = new System.Windows.Forms.Label();
|
||||
this.yPosition = new System.Windows.Forms.NumericUpDown();
|
||||
this.xPosition = new System.Windows.Forms.NumericUpDown();
|
||||
this.labelContents = new System.Windows.Forms.TextBox();
|
||||
this.addItemLabel = new System.Windows.Forms.Label();
|
||||
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
|
||||
this.designerPanel = new System.Windows.Forms.Panel();
|
||||
this.panel1 = new System.Windows.Forms.Panel();
|
||||
this.label1 = new System.Windows.Forms.Label();
|
||||
this.menuStrip1.SuspendLayout();
|
||||
this.AddItem.SuspendLayout();
|
||||
this.addLabel.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.yPosition)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xPosition)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
|
||||
this.splitContainer1.Panel1.SuspendLayout();
|
||||
this.splitContainer1.Panel2.SuspendLayout();
|
||||
this.splitContainer1.SuspendLayout();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// menuStrip1
|
||||
|
|
@ -108,49 +113,72 @@
|
|||
this.addLabelToolStripMenuItem.Text = "Add Label";
|
||||
this.addLabelToolStripMenuItem.Click += new System.EventHandler(this.addLabelToolStripMenuItem_Click);
|
||||
//
|
||||
// AddItem
|
||||
// addLabel
|
||||
//
|
||||
this.AddItem.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
||||
this.AddItem.Controls.Add(this.label1);
|
||||
this.AddItem.Controls.Add(this.panel1);
|
||||
this.AddItem.Controls.Add(this.cancelAdd);
|
||||
this.AddItem.Controls.Add(this.placeAdd);
|
||||
this.AddItem.Controls.Add(this.yLabel);
|
||||
this.AddItem.Controls.Add(this.xLabel);
|
||||
this.AddItem.Controls.Add(this.yPosition);
|
||||
this.AddItem.Controls.Add(this.xPosition);
|
||||
this.AddItem.Controls.Add(this.labelContents);
|
||||
this.AddItem.Controls.Add(this.addItemLabel);
|
||||
this.AddItem.Location = new System.Drawing.Point(260, 152);
|
||||
this.AddItem.Name = "AddItem";
|
||||
this.AddItem.Size = new System.Drawing.Size(244, 199);
|
||||
this.AddItem.TabIndex = 1;
|
||||
this.AddItem.Visible = false;
|
||||
this.addLabel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
||||
this.addLabel.Controls.Add(this.checkBox2);
|
||||
this.addLabel.Controls.Add(this.checkBox1);
|
||||
this.addLabel.Controls.Add(this.label1);
|
||||
this.addLabel.Controls.Add(this.panel1);
|
||||
this.addLabel.Controls.Add(this.yLabel);
|
||||
this.addLabel.Controls.Add(this.xLabel);
|
||||
this.addLabel.Controls.Add(this.yPosition);
|
||||
this.addLabel.Controls.Add(this.xPosition);
|
||||
this.addLabel.Controls.Add(this.labelContents);
|
||||
this.addLabel.Controls.Add(this.addItemLabel);
|
||||
this.addLabel.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.addLabel.Location = new System.Drawing.Point(0, 0);
|
||||
this.addLabel.Name = "addLabel";
|
||||
this.addLabel.Size = new System.Drawing.Size(252, 456);
|
||||
this.addLabel.TabIndex = 1;
|
||||
this.addLabel.Visible = false;
|
||||
//
|
||||
// cancelAdd
|
||||
// checkBox2
|
||||
//
|
||||
this.cancelAdd.Location = new System.Drawing.Point(120, 174);
|
||||
this.cancelAdd.Name = "cancelAdd";
|
||||
this.cancelAdd.Size = new System.Drawing.Size(123, 23);
|
||||
this.cancelAdd.TabIndex = 7;
|
||||
this.cancelAdd.Text = "Cancel";
|
||||
this.cancelAdd.UseVisualStyleBackColor = true;
|
||||
this.cancelAdd.Click += new System.EventHandler(this.button2_Click);
|
||||
this.checkBox2.AutoSize = true;
|
||||
this.checkBox2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.checkBox2.Location = new System.Drawing.Point(6, 163);
|
||||
this.checkBox2.Name = "checkBox2";
|
||||
this.checkBox2.Size = new System.Drawing.Size(48, 17);
|
||||
this.checkBox2.TabIndex = 11;
|
||||
this.checkBox2.Text = "Italic";
|
||||
this.checkBox2.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// placeAdd
|
||||
// checkBox1
|
||||
//
|
||||
this.placeAdd.Location = new System.Drawing.Point(-1, 174);
|
||||
this.placeAdd.Name = "placeAdd";
|
||||
this.placeAdd.Size = new System.Drawing.Size(123, 23);
|
||||
this.placeAdd.TabIndex = 6;
|
||||
this.placeAdd.Text = "Place";
|
||||
this.placeAdd.UseVisualStyleBackColor = true;
|
||||
this.placeAdd.Click += new System.EventHandler(this.placeAdd_Click);
|
||||
this.checkBox1.AutoSize = true;
|
||||
this.checkBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.checkBox1.Location = new System.Drawing.Point(6, 140);
|
||||
this.checkBox1.Name = "checkBox1";
|
||||
this.checkBox1.Size = new System.Drawing.Size(51, 17);
|
||||
this.checkBox1.TabIndex = 10;
|
||||
this.checkBox1.Text = "Bold";
|
||||
this.checkBox1.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// label1
|
||||
//
|
||||
this.label1.AutoSize = true;
|
||||
this.label1.Location = new System.Drawing.Point(115, 144);
|
||||
this.label1.Name = "label1";
|
||||
this.label1.Size = new System.Drawing.Size(58, 13);
|
||||
this.label1.TabIndex = 9;
|
||||
this.label1.Text = "Text Color:";
|
||||
//
|
||||
// panel1
|
||||
//
|
||||
this.panel1.BackColor = System.Drawing.Color.Black;
|
||||
this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
||||
this.panel1.ForeColor = System.Drawing.Color.Black;
|
||||
this.panel1.Location = new System.Drawing.Point(179, 141);
|
||||
this.panel1.Name = "panel1";
|
||||
this.panel1.Size = new System.Drawing.Size(35, 20);
|
||||
this.panel1.TabIndex = 8;
|
||||
this.panel1.Click += new System.EventHandler(this.panel1_Click);
|
||||
//
|
||||
// yLabel
|
||||
//
|
||||
this.yLabel.AutoSize = true;
|
||||
this.yLabel.Location = new System.Drawing.Point(227, 95);
|
||||
this.yLabel.Location = new System.Drawing.Point(200, 96);
|
||||
this.yLabel.Name = "yLabel";
|
||||
this.yLabel.Size = new System.Drawing.Size(14, 13);
|
||||
this.yLabel.TabIndex = 5;
|
||||
|
|
@ -168,7 +196,7 @@
|
|||
// yPosition
|
||||
//
|
||||
this.yPosition.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
||||
this.yPosition.Location = new System.Drawing.Point(157, 114);
|
||||
this.yPosition.Location = new System.Drawing.Point(127, 114);
|
||||
this.yPosition.Maximum = new decimal(new int[] {
|
||||
999999999,
|
||||
0,
|
||||
|
|
@ -196,7 +224,7 @@
|
|||
this.labelContents.Location = new System.Drawing.Point(3, 26);
|
||||
this.labelContents.Multiline = true;
|
||||
this.labelContents.Name = "labelContents";
|
||||
this.labelContents.Size = new System.Drawing.Size(238, 67);
|
||||
this.labelContents.Size = new System.Drawing.Size(211, 67);
|
||||
this.labelContents.TabIndex = 1;
|
||||
this.labelContents.Text = "Text";
|
||||
//
|
||||
|
|
@ -204,54 +232,55 @@
|
|||
//
|
||||
this.addItemLabel.Location = new System.Drawing.Point(0, 0);
|
||||
this.addItemLabel.Name = "addItemLabel";
|
||||
this.addItemLabel.Size = new System.Drawing.Size(244, 23);
|
||||
this.addItemLabel.Size = new System.Drawing.Size(214, 23);
|
||||
this.addItemLabel.TabIndex = 0;
|
||||
this.addItemLabel.Text = "{ADD_ITEM_LABEL}";
|
||||
this.addItemLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
|
||||
//
|
||||
// splitContainer1
|
||||
//
|
||||
this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.splitContainer1.Location = new System.Drawing.Point(0, 24);
|
||||
this.splitContainer1.Name = "splitContainer1";
|
||||
//
|
||||
// splitContainer1.Panel1
|
||||
//
|
||||
this.splitContainer1.Panel1.Controls.Add(this.addLabel);
|
||||
//
|
||||
// splitContainer1.Panel2
|
||||
//
|
||||
this.splitContainer1.Panel2.Controls.Add(this.designerPanel);
|
||||
this.splitContainer1.Size = new System.Drawing.Size(758, 456);
|
||||
this.splitContainer1.SplitterDistance = 252;
|
||||
this.splitContainer1.TabIndex = 2;
|
||||
//
|
||||
// designerPanel
|
||||
//
|
||||
this.designerPanel.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.designerPanel.Location = new System.Drawing.Point(0, 24);
|
||||
this.designerPanel.Location = new System.Drawing.Point(0, 0);
|
||||
this.designerPanel.Name = "designerPanel";
|
||||
this.designerPanel.Size = new System.Drawing.Size(758, 456);
|
||||
this.designerPanel.TabIndex = 2;
|
||||
//
|
||||
// panel1
|
||||
//
|
||||
this.panel1.BackColor = System.Drawing.Color.Black;
|
||||
this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
||||
this.panel1.ForeColor = System.Drawing.Color.Black;
|
||||
this.panel1.Location = new System.Drawing.Point(203, 144);
|
||||
this.panel1.Name = "panel1";
|
||||
this.panel1.Size = new System.Drawing.Size(35, 20);
|
||||
this.panel1.TabIndex = 8;
|
||||
this.panel1.Click += new System.EventHandler(this.panel1_Click);
|
||||
//
|
||||
// label1
|
||||
//
|
||||
this.label1.AutoSize = true;
|
||||
this.label1.Location = new System.Drawing.Point(139, 147);
|
||||
this.label1.Name = "label1";
|
||||
this.label1.Size = new System.Drawing.Size(58, 13);
|
||||
this.label1.TabIndex = 9;
|
||||
this.label1.Text = "Text Color:";
|
||||
this.designerPanel.Size = new System.Drawing.Size(502, 456);
|
||||
this.designerPanel.TabIndex = 0;
|
||||
this.designerPanel.Click += new System.EventHandler(this.designerPanel_Click);
|
||||
//
|
||||
// TriPresent
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.Controls.Add(this.AddItem);
|
||||
this.Controls.Add(this.designerPanel);
|
||||
this.Controls.Add(this.splitContainer1);
|
||||
this.Controls.Add(this.menuStrip1);
|
||||
this.Name = "TriPresent";
|
||||
this.Size = new System.Drawing.Size(758, 480);
|
||||
this.menuStrip1.ResumeLayout(false);
|
||||
this.menuStrip1.PerformLayout();
|
||||
this.AddItem.ResumeLayout(false);
|
||||
this.AddItem.PerformLayout();
|
||||
this.addLabel.ResumeLayout(false);
|
||||
this.addLabel.PerformLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.yPosition)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xPosition)).EndInit();
|
||||
this.splitContainer1.Panel1.ResumeLayout(false);
|
||||
this.splitContainer1.Panel2.ResumeLayout(false);
|
||||
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
|
||||
this.splitContainer1.ResumeLayout(false);
|
||||
this.ResumeLayout(false);
|
||||
this.PerformLayout();
|
||||
|
||||
|
|
@ -266,17 +295,18 @@
|
|||
private System.Windows.Forms.ToolStripMenuItem saveToolStripMenuItem;
|
||||
private System.Windows.Forms.ToolStripMenuItem addToolStripMenuItem;
|
||||
private System.Windows.Forms.ToolStripMenuItem addLabelToolStripMenuItem;
|
||||
private System.Windows.Forms.Panel AddItem;
|
||||
private System.Windows.Forms.Panel addLabel;
|
||||
private System.Windows.Forms.Label addItemLabel;
|
||||
private System.Windows.Forms.Button cancelAdd;
|
||||
private System.Windows.Forms.Button placeAdd;
|
||||
private System.Windows.Forms.Label yLabel;
|
||||
private System.Windows.Forms.Label xLabel;
|
||||
private System.Windows.Forms.NumericUpDown yPosition;
|
||||
private System.Windows.Forms.NumericUpDown xPosition;
|
||||
private System.Windows.Forms.TextBox labelContents;
|
||||
private System.Windows.Forms.Panel designerPanel;
|
||||
private System.Windows.Forms.Label label1;
|
||||
private System.Windows.Forms.Panel panel1;
|
||||
private System.Windows.Forms.CheckBox checkBox2;
|
||||
private System.Windows.Forms.CheckBox checkBox1;
|
||||
private System.Windows.Forms.SplitContainer splitContainer1;
|
||||
private System.Windows.Forms.Panel designerPanel;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ using System.Text;
|
|||
using System.Threading.Tasks;
|
||||
using System.Windows.Forms;
|
||||
using ShiftOS.Engine;
|
||||
using System.Threading;
|
||||
|
||||
namespace ShiftOS.WinForms.Applications
|
||||
{
|
||||
|
|
@ -26,17 +27,18 @@ namespace ShiftOS.WinForms.Applications
|
|||
private void addLabelToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
addItemLabel.Text = "Add Label";
|
||||
AddItem.Show();
|
||||
addLabel.Show();
|
||||
}
|
||||
|
||||
private void button2_Click(object sender, EventArgs e)
|
||||
{
|
||||
AddItem.Hide();
|
||||
addLabel.Hide();
|
||||
}
|
||||
|
||||
public void OnLoad()
|
||||
{
|
||||
|
||||
panel1.ForeColor = Color.Black;
|
||||
panel1.BackColor = Color.Black;
|
||||
}
|
||||
|
||||
public void OnSkinLoad()
|
||||
|
|
@ -56,15 +58,7 @@ namespace ShiftOS.WinForms.Applications
|
|||
|
||||
private void placeAdd_Click(object sender, EventArgs e)
|
||||
{
|
||||
Label label = new Label();
|
||||
label.Parent = designerPanel;
|
||||
label.BackColor = Color.Transparent;
|
||||
label.ForeColor = panel1.BackColor;
|
||||
label.Text = labelContents.Text;
|
||||
label.Location = new Point(Convert.ToInt32(xPosition.Value), Convert.ToInt32(yPosition.Value));
|
||||
label.Text = labelContents.Text;
|
||||
Random rnd = new Random();
|
||||
label.Name = labelContents.Text + rnd.Next(0, 500);
|
||||
|
||||
}
|
||||
|
||||
private void panel1_Click(object sender, EventArgs e)
|
||||
|
|
@ -75,5 +69,19 @@ namespace ShiftOS.WinForms.Applications
|
|||
panel1.BackColor = col;
|
||||
})));
|
||||
}
|
||||
|
||||
private void designerPanel_Click(object sender, EventArgs e)
|
||||
{
|
||||
if (addLabel.Visible == true)
|
||||
{
|
||||
Label label = new Label();
|
||||
label.Parent = designerPanel;
|
||||
label.BackColor = Color.Transparent;
|
||||
label.ForeColor = panel1.BackColor;
|
||||
label.Text = labelContents.Text;
|
||||
label.Location = new Point(Cursor.Position.X / 3, Cursor.Position.Y);
|
||||
label.Text = labelContents.Text;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue