Updated fork

Conflicts:
	.vs/ShiftOS/v15/sqlite3/storage.ide
This commit is contained in:
Alex-TIMEHACK 2017-10-14 16:31:58 +01:00
commit 5d1004015d
22 changed files with 78765 additions and 326 deletions

Binary file not shown.

View file

@ -59,6 +59,7 @@
<Compile Include="WindowManager\InfoboxTemplate.Designer.cs">
<DependentUpon>InfoboxTemplate.cs</DependentUpon>
</Compile>
<Compile Include="WindowManager\ShiftSkinData.cs" />
<Compile Include="WindowManager\ShiftWindow.cs">
<SubType>Form</SubType>
</Compile>

View file

@ -0,0 +1,20 @@
using System.Drawing;
namespace ShiftOS.Engine.WindowManager
{
public abstract class ShiftSkinData
{
// ColorData
public static Color leftTopCornerColor = Color.Empty;
public static Color titleBarColor = Color.Empty;
public static Color rightTopCornerColor = Color.Empty;
public static Color btnCloseColor = Color.Empty;
public static Color btnMaxColor = Color.Empty;
public static Color btnMinColor = Color.Empty;
public static Color leftSideColor = Color.Empty;
public static Color rightSideColor = Color.Empty;
public static Color leftBottomCornerColor = Color.Empty;
public static Color bottomSideColor = Color.Empty;
public static Color rightBottomCornerColor = Color.Empty;
}
}

View file

