From 6b804f03ebcdd1c5aa145f29ae71b62bd61f8cb9 Mon Sep 17 00:00:00 2001 From: MichaelTheShifter Date: Tue, 19 Jul 2016 21:53:26 -0400 Subject: Full ShiftUI conversion The only bugs are that windows don't show in the center of the screen, and Gecko webbrowsers are not serializing properly to be converted to ShiftUI widgets (you can use the ToWidget() extension method to convert a WinForms control to a ShiftUI widget) Also multiple desktop panels are removed due to some odd bug I can't diagnose. Will add them back in the future. Promise. I loved creating GNOME2 skins. --- .../Apps/TextPad.Designer.cs | 80 +++++++++++----------- 1 file changed, 40 insertions(+), 40 deletions(-) (limited to 'source/WindowsFormsApplication1/Apps/TextPad.Designer.cs') diff --git a/source/WindowsFormsApplication1/Apps/TextPad.Designer.cs b/source/WindowsFormsApplication1/Apps/TextPad.Designer.cs index 3ac11b4..69ac78d 100644 --- a/source/WindowsFormsApplication1/Apps/TextPad.Designer.cs +++ b/source/WindowsFormsApplication1/Apps/TextPad.Designer.cs @@ -1,5 +1,5 @@ using System; -using System.Windows.Forms; +using ShiftUI; namespace ShiftOS { @@ -26,25 +26,25 @@ namespace ShiftOS private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - this.pgcontents = new System.Windows.Forms.Panel(); - this.txtuserinput = new System.Windows.Forms.TextBox(); - this.pnlbreak = new System.Windows.Forms.Panel(); - this.pnloptions = new System.Windows.Forms.Panel(); - this.btnsave = new System.Windows.Forms.Button(); - this.btnopen = new System.Windows.Forms.Button(); - this.btnnew = new System.Windows.Forms.Button(); - this.tmrcodepointcooldown = new System.Windows.Forms.Timer(this.components); - this.tmrshowearnedcodepoints = new System.Windows.Forms.Timer(this.components); + this.pgcontents = new ShiftUI.Panel(); + this.txtuserinput = new ShiftUI.TextBox(); + this.pnlbreak = new ShiftUI.Panel(); + this.pnloptions = new ShiftUI.Panel(); + this.btnsave = new ShiftUI.Button(); + this.btnopen = new ShiftUI.Button(); + this.btnnew = new ShiftUI.Button(); + this.tmrcodepointcooldown = new ShiftUI.Timer(this.components); + this.tmrshowearnedcodepoints = new ShiftUI.Timer(this.components); this.pgcontents.SuspendLayout(); this.pnloptions.SuspendLayout(); this.SuspendLayout(); // // pgcontents // - this.pgcontents.Controls.Add(this.txtuserinput); - this.pgcontents.Controls.Add(this.pnlbreak); - this.pgcontents.Controls.Add(this.pnloptions); - this.pgcontents.Dock = System.Windows.Forms.DockStyle.Fill; + this.pgcontents.Widgets.Add(this.txtuserinput); + this.pgcontents.Widgets.Add(this.pnlbreak); + this.pgcontents.Widgets.Add(this.pnloptions); + this.pgcontents.Dock = ShiftUI.DockStyle.Fill; this.pgcontents.Location = new System.Drawing.Point(0, 0); this.pgcontents.Name = "pgcontents"; this.pgcontents.Size = new System.Drawing.Size(530, 330); @@ -52,17 +52,17 @@ namespace ShiftOS // // txtuserinput // - this.txtuserinput.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.txtuserinput.Anchor = ((ShiftUI.AnchorStyles)((((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom) + | ShiftUI.AnchorStyles.Left) + | ShiftUI.AnchorStyles.Right))); this.txtuserinput.BackColor = System.Drawing.Color.White; - this.txtuserinput.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.txtuserinput.BorderStyle = ShiftUI.BorderStyle.None; this.txtuserinput.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txtuserinput.ForeColor = System.Drawing.Color.Black; this.txtuserinput.Location = new System.Drawing.Point(4, 2); this.txtuserinput.Multiline = true; this.txtuserinput.Name = "txtuserinput"; - this.txtuserinput.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; + this.txtuserinput.ScrollBars = ShiftUI.ScrollBars.Vertical; this.txtuserinput.Size = new System.Drawing.Size(528, 272); this.txtuserinput.TabIndex = 0; // @@ -70,8 +70,8 @@ namespace ShiftOS // this.pnlbreak.BackColor = System.Drawing.Color.White; this.pnlbreak.BackgroundImage = global::ShiftOS.Properties.Resources.uparrow; - this.pnlbreak.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pnlbreak.Dock = System.Windows.Forms.DockStyle.Bottom; + this.pnlbreak.BackgroundImageLayout = ShiftUI.ImageLayout.Center; + this.pnlbreak.Dock = ShiftUI.DockStyle.Bottom; this.pnlbreak.ForeColor = System.Drawing.Color.Black; this.pnlbreak.Location = new System.Drawing.Point(0, 277); this.pnlbreak.Name = "pnlbreak"; @@ -81,10 +81,10 @@ namespace ShiftOS // pnloptions // this.pnloptions.BackColor = System.Drawing.Color.White; - this.pnloptions.Controls.Add(this.btnsave); - this.pnloptions.Controls.Add(this.btnopen); - this.pnloptions.Controls.Add(this.btnnew); - this.pnloptions.Dock = System.Windows.Forms.DockStyle.Bottom; + this.pnloptions.Widgets.Add(this.btnsave); + this.pnloptions.Widgets.Add(this.btnopen); + this.pnloptions.Widgets.Add(this.btnnew); + this.pnloptions.Dock = ShiftUI.DockStyle.Bottom; this.pnloptions.Location = new System.Drawing.Point(0, 292); this.pnloptions.Name = "pnloptions"; this.pnloptions.Size = new System.Drawing.Size(530, 38); @@ -94,7 +94,7 @@ namespace ShiftOS // btnsave // this.btnsave.BackColor = System.Drawing.Color.White; - this.btnsave.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnsave.FlatStyle = ShiftUI.FlatStyle.Flat; this.btnsave.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnsave.Image = global::ShiftOS.Properties.Resources.saveicon; this.btnsave.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -109,7 +109,7 @@ namespace ShiftOS // btnopen // this.btnopen.BackColor = System.Drawing.Color.White; - this.btnopen.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnopen.FlatStyle = ShiftUI.FlatStyle.Flat; this.btnopen.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnopen.Image = global::ShiftOS.Properties.Resources.openicon; this.btnopen.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -124,7 +124,7 @@ namespace ShiftOS // btnnew // this.btnnew.BackColor = System.Drawing.Color.White; - this.btnnew.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnnew.FlatStyle = ShiftUI.FlatStyle.Flat; this.btnnew.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnnew.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnnew.Location = new System.Drawing.Point(4, 4); @@ -146,11 +146,11 @@ namespace ShiftOS // TextPad // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.AutoScaleMode = ShiftUI.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.White; this.ClientSize = new System.Drawing.Size(530, 330); - this.Controls.Add(this.pgcontents); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; + this.Widgets.Add(this.pgcontents); + this.FormBorderStyle = ShiftUI.FormBorderStyle.None; this.MinimumSize = new System.Drawing.Size(230, 230); this.Name = "TextPad"; this.Text = "TextPad"; @@ -168,14 +168,14 @@ namespace ShiftOS this.tmrshowearnedcodepoints.Tick += new EventHandler(tmrshowearnedcodepoints_Tick); this.pnlbreak.MouseEnter += new EventHandler(this.pnlbreak_MouseEnter); } - internal System.Windows.Forms.Panel pgcontents; - internal System.Windows.Forms.TextBox txtuserinput; - internal System.Windows.Forms.Panel pnloptions; - internal System.Windows.Forms.Button btnnew; - internal System.Windows.Forms.Button btnsave; - internal System.Windows.Forms.Button btnopen; - internal System.Windows.Forms.Panel pnlbreak; - internal System.Windows.Forms.Timer tmrcodepointcooldown; - internal System.Windows.Forms.Timer tmrshowearnedcodepoints; + internal ShiftUI.Panel pgcontents; + internal ShiftUI.TextBox txtuserinput; + internal ShiftUI.Panel pnloptions; + internal ShiftUI.Button btnnew; + internal ShiftUI.Button btnsave; + internal ShiftUI.Button btnopen; + internal ShiftUI.Panel pnlbreak; + internal ShiftUI.Timer tmrcodepointcooldown; + internal ShiftUI.Timer tmrshowearnedcodepoints; } } \ No newline at end of file -- cgit v1.2.3