shiftos-archive/ShiftOS-Rewind
1
0
Fork 0
mirror of https://github.com/ShiftOS-Rewind/ShiftOS.git synced 2025-01-22 11:21:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'refs/remotes/ShiftOS-Rewind/master'

Browse source
This commit is contained in:
AShifter 2017-09-25 09:35:03 -06:00
commit f5004702c4
12 changed files with 394 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
.vs/ShiftOS/v15/sqlite3/storage.ide
View file

Binary file not shown.

12
ShiftOS.Engine/WindowManager/ShiftWindow.Designer.cs generated
View file

@ -155,21 +155,25 @@
//
this.maximizebutton.Anchor = System.Windows.Forms.AnchorStyles.Right;
this.maximizebutton.BackColor = System.Drawing.Color.Black;
this.maximizebutton.Location = new System.Drawing.Point(228, 5);
this.maximizebutton.Location = new System.Drawing.Point(231, 4);
this.maximizebutton.Name = "maximizebutton";
this.maximizebutton.Size = new System.Drawing.Size(21, 21);
this.maximizebutton.TabIndex = 6;
this.maximizebutton.TabStop = false;
this.maximizebutton.MouseEnter += new System.EventHandler(this.maximizebutton_MouseEnter);
this.maximizebutton.MouseLeave += new System.EventHandler(this.maximizebutton_MouseLeave);
//
// minimizebutton
//
this.minimizebutton.Anchor = System.Windows.Forms.AnchorStyles.Right;
this.minimizebutton.BackColor = System.Drawing.Color.Black;
this.minimizebutton.Location = new System.Drawing.Point(205, 5);
this.minimizebutton.Location = new System.Drawing.Point(208, 4);
this.minimizebutton.Name = "minimizebutton";
this.minimizebutton.Size = new System.Drawing.Size(21, 21);
this.minimizebutton.TabIndex = 5;
this.minimizebutton.TabStop = false;
this.minimizebutton.MouseEnter += new System.EventHandler(this.minimizebutton_MouseEnter);
this.minimizebutton.MouseLeave += new System.EventHandler(this.minimizebutton_MouseLeave);
//
// Title
//
@ -188,12 +192,14 @@
//
this.closebutton.Anchor = System.Windows.Forms.AnchorStyles.Right;
this.closebutton.BackColor = System.Drawing.Color.Black;
this.closebutton.Location = new System.Drawing.Point(251, 5);
this.closebutton.Location = new System.Drawing.Point(254, 4);
this.closebutton.Name = "closebutton";
this.closebutton.Size = new System.Drawing.Size(21, 21);
this.closebutton.TabIndex = 4;
this.closebutton.TabStop = false;
this.closebutton.Click += new System.EventHandler(this.closebutton_Click);
this.closebutton.MouseEnter += new System.EventHandler(this.closebutton_MouseEnter);
this.closebutton.MouseLeave += new System.EventHandler(this.closebutton_MouseLeave);
//
// right
//

29
ShiftOS.Engine/WindowManager/ShiftWindow.cs
View file

@ -40,5 +40,34 @@ namespace ShiftOS.Engine.WindowManager
this.Close();
}
private void closebutton_MouseEnter(object sender, EventArgs e)
{
closebutton.BackColor = Color.Gray;
}
private void closebutton_MouseLeave(object sender, EventArgs e)
{
closebutton.BackColor = Color.Black;
}
private void maximizebutton_MouseEnter(object sender, EventArgs e)
{
maximizebutton.BackColor = Color.Gray;
}
private void maximizebutton_MouseLeave(object sender, EventArgs e)
{
maximizebutton.BackColor = Color.Black;
}
private void minimizebutton_MouseEnter(object sender, EventArgs e)
{
minimizebutton.BackColor = Color.Gray;
}
private void minimizebutton_MouseLeave(object sender, EventArgs e)
{
minimizebutton.BackColor = Color.Black;
}
}
}

15
ShiftOS.Main/ShiftOS.Main.csproj
View file