@ -18,7 +18,7 @@ namespace ShiftOS.Engine.WindowManager
}
/// <summary>
/// Shows a new Window based on a UserControl.
/// Shows a new ShiftWindow based on a UserControl.
/// </summary>
/// <param name="content">The UserControl to use</param>
/// <param name="title">The program's title</param>
@ -33,13 +33,42 @@ namespace ShiftOS.Engine.WindowManager
{
Text = title,
Title = {Text = title}
};
};
app.Width = content.Width + app.left.Width + app.right.Width;
app.Height = content.Height + app.bottom.Height + app.top.Height;
app.Width = content.Width + app.leftSide.Width + app.rightSide.Width;
app.Height = content.Height + app.bottomSide.Height + app.titleBar.Height;
if (ShiftSkinData.titleBarColor == Color.Empty)
{
Color borderColor = Color.FromArgb(64, 64, 64);
ShiftSkinData.btnCloseColor = Color.Black;
ShiftSkinData.btnMaxColor = Color.Black;
ShiftSkinData.btnMinColor = Color.Black;
ShiftSkinData.leftTopCornerColor = borderColor;
ShiftSkinData.titleBarColor = borderColor;
ShiftSkinData.rightTopCornerColor = borderColor;
ShiftSkinData.leftSideColor = borderColor;
ShiftSkinData.rightSideColor = borderColor;
ShiftSkinData.leftBottomCornerColor = borderColor;
ShiftSkinData.bottomSideColor = borderColor;
ShiftSkinData.rightBottomCornerColor = borderColor;
}
app.btnClose.BackColor = ShiftSkinData.btnCloseColor;
app.btnMax.BackColor = ShiftSkinData.btnMaxColor;
app.btnMin.BackColor = ShiftSkinData.btnMinColor;
app.leftTopCorner.BackColor = ShiftSkinData.leftTopCornerColor;
app.titleBar.BackColor = ShiftSkinData.titleBarColor;
app.rightTopCorner.BackColor = ShiftSkinData.rightTopCornerColor;
app.leftSide.BackColor = ShiftSkinData.leftSideColor;
app.rightSide.BackColor = ShiftSkinData.rightSideColor;
app.leftBottomCorner.BackColor = ShiftSkinData.leftBottomCornerColor;
app.bottomSide.BackColor = ShiftSkinData.bottomSideColor;
app.rightBottomCorner.BackColor = ShiftSkinData.rightBottomCornerColor;
// Icon Setup
if (icon == null)
if (icon == null)
{
app.programIcon.Hide();
app.programIcon.Image = Properties.Resources.nullIcon;

View file

@ -28,238 +28,222 @@
/// </summary>
private void InitializeComponent()
{
this.program = new System.Windows.Forms.Panel();
this.programContent = new System.Windows.Forms.Panel();
this.bottomleftcorner = new System.Windows.Forms.Panel();
this.toprightcorner = new System.Windows.Forms.Panel();
this.bottomrightcorner = new System.Windows.Forms.Panel();
this.topleftcorner = new System.Windows.Forms.Panel();
this.bottom = new System.Windows.Forms.Panel();
this.top = new System.Windows.Forms.Panel();
this.programIcon = new System.Windows.Forms.PictureBox();
this.maximizebutton = new System.Windows.Forms.PictureBox();
this.minimizebutton = new System.Windows.Forms.PictureBox();
this.Title = new System.Windows.Forms.Label();
this.closebutton = new System.Windows.Forms.PictureBox();
this.right = new System.Windows.Forms.Panel();
this.left = new System.Windows.Forms.Panel();
this.program.SuspendLayout();
this.top.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.programIcon)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.maximizebutton)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.minimizebutton)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.closebutton)).BeginInit();
this.SuspendLayout();
//
// program
//
this.program.BackColor = System.Drawing.Color.White;
this.program.Controls.Add(this.programContent);
this.program.Controls.Add(this.bottomleftcorner);
this.program.Controls.Add(this.toprightcorner);
this.program.Controls.Add(this.bottomrightcorner);
this.program.Controls.Add(this.topleftcorner);
this.program.Controls.Add(this.bottom);
this.program.Controls.Add(this.top);
this.program.Controls.Add(this.right);
this.program.Controls.Add(this.left);
this.program.Dock = System.Windows.Forms.DockStyle.Fill;
this.program.Location = new System.Drawing.Point(0, 0);
this.program.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.program.Name = "program";
this.program.Size = new System.Drawing.Size(426, 402);
this.program.TabIndex = 11;
//
// programContent
//
this.programContent.Dock = System.Windows.Forms.DockStyle.Fill;
this.programContent.Location = new System.Drawing.Point(6, 46);
this.programContent.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.programContent.Name = "programContent";
this.programContent.Size = new System.Drawing.Size(414, 350);
this.programContent.TabIndex = 11;
//
// bottomleftcorner
//
this.bottomleftcorner.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.bottomleftcorner.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.bottomleftcorner.Location = new System.Drawing.Point(0, 395);
this.bottomleftcorner.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.bottomleftcorner.Name = "bottomleftcorner";
this.bottomleftcorner.Size = new System.Drawing.Size(8, 6);
this.bottomleftcorner.TabIndex = 10;
//
// toprightcorner
//
this.toprightcorner.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.toprightcorner.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.toprightcorner.Location = new System.Drawing.Point(417, 0);
this.toprightcorner.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.toprightcorner.Name = "toprightcorner";
this.toprightcorner.Size = new System.Drawing.Size(9, 46);
this.toprightcorner.TabIndex = 9;
//
// bottomrightcorner
//
this.bottomrightcorner.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.bottomrightcorner.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.bottomrightcorner.Cursor = System.Windows.Forms.Cursors.SizeNWSE;
this.bottomrightcorner.Location = new System.Drawing.Point(420, 395);
this.bottomrightcorner.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.bottomrightcorner.Name = "bottomrightcorner";
this.bottomrightcorner.Size = new System.Drawing.Size(6, 6);
this.bottomrightcorner.TabIndex = 4;
//
// topleftcorner
//
this.topleftcorner.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.topleftcorner.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
this.topleftcorner.Location = new System.Drawing.Point(0, 0);
this.topleftcorner.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.topleftcorner.Name = "topleftcorner";
this.topleftcorner.Size = new System.Drawing.Size(10, 46);
this.topleftcorner.TabIndex = 8;
//
// bottom
//
this.bottom.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.bottom.Cursor = System.Windows.Forms.Cursors.SizeNS;
this.bottom.Dock = System.Windows.Forms.DockStyle.Bottom;
this.bottom.Location = new System.Drawing.Point(6, 396);
this.bottom.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.bottom.Name = "bottom";
this.bottom.Size = new System.Drawing.Size(414, 6);
this.bottom.TabIndex = 3;
//
// top
//
this.top.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.top.Controls.Add(this.programIcon);
this.top.Controls.Add(this.maximizebutton);
this.top.Controls.Add(this.minimizebutton);
this.top.Controls.Add(this.Title);
this.top.Controls.Add(this.closebutton);
this.top.Dock = System.Windows.Forms.DockStyle.Top;
this.top.ForeColor = System.Drawing.SystemColors.ControlText;
this.top.Location = new System.Drawing.Point(6, 0);
this.top.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.top.Name = "top";
this.top.Size = new System.Drawing.Size(414, 46);
this.top.TabIndex = 0;
this.top.MouseDown += new System.Windows.Forms.MouseEventHandler(this.Programtopbar_drag);
//
// programIcon
//
this.programIcon.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.programIcon.ErrorImage = null;
this.programIcon.InitialImage = null;
this.programIcon.Location = new System.Drawing.Point(9, 11);
this.programIcon.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.programIcon.Name = "programIcon";
this.programIcon.Size = new System.Drawing.Size(24, 25);
this.programIcon.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.programIcon.TabIndex = 7;
this.programIcon.TabStop = false;
//
// maximizebutton
//
this.maximizebutton.Anchor = System.Windows.Forms.AnchorStyles.Right;
this.maximizebutton.BackColor = System.Drawing.Color.Black;
this.maximizebutton.Location = new System.Drawing.Point(345, 6);
this.maximizebutton.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.maximizebutton.Name = "maximizebutton";
this.maximizebutton.Size = new System.Drawing.Size(32, 32);
this.maximizebutton.TabIndex = 6;
this.maximizebutton.TabStop = false;
this.maximizebutton.MouseDown += new System.Windows.Forms.MouseEventHandler(this.maximizebutton_MouseDown);
this.maximizebutton.MouseEnter += new System.EventHandler(this.maximizebutton_MouseEnter);
this.maximizebutton.MouseLeave += new System.EventHandler(this.maximizebutton_MouseLeave);
this.maximizebutton.MouseUp += new System.Windows.Forms.MouseEventHandler(this.maximizebutton_MouseUp);
//
// minimizebutton
//
this.minimizebutton.Anchor = System.Windows.Forms.AnchorStyles.Right;
this.minimizebutton.BackColor = System.Drawing.Color.Black;
this.minimizebutton.Location = new System.Drawing.Point(310, 6);
this.minimizebutton.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.minimizebutton.Name = "minimizebutton";
this.minimizebutton.Size = new System.Drawing.Size(32, 32);
this.minimizebutton.TabIndex = 5;
this.minimizebutton.TabStop = false;
this.minimizebutton.MouseDown += new System.Windows.Forms.MouseEventHandler(this.minimizebutton_MouseDown);
this.minimizebutton.MouseEnter += new System.EventHandler(this.minimizebutton_MouseEnter);
this.minimizebutton.MouseLeave += new System.EventHandler(this.minimizebutton_MouseLeave);
this.minimizebutton.MouseUp += new System.Windows.Forms.MouseEventHandler(this.minimizebutton_MouseUp);
//
// Title
//
this.Title.AutoSize = true;
this.Title.BackColor = System.Drawing.Color.Transparent;
this.Title.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Title.ForeColor = System.Drawing.Color.White;
this.Title.Location = new System.Drawing.Point(38, 12);
this.Title.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.Title.Name = "Title";
this.Title.Size = new System.Drawing.Size(149, 21);
this.Title.TabIndex = 3;
this.Title.Text = "Application Title";
this.Title.MouseDown += new System.Windows.Forms.MouseEventHandler(this.Programtopbar_drag);
//
// closebutton
//
this.closebutton.Anchor = System.Windows.Forms.AnchorStyles.Right;
this.closebutton.BackColor = System.Drawing.Color.Black;
this.closebutton.Location = new System.Drawing.Point(380, 6);
this.closebutton.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.closebutton.Name = "closebutton";
this.closebutton.Size = new System.Drawing.Size(32, 32);
this.closebutton.TabIndex = 4;
this.closebutton.TabStop = false;
this.closebutton.Click += new System.EventHandler(this.closebutton_Click);
this.closebutton.MouseDown += new System.Windows.Forms.MouseEventHandler(this.closebutton_MouseDown);
this.closebutton.MouseEnter += new System.EventHandler(this.closebutton_MouseEnter);
this.closebutton.MouseLeave += new System.EventHandler(this.closebutton_MouseLeave);
this.closebutton.MouseUp += new System.Windows.Forms.MouseEventHandler(this.closebutton_MouseUp);
//
// right
//
this.right.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.right.Cursor = System.Windows.Forms.Cursors.SizeWE;
this.right.Dock = System.Windows.Forms.DockStyle.Right;
this.right.Location = new System.Drawing.Point(420, 0);
this.right.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.right.Name = "right";
this.right.Size = new System.Drawing.Size(6, 402);
this.right.TabIndex = 2;
//
// left
//
this.left.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.left.Dock = System.Windows.Forms.DockStyle.Left;
this.left.Location = new System.Drawing.Point(0, 0);
this.left.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.left.Name = "left";
this.left.Size = new System.Drawing.Size(6, 402);
this.left.TabIndex = 1;
//
// ShiftWindow
//
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(426, 402);
this.Controls.Add(this.program);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.Name = "ShiftWindow";
this.Text = "c";
this.program.ResumeLayout(false);
this.top.ResumeLayout(false);
this.top.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.programIcon)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.maximizebutton)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.minimizebutton)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.closebutton)).EndInit();
this.ResumeLayout(false);
this.program = new System.Windows.Forms.Panel();
this.programContent = new System.Windows.Forms.Panel();
this.leftBottomCorner = new System.Windows.Forms.Panel();
this.rightTopCorner = new System.Windows.Forms.Panel();
this.rightBottomCorner = new System.Windows.Forms.Panel();
this.leftTopCorner = new System.Windows.Forms.Panel();
this.bottomSide = new System.Windows.Forms.Panel();
this.titleBar = new System.Windows.Forms.Panel();
this.programIcon = new System.Windows.Forms.PictureBox();
this.btnMax = new System.Windows.Forms.PictureBox();
this.btnMin = new System.Windows.Forms.PictureBox();
this.Title = new System.Windows.Forms.Label();
this.btnClose = new System.Windows.Forms.PictureBox();
this.rightSide = new System.Windows.Forms.Panel();
this.leftSide = new System.Windows.Forms.Panel();
this.program.SuspendLayout();
this.titleBar.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.programIcon)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.btnMax)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.btnMin)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.btnClose)).BeginInit();
this.SuspendLayout();
//
// program
//
this.program.BackColor = System.Drawing.Color.White;
this.program.Controls.Add(this.programContent);
this.program.Controls.Add(this.leftBottomCorner);
this.program.Controls.Add(this.rightTopCorner);
this.program.Controls.Add(this.rightBottomCorner);
this.program.Controls.Add(this.leftTopCorner);
this.program.Controls.Add(this.bottomSide);
this.program.Controls.Add(this.titleBar);
this.program.Controls.Add(this.rightSide);
this.program.Controls.Add(this.leftSide);
this.program.Dock = System.Windows.Forms.DockStyle.Fill;
this.program.Location = new System.Drawing.Point(0, 0);
this.program.Name = "program";
this.program.Size = new System.Drawing.Size(284, 261);
this.program.TabIndex = 11;
//
// programContent
//
this.programContent.Dock = System.Windows.Forms.DockStyle.Fill;
this.programContent.Location = new System.Drawing.Point(4, 30);
this.programContent.Name = "programContent";
this.programContent.Size = new System.Drawing.Size(276, 227);
this.programContent.TabIndex = 11;
//
// leftBottomCorner
//
this.leftBottomCorner.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.leftBottomCorner.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.leftBottomCorner.Location = new System.Drawing.Point(0, 257);
this.leftBottomCorner.Name = "leftBottomCorner";
this.leftBottomCorner.Size = new System.Drawing.Size(5, 4);
this.leftBottomCorner.TabIndex = 10;
//
// rightTopCorner
//
this.rightTopCorner.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.rightTopCorner.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.rightTopCorner.Location = new System.Drawing.Point(278, 0);
this.rightTopCorner.Name = "rightTopCorner";
this.rightTopCorner.Size = new System.Drawing.Size(6, 30);
this.rightTopCorner.TabIndex = 9;
//
// rightBottomCorner
//
this.rightBottomCorner.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.rightBottomCorner.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.rightBottomCorner.Cursor = System.Windows.Forms.Cursors.SizeNWSE;
this.rightBottomCorner.Location = new System.Drawing.Point(280, 257);
this.rightBottomCorner.Name = "rightBottomCorner";
this.rightBottomCorner.Size = new System.Drawing.Size(4, 4);
this.rightBottomCorner.TabIndex = 4;
//
// leftTopCorner
//
this.leftTopCorner.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.leftTopCorner.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
this.leftTopCorner.Location = new System.Drawing.Point(0, 0);
this.leftTopCorner.Name = "leftTopCorner";
this.leftTopCorner.Size = new System.Drawing.Size(7, 30);
this.leftTopCorner.TabIndex = 8;
//
// bottomSide
//
this.bottomSide.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.bottomSide.Cursor = System.Windows.Forms.Cursors.SizeNS;
this.bottomSide.Dock = System.Windows.Forms.DockStyle.Bottom;
this.bottomSide.Location = new System.Drawing.Point(4, 257);
this.bottomSide.Name = "bottomSide";
this.bottomSide.Size = new System.Drawing.Size(276, 4);
this.bottomSide.TabIndex = 3;
//
// titleBar
//
this.titleBar.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.titleBar.Controls.Add(this.programIcon);
this.titleBar.Controls.Add(this.btnMax);
this.titleBar.Controls.Add(this.btnMin);
this.titleBar.Controls.Add(this.Title);
this.titleBar.Controls.Add(this.btnClose);
this.titleBar.Dock = System.Windows.Forms.DockStyle.Top;
this.titleBar.ForeColor = System.Drawing.SystemColors.ControlText;
this.titleBar.Location = new System.Drawing.Point(4, 0);
this.titleBar.Name = "titleBar";
this.titleBar.Size = new System.Drawing.Size(276, 30);
this.titleBar.TabIndex = 0;
this.titleBar.MouseDown += new System.Windows.Forms.MouseEventHandler(this.Programtopbar_drag);
//
// programIcon
//
this.programIcon.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.programIcon.ErrorImage = null;
this.programIcon.InitialImage = null;
this.programIcon.Location = new System.Drawing.Point(6, 7);
this.programIcon.Name = "programIcon";
this.programIcon.Size = new System.Drawing.Size(16, 16);
this.programIcon.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.programIcon.TabIndex = 7;
this.programIcon.TabStop = false;
//
// btnMax
//
this.btnMax.Anchor = System.Windows.Forms.AnchorStyles.Right;
this.btnMax.BackColor = System.Drawing.Color.Black;
this.btnMax.Location = new System.Drawing.Point(230, 4);
this.btnMax.Name = "btnMax";
this.btnMax.Size = new System.Drawing.Size(21, 21);
this.btnMax.TabIndex = 6;
this.btnMax.TabStop = false;
this.btnMax.MouseDown += new System.Windows.Forms.MouseEventHandler(this.maximizebutton_MouseDown);
this.btnMax.MouseEnter += new System.EventHandler(this.maximizebutton_MouseEnter);
this.btnMax.MouseLeave += new System.EventHandler(this.maximizebutton_MouseLeave);
this.btnMax.MouseUp += new System.Windows.Forms.MouseEventHandler(this.maximizebutton_MouseUp);
//
// btnMin
//
this.btnMin.Anchor = System.Windows.Forms.AnchorStyles.Right;
this.btnMin.BackColor = System.Drawing.Color.Black;
this.btnMin.Location = new System.Drawing.Point(207, 4);
this.btnMin.Name = "btnMin";
this.btnMin.Size = new System.Drawing.Size(21, 21);
this.btnMin.TabIndex = 5;
this.btnMin.TabStop = false;
this.btnMin.MouseDown += new System.Windows.Forms.MouseEventHandler(this.minimizebutton_MouseDown);
this.btnMin.MouseEnter += new System.EventHandler(this.minimizebutton_MouseEnter);
this.btnMin.MouseLeave += new System.EventHandler(this.minimizebutton_MouseLeave);
this.btnMin.MouseUp += new System.Windows.Forms.MouseEventHandler(this.minimizebutton_MouseUp);
//
// Title
//
this.Title.AutoSize = true;
this.Title.BackColor = System.Drawing.Color.Transparent;
this.Title.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Title.ForeColor = System.Drawing.Color.White;
this.Title.Location = new System.Drawing.Point(25, 8);
this.Title.Name = "Title";
this.Title.Size = new System.Drawing.Size(98, 13);
this.Title.TabIndex = 3;
this.Title.Text = "Application Title";
this.Title.MouseDown += new System.Windows.Forms.MouseEventHandler(this.Programtopbar_drag);
//
// btnClose
//
this.btnClose.Anchor = System.Windows.Forms.AnchorStyles.Right;
this.btnClose.BackColor = System.Drawing.Color.Black;
this.btnClose.Location = new System.Drawing.Point(253, 4);
this.btnClose.Name = "btnClose";
this.btnClose.Size = new System.Drawing.Size(21, 21);
this.btnClose.TabIndex = 4;
this.btnClose.TabStop = false;
this.btnClose.Click += new System.EventHandler(this.closebutton_Click);
this.btnClose.MouseDown += new System.Windows.Forms.MouseEventHandler(this.closebutton_MouseDown);
this.btnClose.MouseEnter += new System.EventHandler(this.closebutton_MouseEnter);
this.btnClose.MouseLeave += new System.EventHandler(this.closebutton_MouseLeave);
this.btnClose.MouseUp += new System.Windows.Forms.MouseEventHandler(this.closebutton_MouseUp);
//
// rightSide
//
this.rightSide.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.rightSide.Cursor = System.Windows.Forms.Cursors.SizeWE;
this.rightSide.Dock = System.Windows.Forms.DockStyle.Right;
this.rightSide.Location = new System.Drawing.Point(280, 0);
this.rightSide.Name = "rightSide";
this.rightSide.Size = new System.Drawing.Size(4, 261);
this.rightSide.TabIndex = 2;
//
// leftSide
//
this.leftSide.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.leftSide.Dock = System.Windows.Forms.DockStyle.Left;
this.leftSide.Location = new System.Drawing.Point(0, 0);
this.leftSide.Name = "leftSide";
this.leftSide.Size = new System.Drawing.Size(4, 261);
this.leftSide.TabIndex = 1;
//
// ShiftWindow
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(284, 261);
this.Controls.Add(this.program);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.Name = "ShiftWindow";
this.Text = "c";
this.program.ResumeLayout(false);
this.titleBar.ResumeLayout(false);
this.titleBar.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.programIcon)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.btnMax)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.btnMin)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.btnClose)).EndInit();
this.ResumeLayout(false);
}
@ -267,17 +251,17 @@
public System.Windows.Forms.PictureBox programIcon;
public System.Windows.Forms.Panel programContent;
public System.Windows.Forms.Panel program;
public System.Windows.Forms.Panel bottomleftcorner;
public System.Windows.Forms.Panel toprightcorner;
public System.Windows.Forms.Panel bottomrightcorner;
public System.Windows.Forms.Panel topleftcorner;
public System.Windows.Forms.Panel bottom;
public System.Windows.Forms.Panel top;
public System.Windows.Forms.PictureBox maximizebutton;
public System.Windows.Forms.PictureBox minimizebutton;
public System.Windows.Forms.Panel leftBottomCorner;
public System.Windows.Forms.Panel rightTopCorner;
public System.Windows.Forms.Panel rightBottomCorner;
public System.Windows.Forms.Panel leftTopCorner;
public System.Windows.Forms.Panel bottomSide;
public System.Windows.Forms.Panel titleBar;
public System.Windows.Forms.PictureBox btnMax;
public System.Windows.Forms.PictureBox btnMin;
public System.Windows.Forms.Label Title;
public System.Windows.Forms.PictureBox closebutton;
public System.Windows.Forms.Panel right;
public System.Windows.Forms.Panel left;
public System.Windows.Forms.PictureBox btnClose;
public System.Windows.Forms.Panel rightSide;
public System.Windows.Forms.Panel leftSide;
}
}

