diff --git a/.vs/ShiftOS/v15/sqlite3/storage.ide b/.vs/ShiftOS/v15/sqlite3/storage.ide index 63759d8..0209546 100644 Binary files a/.vs/ShiftOS/v15/sqlite3/storage.ide and b/.vs/ShiftOS/v15/sqlite3/storage.ide differ diff --git a/ShiftOS.Engine/Properties/Resources.Designer.cs b/ShiftOS.Engine/Properties/Resources.Designer.cs index f42976a..db83dd9 100644 --- a/ShiftOS.Engine/Properties/Resources.Designer.cs +++ b/ShiftOS.Engine/Properties/Resources.Designer.cs @@ -60,6 +60,25 @@ namespace ShiftOS.Engine.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap iconInfoBox_fw { + get { + object obj = ResourceManager.GetObject("iconInfoBox_fw", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream. + /// + internal static System.IO.UnmanagedMemoryStream infobox { + get { + return ResourceManager.GetStream("infobox", resourceCulture); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -69,5 +88,15 @@ namespace ShiftOS.Engine.Properties { return ((System.Drawing.Bitmap)(obj)); } } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Symbolinfo { + get { + object obj = ResourceManager.GetObject("Symbolinfo", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } } } diff --git a/ShiftOS.Engine/Properties/Resources.resx b/ShiftOS.Engine/Properties/Resources.resx index 45ddded..db3d27b 100644 --- a/ShiftOS.Engine/Properties/Resources.resx +++ b/ShiftOS.Engine/Properties/Resources.resx @@ -121,4 +121,13 @@ ..\Resources\nullIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Symbolinfo1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\iconInfoBox.fw.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\infobox.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/ShiftOS.Engine/Resources/Symbolinfo1.png b/ShiftOS.Engine/Resources/Symbolinfo1.png new file mode 100644 index 0000000..659d9b3 Binary files /dev/null and b/ShiftOS.Engine/Resources/Symbolinfo1.png differ diff --git a/ShiftOS.Engine/Resources/iconInfoBox.fw.png b/ShiftOS.Engine/Resources/iconInfoBox.fw.png new file mode 100644 index 0000000..0c9ebbd Binary files /dev/null and b/ShiftOS.Engine/Resources/iconInfoBox.fw.png differ diff --git a/ShiftOS.Engine/Resources/infobox.wav b/ShiftOS.Engine/Resources/infobox.wav new file mode 100644 index 0000000..3c6f3f2 Binary files /dev/null and b/ShiftOS.Engine/Resources/infobox.wav differ diff --git a/ShiftOS.Engine/ShiftOS.Engine.csproj b/ShiftOS.Engine/ShiftOS.Engine.csproj index 6045cb5..8683d20 100644 --- a/ShiftOS.Engine/ShiftOS.Engine.csproj +++ b/ShiftOS.Engine/ShiftOS.Engine.csproj @@ -48,6 +48,12 @@ True Resources.resx + + UserControl + + + InfoboxTemplate.cs + Form @@ -61,6 +67,9 @@ ResXFileCodeGenerator Resources.Designer.cs + + InfoboxTemplate.cs + ShiftWindow.cs @@ -68,5 +77,14 @@ + + + + + + + + + \ No newline at end of file diff --git a/ShiftOS.Engine/WindowManager/InfoboxTemplate.Designer.cs b/ShiftOS.Engine/WindowManager/InfoboxTemplate.Designer.cs new file mode 100644 index 0000000..6b18e5f --- /dev/null +++ b/ShiftOS.Engine/WindowManager/InfoboxTemplate.Designer.cs @@ -0,0 +1,115 @@ +namespace ShiftOS.Engine.WindowManager +{ + partial class InfoboxTemplate + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.btnOpt1 = new System.Windows.Forms.Button(); + this.btnOpt2 = new System.Windows.Forms.Button(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.label1 = new System.Windows.Forms.Label(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + this.SuspendLayout(); + // + // btnOpt1 + // + this.btnOpt1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.btnOpt1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnOpt1.Font = new System.Drawing.Font("Lucida Console", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btnOpt1.Location = new System.Drawing.Point(65, 134); + this.btnOpt1.Name = "btnOpt1"; + this.btnOpt1.Size = new System.Drawing.Size(75, 23); + this.btnOpt1.TabIndex = 0; + this.btnOpt1.Text = "button1"; + this.btnOpt1.UseVisualStyleBackColor = true; + this.btnOpt1.Click += new System.EventHandler(this.btnOpt1_Click); + // + // btnOpt2 + // + this.btnOpt2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.btnOpt2.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnOpt2.Font = new System.Drawing.Font("Lucida Console", 9F); + this.btnOpt2.Location = new System.Drawing.Point(188, 134); + this.btnOpt2.Name = "btnOpt2"; + this.btnOpt2.Size = new System.Drawing.Size(75, 23); + this.btnOpt2.TabIndex = 1; + this.btnOpt2.Text = "button2"; + this.btnOpt2.UseVisualStyleBackColor = true; + this.btnOpt2.Click += new System.EventHandler(this.btnOpt2_Click); + // + // pictureBox1 + // + this.pictureBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left))); + this.pictureBox1.Image = global::ShiftOS.Engine.Properties.Resources.Symbolinfo; + this.pictureBox1.Location = new System.Drawing.Point(3, 35); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(80, 70); + this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; + this.pictureBox1.TabIndex = 2; + this.pictureBox1.TabStop = false; + // + // label1 + // + this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.label1.AutoSize = true; + this.label1.Font = new System.Drawing.Font("Lucida Console", 9.25F); + this.label1.Location = new System.Drawing.Point(106, 57); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(103, 13); + this.label1.TabIndex = 3; + this.label1.Text = "Generic Body"; + // + // InfoboxTemplate + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.label1); + this.Controls.Add(this.pictureBox1); + this.Controls.Add(this.btnOpt2); + this.Controls.Add(this.btnOpt1); + this.Name = "InfoboxTemplate"; + this.Size = new System.Drawing.Size(346, 174); + this.Load += new System.EventHandler(this.InfoboxTemplate_Load); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + public System.Windows.Forms.Button btnOpt1; + public System.Windows.Forms.Button btnOpt2; + public System.Windows.Forms.PictureBox pictureBox1; + public System.Windows.Forms.Label label1; + } +} diff --git a/ShiftOS.Engine/WindowManager/InfoboxTemplate.cs b/ShiftOS.Engine/WindowManager/InfoboxTemplate.cs new file mode 100644 index 0000000..f261ace --- /dev/null +++ b/ShiftOS.Engine/WindowManager/InfoboxTemplate.cs @@ -0,0 +1,90 @@ +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 System.Media; +using System.IO; + +namespace ShiftOS.Engine.WindowManager +{ + public partial class InfoboxTemplate : UserControl + { + Stream str; + public int buttonChoice; + public int buttonSelected; + public InfoboxTemplate(buttonType type) + { + InitializeComponent(); + switch (type) + { + case buttonType.OK: + btnOpt1.Text = "OK"; + btnOpt2.Hide(); + btnOpt1.Location = new Point(122, 134); + buttonChoice = 1; + break; + case buttonType.OKCancel: + btnOpt1.Text = "OK"; + btnOpt2.Text = "Cancel"; + buttonChoice = 2; + break; + case buttonType.YesNo: + btnOpt1.Text = "Yes"; + btnOpt2.Text = "No"; + buttonChoice = 3; + break; + } + } + public enum buttonType + { + YesNo, + OKCancel, + OK + } + + private void btnOpt1_Click(object sender, EventArgs e) + { + switch (btnOpt1.Text) + { + case "OK": + buttonSelected = 1; + ParentForm.Close(); + break; + case "Yes": + buttonSelected = 2; + ParentForm.Close(); + break; + } + } + + private void btnOpt2_Click(object sender, EventArgs e) + { + switch (btnOpt2.Text) + { + case "No": + buttonSelected = 3; + break; + case "Cancel": + buttonSelected = 4; + break; + } + } + public void Play() + { + str = Properties.Resources.infobox; + SoundPlayer sp = new SoundPlayer(str); + sp.Play(); + sp.Stream.Position = 0; + } + + private void InfoboxTemplate_Load(object sender, EventArgs e) + { + Play(); + } + } +} diff --git a/ShiftOS.Engine/WindowManager/InfoboxTemplate.resx b/ShiftOS.Engine/WindowManager/InfoboxTemplate.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/ShiftOS.Engine/WindowManager/InfoboxTemplate.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/ShiftOS.Engine/WindowManager/ShiftWM.cs b/ShiftOS.Engine/WindowManager/ShiftWM.cs index d30224c..38537c7 100644 --- a/ShiftOS.Engine/WindowManager/ShiftWM.cs +++ b/ShiftOS.Engine/WindowManager/ShiftWM.cs @@ -1,5 +1,6 @@ using System.Drawing; using System.Windows.Forms; +using static ShiftOS.Engine.WindowManager.InfoboxTemplate; namespace ShiftOS.Engine.WindowManager { @@ -30,5 +31,12 @@ namespace ShiftOS.Engine.WindowManager app.Show(); return app; } + public InfoboxTemplate StartInfoboxSession(string title, string body, buttonType type) + { + InfoboxTemplate info = new InfoboxTemplate(type); + info.label1.Text = body; + Init(info, title, Properties.Resources.iconInfoBox_fw, true, false); + return info; + } } } diff --git a/ShiftOS.Engine/WindowManager/ShiftWindow.Designer.cs b/ShiftOS.Engine/WindowManager/ShiftWindow.Designer.cs index 197c659..0b215a9 100644 --- a/ShiftOS.Engine/WindowManager/ShiftWindow.Designer.cs +++ b/ShiftOS.Engine/WindowManager/ShiftWindow.Designer.cs @@ -234,21 +234,20 @@ } #endregion - - internal System.Windows.Forms.Panel program; - internal System.Windows.Forms.Panel bottomleftcorner; - internal System.Windows.Forms.Panel toprightcorner; - internal System.Windows.Forms.Panel bottomrightcorner; - internal System.Windows.Forms.Panel topleftcorner; - internal System.Windows.Forms.Panel bottom; - internal System.Windows.Forms.Panel top; public System.Windows.Forms.PictureBox programIcon; - internal System.Windows.Forms.PictureBox maximizebutton; - internal System.Windows.Forms.PictureBox minimizebutton; - internal System.Windows.Forms.Label Title; - internal System.Windows.Forms.PictureBox closebutton; - internal System.Windows.Forms.Panel right; - internal System.Windows.Forms.Panel left; 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.Label Title; + public System.Windows.Forms.PictureBox closebutton; + public System.Windows.Forms.Panel right; + public System.Windows.Forms.Panel left; } } diff --git a/ShiftOS.Main/ShiftOS.Main.csproj b/ShiftOS.Main/ShiftOS.Main.csproj index 77bf889..d6ea600 100644 --- a/ShiftOS.Main/ShiftOS.Main.csproj +++ b/ShiftOS.Main/ShiftOS.Main.csproj @@ -58,6 +58,12 @@ ShiftDemo.cs + + UserControl + + + Shifter.cs + Form @@ -80,6 +86,9 @@ ShiftDemo.cs + + Shifter.cs + TestForm.cs diff --git a/ShiftOS.Main/ShiftOS/Apps/Shifter.Designer.cs b/ShiftOS.Main/ShiftOS/Apps/Shifter.Designer.cs new file mode 100644 index 0000000..0e9b2b4 --- /dev/null +++ b/ShiftOS.Main/ShiftOS/Apps/Shifter.Designer.cs @@ -0,0 +1,119 @@ +namespace ShiftOS.Main.ShiftOS.Apps +{ + partial class Shifter + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + 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.tabControl1.SuspendLayout(); + this.tabPage1.SuspendLayout(); + this.groupBox1.SuspendLayout(); + this.SuspendLayout(); + // + // tabControl1 + // + this.tabControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.tabControl1.Controls.Add(this.tabPage1); + this.tabControl1.Controls.Add(this.tabPage2); + this.tabControl1.Location = new System.Drawing.Point(3, 3); + this.tabControl1.Name = "tabControl1"; + this.tabControl1.SelectedIndex = 0; + this.tabControl1.Size = new System.Drawing.Size(334, 322); + this.tabControl1.TabIndex = 0; + // + // tabPage1 + // + this.tabPage1.Controls.Add(this.groupBox1); + this.tabPage1.Location = new System.Drawing.Point(4, 22); + this.tabPage1.Name = "tabPage1"; + 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.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); + this.groupBox1.Location = new System.Drawing.Point(6, 6); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(161, 108); + this.groupBox1.TabIndex = 0; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "groupBox1"; + // + // button1 + // + this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.button1.Font = new System.Drawing.Font("Lucida Console", 8.25F); + this.button1.Location = new System.Drawing.Point(6, 19); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(149, 23); + this.button1.TabIndex = 1; + this.button1.Text = "Set Titlebar Color"; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.button1_Click); + // + // Shifter + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.tabControl1); + this.Name = "Shifter"; + this.Size = new System.Drawing.Size(340, 325); + this.tabControl1.ResumeLayout(false); + this.tabPage1.ResumeLayout(false); + this.groupBox1.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.TabControl tabControl1; + private System.Windows.Forms.TabPage tabPage1; + private System.Windows.Forms.GroupBox groupBox1; + private System.Windows.Forms.Button button1; + private System.Windows.Forms.TabPage tabPage2; + } +} diff --git a/ShiftOS.Main/ShiftOS/Apps/Shifter.cs b/ShiftOS.Main/ShiftOS/Apps/Shifter.cs new file mode 100644 index 0000000..ce80f2b --- /dev/null +++ b/ShiftOS.Main/ShiftOS/Apps/Shifter.cs @@ -0,0 +1,31 @@ +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 Shifter : UserControl + { + public Shifter() + { + InitializeComponent(); + } + + 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; + } + } + } +} diff --git a/ShiftOS.Main/ShiftOS/Apps/Shifter.resx b/ShiftOS.Main/ShiftOS/Apps/Shifter.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/ShiftOS.Main/ShiftOS/Apps/Shifter.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/ShiftOS.Main/ShiftOS/Apps/TestForm.cs b/ShiftOS.Main/ShiftOS/Apps/TestForm.cs index 85be4a3..91055af 100644 --- a/ShiftOS.Main/ShiftOS/Apps/TestForm.cs +++ b/ShiftOS.Main/ShiftOS/Apps/TestForm.cs @@ -18,6 +18,7 @@ namespace ShiftOS.Main ShiftDemo demo = new ShiftDemo(); demo.label1.Text = textBox2.Text; shiftWM.Init(demo, textBox1.Text, null); + shiftWM.StartInfoboxSession(textBox1.Text, textBox2.Text, InfoboxTemplate.buttonType.OK); } } }