@ -52,16 +52,22 @@
</Compile>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ShiftOS\Apps\ShifterStuff\SelectColor.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="ShiftOS\Apps\ShifterStuff\SelectColor.Designer.cs">
<DependentUpon>SelectColor.cs</DependentUpon>
</Compile>
<Compile Include="ShiftOS\Apps\ShiftDemo.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="ShiftOS\Apps\ShiftDemo.Designer.cs">
<DependentUpon>ShiftDemo.cs</DependentUpon>
</Compile>
<Compile Include="ShiftOS\Apps\Shifter.cs">
<Compile Include="ShiftOS\Apps\ShifterStuff\Shifter.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="ShiftOS\Apps\Shifter.Designer.cs">
<Compile Include="ShiftOS\Apps\ShifterStuff\Shifter.Designer.cs">
<DependentUpon>Shifter.cs</DependentUpon>
</Compile>
<Compile Include="ShiftOS\Apps\TestForm.cs">
@ -83,10 +89,13 @@
<DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
<EmbeddedResource Include="ShiftOS\Apps\ShifterStuff\SelectColor.resx">
<DependentUpon>SelectColor.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="ShiftOS\Apps\ShiftDemo.resx">
<DependentUpon>ShiftDemo.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="ShiftOS\Apps\Shifter.resx">
<EmbeddedResource Include="ShiftOS\Apps\ShifterStuff\Shifter.resx">
<DependentUpon>Shifter.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="ShiftOS\Apps\TestForm.resx">

128
ShiftOS.Main/ShiftOS/Apps/ShifterStuff/SelectColor.Designer.cs generated Normal file
View file

@ -0,0 +1,128 @@
namespace ShiftOS.Main.ShiftOS.Apps
{
partial class SelectColor
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Component Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
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.SuspendLayout();
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(21, 34);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(39, 13);
this.label1.TabIndex = 0;
this.label1.Text = "Red:";
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(21, 62);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(55, 13);
this.label2.TabIndex = 1;
this.label2.Text = "Green:";
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(21, 92);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(47, 13);
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;
this.btnSetColor.Location = new System.Drawing.Point(75, 121);
this.btnSetColor.Name = "btnSetColor";
this.btnSetColor.Size = new System.Drawing.Size(93, 23);
this.btnSetColor.TabIndex = 6;
this.btnSetColor.Text = "Set Color";
this.btnSetColor.UseVisualStyleBackColor = true;
this.btnSetColor.Click += new System.EventHandler(this.btnSetColor_Click);
//
// SelectColor
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
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);
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
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;
}
}

60
ShiftOS.Main/ShiftOS/Apps/ShifterStuff/SelectColor.cs Normal file
View file

@ -0,0 +1,60 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Data;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using ShiftOS.Engine.WindowManager;
namespace ShiftOS.Main.ShiftOS.Apps
{
public partial class SelectColor : UserControl
{
ShiftWM shiftWM = new ShiftWM();
Color finalColor;
int colorType1;
int colorType2;
int colorType3;
public SelectColor()
{
InitializeComponent();
}
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
{
shiftWM.StartInfoboxSession("Error!", "Cannot parse a string.", 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);
this.BackColor = finalColor;
shiftWM.StartInfoboxSession("Success!", "Changed color to:\n" + colorType1.ToString() + ", " + colorType2.ToString() + ", " + colorType3.ToString() + ".", InfoboxTemplate.buttonType.OK);
}
catch (Exception ex)
{
shiftWM.StartInfoboxSession("Error!", "An exception occured while setting the color! Exception: \n" + ex, InfoboxTemplate.buttonType.OK);
}
}
}
}
}

0
ShiftOS.Main/ShiftOS/Apps/Shifter.resx → ShiftOS.Main/ShiftOS/Apps/ShifterStuff/SelectColor.resx
View file

24
ShiftOS.Main/ShiftOS/Apps/Shifter.Designer.cs → ShiftOS.Main/ShiftOS/Apps/ShifterStuff/Shifter.Designer.cs generated
View file