View file

@ -50,40 +50,40 @@ namespace ShiftOS.Engine.WindowManager
=> this.Close();
private void closebutton_MouseEnter(object sender, EventArgs e)
=> closebutton.BackColor = Color.Gray;
=> btnClose.BackColor = Color.Gray;
private void closebutton_MouseLeave(object sender, EventArgs e)
=> closebutton.BackColor = Color.Black;
=> btnClose.BackColor = Color.Black;
private void maximizebutton_MouseEnter(object sender, EventArgs e)
=> maximizebutton.BackColor = Color.Gray;
=> btnMax.BackColor = Color.Gray;
private void maximizebutton_MouseLeave(object sender, EventArgs e)
=> maximizebutton.BackColor = Color.Black;
=> btnMax.BackColor = Color.Black;
private void minimizebutton_MouseEnter(object sender, EventArgs e)
=> minimizebutton.BackColor = Color.Gray;
=> btnMin.BackColor = Color.Gray;
private void minimizebutton_MouseLeave(object sender, EventArgs e)
=> minimizebutton.BackColor = Color.Black;
=> btnMin.BackColor = Color.Black;
private void closebutton_MouseDown(object sender, MouseEventArgs e)
=> closebutton.BackColor = Color.Black;
=> btnClose.BackColor = Color.Black;
private void maximizebutton_MouseDown(object sender, MouseEventArgs e)
=> maximizebutton.BackColor = Color.Black;
=> btnMax.BackColor = Color.Black;
private void minimizebutton_MouseDown(object sender, MouseEventArgs e)
=> minimizebutton.BackColor = Color.Black;
=> btnMin.BackColor = Color.Black;
private void minimizebutton_MouseUp(object sender, MouseEventArgs e)
=> minimizebutton.BackColor = Color.Gray;
=> btnMin.BackColor = Color.Gray;
private void maximizebutton_MouseUp(object sender, MouseEventArgs e)
=> maximizebutton.BackColor = Color.Gray;
=> btnMax.BackColor = Color.Gray;
private void closebutton_MouseUp(object sender, MouseEventArgs e)
=> closebutton.BackColor = Color.Gray;
=> btnClose.BackColor = Color.Gray;
}
public interface IShiftWindowExtensions

View file

@ -31,10 +31,13 @@
this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.textBox1 = new System.Windows.Forms.TextBox();
this.textBox2 = new System.Windows.Forms.TextBox();
this.textBox3 = new System.Windows.Forms.TextBox();
this.btnSetColor = new System.Windows.Forms.Button();
this.redUpDown = new System.Windows.Forms.NumericUpDown();
this.greenUpDown = new System.Windows.Forms.NumericUpDown();
this.blueUpDown = new System.Windows.Forms.NumericUpDown();
((System.ComponentModel.ISupportInitialize)(this.redUpDown)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.greenUpDown)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.blueUpDown)).BeginInit();
this.SuspendLayout();
//
// label1
@ -64,27 +67,6 @@
this.label3.TabIndex = 2;
this.label3.Text = "Blue:";
//
// textBox1
//
this.textBox1.Location = new System.Drawing.Point(75, 27);
this.textBox1.Name = "textBox1";
this.textBox1.Size = new System.Drawing.Size(206, 20);
this.textBox1.TabIndex = 3;
//
// textBox2
//
this.textBox2.Location = new System.Drawing.Point(75, 58);
this.textBox2.Name = "textBox2";
this.textBox2.Size = new System.Drawing.Size(206, 20);
this.textBox2.TabIndex = 4;
//
// textBox3
//
this.textBox3.Location = new System.Drawing.Point(75, 88);
this.textBox3.Name = "textBox3";
this.textBox3.Size = new System.Drawing.Size(206, 20);
this.textBox3.TabIndex = 5;
//
// btnSetColor
//
this.btnSetColor.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
@ -96,20 +78,59 @@
this.btnSetColor.UseVisualStyleBackColor = true;
this.btnSetColor.Click += new System.EventHandler(this.btnSetColor_Click);
//
// redUpDown
//
this.redUpDown.Location = new System.Drawing.Point(82, 32);
this.redUpDown.Maximum = new decimal(new int[] {
255,
0,
0,
0});
this.redUpDown.Name = "redUpDown";
this.redUpDown.Size = new System.Drawing.Size(120, 20);
this.redUpDown.TabIndex = 7;
//
// greenUpDown
//
this.greenUpDown.Location = new System.Drawing.Point(82, 60);
this.greenUpDown.Maximum = new decimal(new int[] {
255,
0,
0,
0});
this.greenUpDown.Name = "greenUpDown";
this.greenUpDown.Size = new System.Drawing.Size(120, 20);
this.greenUpDown.TabIndex = 8;
//
// blueUpDown
//
this.blueUpDown.Location = new System.Drawing.Point(82, 90);
this.blueUpDown.Maximum = new decimal(new int[] {
255,
0,
0,
0});
this.blueUpDown.Name = "blueUpDown";
this.blueUpDown.Size = new System.Drawing.Size(120, 20);
this.blueUpDown.TabIndex = 9;
//
// SelectColor
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.blueUpDown);
this.Controls.Add(this.greenUpDown);
this.Controls.Add(this.redUpDown);
this.Controls.Add(this.btnSetColor);
this.Controls.Add(this.textBox3);
this.Controls.Add(this.textBox2);
this.Controls.Add(this.textBox1);
this.Controls.Add(this.label3);
this.Controls.Add(this.label2);
this.Controls.Add(this.label1);
this.Font = new System.Drawing.Font("Lucida Console", 9.25F);
this.Name = "SelectColor";
this.Size = new System.Drawing.Size(317, 158);
((System.ComponentModel.ISupportInitialize)(this.redUpDown)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.greenUpDown)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.blueUpDown)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@ -120,9 +141,9 @@
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.TextBox textBox1;
private System.Windows.Forms.TextBox textBox2;
private System.Windows.Forms.TextBox textBox3;
private System.Windows.Forms.Button btnSetColor;
private System.Windows.Forms.NumericUpDown redUpDown;
private System.Windows.Forms.NumericUpDown greenUpDown;
private System.Windows.Forms.NumericUpDown blueUpDown;
}
}