@ -30,9 +30,9 @@
{
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.tabPage2 = new System.Windows.Forms.TabPage();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.button1 = new System.Windows.Forms.Button();
this.tabPage2 = new System.Windows.Forms.TabPage();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
this.groupBox1.SuspendLayout();
@ -59,19 +59,9 @@
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(326, 296);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "tabPage1";
this.tabPage1.Text = "Titlebar";
this.tabPage1.UseVisualStyleBackColor = true;
//
// tabPage2
//
this.tabPage2.Location = new System.Drawing.Point(4, 22);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
this.tabPage2.Size = new System.Drawing.Size(192, 74);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "tabPage2";
this.tabPage2.UseVisualStyleBackColor = true;
//
// groupBox1
//
this.groupBox1.Controls.Add(this.button1);
@ -94,6 +84,16 @@
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// tabPage2
//
this.tabPage2.Location = new System.Drawing.Point(4, 22);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
this.tabPage2.Size = new System.Drawing.Size(326, 296);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "tabPage2";
this.tabPage2.UseVisualStyleBackColor = true;
//
// Shifter
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

10
ShiftOS.Main/ShiftOS/Apps/Shifter.cs → ShiftOS.Main/ShiftOS/Apps/ShifterStuff/Shifter.cs
View file

@ -13,6 +13,8 @@ namespace ShiftOS.Main.ShiftOS.Apps
{
public partial class Shifter : UserControl
{
public int colorType; //This is a check to see what option was chosen.
ShiftWM wm = new ShiftWM();
public Shifter()
{
InitializeComponent();
@ -20,12 +22,8 @@ namespace ShiftOS.Main.ShiftOS.Apps
private void button1_Click(object sender, EventArgs e)
{
ColorDialog cD = new ColorDialog();
if (cD.ShowDialog() == DialogResult.OK)
{
ShiftWindow sw = new ShiftWindow();
sw.top.BackColor = cD.Color;
}
colorType = 1;
wm.Init(new SelectColor(), "Select a color", Properties.Resources.iconColourPicker_fw);
}
}
}

120
ShiftOS.Main/ShiftOS/Apps/ShifterStuff/Shifter.resx Normal file
View file

@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

15
ShiftOS.Main/ShiftOS/Apps/TestForm.Designer.cs generated
View file

@ -31,6 +31,7 @@
this.textBox1 = new System.Windows.Forms.TextBox();
this.textBox2 = new System.Windows.Forms.TextBox();
this.button1 = new System.Windows.Forms.Button();
this.button2 = new System.Windows.Forms.Button();
this.SuspendLayout();
//
// textBox1
@ -53,17 +54,28 @@
//
this.button1.Location = new System.Drawing.Point(12, 65);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(260, 23);
this.button1.Size = new System.Drawing.Size(128, 23);
this.button1.TabIndex = 2;
this.button1.Text = "Create Window";
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.Button1_Click);
//
// button2
//
this.button2.Location = new System.Drawing.Point(146, 65);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(126, 23);
this.button2.TabIndex = 4;
this.button2.Text = "Test Shifter";
this.button2.UseVisualStyleBackColor = true;
this.button2.Click += new System.EventHandler(this.button2_Click);
//
// TestForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(284, 100);
this.Controls.Add(this.button2);
this.Controls.Add(this.button1);
this.Controls.Add(this.textBox2);
this.Controls.Add(this.textBox1);
@ -79,5 +91,6 @@
private System.Windows.Forms.TextBox textBox1;
private System.Windows.Forms.TextBox textBox2;
private System.Windows.Forms.Button button1;
private System.Windows.Forms.Button button2;
}
}

6
ShiftOS.Main/ShiftOS/Apps/TestForm.cs
View file

@ -1,6 +1,7 @@
using System;
using System.Windows.Forms;
using ShiftOS.Engine.WindowManager;
using ShiftOS.Main.ShiftOS.Apps;
namespace ShiftOS.Main
{
@ -20,5 +21,10 @@ namespace ShiftOS.Main
shiftWM.Init(demo, textBox1.Text, null);
shiftWM.StartInfoboxSession(textBox1.Text, textBox2.Text, InfoboxTemplate.buttonType.OK);
}
private void button2_Click(object sender, EventArgs e)
{
shiftWM.Init(new Shifter(), "Shifter", Properties.Resources.iconShifter);
}
}
}