View file

@ -14,40 +14,37 @@ namespace ShiftOS.Main.ShiftOS.Apps
public SelectColor()
{
InitializeComponent();
}
private Color setColor()
{
_colorType1 = Int32.Parse(redUpDown.Value.ToString());
_colorType2 = Int32.Parse(greenUpDown.Value.ToString());
_colorType3 = Int32.Parse(blueUpDown.Value.ToString());
try
{
_finalColor = Color.FromArgb(_colorType1, _colorType2, _colorType3);
/*
foreach (var window in ShiftWM.Windows)
{
window.Invoke(new Action(() => window.top.BackColor = _finalColor));
}
*/
ShiftWM.StartInfoboxSession("Success!", $"Changed color to:\r\n{_colorType1}, {_colorType2}, {_colorType3}.", InfoboxTemplate.ButtonType.Ok);
}
catch (Exception)
{
ShiftWM.StartInfoboxSession("Error!", "An error occured while setting the color.", InfoboxTemplate.ButtonType.Ok);
}
return _finalColor;
}
private void btnSetColor_Click(object sender, EventArgs e)
{
try
{
_colorType1 = Convert.ToInt32(textBox1.Text);
_colorType2 = Convert.ToInt32(textBox2.Text);
_colorType3 = Convert.ToInt32(textBox3.Text);
}
catch(FormatException ex)
{
ShiftWM.StartInfoboxSession("Error!", "Failed to parse integer. Error:\n" + ex, InfoboxTemplate.ButtonType.Ok);
}
if (_colorType1 > 255 || _colorType2 > 255 || _colorType3 > 255)
{
ShiftWM.StartInfoboxSession("Error!", "A value cannot be greater than 255!", InfoboxTemplate.ButtonType.Ok);
}
else
{
try
{
ShiftWindow sw = new ShiftWindow();
_finalColor = Color.FromArgb(_colorType1, _colorType2, _colorType3);
BackColor = _finalColor;
ShiftWM.StartInfoboxSession("Success!", "Changed color to:\n" + _colorType1.ToString() + ", " + _colorType2.ToString() + ", " + _colorType3.ToString() + ".", InfoboxTemplate.ButtonType.Ok);
}
catch (Exception)
{
ShiftWM.StartInfoboxSession("Error!", "An error occured while setting the color.", InfoboxTemplate.ButtonType.Ok);
}
}
setColor();
}
}
}

View file

@ -30,6 +30,10 @@
{
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.button5 = new System.Windows.Forms.Button();
this.button4 = new System.Windows.Forms.Button();
this.button3 = new System.Windows.Forms.Button();
this.button2 = new System.Windows.Forms.Button();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.button1 = new System.Windows.Forms.Button();
this.tabPage2 = new System.Windows.Forms.TabPage();
@ -53,6 +57,10 @@
//
// tabPage1
//
this.tabPage1.Controls.Add(this.button5);
this.tabPage1.Controls.Add(this.button4);
this.tabPage1.Controls.Add(this.button3);
this.tabPage1.Controls.Add(this.button2);
this.tabPage1.Controls.Add(this.groupBox1);
this.tabPage1.Location = new System.Drawing.Point(4, 22);
this.tabPage1.Name = "tabPage1";
@ -62,6 +70,54 @@
this.tabPage1.Text = "Titlebar";
this.tabPage1.UseVisualStyleBackColor = true;
//
// button5
//
this.button5.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button5.Font = new System.Drawing.Font("Lucida Console", 8.25F);
this.button5.Location = new System.Drawing.Point(6, 267);
this.button5.Name = "button5";
this.button5.Size = new System.Drawing.Size(314, 23);
this.button5.TabIndex = 5;
this.button5.Text = "Apply";
this.button5.UseVisualStyleBackColor = true;
this.button5.Click += new System.EventHandler(this.button5_Click);
//
// button4
//
this.button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button4.Font = new System.Drawing.Font("Lucida Console", 8.25F);
this.button4.Location = new System.Drawing.Point(6, 209);
this.button4.Name = "button4";
this.button4.Size = new System.Drawing.Size(314, 23);
this.button4.TabIndex = 4;
this.button4.Text = "Set Random Skin";
this.button4.UseVisualStyleBackColor = true;
this.button4.Click += new System.EventHandler(this.setRandomSkin);
//
// button3
//
this.button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button3.Font = new System.Drawing.Font("Lucida Console", 8.25F);
this.button3.Location = new System.Drawing.Point(6, 238);
this.button3.Name = "button3";
this.button3.Size = new System.Drawing.Size(155, 23);
this.button3.TabIndex = 3;
this.button3.Text = "Set Default Skin";
this.button3.UseVisualStyleBackColor = true;
this.button3.Click += new System.EventHandler(this.setDefaultSkin);
//
// button2
//
this.button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button2.Font = new System.Drawing.Font("Lucida Console", 8.25F);
this.button2.Location = new System.Drawing.Point(171, 238);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(149, 23);
this.button2.TabIndex = 2;
this.button2.Text = "Set Colorful Skin";
this.button2.UseVisualStyleBackColor = true;
this.button2.Click += new System.EventHandler(this.setColorSkin);
//
// groupBox1
//
this.groupBox1.Controls.Add(this.button1);
@ -115,5 +171,9 @@
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.Button button1;
private System.Windows.Forms.TabPage tabPage2;
private System.Windows.Forms.Button button3;
private System.Windows.Forms.Button button2;
private System.Windows.Forms.Button button4;
private System.Windows.Forms.Button button5;
}
}

View file

@ -2,6 +2,7 @@
using System.Windows.Forms;
using ShiftOS.Engine;
using ShiftOS.Engine.WindowManager;
using System.Drawing;
namespace ShiftOS.Main.ShiftOS.Apps
{
@ -18,5 +19,66 @@ namespace ShiftOS.Main.ShiftOS.Apps
colorType = 1;
ShiftWM.Init(new SelectColor(), "Select a color", Properties.Resources.iconColourPicker_fw.ToIcon());
}
private void setDefaultSkin(object sender, EventArgs e)
{
setBorderColor(Color.FromArgb(64, 64, 64));
ShiftSkinData.btnCloseColor = Color.Black;
ShiftSkinData.btnMaxColor = Color.Black;
ShiftSkinData.btnMinColor = Color.Black;
button5_Click(sender, e);
}
private void setColorSkin(object sender, EventArgs e)
{
setBorderColor(Color.Blue);
ShiftSkinData.btnCloseColor = Color.Red;
ShiftSkinData.btnMaxColor = Color.Yellow;
ShiftSkinData.btnMinColor = Color.Green;
button5_Click(sender, e);
}
private void setRandomSkin(object sender, EventArgs e)
{
Random rnd = new Random();
setBorderColor(Color.FromArgb(rnd.Next(255), rnd.Next(255), rnd.Next(255)));
ShiftSkinData.btnCloseColor = Color.FromArgb(rnd.Next(255), rnd.Next(255), rnd.Next(255));
ShiftSkinData.btnMaxColor = Color.FromArgb(rnd.Next(255), rnd.Next(255), rnd.Next(255));
ShiftSkinData.btnMinColor = Color.FromArgb(rnd.Next(255), rnd.Next(255), rnd.Next(255));
button5_Click(sender, e);
}
// SetBorderColor
public void setBorderColor(Color borderColor)
{
ShiftSkinData.leftTopCornerColor = borderColor;
ShiftSkinData.titleBarColor = borderColor;
ShiftSkinData.rightTopCornerColor = borderColor;
ShiftSkinData.leftSideColor = borderColor;
ShiftSkinData.rightSideColor = borderColor;
ShiftSkinData.leftBottomCornerColor = borderColor;
ShiftSkinData.bottomSideColor = borderColor;
ShiftSkinData.rightBottomCornerColor = borderColor;
}
private void button5_Click(object sender, EventArgs e)
{
foreach (var window in ShiftWM.Windows)
{
window.Invoke(new Action(() => window.titleBar.BackColor = ShiftSkinData.titleBarColor));
window.Invoke(new Action(() => window.leftTopCorner.BackColor = ShiftSkinData.leftTopCornerColor));
window.Invoke(new Action(() => window.rightTopCorner.BackColor = ShiftSkinData.rightTopCornerColor));
window.Invoke(new Action(() => window.leftSide.BackColor = ShiftSkinData.leftSideColor));
window.Invoke(new Action(() => window.rightSide.BackColor = ShiftSkinData.rightSideColor));
window.Invoke(new Action(() => window.leftBottomCorner.BackColor = ShiftSkinData.leftBottomCornerColor));
window.Invoke(new Action(() => window.bottomSide.BackColor = ShiftSkinData.bottomSideColor));
window.Invoke(new Action(() => window.rightBottomCorner.BackColor = ShiftSkinData.rightBottomCornerColor));
window.Invoke(new Action(() => window.btnClose.BackColor = ShiftSkinData.btnCloseColor));
window.Invoke(new Action(() => window.btnMax.BackColor = ShiftSkinData.btnMaxColor));
window.Invoke(new Action(() => window.btnMin.BackColor = ShiftSkinData.btnMinColor));
}
}
}
}

View file

@ -17,12 +17,8 @@ namespace ShiftOS.Main
private void Button1_Click(object sender, EventArgs e)
{
ShiftDemo demo = new ShiftDemo {label1 = {Text = textBox2.Text}};
var item = typeof(SystemIcons).GetProperties()
.First(p => p.Name == comboBox1.SelectedItem as string);
ShiftWM.Init(demo, textBox1.Text, (item.GetMethod.Invoke(null, new object[0]) as Icon));
ShiftDemo demo = new ShiftDemo();
ShiftWM.Init(demo, textBox1.Text, null);
ShiftWM.StartInfoboxSession(textBox1.Text, textBox2.Text, InfoboxTemplate.ButtonType.Ok);
}

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,11 @@
Please visit https://github.com/dlemstra/Magick.NET/Documentation for information on how to use Magick.NET.
The release notes can be found here: https://github.com/dlemstra/Magick.NET/releases.
Follow me on twitter (@MagickNET, https://twitter.com/MagickNET) to receive information about new
downloads and changes to Magick.NET and ImageMagick.
If you have an uncontrollable urge to give me something for the time and effort I am putting into this
project then please buy me something from my amazon wish list or send me an amazon gift card. You can
find my wishlist here: https://www.amazon.de/gp/registry/wishlist/2XFZAC3J04WAY. If you prefer to use
PayPal then click here: https://www.paypal.me/DirkLemstra.

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff