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/Artpad.Designer.cs | 2022 ++++++++++---------- 1 file changed, 1011 insertions(+), 1011 deletions(-) (limited to 'source/WindowsFormsApplication1/Apps/Artpad.Designer.cs') diff --git a/source/WindowsFormsApplication1/Apps/Artpad.Designer.cs b/source/WindowsFormsApplication1/Apps/Artpad.Designer.cs index 13bfba1..dead4c0 100644 --- a/source/WindowsFormsApplication1/Apps/Artpad.Designer.cs +++ b/source/WindowsFormsApplication1/Apps/Artpad.Designer.cs @@ -23,269 +23,269 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - this.pgcontents = new System.Windows.Forms.Panel(); - this.pnldrawingbackground = new System.Windows.Forms.Panel(); - this.pnlinitialcanvassettings = new System.Windows.Forms.Panel(); - this.btncancel = new System.Windows.Forms.Button(); - this.btncreate = new System.Windows.Forms.Button(); - this.Label11 = new System.Windows.Forms.Label(); - this.lbltotalpixels = new System.Windows.Forms.Label(); - this.txtnewcanvasheight = new System.Windows.Forms.TextBox(); - this.Label10 = new System.Windows.Forms.Label(); - this.txtnewcanvaswidth = new System.Windows.Forms.TextBox(); - this.Label9 = new System.Windows.Forms.Label(); - this.pnlpalletsize = new System.Windows.Forms.Panel(); - this.txttopspace = new System.Windows.Forms.TextBox(); - this.Label40 = new System.Windows.Forms.Label(); - this.txtsidespace = new System.Windows.Forms.TextBox(); - this.Label41 = new System.Windows.Forms.Label(); - this.btnchangesizecancel = new System.Windows.Forms.Button(); - this.btnsetsize = new System.Windows.Forms.Button(); - this.txtcolorpalletheight = new System.Windows.Forms.TextBox(); - this.Label42 = new System.Windows.Forms.Label(); - this.txtcolorpalletwidth = new System.Windows.Forms.TextBox(); - this.Label43 = new System.Windows.Forms.Label(); - this.picdrawingdisplay = new System.Windows.Forms.PictureBox(); - this.pnlbottompanel = new System.Windows.Forms.Panel(); - this.pnlpallet = new System.Windows.Forms.Panel(); - this.flowcolours = new System.Windows.Forms.FlowLayoutPanel(); - this.colourpallet1 = new System.Windows.Forms.Panel(); - this.colourpallet2 = new System.Windows.Forms.Panel(); - this.colourpallet3 = new System.Windows.Forms.Panel(); - this.colourpallet4 = new System.Windows.Forms.Panel(); - this.colourpallet5 = new System.Windows.Forms.Panel(); - this.colourpallet6 = new System.Windows.Forms.Panel(); - this.colourpallet7 = new System.Windows.Forms.Panel(); - this.colourpallet8 = new System.Windows.Forms.Panel(); - this.colourpallet9 = new System.Windows.Forms.Panel(); - this.colourpallet10 = new System.Windows.Forms.Panel(); - this.colourpallet11 = new System.Windows.Forms.Panel(); - this.colourpallet12 = new System.Windows.Forms.Panel(); - this.colourpallet13 = new System.Windows.Forms.Panel(); - this.colourpallet14 = new System.Windows.Forms.Panel(); - this.colourpallet15 = new System.Windows.Forms.Panel(); - this.colourpallet16 = new System.Windows.Forms.Panel(); - this.colourpallet17 = new System.Windows.Forms.Panel(); - this.colourpallet18 = new System.Windows.Forms.Panel(); - this.colourpallet19 = new System.Windows.Forms.Panel(); - this.colourpallet20 = new System.Windows.Forms.Panel(); - this.colourpallet21 = new System.Windows.Forms.Panel(); - this.colourpallet22 = new System.Windows.Forms.Panel(); - this.colourpallet23 = new System.Windows.Forms.Panel(); - this.colourpallet24 = new System.Windows.Forms.Panel(); - this.colourpallet25 = new System.Windows.Forms.Panel(); - this.colourpallet26 = new System.Windows.Forms.Panel(); - this.colourpallet27 = new System.Windows.Forms.Panel(); - this.colourpallet28 = new System.Windows.Forms.Panel(); - this.colourpallet29 = new System.Windows.Forms.Panel(); - this.colourpallet30 = new System.Windows.Forms.Panel(); - this.colourpallet31 = new System.Windows.Forms.Panel(); - this.colourpallet32 = new System.Windows.Forms.Panel(); - this.colourpallet33 = new System.Windows.Forms.Panel(); - this.colourpallet34 = new System.Windows.Forms.Panel(); - this.colourpallet35 = new System.Windows.Forms.Panel(); - this.colourpallet36 = new System.Windows.Forms.Panel(); - this.colourpallet37 = new System.Windows.Forms.Panel(); - this.colourpallet38 = new System.Windows.Forms.Panel(); - this.colourpallet39 = new System.Windows.Forms.Panel(); - this.colourpallet40 = new System.Windows.Forms.Panel(); - this.colourpallet41 = new System.Windows.Forms.Panel(); - this.colourpallet42 = new System.Windows.Forms.Panel(); - this.colourpallet43 = new System.Windows.Forms.Panel(); - this.colourpallet44 = new System.Windows.Forms.Panel(); - this.colourpallet45 = new System.Windows.Forms.Panel(); - this.colourpallet46 = new System.Windows.Forms.Panel(); - this.colourpallet47 = new System.Windows.Forms.Panel(); - this.colourpallet48 = new System.Windows.Forms.Panel(); - this.colourpallet49 = new System.Windows.Forms.Panel(); - this.colourpallet50 = new System.Windows.Forms.Panel(); - this.colourpallet51 = new System.Windows.Forms.Panel(); - this.colourpallet52 = new System.Windows.Forms.Panel(); - this.colourpallet53 = new System.Windows.Forms.Panel(); - this.colourpallet54 = new System.Windows.Forms.Panel(); - this.colourpallet55 = new System.Windows.Forms.Panel(); - this.colourpallet56 = new System.Windows.Forms.Panel(); - this.colourpallet57 = new System.Windows.Forms.Panel(); - this.colourpallet58 = new System.Windows.Forms.Panel(); - this.colourpallet59 = new System.Windows.Forms.Panel(); - this.colourpallet60 = new System.Windows.Forms.Panel(); - this.colourpallet61 = new System.Windows.Forms.Panel(); - this.colourpallet62 = new System.Windows.Forms.Panel(); - this.colourpallet63 = new System.Windows.Forms.Panel(); - this.colourpallet64 = new System.Windows.Forms.Panel(); - this.colourpallet65 = new System.Windows.Forms.Panel(); - this.colourpallet66 = new System.Windows.Forms.Panel(); - this.colourpallet67 = new System.Windows.Forms.Panel(); - this.colourpallet68 = new System.Windows.Forms.Panel(); - this.colourpallet69 = new System.Windows.Forms.Panel(); - this.colourpallet70 = new System.Windows.Forms.Panel(); - this.colourpallet71 = new System.Windows.Forms.Panel(); - this.colourpallet72 = new System.Windows.Forms.Panel(); - this.colourpallet73 = new System.Windows.Forms.Panel(); - this.colourpallet74 = new System.Windows.Forms.Panel(); - this.colourpallet75 = new System.Windows.Forms.Panel(); - this.colourpallet76 = new System.Windows.Forms.Panel(); - this.colourpallet77 = new System.Windows.Forms.Panel(); - this.colourpallet78 = new System.Windows.Forms.Panel(); - this.colourpallet79 = new System.Windows.Forms.Panel(); - this.colourpallet80 = new System.Windows.Forms.Panel(); - this.colourpallet81 = new System.Windows.Forms.Panel(); - this.colourpallet82 = new System.Windows.Forms.Panel(); - this.colourpallet83 = new System.Windows.Forms.Panel(); - this.colourpallet84 = new System.Windows.Forms.Panel(); - this.colourpallet85 = new System.Windows.Forms.Panel(); - this.colourpallet86 = new System.Windows.Forms.Panel(); - this.colourpallet87 = new System.Windows.Forms.Panel(); - this.colourpallet88 = new System.Windows.Forms.Panel(); - this.colourpallet89 = new System.Windows.Forms.Panel(); - this.colourpallet90 = new System.Windows.Forms.Panel(); - this.colourpallet91 = new System.Windows.Forms.Panel(); - this.colourpallet92 = new System.Windows.Forms.Panel(); - this.colourpallet93 = new System.Windows.Forms.Panel(); - this.colourpallet94 = new System.Windows.Forms.Panel(); - this.colourpallet95 = new System.Windows.Forms.Panel(); - this.colourpallet96 = new System.Windows.Forms.Panel(); - this.colourpallet97 = new System.Windows.Forms.Panel(); - this.colourpallet98 = new System.Windows.Forms.Panel(); - this.colourpallet99 = new System.Windows.Forms.Panel(); - this.colourpallet100 = new System.Windows.Forms.Panel(); - this.colourpallet101 = new System.Windows.Forms.Panel(); - this.colourpallet102 = new System.Windows.Forms.Panel(); - this.colourpallet103 = new System.Windows.Forms.Panel(); - this.colourpallet104 = new System.Windows.Forms.Panel(); - this.colourpallet105 = new System.Windows.Forms.Panel(); - this.colourpallet106 = new System.Windows.Forms.Panel(); - this.colourpallet107 = new System.Windows.Forms.Panel(); - this.colourpallet108 = new System.Windows.Forms.Panel(); - this.colourpallet109 = new System.Windows.Forms.Panel(); - this.colourpallet110 = new System.Windows.Forms.Panel(); - this.colourpallet111 = new System.Windows.Forms.Panel(); - this.colourpallet112 = new System.Windows.Forms.Panel(); - this.colourpallet113 = new System.Windows.Forms.Panel(); - this.colourpallet114 = new System.Windows.Forms.Panel(); - this.colourpallet115 = new System.Windows.Forms.Panel(); - this.colourpallet116 = new System.Windows.Forms.Panel(); - this.colourpallet117 = new System.Windows.Forms.Panel(); - this.colourpallet118 = new System.Windows.Forms.Panel(); - this.colourpallet119 = new System.Windows.Forms.Panel(); - this.colourpallet120 = new System.Windows.Forms.Panel(); - this.colourpallet121 = new System.Windows.Forms.Panel(); - this.colourpallet122 = new System.Windows.Forms.Panel(); - this.colourpallet123 = new System.Windows.Forms.Panel(); - this.colourpallet124 = new System.Windows.Forms.Panel(); - this.colourpallet125 = new System.Windows.Forms.Panel(); - this.colourpallet126 = new System.Windows.Forms.Panel(); - this.colourpallet127 = new System.Windows.Forms.Panel(); - this.colourpallet128 = new System.Windows.Forms.Panel(); - this.Label4 = new System.Windows.Forms.Label(); - this.line6 = new System.Windows.Forms.Panel(); - this.pnltoolproperties = new System.Windows.Forms.Panel(); - this.pnlovaltoolsettings = new System.Windows.Forms.Panel(); - this.Label20 = new System.Windows.Forms.Label(); - this.btnovalfillonoff = new System.Windows.Forms.Button(); - this.pnlovalfillcolour = new System.Windows.Forms.Panel(); - this.txtovalborderwidth = new System.Windows.Forms.TextBox(); - this.Label21 = new System.Windows.Forms.Label(); - this.Label22 = new System.Windows.Forms.Label(); - this.Label23 = new System.Windows.Forms.Label(); - this.pnleracertoolsettings = new System.Windows.Forms.Panel(); - this.Label28 = new System.Windows.Forms.Label(); - this.btneracersquare = new System.Windows.Forms.Button(); - this.btneracercircle = new System.Windows.Forms.Button(); - this.Label24 = new System.Windows.Forms.Label(); - this.txteracersize = new System.Windows.Forms.TextBox(); - this.Label26 = new System.Windows.Forms.Label(); - this.Label27 = new System.Windows.Forms.Label(); - this.pnllinetoolsettings = new System.Windows.Forms.Panel(); - this.Label29 = new System.Windows.Forms.Label(); - this.txtlinewidth = new System.Windows.Forms.TextBox(); - this.Label30 = new System.Windows.Forms.Label(); - this.Label31 = new System.Windows.Forms.Label(); - this.pnlpaintbrushtoolsettings = new System.Windows.Forms.Panel(); - this.Label36 = new System.Windows.Forms.Label(); - this.btnpaintsquareshape = new System.Windows.Forms.Button(); - this.btnpaintcircleshape = new System.Windows.Forms.Button(); - this.Label37 = new System.Windows.Forms.Label(); - this.txtpaintbrushsize = new System.Windows.Forms.TextBox(); - this.Label38 = new System.Windows.Forms.Label(); - this.Label39 = new System.Windows.Forms.Label(); - this.pnltexttoolsettings = new System.Windows.Forms.Panel(); - this.Label35 = new System.Windows.Forms.Label(); - this.combofontstyle = new System.Windows.Forms.ComboBox(); - this.txtdrawstringtext = new System.Windows.Forms.TextBox(); - this.combodrawtextfont = new System.Windows.Forms.ComboBox(); - this.Label25 = new System.Windows.Forms.Label(); - this.txtdrawtextsize = new System.Windows.Forms.TextBox(); - this.Label32 = new System.Windows.Forms.Label(); - this.Label33 = new System.Windows.Forms.Label(); - this.Label34 = new System.Windows.Forms.Label(); - this.pnlpixelsettersettings = new System.Windows.Forms.Panel(); - this.btnpixelsettersetpixel = new System.Windows.Forms.Button(); - this.txtpixelsetterycoordinate = new System.Windows.Forms.TextBox(); - this.txtpixelsetterxcoordinate = new System.Windows.Forms.TextBox(); - this.Label3 = new System.Windows.Forms.Label(); - this.Label2 = new System.Windows.Forms.Label(); - this.Label1 = new System.Windows.Forms.Label(); - this.pnlmagnifiersettings = new System.Windows.Forms.Panel(); - this.btnzoomout = new System.Windows.Forms.Button(); - this.btnzoomin = new System.Windows.Forms.Button(); - this.lblzoomlevel = new System.Windows.Forms.Label(); - this.Label7 = new System.Windows.Forms.Label(); - this.pnlfloodfillsettings = new System.Windows.Forms.Panel(); - this.Label12 = new System.Windows.Forms.Label(); - this.Label15 = new System.Windows.Forms.Label(); - this.pnlsquaretoolsettings = new System.Windows.Forms.Panel(); - this.Label19 = new System.Windows.Forms.Label(); - this.btnsquarefillonoff = new System.Windows.Forms.Button(); - this.pnlsquarefillcolour = new System.Windows.Forms.Panel(); - this.txtsquareborderwidth = new System.Windows.Forms.TextBox(); - this.Label16 = new System.Windows.Forms.Label(); - this.Label18 = new System.Windows.Forms.Label(); - this.Label17 = new System.Windows.Forms.Label(); - this.pnlpixelplacersettings = new System.Windows.Forms.Panel(); - this.lblpixelplacerhelp = new System.Windows.Forms.Label(); - this.btnpixelplacermovementmode = new System.Windows.Forms.Button(); - this.Label8 = new System.Windows.Forms.Label(); - this.pnlpencilsettings = new System.Windows.Forms.Panel(); - this.btnpencilsize3 = new System.Windows.Forms.Button(); - this.btnpencilsize2 = new System.Windows.Forms.Button(); - this.btnpencilsize1 = new System.Windows.Forms.Button(); - this.Label14 = new System.Windows.Forms.Label(); - this.Label6 = new System.Windows.Forms.Label(); - this.Label5 = new System.Windows.Forms.Label(); - this.line5 = new System.Windows.Forms.Panel(); - this.line3 = new System.Windows.Forms.Panel(); - this.pnltools = new System.Windows.Forms.Panel(); - this.pnltoolpositioner = new System.Windows.Forms.FlowLayoutPanel(); - this.btnpixelsetter = new System.Windows.Forms.Button(); - this.btnpixelplacer = new System.Windows.Forms.Button(); - this.btnpencil = new System.Windows.Forms.Button(); - this.btnfloodfill = new System.Windows.Forms.Button(); - this.btnoval = new System.Windows.Forms.Button(); - this.btnsquare = new System.Windows.Forms.Button(); - this.btnlinetool = new System.Windows.Forms.Button(); - this.btnpaintbrush = new System.Windows.Forms.Button(); - this.btntexttool = new System.Windows.Forms.Button(); - this.btneracer = new System.Windows.Forms.Button(); - this.btnnew = new System.Windows.Forms.Button(); - this.btnmagnify = new System.Windows.Forms.Button(); - this.btnopen = new System.Windows.Forms.Button(); - this.btnsave = new System.Windows.Forms.Button(); - this.btnundo = new System.Windows.Forms.Button(); - this.btnredo = new System.Windows.Forms.Button(); - this.line1 = new System.Windows.Forms.Panel(); - this.pnltoolpreview = new System.Windows.Forms.Panel(); - this.Label13 = new System.Windows.Forms.Label(); - this.picpreview = new System.Windows.Forms.PictureBox(); - this.lbltoolselected = new System.Windows.Forms.Label(); - this.line4 = new System.Windows.Forms.Panel(); - this.line2 = new System.Windows.Forms.Panel(); - this.tmrcodepointcooldown = new System.Windows.Forms.Timer(this.components); - this.tmrshowearnedcodepoints = new System.Windows.Forms.Timer(this.components); - this.pullbs = new System.Windows.Forms.Timer(this.components); - this.pullbottom = new System.Windows.Forms.Timer(this.components); - this.pullside = new System.Windows.Forms.Timer(this.components); - this.tmrsetupui = new System.Windows.Forms.Timer(this.components); + this.pgcontents = new ShiftUI.Panel(); + this.pnldrawingbackground = new ShiftUI.Panel(); + this.pnlinitialcanvassettings = new ShiftUI.Panel(); + this.btncancel = new ShiftUI.Button(); + this.btncreate = new ShiftUI.Button(); + this.Label11 = new ShiftUI.Label(); + this.lbltotalpixels = new ShiftUI.Label(); + this.txtnewcanvasheight = new ShiftUI.TextBox(); + this.Label10 = new ShiftUI.Label(); + this.txtnewcanvaswidth = new ShiftUI.TextBox(); + this.Label9 = new ShiftUI.Label(); + this.pnlpalletsize = new ShiftUI.Panel(); + this.txttopspace = new ShiftUI.TextBox(); + this.Label40 = new ShiftUI.Label(); + this.txtsidespace = new ShiftUI.TextBox(); + this.Label41 = new ShiftUI.Label(); + this.btnchangesizecancel = new ShiftUI.Button(); + this.btnsetsize = new ShiftUI.Button(); + this.txtcolorpalletheight = new ShiftUI.TextBox(); + this.Label42 = new ShiftUI.Label(); + this.txtcolorpalletwidth = new ShiftUI.TextBox(); + this.Label43 = new ShiftUI.Label(); + this.picdrawingdisplay = new ShiftUI.PictureBox(); + this.pnlbottompanel = new ShiftUI.Panel(); + this.pnlpallet = new ShiftUI.Panel(); + this.flowcolours = new ShiftUI.FlowLayoutPanel(); + this.colourpallet1 = new ShiftUI.Panel(); + this.colourpallet2 = new ShiftUI.Panel(); + this.colourpallet3 = new ShiftUI.Panel(); + this.colourpallet4 = new ShiftUI.Panel(); + this.colourpallet5 = new ShiftUI.Panel(); + this.colourpallet6 = new ShiftUI.Panel(); + this.colourpallet7 = new ShiftUI.Panel(); + this.colourpallet8 = new ShiftUI.Panel(); + this.colourpallet9 = new ShiftUI.Panel(); + this.colourpallet10 = new ShiftUI.Panel(); + this.colourpallet11 = new ShiftUI.Panel(); + this.colourpallet12 = new ShiftUI.Panel(); + this.colourpallet13 = new ShiftUI.Panel(); + this.colourpallet14 = new ShiftUI.Panel(); + this.colourpallet15 = new ShiftUI.Panel(); + this.colourpallet16 = new ShiftUI.Panel(); + this.colourpallet17 = new ShiftUI.Panel(); + this.colourpallet18 = new ShiftUI.Panel(); + this.colourpallet19 = new ShiftUI.Panel(); + this.colourpallet20 = new ShiftUI.Panel(); + this.colourpallet21 = new ShiftUI.Panel(); + this.colourpallet22 = new ShiftUI.Panel(); + this.colourpallet23 = new ShiftUI.Panel(); + this.colourpallet24 = new ShiftUI.Panel(); + this.colourpallet25 = new ShiftUI.Panel(); + this.colourpallet26 = new ShiftUI.Panel(); + this.colourpallet27 = new ShiftUI.Panel(); + this.colourpallet28 = new ShiftUI.Panel(); + this.colourpallet29 = new ShiftUI.Panel(); + this.colourpallet30 = new ShiftUI.Panel(); + this.colourpallet31 = new ShiftUI.Panel(); + this.colourpallet32 = new ShiftUI.Panel(); + this.colourpallet33 = new ShiftUI.Panel(); + this.colourpallet34 = new ShiftUI.Panel(); + this.colourpallet35 = new ShiftUI.Panel(); + this.colourpallet36 = new ShiftUI.Panel(); + this.colourpallet37 = new ShiftUI.Panel(); + this.colourpallet38 = new ShiftUI.Panel(); + this.colourpallet39 = new ShiftUI.Panel(); + this.colourpallet40 = new ShiftUI.Panel(); + this.colourpallet41 = new ShiftUI.Panel(); + this.colourpallet42 = new ShiftUI.Panel(); + this.colourpallet43 = new ShiftUI.Panel(); + this.colourpallet44 = new ShiftUI.Panel(); + this.colourpallet45 = new ShiftUI.Panel(); + this.colourpallet46 = new ShiftUI.Panel(); + this.colourpallet47 = new ShiftUI.Panel(); + this.colourpallet48 = new ShiftUI.Panel(); + this.colourpallet49 = new ShiftUI.Panel(); + this.colourpallet50 = new ShiftUI.Panel(); + this.colourpallet51 = new ShiftUI.Panel(); + this.colourpallet52 = new ShiftUI.Panel(); + this.colourpallet53 = new ShiftUI.Panel(); + this.colourpallet54 = new ShiftUI.Panel(); + this.colourpallet55 = new ShiftUI.Panel(); + this.colourpallet56 = new ShiftUI.Panel(); + this.colourpallet57 = new ShiftUI.Panel(); + this.colourpallet58 = new ShiftUI.Panel(); + this.colourpallet59 = new ShiftUI.Panel(); + this.colourpallet60 = new ShiftUI.Panel(); + this.colourpallet61 = new ShiftUI.Panel(); + this.colourpallet62 = new ShiftUI.Panel(); + this.colourpallet63 = new ShiftUI.Panel(); + this.colourpallet64 = new ShiftUI.Panel(); + this.colourpallet65 = new ShiftUI.Panel(); + this.colourpallet66 = new ShiftUI.Panel(); + this.colourpallet67 = new ShiftUI.Panel(); + this.colourpallet68 = new ShiftUI.Panel(); + this.colourpallet69 = new ShiftUI.Panel(); + this.colourpallet70 = new ShiftUI.Panel(); + this.colourpallet71 = new ShiftUI.Panel(); + this.colourpallet72 = new ShiftUI.Panel(); + this.colourpallet73 = new ShiftUI.Panel(); + this.colourpallet74 = new ShiftUI.Panel(); + this.colourpallet75 = new ShiftUI.Panel(); + this.colourpallet76 = new ShiftUI.Panel(); + this.colourpallet77 = new ShiftUI.Panel(); + this.colourpallet78 = new ShiftUI.Panel(); + this.colourpallet79 = new ShiftUI.Panel(); + this.colourpallet80 = new ShiftUI.Panel(); + this.colourpallet81 = new ShiftUI.Panel(); + this.colourpallet82 = new ShiftUI.Panel(); + this.colourpallet83 = new ShiftUI.Panel(); + this.colourpallet84 = new ShiftUI.Panel(); + this.colourpallet85 = new ShiftUI.Panel(); + this.colourpallet86 = new ShiftUI.Panel(); + this.colourpallet87 = new ShiftUI.Panel(); + this.colourpallet88 = new ShiftUI.Panel(); + this.colourpallet89 = new ShiftUI.Panel(); + this.colourpallet90 = new ShiftUI.Panel(); + this.colourpallet91 = new ShiftUI.Panel(); + this.colourpallet92 = new ShiftUI.Panel(); + this.colourpallet93 = new ShiftUI.Panel(); + this.colourpallet94 = new ShiftUI.Panel(); + this.colourpallet95 = new ShiftUI.Panel(); + this.colourpallet96 = new ShiftUI.Panel(); + this.colourpallet97 = new ShiftUI.Panel(); + this.colourpallet98 = new ShiftUI.Panel(); + this.colourpallet99 = new ShiftUI.Panel(); + this.colourpallet100 = new ShiftUI.Panel(); + this.colourpallet101 = new ShiftUI.Panel(); + this.colourpallet102 = new ShiftUI.Panel(); + this.colourpallet103 = new ShiftUI.Panel(); + this.colourpallet104 = new ShiftUI.Panel(); + this.colourpallet105 = new ShiftUI.Panel(); + this.colourpallet106 = new ShiftUI.Panel(); + this.colourpallet107 = new ShiftUI.Panel(); + this.colourpallet108 = new ShiftUI.Panel(); + this.colourpallet109 = new ShiftUI.Panel(); + this.colourpallet110 = new ShiftUI.Panel(); + this.colourpallet111 = new ShiftUI.Panel(); + this.colourpallet112 = new ShiftUI.Panel(); + this.colourpallet113 = new ShiftUI.Panel(); + this.colourpallet114 = new ShiftUI.Panel(); + this.colourpallet115 = new ShiftUI.Panel(); + this.colourpallet116 = new ShiftUI.Panel(); + this.colourpallet117 = new ShiftUI.Panel(); + this.colourpallet118 = new ShiftUI.Panel(); + this.colourpallet119 = new ShiftUI.Panel(); + this.colourpallet120 = new ShiftUI.Panel(); + this.colourpallet121 = new ShiftUI.Panel(); + this.colourpallet122 = new ShiftUI.Panel(); + this.colourpallet123 = new ShiftUI.Panel(); + this.colourpallet124 = new ShiftUI.Panel(); + this.colourpallet125 = new ShiftUI.Panel(); + this.colourpallet126 = new ShiftUI.Panel(); + this.colourpallet127 = new ShiftUI.Panel(); + this.colourpallet128 = new ShiftUI.Panel(); + this.Label4 = new ShiftUI.Label(); + this.line6 = new ShiftUI.Panel(); + this.pnltoolproperties = new ShiftUI.Panel(); + this.pnlovaltoolsettings = new ShiftUI.Panel(); + this.Label20 = new ShiftUI.Label(); + this.btnovalfillonoff = new ShiftUI.Button(); + this.pnlovalfillcolour = new ShiftUI.Panel(); + this.txtovalborderwidth = new ShiftUI.TextBox(); + this.Label21 = new ShiftUI.Label(); + this.Label22 = new ShiftUI.Label(); + this.Label23 = new ShiftUI.Label(); + this.pnleracertoolsettings = new ShiftUI.Panel(); + this.Label28 = new ShiftUI.Label(); + this.btneracersquare = new ShiftUI.Button(); + this.btneracercircle = new ShiftUI.Button(); + this.Label24 = new ShiftUI.Label(); + this.txteracersize = new ShiftUI.TextBox(); + this.Label26 = new ShiftUI.Label(); + this.Label27 = new ShiftUI.Label(); + this.pnllinetoolsettings = new ShiftUI.Panel(); + this.Label29 = new ShiftUI.Label(); + this.txtlinewidth = new ShiftUI.TextBox(); + this.Label30 = new ShiftUI.Label(); + this.Label31 = new ShiftUI.Label(); + this.pnlpaintbrushtoolsettings = new ShiftUI.Panel(); + this.Label36 = new ShiftUI.Label(); + this.btnpaintsquareshape = new ShiftUI.Button(); + this.btnpaintcircleshape = new ShiftUI.Button(); + this.Label37 = new ShiftUI.Label(); + this.txtpaintbrushsize = new ShiftUI.TextBox(); + this.Label38 = new ShiftUI.Label(); + this.Label39 = new ShiftUI.Label(); + this.pnltexttoolsettings = new ShiftUI.Panel(); + this.Label35 = new ShiftUI.Label(); + this.combofontstyle = new ShiftUI.ComboBox(); + this.txtdrawstringtext = new ShiftUI.TextBox(); + this.combodrawtextfont = new ShiftUI.ComboBox(); + this.Label25 = new ShiftUI.Label(); + this.txtdrawtextsize = new ShiftUI.TextBox(); + this.Label32 = new ShiftUI.Label(); + this.Label33 = new ShiftUI.Label(); + this.Label34 = new ShiftUI.Label(); + this.pnlpixelsettersettings = new ShiftUI.Panel(); + this.btnpixelsettersetpixel = new ShiftUI.Button(); + this.txtpixelsetterycoordinate = new ShiftUI.TextBox(); + this.txtpixelsetterxcoordinate = new ShiftUI.TextBox(); + this.Label3 = new ShiftUI.Label(); + this.Label2 = new ShiftUI.Label(); + this.Label1 = new ShiftUI.Label(); + this.pnlmagnifiersettings = new ShiftUI.Panel(); + this.btnzoomout = new ShiftUI.Button(); + this.btnzoomin = new ShiftUI.Button(); + this.lblzoomlevel = new ShiftUI.Label(); + this.Label7 = new ShiftUI.Label(); + this.pnlfloodfillsettings = new ShiftUI.Panel(); + this.Label12 = new ShiftUI.Label(); + this.Label15 = new ShiftUI.Label(); + this.pnlsquaretoolsettings = new ShiftUI.Panel(); + this.Label19 = new ShiftUI.Label(); + this.btnsquarefillonoff = new ShiftUI.Button(); + this.pnlsquarefillcolour = new ShiftUI.Panel(); + this.txtsquareborderwidth = new ShiftUI.TextBox(); + this.Label16 = new ShiftUI.Label(); + this.Label18 = new ShiftUI.Label(); + this.Label17 = new ShiftUI.Label(); + this.pnlpixelplacersettings = new ShiftUI.Panel(); + this.lblpixelplacerhelp = new ShiftUI.Label(); + this.btnpixelplacermovementmode = new ShiftUI.Button(); + this.Label8 = new ShiftUI.Label(); + this.pnlpencilsettings = new ShiftUI.Panel(); + this.btnpencilsize3 = new ShiftUI.Button(); + this.btnpencilsize2 = new ShiftUI.Button(); + this.btnpencilsize1 = new ShiftUI.Button(); + this.Label14 = new ShiftUI.Label(); + this.Label6 = new ShiftUI.Label(); + this.Label5 = new ShiftUI.Label(); + this.line5 = new ShiftUI.Panel(); + this.line3 = new ShiftUI.Panel(); + this.pnltools = new ShiftUI.Panel(); + this.pnltoolpositioner = new ShiftUI.FlowLayoutPanel(); + this.btnpixelsetter = new ShiftUI.Button(); + this.btnpixelplacer = new ShiftUI.Button(); + this.btnpencil = new ShiftUI.Button(); + this.btnfloodfill = new ShiftUI.Button(); + this.btnoval = new ShiftUI.Button(); + this.btnsquare = new ShiftUI.Button(); + this.btnlinetool = new ShiftUI.Button(); + this.btnpaintbrush = new ShiftUI.Button(); + this.btntexttool = new ShiftUI.Button(); + this.btneracer = new ShiftUI.Button(); + this.btnnew = new ShiftUI.Button(); + this.btnmagnify = new ShiftUI.Button(); + this.btnopen = new ShiftUI.Button(); + this.btnsave = new ShiftUI.Button(); + this.btnundo = new ShiftUI.Button(); + this.btnredo = new ShiftUI.Button(); + this.line1 = new ShiftUI.Panel(); + this.pnltoolpreview = new ShiftUI.Panel(); + this.Label13 = new ShiftUI.Label(); + this.picpreview = new ShiftUI.PictureBox(); + this.lbltoolselected = new ShiftUI.Label(); + this.line4 = new ShiftUI.Panel(); + this.line2 = new ShiftUI.Panel(); + this.tmrcodepointcooldown = new ShiftUI.Timer(this.components); + this.tmrshowearnedcodepoints = new ShiftUI.Timer(this.components); + this.pullbs = new ShiftUI.Timer(this.components); + this.pullbottom = new ShiftUI.Timer(this.components); + this.pullside = new ShiftUI.Timer(this.components); + this.tmrsetupui = new ShiftUI.Timer(this.components); this.pgcontents.SuspendLayout(); this.pnldrawingbackground.SuspendLayout(); this.pnlinitialcanvassettings.SuspendLayout(); @@ -315,10 +315,10 @@ // pgcontents // this.pgcontents.BackColor = System.Drawing.Color.White; - this.pgcontents.Controls.Add(this.pnldrawingbackground); - this.pgcontents.Controls.Add(this.pnlbottompanel); - this.pgcontents.Controls.Add(this.pnltools); - this.pgcontents.Dock = System.Windows.Forms.DockStyle.Fill; + this.pgcontents.Widgets.Add(this.pnldrawingbackground); + this.pgcontents.Widgets.Add(this.pnlbottompanel); + this.pgcontents.Widgets.Add(this.pnltools); + 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(802, 598); @@ -328,10 +328,10 @@ // this.pnldrawingbackground.AutoScroll = true; this.pnldrawingbackground.BackColor = System.Drawing.Color.Gray; - this.pnldrawingbackground.Controls.Add(this.pnlinitialcanvassettings); - this.pnldrawingbackground.Controls.Add(this.pnlpalletsize); - this.pnldrawingbackground.Controls.Add(this.picdrawingdisplay); - this.pnldrawingbackground.Dock = System.Windows.Forms.DockStyle.Fill; + this.pnldrawingbackground.Widgets.Add(this.pnlinitialcanvassettings); + this.pnldrawingbackground.Widgets.Add(this.pnlpalletsize); + this.pnldrawingbackground.Widgets.Add(this.picdrawingdisplay); + this.pnldrawingbackground.Dock = ShiftUI.DockStyle.Fill; this.pnldrawingbackground.Location = new System.Drawing.Point(120, 0); this.pnldrawingbackground.Name = "pnldrawingbackground"; this.pnldrawingbackground.Size = new System.Drawing.Size(682, 498); @@ -340,14 +340,14 @@ // pnlinitialcanvassettings // this.pnlinitialcanvassettings.BackColor = System.Drawing.Color.White; - this.pnlinitialcanvassettings.Controls.Add(this.btncancel); - this.pnlinitialcanvassettings.Controls.Add(this.btncreate); - this.pnlinitialcanvassettings.Controls.Add(this.Label11); - this.pnlinitialcanvassettings.Controls.Add(this.lbltotalpixels); - this.pnlinitialcanvassettings.Controls.Add(this.txtnewcanvasheight); - this.pnlinitialcanvassettings.Controls.Add(this.Label10); - this.pnlinitialcanvassettings.Controls.Add(this.txtnewcanvaswidth); - this.pnlinitialcanvassettings.Controls.Add(this.Label9); + this.pnlinitialcanvassettings.Widgets.Add(this.btncancel); + this.pnlinitialcanvassettings.Widgets.Add(this.btncreate); + this.pnlinitialcanvassettings.Widgets.Add(this.Label11); + this.pnlinitialcanvassettings.Widgets.Add(this.lbltotalpixels); + this.pnlinitialcanvassettings.Widgets.Add(this.txtnewcanvasheight); + this.pnlinitialcanvassettings.Widgets.Add(this.Label10); + this.pnlinitialcanvassettings.Widgets.Add(this.txtnewcanvaswidth); + this.pnlinitialcanvassettings.Widgets.Add(this.Label9); this.pnlinitialcanvassettings.Location = new System.Drawing.Point(223, 178); this.pnlinitialcanvassettings.Name = "pnlinitialcanvassettings"; this.pnlinitialcanvassettings.Size = new System.Drawing.Size(223, 100); @@ -355,7 +355,7 @@ // // btncancel // - this.btncancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btncancel.FlatStyle = ShiftUI.FlatStyle.Flat; this.btncancel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btncancel.Location = new System.Drawing.Point(7, 66); this.btncancel.Name = "btncancel"; @@ -367,7 +367,7 @@ // // btncreate // - this.btncreate.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btncreate.FlatStyle = ShiftUI.FlatStyle.Flat; this.btncreate.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btncreate.Location = new System.Drawing.Point(114, 66); this.btncreate.Name = "btncreate"; @@ -400,7 +400,7 @@ // txtnewcanvasheight // this.txtnewcanvasheight.BackColor = System.Drawing.Color.White; - this.txtnewcanvasheight.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.txtnewcanvasheight.BorderStyle = ShiftUI.BorderStyle.FixedSingle; this.txtnewcanvasheight.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txtnewcanvasheight.Location = new System.Drawing.Point(59, 37); this.txtnewcanvasheight.MaxLength = 4; @@ -422,7 +422,7 @@ // txtnewcanvaswidth // this.txtnewcanvaswidth.BackColor = System.Drawing.Color.White; - this.txtnewcanvaswidth.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.txtnewcanvaswidth.BorderStyle = ShiftUI.BorderStyle.FixedSingle; this.txtnewcanvaswidth.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txtnewcanvaswidth.Location = new System.Drawing.Point(59, 9); this.txtnewcanvaswidth.MaxLength = 4; @@ -444,16 +444,16 @@ // pnlpalletsize // this.pnlpalletsize.BackColor = System.Drawing.Color.White; - this.pnlpalletsize.Controls.Add(this.txttopspace); - this.pnlpalletsize.Controls.Add(this.Label40); - this.pnlpalletsize.Controls.Add(this.txtsidespace); - this.pnlpalletsize.Controls.Add(this.Label41); - this.pnlpalletsize.Controls.Add(this.btnchangesizecancel); - this.pnlpalletsize.Controls.Add(this.btnsetsize); - this.pnlpalletsize.Controls.Add(this.txtcolorpalletheight); - this.pnlpalletsize.Controls.Add(this.Label42); - this.pnlpalletsize.Controls.Add(this.txtcolorpalletwidth); - this.pnlpalletsize.Controls.Add(this.Label43); + this.pnlpalletsize.Widgets.Add(this.txttopspace); + this.pnlpalletsize.Widgets.Add(this.Label40); + this.pnlpalletsize.Widgets.Add(this.txtsidespace); + this.pnlpalletsize.Widgets.Add(this.Label41); + this.pnlpalletsize.Widgets.Add(this.btnchangesizecancel); + this.pnlpalletsize.Widgets.Add(this.btnsetsize); + this.pnlpalletsize.Widgets.Add(this.txtcolorpalletheight); + this.pnlpalletsize.Widgets.Add(this.Label42); + this.pnlpalletsize.Widgets.Add(this.txtcolorpalletwidth); + this.pnlpalletsize.Widgets.Add(this.Label43); this.pnlpalletsize.Location = new System.Drawing.Point(207, 178); this.pnlpalletsize.Name = "pnlpalletsize"; this.pnlpalletsize.Size = new System.Drawing.Size(259, 100); @@ -463,7 +463,7 @@ // txttopspace // this.txttopspace.BackColor = System.Drawing.Color.White; - this.txttopspace.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.txttopspace.BorderStyle = ShiftUI.BorderStyle.FixedSingle; this.txttopspace.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txttopspace.Location = new System.Drawing.Point(198, 38); this.txttopspace.Name = "txttopspace"; @@ -483,7 +483,7 @@ // txtsidespace // this.txtsidespace.BackColor = System.Drawing.Color.White; - this.txtsidespace.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.txtsidespace.BorderStyle = ShiftUI.BorderStyle.FixedSingle; this.txtsidespace.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txtsidespace.Location = new System.Drawing.Point(198, 10); this.txtsidespace.Name = "txtsidespace"; @@ -502,7 +502,7 @@ // // btnchangesizecancel // - this.btnchangesizecancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnchangesizecancel.FlatStyle = ShiftUI.FlatStyle.Flat; this.btnchangesizecancel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnchangesizecancel.Location = new System.Drawing.Point(7, 66); this.btnchangesizecancel.Name = "btnchangesizecancel"; @@ -513,7 +513,7 @@ // // btnsetsize // - this.btnsetsize.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnsetsize.FlatStyle = ShiftUI.FlatStyle.Flat; this.btnsetsize.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnsetsize.Location = new System.Drawing.Point(133, 66); this.btnsetsize.Name = "btnsetsize"; @@ -525,7 +525,7 @@ // txtcolorpalletheight // this.txtcolorpalletheight.BackColor = System.Drawing.Color.White; - this.txtcolorpalletheight.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.txtcolorpalletheight.BorderStyle = ShiftUI.BorderStyle.FixedSingle; this.txtcolorpalletheight.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txtcolorpalletheight.Location = new System.Drawing.Point(59, 37); this.txtcolorpalletheight.Name = "txtcolorpalletheight"; @@ -545,7 +545,7 @@ // txtcolorpalletwidth // this.txtcolorpalletwidth.BackColor = System.Drawing.Color.White; - this.txtcolorpalletwidth.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.txtcolorpalletwidth.BorderStyle = ShiftUI.BorderStyle.FixedSingle; this.txtcolorpalletwidth.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txtcolorpalletwidth.Location = new System.Drawing.Point(59, 9); this.txtcolorpalletwidth.Name = "txtcolorpalletwidth"; @@ -571,16 +571,16 @@ this.picdrawingdisplay.TabIndex = 0; this.picdrawingdisplay.TabStop = false; this.picdrawingdisplay.Visible = false; - this.picdrawingdisplay.Paint += new System.Windows.Forms.PaintEventHandler(this.picdrawingdisplay_Paint); - this.picdrawingdisplay.MouseDown += new System.Windows.Forms.MouseEventHandler(this.picdrawingdisplay_MouseDown); - this.picdrawingdisplay.MouseMove += new System.Windows.Forms.MouseEventHandler(this.picdrawingdisplay_MouseMove); - this.picdrawingdisplay.MouseUp += new System.Windows.Forms.MouseEventHandler(this.picdrawingdisplay_MouseUp); + this.picdrawingdisplay.Paint += new ShiftUI.PaintEventHandler(this.picdrawingdisplay_Paint); + this.picdrawingdisplay.MouseDown += new ShiftUI.MouseEventHandler(this.picdrawingdisplay_MouseDown); + this.picdrawingdisplay.MouseMove += new ShiftUI.MouseEventHandler(this.picdrawingdisplay_MouseMove); + this.picdrawingdisplay.MouseUp += new ShiftUI.MouseEventHandler(this.picdrawingdisplay_MouseUp); // // pnlbottompanel // - this.pnlbottompanel.Controls.Add(this.pnlpallet); - this.pnlbottompanel.Controls.Add(this.pnltoolproperties); - this.pnlbottompanel.Dock = System.Windows.Forms.DockStyle.Bottom; + this.pnlbottompanel.Widgets.Add(this.pnlpallet); + this.pnlbottompanel.Widgets.Add(this.pnltoolproperties); + this.pnlbottompanel.Dock = ShiftUI.DockStyle.Bottom; this.pnlbottompanel.Location = new System.Drawing.Point(120, 498); this.pnlbottompanel.Name = "pnlbottompanel"; this.pnlbottompanel.Size = new System.Drawing.Size(682, 100); @@ -588,12 +588,12 @@ // // pnlpallet // - this.pnlpallet.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.pnlpallet.Controls.Add(this.flowcolours); - this.pnlpallet.Controls.Add(this.Label4); - this.pnlpallet.Controls.Add(this.line6); + this.pnlpallet.Anchor = ((ShiftUI.AnchorStyles)((((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom) + | ShiftUI.AnchorStyles.Left) + | ShiftUI.AnchorStyles.Right))); + this.pnlpallet.Widgets.Add(this.flowcolours); + this.pnlpallet.Widgets.Add(this.Label4); + this.pnlpallet.Widgets.Add(this.line6); this.pnlpallet.Location = new System.Drawing.Point(457, 0); this.pnlpallet.Name = "pnlpallet"; this.pnlpallet.Size = new System.Drawing.Size(225, 100); @@ -601,138 +601,138 @@ // // flowcolours // - this.flowcolours.Controls.Add(this.colourpallet1); - this.flowcolours.Controls.Add(this.colourpallet2); - this.flowcolours.Controls.Add(this.colourpallet3); - this.flowcolours.Controls.Add(this.colourpallet4); - this.flowcolours.Controls.Add(this.colourpallet5); - this.flowcolours.Controls.Add(this.colourpallet6); - this.flowcolours.Controls.Add(this.colourpallet7); - this.flowcolours.Controls.Add(this.colourpallet8); - this.flowcolours.Controls.Add(this.colourpallet9); - this.flowcolours.Controls.Add(this.colourpallet10); - this.flowcolours.Controls.Add(this.colourpallet11); - this.flowcolours.Controls.Add(this.colourpallet12); - this.flowcolours.Controls.Add(this.colourpallet13); - this.flowcolours.Controls.Add(this.colourpallet14); - this.flowcolours.Controls.Add(this.colourpallet15); - this.flowcolours.Controls.Add(this.colourpallet16); - this.flowcolours.Controls.Add(this.colourpallet17); - this.flowcolours.Controls.Add(this.colourpallet18); - this.flowcolours.Controls.Add(this.colourpallet19); - this.flowcolours.Controls.Add(this.colourpallet20); - this.flowcolours.Controls.Add(this.colourpallet21); - this.flowcolours.Controls.Add(this.colourpallet22); - this.flowcolours.Controls.Add(this.colourpallet23); - this.flowcolours.Controls.Add(this.colourpallet24); - this.flowcolours.Controls.Add(this.colourpallet25); - this.flowcolours.Controls.Add(this.colourpallet26); - this.flowcolours.Controls.Add(this.colourpallet27); - this.flowcolours.Controls.Add(this.colourpallet28); - this.flowcolours.Controls.Add(this.colourpallet29); - this.flowcolours.Controls.Add(this.colourpallet30); - this.flowcolours.Controls.Add(this.colourpallet31); - this.flowcolours.Controls.Add(this.colourpallet32); - this.flowcolours.Controls.Add(this.colourpallet33); - this.flowcolours.Controls.Add(this.colourpallet34); - this.flowcolours.Controls.Add(this.colourpallet35); - this.flowcolours.Controls.Add(this.colourpallet36); - this.flowcolours.Controls.Add(this.colourpallet37); - this.flowcolours.Controls.Add(this.colourpallet38); - this.flowcolours.Controls.Add(this.colourpallet39); - this.flowcolours.Controls.Add(this.colourpallet40); - this.flowcolours.Controls.Add(this.colourpallet41); - this.flowcolours.Controls.Add(this.colourpallet42); - this.flowcolours.Controls.Add(this.colourpallet43); - this.flowcolours.Controls.Add(this.colourpallet44); - this.flowcolours.Controls.Add(this.colourpallet45); - this.flowcolours.Controls.Add(this.colourpallet46); - this.flowcolours.Controls.Add(this.colourpallet47); - this.flowcolours.Controls.Add(this.colourpallet48); - this.flowcolours.Controls.Add(this.colourpallet49); - this.flowcolours.Controls.Add(this.colourpallet50); - this.flowcolours.Controls.Add(this.colourpallet51); - this.flowcolours.Controls.Add(this.colourpallet52); - this.flowcolours.Controls.Add(this.colourpallet53); - this.flowcolours.Controls.Add(this.colourpallet54); - this.flowcolours.Controls.Add(this.colourpallet55); - this.flowcolours.Controls.Add(this.colourpallet56); - this.flowcolours.Controls.Add(this.colourpallet57); - this.flowcolours.Controls.Add(this.colourpallet58); - this.flowcolours.Controls.Add(this.colourpallet59); - this.flowcolours.Controls.Add(this.colourpallet60); - this.flowcolours.Controls.Add(this.colourpallet61); - this.flowcolours.Controls.Add(this.colourpallet62); - this.flowcolours.Controls.Add(this.colourpallet63); - this.flowcolours.Controls.Add(this.colourpallet64); - this.flowcolours.Controls.Add(this.colourpallet65); - this.flowcolours.Controls.Add(this.colourpallet66); - this.flowcolours.Controls.Add(this.colourpallet67); - this.flowcolours.Controls.Add(this.colourpallet68); - this.flowcolours.Controls.Add(this.colourpallet69); - this.flowcolours.Controls.Add(this.colourpallet70); - this.flowcolours.Controls.Add(this.colourpallet71); - this.flowcolours.Controls.Add(this.colourpallet72); - this.flowcolours.Controls.Add(this.colourpallet73); - this.flowcolours.Controls.Add(this.colourpallet74); - this.flowcolours.Controls.Add(this.colourpallet75); - this.flowcolours.Controls.Add(this.colourpallet76); - this.flowcolours.Controls.Add(this.colourpallet77); - this.flowcolours.Controls.Add(this.colourpallet78); - this.flowcolours.Controls.Add(this.colourpallet79); - this.flowcolours.Controls.Add(this.colourpallet80); - this.flowcolours.Controls.Add(this.colourpallet81); - this.flowcolours.Controls.Add(this.colourpallet82); - this.flowcolours.Controls.Add(this.colourpallet83); - this.flowcolours.Controls.Add(this.colourpallet84); - this.flowcolours.Controls.Add(this.colourpallet85); - this.flowcolours.Controls.Add(this.colourpallet86); - this.flowcolours.Controls.Add(this.colourpallet87); - this.flowcolours.Controls.Add(this.colourpallet88); - this.flowcolours.Controls.Add(this.colourpallet89); - this.flowcolours.Controls.Add(this.colourpallet90); - this.flowcolours.Controls.Add(this.colourpallet91); - this.flowcolours.Controls.Add(this.colourpallet92); - this.flowcolours.Controls.Add(this.colourpallet93); - this.flowcolours.Controls.Add(this.colourpallet94); - this.flowcolours.Controls.Add(this.colourpallet95); - this.flowcolours.Controls.Add(this.colourpallet96); - this.flowcolours.Controls.Add(this.colourpallet97); - this.flowcolours.Controls.Add(this.colourpallet98); - this.flowcolours.Controls.Add(this.colourpallet99); - this.flowcolours.Controls.Add(this.colourpallet100); - this.flowcolours.Controls.Add(this.colourpallet101); - this.flowcolours.Controls.Add(this.colourpallet102); - this.flowcolours.Controls.Add(this.colourpallet103); - this.flowcolours.Controls.Add(this.colourpallet104); - this.flowcolours.Controls.Add(this.colourpallet105); - this.flowcolours.Controls.Add(this.colourpallet106); - this.flowcolours.Controls.Add(this.colourpallet107); - this.flowcolours.Controls.Add(this.colourpallet108); - this.flowcolours.Controls.Add(this.colourpallet109); - this.flowcolours.Controls.Add(this.colourpallet110); - this.flowcolours.Controls.Add(this.colourpallet111); - this.flowcolours.Controls.Add(this.colourpallet112); - this.flowcolours.Controls.Add(this.colourpallet113); - this.flowcolours.Controls.Add(this.colourpallet114); - this.flowcolours.Controls.Add(this.colourpallet115); - this.flowcolours.Controls.Add(this.colourpallet116); - this.flowcolours.Controls.Add(this.colourpallet117); - this.flowcolours.Controls.Add(this.colourpallet118); - this.flowcolours.Controls.Add(this.colourpallet119); - this.flowcolours.Controls.Add(this.colourpallet120); - this.flowcolours.Controls.Add(this.colourpallet121); - this.flowcolours.Controls.Add(this.colourpallet122); - this.flowcolours.Controls.Add(this.colourpallet123); - this.flowcolours.Controls.Add(this.colourpallet124); - this.flowcolours.Controls.Add(this.colourpallet125); - this.flowcolours.Controls.Add(this.colourpallet126); - this.flowcolours.Controls.Add(this.colourpallet127); - this.flowcolours.Controls.Add(this.colourpallet128); - this.flowcolours.Dock = System.Windows.Forms.DockStyle.Bottom; + this.flowcolours.Widgets.Add(this.colourpallet1); + this.flowcolours.Widgets.Add(this.colourpallet2); + this.flowcolours.Widgets.Add(this.colourpallet3); + this.flowcolours.Widgets.Add(this.colourpallet4); + this.flowcolours.Widgets.Add(this.colourpallet5); + this.flowcolours.Widgets.Add(this.colourpallet6); + this.flowcolours.Widgets.Add(this.colourpallet7); + this.flowcolours.Widgets.Add(this.colourpallet8); + this.flowcolours.Widgets.Add(this.colourpallet9); + this.flowcolours.Widgets.Add(this.colourpallet10); + this.flowcolours.Widgets.Add(this.colourpallet11); + this.flowcolours.Widgets.Add(this.colourpallet12); + this.flowcolours.Widgets.Add(this.colourpallet13); + this.flowcolours.Widgets.Add(this.colourpallet14); + this.flowcolours.Widgets.Add(this.colourpallet15); + this.flowcolours.Widgets.Add(this.colourpallet16); + this.flowcolours.Widgets.Add(this.colourpallet17); + this.flowcolours.Widgets.Add(this.colourpallet18); + this.flowcolours.Widgets.Add(this.colourpallet19); + this.flowcolours.Widgets.Add(this.colourpallet20); + this.flowcolours.Widgets.Add(this.colourpallet21); + this.flowcolours.Widgets.Add(this.colourpallet22); + this.flowcolours.Widgets.Add(this.colourpallet23); + this.flowcolours.Widgets.Add(this.colourpallet24); + this.flowcolours.Widgets.Add(this.colourpallet25); + this.flowcolours.Widgets.Add(this.colourpallet26); + this.flowcolours.Widgets.Add(this.colourpallet27); + this.flowcolours.Widgets.Add(this.colourpallet28); + this.flowcolours.Widgets.Add(this.colourpallet29); + this.flowcolours.Widgets.Add(this.colourpallet30); + this.flowcolours.Widgets.Add(this.colourpallet31); + this.flowcolours.Widgets.Add(this.colourpallet32); + this.flowcolours.Widgets.Add(this.colourpallet33); + this.flowcolours.Widgets.Add(this.colourpallet34); + this.flowcolours.Widgets.Add(this.colourpallet35); + this.flowcolours.Widgets.Add(this.colourpallet36); + this.flowcolours.Widgets.Add(this.colourpallet37); + this.flowcolours.Widgets.Add(this.colourpallet38); + this.flowcolours.Widgets.Add(this.colourpallet39); + this.flowcolours.Widgets.Add(this.colourpallet40); + this.flowcolours.Widgets.Add(this.colourpallet41); + this.flowcolours.Widgets.Add(this.colourpallet42); + this.flowcolours.Widgets.Add(this.colourpallet43); + this.flowcolours.Widgets.Add(this.colourpallet44); + this.flowcolours.Widgets.Add(this.colourpallet45); + this.flowcolours.Widgets.Add(this.colourpallet46); + this.flowcolours.Widgets.Add(this.colourpallet47); + this.flowcolours.Widgets.Add(this.colourpallet48); + this.flowcolours.Widgets.Add(this.colourpallet49); + this.flowcolours.Widgets.Add(this.colourpallet50); + this.flowcolours.Widgets.Add(this.colourpallet51); + this.flowcolours.Widgets.Add(this.colourpallet52); + this.flowcolours.Widgets.Add(this.colourpallet53); + this.flowcolours.Widgets.Add(this.colourpallet54); + this.flowcolours.Widgets.Add(this.colourpallet55); + this.flowcolours.Widgets.Add(this.colourpallet56); + this.flowcolours.Widgets.Add(this.colourpallet57); + this.flowcolours.Widgets.Add(this.colourpallet58); + this.flowcolours.Widgets.Add(this.colourpallet59); + this.flowcolours.Widgets.Add(this.colourpallet60); + this.flowcolours.Widgets.Add(this.colourpallet61); + this.flowcolours.Widgets.Add(this.colourpallet62); + this.flowcolours.Widgets.Add(this.colourpallet63); + this.flowcolours.Widgets.Add(this.colourpallet64); + this.flowcolours.Widgets.Add(this.colourpallet65); + this.flowcolours.Widgets.Add(this.colourpallet66); + this.flowcolours.Widgets.Add(this.colourpallet67); + this.flowcolours.Widgets.Add(this.colourpallet68); + this.flowcolours.Widgets.Add(this.colourpallet69); + this.flowcolours.Widgets.Add(this.colourpallet70); + this.flowcolours.Widgets.Add(this.colourpallet71); + this.flowcolours.Widgets.Add(this.colourpallet72); + this.flowcolours.Widgets.Add(this.colourpallet73); + this.flowcolours.Widgets.Add(this.colourpallet74); + this.flowcolours.Widgets.Add(this.colourpallet75); + this.flowcolours.Widgets.Add(this.colourpallet76); + this.flowcolours.Widgets.Add(this.colourpallet77); + this.flowcolours.Widgets.Add(this.colourpallet78); + this.flowcolours.Widgets.Add(this.colourpallet79); + this.flowcolours.Widgets.Add(this.colourpallet80); + this.flowcolours.Widgets.Add(this.colourpallet81); + this.flowcolours.Widgets.Add(this.colourpallet82); + this.flowcolours.Widgets.Add(this.colourpallet83); + this.flowcolours.Widgets.Add(this.colourpallet84); + this.flowcolours.Widgets.Add(this.colourpallet85); + this.flowcolours.Widgets.Add(this.colourpallet86); + this.flowcolours.Widgets.Add(this.colourpallet87); + this.flowcolours.Widgets.Add(this.colourpallet88); + this.flowcolours.Widgets.Add(this.colourpallet89); + this.flowcolours.Widgets.Add(this.colourpallet90); + this.flowcolours.Widgets.Add(this.colourpallet91); + this.flowcolours.Widgets.Add(this.colourpallet92); + this.flowcolours.Widgets.Add(this.colourpallet93); + this.flowcolours.Widgets.Add(this.colourpallet94); + this.flowcolours.Widgets.Add(this.colourpallet95); + this.flowcolours.Widgets.Add(this.colourpallet96); + this.flowcolours.Widgets.Add(this.colourpallet97); + this.flowcolours.Widgets.Add(this.colourpallet98); + this.flowcolours.Widgets.Add(this.colourpallet99); + this.flowcolours.Widgets.Add(this.colourpallet100); + this.flowcolours.Widgets.Add(this.colourpallet101); + this.flowcolours.Widgets.Add(this.colourpallet102); + this.flowcolours.Widgets.Add(this.colourpallet103); + this.flowcolours.Widgets.Add(this.colourpallet104); + this.flowcolours.Widgets.Add(this.colourpallet105); + this.flowcolours.Widgets.Add(this.colourpallet106); + this.flowcolours.Widgets.Add(this.colourpallet107); + this.flowcolours.Widgets.Add(this.colourpallet108); + this.flowcolours.Widgets.Add(this.colourpallet109); + this.flowcolours.Widgets.Add(this.colourpallet110); + this.flowcolours.Widgets.Add(this.colourpallet111); + this.flowcolours.Widgets.Add(this.colourpallet112); + this.flowcolours.Widgets.Add(this.colourpallet113); + this.flowcolours.Widgets.Add(this.colourpallet114); + this.flowcolours.Widgets.Add(this.colourpallet115); + this.flowcolours.Widgets.Add(this.colourpallet116); + this.flowcolours.Widgets.Add(this.colourpallet117); + this.flowcolours.Widgets.Add(this.colourpallet118); + this.flowcolours.Widgets.Add(this.colourpallet119); + this.flowcolours.Widgets.Add(this.colourpallet120); + this.flowcolours.Widgets.Add(this.colourpallet121); + this.flowcolours.Widgets.Add(this.colourpallet122); + this.flowcolours.Widgets.Add(this.colourpallet123); + this.flowcolours.Widgets.Add(this.colourpallet124); + this.flowcolours.Widgets.Add(this.colourpallet125); + this.flowcolours.Widgets.Add(this.colourpallet126); + this.flowcolours.Widgets.Add(this.colourpallet127); + this.flowcolours.Widgets.Add(this.colourpallet128); + this.flowcolours.Dock = ShiftUI.DockStyle.Bottom; this.flowcolours.Location = new System.Drawing.Point(0, 27); this.flowcolours.Name = "flowcolours"; - this.flowcolours.Padding = new System.Windows.Forms.Padding(1, 1, 0, 0); + this.flowcolours.Padding = new ShiftUI.Padding(1, 1, 0, 0); this.flowcolours.Size = new System.Drawing.Size(225, 73); this.flowcolours.TabIndex = 12; // @@ -740,7 +740,7 @@ // this.colourpallet1.BackColor = System.Drawing.Color.Black; this.colourpallet1.Location = new System.Drawing.Point(2, 1); - this.colourpallet1.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet1.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet1.Name = "colourpallet1"; this.colourpallet1.Size = new System.Drawing.Size(12, 8); this.colourpallet1.TabIndex = 5; @@ -750,7 +750,7 @@ // this.colourpallet2.BackColor = System.Drawing.Color.Black; this.colourpallet2.Location = new System.Drawing.Point(15, 1); - this.colourpallet2.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet2.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet2.Name = "colourpallet2"; this.colourpallet2.Size = new System.Drawing.Size(12, 8); this.colourpallet2.TabIndex = 9; @@ -760,7 +760,7 @@ // this.colourpallet3.BackColor = System.Drawing.Color.Black; this.colourpallet3.Location = new System.Drawing.Point(28, 1); - this.colourpallet3.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet3.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet3.Name = "colourpallet3"; this.colourpallet3.Size = new System.Drawing.Size(12, 8); this.colourpallet3.TabIndex = 13; @@ -770,7 +770,7 @@ // this.colourpallet4.BackColor = System.Drawing.Color.Black; this.colourpallet4.Location = new System.Drawing.Point(41, 1); - this.colourpallet4.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet4.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet4.Name = "colourpallet4"; this.colourpallet4.Size = new System.Drawing.Size(12, 8); this.colourpallet4.TabIndex = 9; @@ -780,7 +780,7 @@ // this.colourpallet5.BackColor = System.Drawing.Color.Black; this.colourpallet5.Location = new System.Drawing.Point(54, 1); - this.colourpallet5.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet5.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet5.Name = "colourpallet5"; this.colourpallet5.Size = new System.Drawing.Size(12, 8); this.colourpallet5.TabIndex = 18; @@ -790,7 +790,7 @@ // this.colourpallet6.BackColor = System.Drawing.Color.Black; this.colourpallet6.Location = new System.Drawing.Point(67, 1); - this.colourpallet6.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet6.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet6.Name = "colourpallet6"; this.colourpallet6.Size = new System.Drawing.Size(12, 8); this.colourpallet6.TabIndex = 17; @@ -800,7 +800,7 @@ // this.colourpallet7.BackColor = System.Drawing.Color.Black; this.colourpallet7.Location = new System.Drawing.Point(80, 1); - this.colourpallet7.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet7.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet7.Name = "colourpallet7"; this.colourpallet7.Size = new System.Drawing.Size(12, 8); this.colourpallet7.TabIndex = 14; @@ -810,7 +810,7 @@ // this.colourpallet8.BackColor = System.Drawing.Color.Black; this.colourpallet8.Location = new System.Drawing.Point(93, 1); - this.colourpallet8.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet8.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet8.Name = "colourpallet8"; this.colourpallet8.Size = new System.Drawing.Size(12, 8); this.colourpallet8.TabIndex = 13; @@ -820,7 +820,7 @@ // this.colourpallet9.BackColor = System.Drawing.Color.Black; this.colourpallet9.Location = new System.Drawing.Point(106, 1); - this.colourpallet9.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet9.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet9.Name = "colourpallet9"; this.colourpallet9.Size = new System.Drawing.Size(12, 8); this.colourpallet9.TabIndex = 15; @@ -830,7 +830,7 @@ // this.colourpallet10.BackColor = System.Drawing.Color.Black; this.colourpallet10.Location = new System.Drawing.Point(119, 1); - this.colourpallet10.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet10.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet10.Name = "colourpallet10"; this.colourpallet10.Size = new System.Drawing.Size(12, 8); this.colourpallet10.TabIndex = 11; @@ -840,7 +840,7 @@ // this.colourpallet11.BackColor = System.Drawing.Color.Black; this.colourpallet11.Location = new System.Drawing.Point(132, 1); - this.colourpallet11.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet11.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet11.Name = "colourpallet11"; this.colourpallet11.Size = new System.Drawing.Size(12, 8); this.colourpallet11.TabIndex = 12; @@ -850,7 +850,7 @@ // this.colourpallet12.BackColor = System.Drawing.Color.Black; this.colourpallet12.Location = new System.Drawing.Point(145, 1); - this.colourpallet12.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet12.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet12.Name = "colourpallet12"; this.colourpallet12.Size = new System.Drawing.Size(12, 8); this.colourpallet12.TabIndex = 16; @@ -860,7 +860,7 @@ // this.colourpallet13.BackColor = System.Drawing.Color.Black; this.colourpallet13.Location = new System.Drawing.Point(158, 1); - this.colourpallet13.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet13.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet13.Name = "colourpallet13"; this.colourpallet13.Size = new System.Drawing.Size(12, 8); this.colourpallet13.TabIndex = 10; @@ -870,7 +870,7 @@ // this.colourpallet14.BackColor = System.Drawing.Color.Black; this.colourpallet14.Location = new System.Drawing.Point(171, 1); - this.colourpallet14.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet14.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet14.Name = "colourpallet14"; this.colourpallet14.Size = new System.Drawing.Size(12, 8); this.colourpallet14.TabIndex = 20; @@ -880,7 +880,7 @@ // this.colourpallet15.BackColor = System.Drawing.Color.Black; this.colourpallet15.Location = new System.Drawing.Point(184, 1); - this.colourpallet15.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet15.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet15.Name = "colourpallet15"; this.colourpallet15.Size = new System.Drawing.Size(12, 8); this.colourpallet15.TabIndex = 14; @@ -890,7 +890,7 @@ // this.colourpallet16.BackColor = System.Drawing.Color.Black; this.colourpallet16.Location = new System.Drawing.Point(197, 1); - this.colourpallet16.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet16.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet16.Name = "colourpallet16"; this.colourpallet16.Size = new System.Drawing.Size(12, 8); this.colourpallet16.TabIndex = 16; @@ -900,7 +900,7 @@ // this.colourpallet17.BackColor = System.Drawing.Color.Black; this.colourpallet17.Location = new System.Drawing.Point(210, 1); - this.colourpallet17.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet17.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet17.Name = "colourpallet17"; this.colourpallet17.Size = new System.Drawing.Size(12, 8); this.colourpallet17.TabIndex = 11; @@ -910,7 +910,7 @@ // this.colourpallet18.BackColor = System.Drawing.Color.Black; this.colourpallet18.Location = new System.Drawing.Point(2, 10); - this.colourpallet18.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet18.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet18.Name = "colourpallet18"; this.colourpallet18.Size = new System.Drawing.Size(12, 8); this.colourpallet18.TabIndex = 8; @@ -920,7 +920,7 @@ // this.colourpallet19.BackColor = System.Drawing.Color.Black; this.colourpallet19.Location = new System.Drawing.Point(15, 10); - this.colourpallet19.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet19.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet19.Name = "colourpallet19"; this.colourpallet19.Size = new System.Drawing.Size(12, 8); this.colourpallet19.TabIndex = 24; @@ -930,7 +930,7 @@ // this.colourpallet20.BackColor = System.Drawing.Color.Black; this.colourpallet20.Location = new System.Drawing.Point(28, 10); - this.colourpallet20.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet20.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet20.Name = "colourpallet20"; this.colourpallet20.Size = new System.Drawing.Size(12, 8); this.colourpallet20.TabIndex = 12; @@ -940,7 +940,7 @@ // this.colourpallet21.BackColor = System.Drawing.Color.Black; this.colourpallet21.Location = new System.Drawing.Point(41, 10); - this.colourpallet21.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet21.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet21.Name = "colourpallet21"; this.colourpallet21.Size = new System.Drawing.Size(12, 8); this.colourpallet21.TabIndex = 20; @@ -950,7 +950,7 @@ // this.colourpallet22.BackColor = System.Drawing.Color.Black; this.colourpallet22.Location = new System.Drawing.Point(54, 10); - this.colourpallet22.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet22.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet22.Name = "colourpallet22"; this.colourpallet22.Size = new System.Drawing.Size(12, 8); this.colourpallet22.TabIndex = 8; @@ -960,7 +960,7 @@ // this.colourpallet23.BackColor = System.Drawing.Color.Black; this.colourpallet23.Location = new System.Drawing.Point(67, 10); - this.colourpallet23.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet23.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet23.Name = "colourpallet23"; this.colourpallet23.Size = new System.Drawing.Size(12, 8); this.colourpallet23.TabIndex = 19; @@ -970,7 +970,7 @@ // this.colourpallet24.BackColor = System.Drawing.Color.Black; this.colourpallet24.Location = new System.Drawing.Point(80, 10); - this.colourpallet24.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet24.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet24.Name = "colourpallet24"; this.colourpallet24.Size = new System.Drawing.Size(12, 8); this.colourpallet24.TabIndex = 10; @@ -980,7 +980,7 @@ // this.colourpallet25.BackColor = System.Drawing.Color.Black; this.colourpallet25.Location = new System.Drawing.Point(93, 10); - this.colourpallet25.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet25.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet25.Name = "colourpallet25"; this.colourpallet25.Size = new System.Drawing.Size(12, 8); this.colourpallet25.TabIndex = 15; @@ -990,7 +990,7 @@ // this.colourpallet26.BackColor = System.Drawing.Color.Black; this.colourpallet26.Location = new System.Drawing.Point(106, 10); - this.colourpallet26.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet26.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet26.Name = "colourpallet26"; this.colourpallet26.Size = new System.Drawing.Size(12, 8); this.colourpallet26.TabIndex = 23; @@ -1000,7 +1000,7 @@ // this.colourpallet27.BackColor = System.Drawing.Color.Black; this.colourpallet27.Location = new System.Drawing.Point(119, 10); - this.colourpallet27.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet27.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet27.Name = "colourpallet27"; this.colourpallet27.Size = new System.Drawing.Size(12, 8); this.colourpallet27.TabIndex = 6; @@ -1010,7 +1010,7 @@ // this.colourpallet28.BackColor = System.Drawing.Color.Black; this.colourpallet28.Location = new System.Drawing.Point(132, 10); - this.colourpallet28.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet28.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet28.Name = "colourpallet28"; this.colourpallet28.Size = new System.Drawing.Size(12, 8); this.colourpallet28.TabIndex = 19; @@ -1020,7 +1020,7 @@ // this.colourpallet29.BackColor = System.Drawing.Color.Black; this.colourpallet29.Location = new System.Drawing.Point(145, 10); - this.colourpallet29.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet29.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet29.Name = "colourpallet29"; this.colourpallet29.Size = new System.Drawing.Size(12, 8); this.colourpallet29.TabIndex = 22; @@ -1030,7 +1030,7 @@ // this.colourpallet30.BackColor = System.Drawing.Color.Black; this.colourpallet30.Location = new System.Drawing.Point(158, 10); - this.colourpallet30.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet30.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet30.Name = "colourpallet30"; this.colourpallet30.Size = new System.Drawing.Size(12, 8); this.colourpallet30.TabIndex = 18; @@ -1040,7 +1040,7 @@ // this.colourpallet31.BackColor = System.Drawing.Color.Black; this.colourpallet31.Location = new System.Drawing.Point(171, 10); - this.colourpallet31.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet31.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet31.Name = "colourpallet31"; this.colourpallet31.Size = new System.Drawing.Size(12, 8); this.colourpallet31.TabIndex = 21; @@ -1050,7 +1050,7 @@ // this.colourpallet32.BackColor = System.Drawing.Color.Black; this.colourpallet32.Location = new System.Drawing.Point(184, 10); - this.colourpallet32.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet32.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet32.Name = "colourpallet32"; this.colourpallet32.Size = new System.Drawing.Size(12, 8); this.colourpallet32.TabIndex = 17; @@ -1060,7 +1060,7 @@ // this.colourpallet33.BackColor = System.Drawing.Color.Black; this.colourpallet33.Location = new System.Drawing.Point(197, 10); - this.colourpallet33.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet33.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet33.Name = "colourpallet33"; this.colourpallet33.Size = new System.Drawing.Size(12, 8); this.colourpallet33.TabIndex = 50; @@ -1070,7 +1070,7 @@ // this.colourpallet34.BackColor = System.Drawing.Color.Black; this.colourpallet34.Location = new System.Drawing.Point(210, 10); - this.colourpallet34.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet34.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet34.Name = "colourpallet34"; this.colourpallet34.Size = new System.Drawing.Size(12, 8); this.colourpallet34.TabIndex = 46; @@ -1080,7 +1080,7 @@ // this.colourpallet35.BackColor = System.Drawing.Color.Black; this.colourpallet35.Location = new System.Drawing.Point(2, 19); - this.colourpallet35.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet35.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet35.Name = "colourpallet35"; this.colourpallet35.Size = new System.Drawing.Size(12, 8); this.colourpallet35.TabIndex = 53; @@ -1090,7 +1090,7 @@ // this.colourpallet36.BackColor = System.Drawing.Color.Black; this.colourpallet36.Location = new System.Drawing.Point(15, 19); - this.colourpallet36.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet36.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet36.Name = "colourpallet36"; this.colourpallet36.Size = new System.Drawing.Size(12, 8); this.colourpallet36.TabIndex = 48; @@ -1100,7 +1100,7 @@ // this.colourpallet37.BackColor = System.Drawing.Color.Black; this.colourpallet37.Location = new System.Drawing.Point(28, 19); - this.colourpallet37.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet37.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet37.Name = "colourpallet37"; this.colourpallet37.Size = new System.Drawing.Size(12, 8); this.colourpallet37.TabIndex = 54; @@ -1110,7 +1110,7 @@ // this.colourpallet38.BackColor = System.Drawing.Color.Black; this.colourpallet38.Location = new System.Drawing.Point(41, 19); - this.colourpallet38.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet38.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet38.Name = "colourpallet38"; this.colourpallet38.Size = new System.Drawing.Size(12, 8); this.colourpallet38.TabIndex = 26; @@ -1120,7 +1120,7 @@ // this.colourpallet39.BackColor = System.Drawing.Color.Black; this.colourpallet39.Location = new System.Drawing.Point(54, 19); - this.colourpallet39.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet39.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet39.Name = "colourpallet39"; this.colourpallet39.Size = new System.Drawing.Size(12, 8); this.colourpallet39.TabIndex = 55; @@ -1130,7 +1130,7 @@ // this.colourpallet40.BackColor = System.Drawing.Color.Black; this.colourpallet40.Location = new System.Drawing.Point(67, 19); - this.colourpallet40.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet40.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet40.Name = "colourpallet40"; this.colourpallet40.Size = new System.Drawing.Size(12, 8); this.colourpallet40.TabIndex = 41; @@ -1140,7 +1140,7 @@ // this.colourpallet41.BackColor = System.Drawing.Color.Black; this.colourpallet41.Location = new System.Drawing.Point(80, 19); - this.colourpallet41.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet41.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet41.Name = "colourpallet41"; this.colourpallet41.Size = new System.Drawing.Size(12, 8); this.colourpallet41.TabIndex = 31; @@ -1150,7 +1150,7 @@ // this.colourpallet42.BackColor = System.Drawing.Color.Black; this.colourpallet42.Location = new System.Drawing.Point(93, 19); - this.colourpallet42.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet42.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet42.Name = "colourpallet42"; this.colourpallet42.Size = new System.Drawing.Size(12, 8); this.colourpallet42.TabIndex = 49; @@ -1160,7 +1160,7 @@ // this.colourpallet43.BackColor = System.Drawing.Color.Black; this.colourpallet43.Location = new System.Drawing.Point(106, 19); - this.colourpallet43.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet43.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet43.Name = "colourpallet43"; this.colourpallet43.Size = new System.Drawing.Size(12, 8); this.colourpallet43.TabIndex = 27; @@ -1170,7 +1170,7 @@ // this.colourpallet44.BackColor = System.Drawing.Color.Black; this.colourpallet44.Location = new System.Drawing.Point(119, 19); - this.colourpallet44.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet44.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet44.Name = "colourpallet44"; this.colourpallet44.Size = new System.Drawing.Size(12, 8); this.colourpallet44.TabIndex = 51; @@ -1180,7 +1180,7 @@ // this.colourpallet45.BackColor = System.Drawing.Color.Black; this.colourpallet45.Location = new System.Drawing.Point(132, 19); - this.colourpallet45.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet45.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet45.Name = "colourpallet45"; this.colourpallet45.Size = new System.Drawing.Size(12, 8); this.colourpallet45.TabIndex = 36; @@ -1190,7 +1190,7 @@ // this.colourpallet46.BackColor = System.Drawing.Color.Black; this.colourpallet46.Location = new System.Drawing.Point(145, 19); - this.colourpallet46.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet46.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet46.Name = "colourpallet46"; this.colourpallet46.Size = new System.Drawing.Size(12, 8); this.colourpallet46.TabIndex = 56; @@ -1200,7 +1200,7 @@ // this.colourpallet47.BackColor = System.Drawing.Color.Black; this.colourpallet47.Location = new System.Drawing.Point(158, 19); - this.colourpallet47.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet47.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet47.Name = "colourpallet47"; this.colourpallet47.Size = new System.Drawing.Size(12, 8); this.colourpallet47.TabIndex = 28; @@ -1210,7 +1210,7 @@ // this.colourpallet48.BackColor = System.Drawing.Color.Black; this.colourpallet48.Location = new System.Drawing.Point(171, 19); - this.colourpallet48.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet48.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet48.Name = "colourpallet48"; this.colourpallet48.Size = new System.Drawing.Size(12, 8); this.colourpallet48.TabIndex = 33; @@ -1220,7 +1220,7 @@ // this.colourpallet49.BackColor = System.Drawing.Color.Black; this.colourpallet49.Location = new System.Drawing.Point(184, 19); - this.colourpallet49.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet49.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet49.Name = "colourpallet49"; this.colourpallet49.Size = new System.Drawing.Size(12, 8); this.colourpallet49.TabIndex = 43; @@ -1230,7 +1230,7 @@ // this.colourpallet50.BackColor = System.Drawing.Color.Black; this.colourpallet50.Location = new System.Drawing.Point(197, 19); - this.colourpallet50.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet50.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet50.Name = "colourpallet50"; this.colourpallet50.Size = new System.Drawing.Size(12, 8); this.colourpallet50.TabIndex = 40; @@ -1240,7 +1240,7 @@ // this.colourpallet51.BackColor = System.Drawing.Color.Black; this.colourpallet51.Location = new System.Drawing.Point(210, 19); - this.colourpallet51.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet51.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet51.Name = "colourpallet51"; this.colourpallet51.Size = new System.Drawing.Size(12, 8); this.colourpallet51.TabIndex = 52; @@ -1250,7 +1250,7 @@ // this.colourpallet52.BackColor = System.Drawing.Color.Black; this.colourpallet52.Location = new System.Drawing.Point(2, 28); - this.colourpallet52.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet52.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet52.Name = "colourpallet52"; this.colourpallet52.Size = new System.Drawing.Size(12, 8); this.colourpallet52.TabIndex = 32; @@ -1260,7 +1260,7 @@ // this.colourpallet53.BackColor = System.Drawing.Color.Black; this.colourpallet53.Location = new System.Drawing.Point(15, 28); - this.colourpallet53.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet53.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet53.Name = "colourpallet53"; this.colourpallet53.Size = new System.Drawing.Size(12, 8); this.colourpallet53.TabIndex = 44; @@ -1270,7 +1270,7 @@ // this.colourpallet54.BackColor = System.Drawing.Color.Black; this.colourpallet54.Location = new System.Drawing.Point(28, 28); - this.colourpallet54.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet54.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet54.Name = "colourpallet54"; this.colourpallet54.Size = new System.Drawing.Size(12, 8); this.colourpallet54.TabIndex = 35; @@ -1280,7 +1280,7 @@ // this.colourpallet55.BackColor = System.Drawing.Color.Black; this.colourpallet55.Location = new System.Drawing.Point(41, 28); - this.colourpallet55.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet55.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet55.Name = "colourpallet55"; this.colourpallet55.Size = new System.Drawing.Size(12, 8); this.colourpallet55.TabIndex = 34; @@ -1290,7 +1290,7 @@ // this.colourpallet56.BackColor = System.Drawing.Color.Black; this.colourpallet56.Location = new System.Drawing.Point(54, 28); - this.colourpallet56.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet56.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet56.Name = "colourpallet56"; this.colourpallet56.Size = new System.Drawing.Size(12, 8); this.colourpallet56.TabIndex = 42; @@ -1300,7 +1300,7 @@ // this.colourpallet57.BackColor = System.Drawing.Color.Black; this.colourpallet57.Location = new System.Drawing.Point(67, 28); - this.colourpallet57.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet57.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet57.Name = "colourpallet57"; this.colourpallet57.Size = new System.Drawing.Size(12, 8); this.colourpallet57.TabIndex = 38; @@ -1310,7 +1310,7 @@ // this.colourpallet58.BackColor = System.Drawing.Color.Black; this.colourpallet58.Location = new System.Drawing.Point(80, 28); - this.colourpallet58.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet58.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet58.Name = "colourpallet58"; this.colourpallet58.Size = new System.Drawing.Size(12, 8); this.colourpallet58.TabIndex = 39; @@ -1320,7 +1320,7 @@ // this.colourpallet59.BackColor = System.Drawing.Color.Black; this.colourpallet59.Location = new System.Drawing.Point(93, 28); - this.colourpallet59.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet59.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet59.Name = "colourpallet59"; this.colourpallet59.Size = new System.Drawing.Size(12, 8); this.colourpallet59.TabIndex = 45; @@ -1330,7 +1330,7 @@ // this.colourpallet60.BackColor = System.Drawing.Color.Black; this.colourpallet60.Location = new System.Drawing.Point(106, 28); - this.colourpallet60.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet60.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet60.Name = "colourpallet60"; this.colourpallet60.Size = new System.Drawing.Size(12, 8); this.colourpallet60.TabIndex = 47; @@ -1340,7 +1340,7 @@ // this.colourpallet61.BackColor = System.Drawing.Color.Black; this.colourpallet61.Location = new System.Drawing.Point(119, 28); - this.colourpallet61.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet61.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet61.Name = "colourpallet61"; this.colourpallet61.Size = new System.Drawing.Size(12, 8); this.colourpallet61.TabIndex = 30; @@ -1350,7 +1350,7 @@ // this.colourpallet62.BackColor = System.Drawing.Color.Black; this.colourpallet62.Location = new System.Drawing.Point(132, 28); - this.colourpallet62.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet62.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet62.Name = "colourpallet62"; this.colourpallet62.Size = new System.Drawing.Size(12, 8); this.colourpallet62.TabIndex = 37; @@ -1360,7 +1360,7 @@ // this.colourpallet63.BackColor = System.Drawing.Color.Black; this.colourpallet63.Location = new System.Drawing.Point(145, 28); - this.colourpallet63.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet63.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet63.Name = "colourpallet63"; this.colourpallet63.Size = new System.Drawing.Size(12, 8); this.colourpallet63.TabIndex = 29; @@ -1370,7 +1370,7 @@ // this.colourpallet64.BackColor = System.Drawing.Color.Black; this.colourpallet64.Location = new System.Drawing.Point(158, 28); - this.colourpallet64.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet64.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet64.Name = "colourpallet64"; this.colourpallet64.Size = new System.Drawing.Size(12, 8); this.colourpallet64.TabIndex = 25; @@ -1380,7 +1380,7 @@ // this.colourpallet65.BackColor = System.Drawing.Color.Black; this.colourpallet65.Location = new System.Drawing.Point(171, 28); - this.colourpallet65.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet65.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet65.Name = "colourpallet65"; this.colourpallet65.Size = new System.Drawing.Size(12, 8); this.colourpallet65.TabIndex = 57; @@ -1390,7 +1390,7 @@ // this.colourpallet66.BackColor = System.Drawing.Color.Black; this.colourpallet66.Location = new System.Drawing.Point(184, 28); - this.colourpallet66.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet66.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet66.Name = "colourpallet66"; this.colourpallet66.Size = new System.Drawing.Size(12, 8); this.colourpallet66.TabIndex = 61; @@ -1400,7 +1400,7 @@ // this.colourpallet67.BackColor = System.Drawing.Color.Black; this.colourpallet67.Location = new System.Drawing.Point(197, 28); - this.colourpallet67.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet67.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet67.Name = "colourpallet67"; this.colourpallet67.Size = new System.Drawing.Size(12, 8); this.colourpallet67.TabIndex = 69; @@ -1410,7 +1410,7 @@ // this.colourpallet68.BackColor = System.Drawing.Color.Black; this.colourpallet68.Location = new System.Drawing.Point(210, 28); - this.colourpallet68.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet68.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet68.Name = "colourpallet68"; this.colourpallet68.Size = new System.Drawing.Size(12, 8); this.colourpallet68.TabIndex = 62; @@ -1420,7 +1420,7 @@ // this.colourpallet69.BackColor = System.Drawing.Color.Black; this.colourpallet69.Location = new System.Drawing.Point(2, 37); - this.colourpallet69.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet69.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet69.Name = "colourpallet69"; this.colourpallet69.Size = new System.Drawing.Size(12, 8); this.colourpallet69.TabIndex = 79; @@ -1430,7 +1430,7 @@ // this.colourpallet70.BackColor = System.Drawing.Color.Black; this.colourpallet70.Location = new System.Drawing.Point(15, 37); - this.colourpallet70.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet70.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet70.Name = "colourpallet70"; this.colourpallet70.Size = new System.Drawing.Size(12, 8); this.colourpallet70.TabIndex = 77; @@ -1440,7 +1440,7 @@ // this.colourpallet71.BackColor = System.Drawing.Color.Black; this.colourpallet71.Location = new System.Drawing.Point(28, 37); - this.colourpallet71.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet71.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet71.Name = "colourpallet71"; this.colourpallet71.Size = new System.Drawing.Size(12, 8); this.colourpallet71.TabIndex = 71; @@ -1450,7 +1450,7 @@ // this.colourpallet72.BackColor = System.Drawing.Color.Black; this.colourpallet72.Location = new System.Drawing.Point(41, 37); - this.colourpallet72.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet72.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet72.Name = "colourpallet72"; this.colourpallet72.Size = new System.Drawing.Size(12, 8); this.colourpallet72.TabIndex = 70; @@ -1460,7 +1460,7 @@ // this.colourpallet73.BackColor = System.Drawing.Color.Black; this.colourpallet73.Location = new System.Drawing.Point(54, 37); - this.colourpallet73.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet73.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet73.Name = "colourpallet73"; this.colourpallet73.Size = new System.Drawing.Size(12, 8); this.colourpallet73.TabIndex = 74; @@ -1470,7 +1470,7 @@ // this.colourpallet74.BackColor = System.Drawing.Color.Black; this.colourpallet74.Location = new System.Drawing.Point(67, 37); - this.colourpallet74.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet74.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet74.Name = "colourpallet74"; this.colourpallet74.Size = new System.Drawing.Size(12, 8); this.colourpallet74.TabIndex = 66; @@ -1480,7 +1480,7 @@ // this.colourpallet75.BackColor = System.Drawing.Color.Black; this.colourpallet75.Location = new System.Drawing.Point(80, 37); - this.colourpallet75.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet75.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet75.Name = "colourpallet75"; this.colourpallet75.Size = new System.Drawing.Size(12, 8); this.colourpallet75.TabIndex = 67; @@ -1490,7 +1490,7 @@ // this.colourpallet76.BackColor = System.Drawing.Color.Black; this.colourpallet76.Location = new System.Drawing.Point(93, 37); - this.colourpallet76.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet76.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet76.Name = "colourpallet76"; this.colourpallet76.Size = new System.Drawing.Size(12, 8); this.colourpallet76.TabIndex = 76; @@ -1500,7 +1500,7 @@ // this.colourpallet77.BackColor = System.Drawing.Color.Black; this.colourpallet77.Location = new System.Drawing.Point(106, 37); - this.colourpallet77.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet77.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet77.Name = "colourpallet77"; this.colourpallet77.Size = new System.Drawing.Size(12, 8); this.colourpallet77.TabIndex = 64; @@ -1510,7 +1510,7 @@ // this.colourpallet78.BackColor = System.Drawing.Color.Black; this.colourpallet78.Location = new System.Drawing.Point(119, 37); - this.colourpallet78.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet78.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet78.Name = "colourpallet78"; this.colourpallet78.Size = new System.Drawing.Size(12, 8); this.colourpallet78.TabIndex = 84; @@ -1520,7 +1520,7 @@ // this.colourpallet79.BackColor = System.Drawing.Color.Black; this.colourpallet79.Location = new System.Drawing.Point(132, 37); - this.colourpallet79.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet79.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet79.Name = "colourpallet79"; this.colourpallet79.Size = new System.Drawing.Size(12, 8); this.colourpallet79.TabIndex = 72; @@ -1530,7 +1530,7 @@ // this.colourpallet80.BackColor = System.Drawing.Color.Black; this.colourpallet80.Location = new System.Drawing.Point(145, 37); - this.colourpallet80.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet80.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet80.Name = "colourpallet80"; this.colourpallet80.Size = new System.Drawing.Size(12, 8); this.colourpallet80.TabIndex = 75; @@ -1540,7 +1540,7 @@ // this.colourpallet81.BackColor = System.Drawing.Color.Black; this.colourpallet81.Location = new System.Drawing.Point(158, 37); - this.colourpallet81.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet81.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet81.Name = "colourpallet81"; this.colourpallet81.Size = new System.Drawing.Size(12, 8); this.colourpallet81.TabIndex = 65; @@ -1550,7 +1550,7 @@ // this.colourpallet82.BackColor = System.Drawing.Color.Black; this.colourpallet82.Location = new System.Drawing.Point(171, 37); - this.colourpallet82.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet82.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet82.Name = "colourpallet82"; this.colourpallet82.Size = new System.Drawing.Size(12, 8); this.colourpallet82.TabIndex = 60; @@ -1560,7 +1560,7 @@ // this.colourpallet83.BackColor = System.Drawing.Color.Black; this.colourpallet83.Location = new System.Drawing.Point(184, 37); - this.colourpallet83.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet83.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet83.Name = "colourpallet83"; this.colourpallet83.Size = new System.Drawing.Size(12, 8); this.colourpallet83.TabIndex = 88; @@ -1570,7 +1570,7 @@ // this.colourpallet84.BackColor = System.Drawing.Color.Black; this.colourpallet84.Location = new System.Drawing.Point(197, 37); - this.colourpallet84.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet84.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet84.Name = "colourpallet84"; this.colourpallet84.Size = new System.Drawing.Size(12, 8); this.colourpallet84.TabIndex = 68; @@ -1580,7 +1580,7 @@ // this.colourpallet85.BackColor = System.Drawing.Color.Black; this.colourpallet85.Location = new System.Drawing.Point(210, 37); - this.colourpallet85.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet85.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet85.Name = "colourpallet85"; this.colourpallet85.Size = new System.Drawing.Size(12, 8); this.colourpallet85.TabIndex = 83; @@ -1590,7 +1590,7 @@ // this.colourpallet86.BackColor = System.Drawing.Color.Black; this.colourpallet86.Location = new System.Drawing.Point(2, 46); - this.colourpallet86.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet86.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet86.Name = "colourpallet86"; this.colourpallet86.Size = new System.Drawing.Size(12, 8); this.colourpallet86.TabIndex = 59; @@ -1600,7 +1600,7 @@ // this.colourpallet87.BackColor = System.Drawing.Color.Black; this.colourpallet87.Location = new System.Drawing.Point(15, 46); - this.colourpallet87.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet87.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet87.Name = "colourpallet87"; this.colourpallet87.Size = new System.Drawing.Size(12, 8); this.colourpallet87.TabIndex = 81; @@ -1610,7 +1610,7 @@ // this.colourpallet88.BackColor = System.Drawing.Color.Black; this.colourpallet88.Location = new System.Drawing.Point(28, 46); - this.colourpallet88.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet88.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet88.Name = "colourpallet88"; this.colourpallet88.Size = new System.Drawing.Size(12, 8); this.colourpallet88.TabIndex = 63; @@ -1620,7 +1620,7 @@ // this.colourpallet89.BackColor = System.Drawing.Color.Black; this.colourpallet89.Location = new System.Drawing.Point(41, 46); - this.colourpallet89.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet89.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet89.Name = "colourpallet89"; this.colourpallet89.Size = new System.Drawing.Size(12, 8); this.colourpallet89.TabIndex = 73; @@ -1630,7 +1630,7 @@ // this.colourpallet90.BackColor = System.Drawing.Color.Black; this.colourpallet90.Location = new System.Drawing.Point(54, 46); - this.colourpallet90.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet90.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet90.Name = "colourpallet90"; this.colourpallet90.Size = new System.Drawing.Size(12, 8); this.colourpallet90.TabIndex = 87; @@ -1640,7 +1640,7 @@ // this.colourpallet91.BackColor = System.Drawing.Color.Black; this.colourpallet91.Location = new System.Drawing.Point(67, 46); - this.colourpallet91.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet91.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet91.Name = "colourpallet91"; this.colourpallet91.Size = new System.Drawing.Size(12, 8); this.colourpallet91.TabIndex = 58; @@ -1650,7 +1650,7 @@ // this.colourpallet92.BackColor = System.Drawing.Color.Black; this.colourpallet92.Location = new System.Drawing.Point(80, 46); - this.colourpallet92.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet92.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet92.Name = "colourpallet92"; this.colourpallet92.Size = new System.Drawing.Size(12, 8); this.colourpallet92.TabIndex = 82; @@ -1660,7 +1660,7 @@ // this.colourpallet93.BackColor = System.Drawing.Color.Black; this.colourpallet93.Location = new System.Drawing.Point(93, 46); - this.colourpallet93.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet93.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet93.Name = "colourpallet93"; this.colourpallet93.Size = new System.Drawing.Size(12, 8); this.colourpallet93.TabIndex = 86; @@ -1670,7 +1670,7 @@ // this.colourpallet94.BackColor = System.Drawing.Color.Black; this.colourpallet94.Location = new System.Drawing.Point(106, 46); - this.colourpallet94.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet94.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet94.Name = "colourpallet94"; this.colourpallet94.Size = new System.Drawing.Size(12, 8); this.colourpallet94.TabIndex = 80; @@ -1680,7 +1680,7 @@ // this.colourpallet95.BackColor = System.Drawing.Color.Black; this.colourpallet95.Location = new System.Drawing.Point(119, 46); - this.colourpallet95.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet95.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet95.Name = "colourpallet95"; this.colourpallet95.Size = new System.Drawing.Size(12, 8); this.colourpallet95.TabIndex = 85; @@ -1690,7 +1690,7 @@ // this.colourpallet96.BackColor = System.Drawing.Color.Black; this.colourpallet96.Location = new System.Drawing.Point(132, 46); - this.colourpallet96.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet96.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet96.Name = "colourpallet96"; this.colourpallet96.Size = new System.Drawing.Size(12, 8); this.colourpallet96.TabIndex = 78; @@ -1700,7 +1700,7 @@ // this.colourpallet97.BackColor = System.Drawing.Color.Black; this.colourpallet97.Location = new System.Drawing.Point(145, 46); - this.colourpallet97.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet97.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet97.Name = "colourpallet97"; this.colourpallet97.Size = new System.Drawing.Size(12, 8); this.colourpallet97.TabIndex = 89; @@ -1710,7 +1710,7 @@ // this.colourpallet98.BackColor = System.Drawing.Color.Black; this.colourpallet98.Location = new System.Drawing.Point(158, 46); - this.colourpallet98.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet98.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet98.Name = "colourpallet98"; this.colourpallet98.Size = new System.Drawing.Size(12, 8); this.colourpallet98.TabIndex = 93; @@ -1720,7 +1720,7 @@ // this.colourpallet99.BackColor = System.Drawing.Color.Black; this.colourpallet99.Location = new System.Drawing.Point(171, 46); - this.colourpallet99.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet99.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet99.Name = "colourpallet99"; this.colourpallet99.Size = new System.Drawing.Size(12, 8); this.colourpallet99.TabIndex = 101; @@ -1730,7 +1730,7 @@ // this.colourpallet100.BackColor = System.Drawing.Color.Black; this.colourpallet100.Location = new System.Drawing.Point(184, 46); - this.colourpallet100.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet100.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet100.Name = "colourpallet100"; this.colourpallet100.Size = new System.Drawing.Size(12, 8); this.colourpallet100.TabIndex = 94; @@ -1740,7 +1740,7 @@ // this.colourpallet101.BackColor = System.Drawing.Color.Black; this.colourpallet101.Location = new System.Drawing.Point(197, 46); - this.colourpallet101.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet101.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet101.Name = "colourpallet101"; this.colourpallet101.Size = new System.Drawing.Size(12, 8); this.colourpallet101.TabIndex = 111; @@ -1750,7 +1750,7 @@ // this.colourpallet102.BackColor = System.Drawing.Color.Black; this.colourpallet102.Location = new System.Drawing.Point(210, 46); - this.colourpallet102.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet102.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet102.Name = "colourpallet102"; this.colourpallet102.Size = new System.Drawing.Size(12, 8); this.colourpallet102.TabIndex = 110; @@ -1760,7 +1760,7 @@ // this.colourpallet103.BackColor = System.Drawing.Color.Black; this.colourpallet103.Location = new System.Drawing.Point(2, 55); - this.colourpallet103.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet103.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet103.Name = "colourpallet103"; this.colourpallet103.Size = new System.Drawing.Size(12, 8); this.colourpallet103.TabIndex = 117; @@ -1770,7 +1770,7 @@ // this.colourpallet104.BackColor = System.Drawing.Color.Black; this.colourpallet104.Location = new System.Drawing.Point(15, 55); - this.colourpallet104.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet104.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet104.Name = "colourpallet104"; this.colourpallet104.Size = new System.Drawing.Size(12, 8); this.colourpallet104.TabIndex = 112; @@ -1780,7 +1780,7 @@ // this.colourpallet105.BackColor = System.Drawing.Color.Black; this.colourpallet105.Location = new System.Drawing.Point(28, 55); - this.colourpallet105.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet105.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet105.Name = "colourpallet105"; this.colourpallet105.Size = new System.Drawing.Size(12, 8); this.colourpallet105.TabIndex = 109; @@ -1790,7 +1790,7 @@ // this.colourpallet106.BackColor = System.Drawing.Color.Black; this.colourpallet106.Location = new System.Drawing.Point(41, 55); - this.colourpallet106.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet106.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet106.Name = "colourpallet106"; this.colourpallet106.Size = new System.Drawing.Size(12, 8); this.colourpallet106.TabIndex = 103; @@ -1800,7 +1800,7 @@ // this.colourpallet107.BackColor = System.Drawing.Color.Black; this.colourpallet107.Location = new System.Drawing.Point(54, 55); - this.colourpallet107.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet107.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet107.Name = "colourpallet107"; this.colourpallet107.Size = new System.Drawing.Size(12, 8); this.colourpallet107.TabIndex = 102; @@ -1810,7 +1810,7 @@ // this.colourpallet108.BackColor = System.Drawing.Color.Black; this.colourpallet108.Location = new System.Drawing.Point(67, 55); - this.colourpallet108.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet108.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet108.Name = "colourpallet108"; this.colourpallet108.Size = new System.Drawing.Size(12, 8); this.colourpallet108.TabIndex = 106; @@ -1820,7 +1820,7 @@ // this.colourpallet109.BackColor = System.Drawing.Color.Black; this.colourpallet109.Location = new System.Drawing.Point(80, 55); - this.colourpallet109.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet109.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet109.Name = "colourpallet109"; this.colourpallet109.Size = new System.Drawing.Size(12, 8); this.colourpallet109.TabIndex = 98; @@ -1830,7 +1830,7 @@ // this.colourpallet110.BackColor = System.Drawing.Color.Black; this.colourpallet110.Location = new System.Drawing.Point(93, 55); - this.colourpallet110.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet110.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet110.Name = "colourpallet110"; this.colourpallet110.Size = new System.Drawing.Size(12, 8); this.colourpallet110.TabIndex = 99; @@ -1840,7 +1840,7 @@ // this.colourpallet111.BackColor = System.Drawing.Color.Black; this.colourpallet111.Location = new System.Drawing.Point(106, 55); - this.colourpallet111.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet111.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet111.Name = "colourpallet111"; this.colourpallet111.Size = new System.Drawing.Size(12, 8); this.colourpallet111.TabIndex = 108; @@ -1850,7 +1850,7 @@ // this.colourpallet112.BackColor = System.Drawing.Color.Black; this.colourpallet112.Location = new System.Drawing.Point(119, 55); - this.colourpallet112.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet112.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet112.Name = "colourpallet112"; this.colourpallet112.Size = new System.Drawing.Size(12, 8); this.colourpallet112.TabIndex = 96; @@ -1860,7 +1860,7 @@ // this.colourpallet113.BackColor = System.Drawing.Color.Black; this.colourpallet113.Location = new System.Drawing.Point(132, 55); - this.colourpallet113.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet113.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet113.Name = "colourpallet113"; this.colourpallet113.Size = new System.Drawing.Size(12, 8); this.colourpallet113.TabIndex = 116; @@ -1870,7 +1870,7 @@ // this.colourpallet114.BackColor = System.Drawing.Color.Black; this.colourpallet114.Location = new System.Drawing.Point(145, 55); - this.colourpallet114.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet114.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet114.Name = "colourpallet114"; this.colourpallet114.Size = new System.Drawing.Size(12, 8); this.colourpallet114.TabIndex = 104; @@ -1880,7 +1880,7 @@ // this.colourpallet115.BackColor = System.Drawing.Color.Black; this.colourpallet115.Location = new System.Drawing.Point(158, 55); - this.colourpallet115.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet115.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet115.Name = "colourpallet115"; this.colourpallet115.Size = new System.Drawing.Size(12, 8); this.colourpallet115.TabIndex = 107; @@ -1890,7 +1890,7 @@ // this.colourpallet116.BackColor = System.Drawing.Color.Black; this.colourpallet116.Location = new System.Drawing.Point(171, 55); - this.colourpallet116.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet116.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet116.Name = "colourpallet116"; this.colourpallet116.Size = new System.Drawing.Size(12, 8); this.colourpallet116.TabIndex = 97; @@ -1900,7 +1900,7 @@ // this.colourpallet117.BackColor = System.Drawing.Color.Black; this.colourpallet117.Location = new System.Drawing.Point(184, 55); - this.colourpallet117.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet117.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet117.Name = "colourpallet117"; this.colourpallet117.Size = new System.Drawing.Size(12, 8); this.colourpallet117.TabIndex = 92; @@ -1910,7 +1910,7 @@ // this.colourpallet118.BackColor = System.Drawing.Color.Black; this.colourpallet118.Location = new System.Drawing.Point(197, 55); - this.colourpallet118.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet118.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet118.Name = "colourpallet118"; this.colourpallet118.Size = new System.Drawing.Size(12, 8); this.colourpallet118.TabIndex = 120; @@ -1920,7 +1920,7 @@ // this.colourpallet119.BackColor = System.Drawing.Color.Black; this.colourpallet119.Location = new System.Drawing.Point(210, 55); - this.colourpallet119.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet119.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet119.Name = "colourpallet119"; this.colourpallet119.Size = new System.Drawing.Size(12, 8); this.colourpallet119.TabIndex = 100; @@ -1930,7 +1930,7 @@ // this.colourpallet120.BackColor = System.Drawing.Color.Black; this.colourpallet120.Location = new System.Drawing.Point(2, 64); - this.colourpallet120.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet120.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet120.Name = "colourpallet120"; this.colourpallet120.Size = new System.Drawing.Size(12, 8); this.colourpallet120.TabIndex = 115; @@ -1940,7 +1940,7 @@ // this.colourpallet121.BackColor = System.Drawing.Color.Black; this.colourpallet121.Location = new System.Drawing.Point(15, 64); - this.colourpallet121.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet121.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet121.Name = "colourpallet121"; this.colourpallet121.Size = new System.Drawing.Size(12, 8); this.colourpallet121.TabIndex = 91; @@ -1950,7 +1950,7 @@ // this.colourpallet122.BackColor = System.Drawing.Color.Black; this.colourpallet122.Location = new System.Drawing.Point(28, 64); - this.colourpallet122.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet122.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet122.Name = "colourpallet122"; this.colourpallet122.Size = new System.Drawing.Size(12, 8); this.colourpallet122.TabIndex = 113; @@ -1960,7 +1960,7 @@ // this.colourpallet123.BackColor = System.Drawing.Color.Black; this.colourpallet123.Location = new System.Drawing.Point(41, 64); - this.colourpallet123.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet123.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet123.Name = "colourpallet123"; this.colourpallet123.Size = new System.Drawing.Size(12, 8); this.colourpallet123.TabIndex = 95; @@ -1970,7 +1970,7 @@ // this.colourpallet124.BackColor = System.Drawing.Color.Black; this.colourpallet124.Location = new System.Drawing.Point(54, 64); - this.colourpallet124.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet124.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet124.Name = "colourpallet124"; this.colourpallet124.Size = new System.Drawing.Size(12, 8); this.colourpallet124.TabIndex = 105; @@ -1980,7 +1980,7 @@ // this.colourpallet125.BackColor = System.Drawing.Color.Black; this.colourpallet125.Location = new System.Drawing.Point(67, 64); - this.colourpallet125.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet125.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet125.Name = "colourpallet125"; this.colourpallet125.Size = new System.Drawing.Size(12, 8); this.colourpallet125.TabIndex = 119; @@ -1990,7 +1990,7 @@ // this.colourpallet126.BackColor = System.Drawing.Color.Black; this.colourpallet126.Location = new System.Drawing.Point(80, 64); - this.colourpallet126.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet126.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet126.Name = "colourpallet126"; this.colourpallet126.Size = new System.Drawing.Size(12, 8); this.colourpallet126.TabIndex = 90; @@ -2000,7 +2000,7 @@ // this.colourpallet127.BackColor = System.Drawing.Color.Black; this.colourpallet127.Location = new System.Drawing.Point(93, 64); - this.colourpallet127.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet127.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet127.Name = "colourpallet127"; this.colourpallet127.Size = new System.Drawing.Size(12, 8); this.colourpallet127.TabIndex = 114; @@ -2010,7 +2010,7 @@ // this.colourpallet128.BackColor = System.Drawing.Color.Black; this.colourpallet128.Location = new System.Drawing.Point(106, 64); - this.colourpallet128.Margin = new System.Windows.Forms.Padding(1, 0, 0, 1); + this.colourpallet128.Margin = new ShiftUI.Padding(1, 0, 0, 1); this.colourpallet128.Name = "colourpallet128"; this.colourpallet128.Size = new System.Drawing.Size(12, 8); this.colourpallet128.TabIndex = 118; @@ -2018,8 +2018,8 @@ // // Label4 // - this.Label4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.Label4.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Left) + | ShiftUI.AnchorStyles.Right))); this.Label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Label4.Location = new System.Drawing.Point(11, 2); this.Label4.Name = "Label4"; @@ -2031,7 +2031,7 @@ // line6 // this.line6.BackColor = System.Drawing.Color.Black; - this.line6.Dock = System.Windows.Forms.DockStyle.Top; + this.line6.Dock = ShiftUI.DockStyle.Top; this.line6.Location = new System.Drawing.Point(0, 0); this.line6.Name = "line6"; this.line6.Size = new System.Drawing.Size(225, 1); @@ -2039,21 +2039,21 @@ // // pnltoolproperties // - this.pnltoolproperties.Controls.Add(this.pnlpixelplacersettings); - this.pnltoolproperties.Controls.Add(this.pnlovaltoolsettings); - this.pnltoolproperties.Controls.Add(this.pnleracertoolsettings); - this.pnltoolproperties.Controls.Add(this.pnllinetoolsettings); - this.pnltoolproperties.Controls.Add(this.pnlpaintbrushtoolsettings); - this.pnltoolproperties.Controls.Add(this.pnltexttoolsettings); - this.pnltoolproperties.Controls.Add(this.pnlpixelsettersettings); - this.pnltoolproperties.Controls.Add(this.pnlmagnifiersettings); - this.pnltoolproperties.Controls.Add(this.pnlfloodfillsettings); - this.pnltoolproperties.Controls.Add(this.pnlsquaretoolsettings); - this.pnltoolproperties.Controls.Add(this.pnlpencilsettings); - this.pnltoolproperties.Controls.Add(this.Label6); - this.pnltoolproperties.Controls.Add(this.Label5); - this.pnltoolproperties.Controls.Add(this.line5); - this.pnltoolproperties.Controls.Add(this.line3); + this.pnltoolproperties.Widgets.Add(this.pnlpixelplacersettings); + this.pnltoolproperties.Widgets.Add(this.pnlovaltoolsettings); + this.pnltoolproperties.Widgets.Add(this.pnleracertoolsettings); + this.pnltoolproperties.Widgets.Add(this.pnllinetoolsettings); + this.pnltoolproperties.Widgets.Add(this.pnlpaintbrushtoolsettings); + this.pnltoolproperties.Widgets.Add(this.pnltexttoolsettings); + this.pnltoolproperties.Widgets.Add(this.pnlpixelsettersettings); + this.pnltoolproperties.Widgets.Add(this.pnlmagnifiersettings); + this.pnltoolproperties.Widgets.Add(this.pnlfloodfillsettings); + this.pnltoolproperties.Widgets.Add(this.pnlsquaretoolsettings); + this.pnltoolproperties.Widgets.Add(this.pnlpencilsettings); + this.pnltoolproperties.Widgets.Add(this.Label6); + this.pnltoolproperties.Widgets.Add(this.Label5); + this.pnltoolproperties.Widgets.Add(this.line5); + this.pnltoolproperties.Widgets.Add(this.line3); this.pnltoolproperties.Location = new System.Drawing.Point(0, 0); this.pnltoolproperties.Name = "pnltoolproperties"; this.pnltoolproperties.Size = new System.Drawing.Size(457, 100); @@ -2061,13 +2061,13 @@ // // pnlovaltoolsettings // - this.pnlovaltoolsettings.Controls.Add(this.Label20); - this.pnlovaltoolsettings.Controls.Add(this.btnovalfillonoff); - this.pnlovaltoolsettings.Controls.Add(this.pnlovalfillcolour); - this.pnlovaltoolsettings.Controls.Add(this.txtovalborderwidth); - this.pnlovaltoolsettings.Controls.Add(this.Label21); - this.pnlovaltoolsettings.Controls.Add(this.Label22); - this.pnlovaltoolsettings.Controls.Add(this.Label23); + this.pnlovaltoolsettings.Widgets.Add(this.Label20); + this.pnlovaltoolsettings.Widgets.Add(this.btnovalfillonoff); + this.pnlovaltoolsettings.Widgets.Add(this.pnlovalfillcolour); + this.pnlovaltoolsettings.Widgets.Add(this.txtovalborderwidth); + this.pnlovaltoolsettings.Widgets.Add(this.Label21); + this.pnlovaltoolsettings.Widgets.Add(this.Label22); + this.pnlovaltoolsettings.Widgets.Add(this.Label23); this.pnlovaltoolsettings.Location = new System.Drawing.Point(0, 1); this.pnlovaltoolsettings.Name = "pnlovaltoolsettings"; this.pnlovaltoolsettings.Size = new System.Drawing.Size(459, 96); @@ -2088,7 +2088,7 @@ // btnovalfillonoff // this.btnovalfillonoff.FlatAppearance.BorderColor = System.Drawing.Color.Black; - this.btnovalfillonoff.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnovalfillonoff.FlatStyle = ShiftUI.FlatStyle.Flat; this.btnovalfillonoff.Location = new System.Drawing.Point(150, 64); this.btnovalfillonoff.Name = "btnovalfillonoff"; this.btnovalfillonoff.Size = new System.Drawing.Size(56, 28); @@ -2099,7 +2099,7 @@ // // pnlovalfillcolour // - this.pnlovalfillcolour.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.pnlovalfillcolour.BorderStyle = ShiftUI.BorderStyle.FixedSingle; this.pnlovalfillcolour.Location = new System.Drawing.Point(109, 64); this.pnlovalfillcolour.Name = "pnlovalfillcolour"; this.pnlovalfillcolour.Size = new System.Drawing.Size(34, 28); @@ -2109,7 +2109,7 @@ // txtovalborderwidth // this.txtovalborderwidth.BackColor = System.Drawing.Color.White; - this.txtovalborderwidth.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.txtovalborderwidth.BorderStyle = ShiftUI.BorderStyle.FixedSingle; this.txtovalborderwidth.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txtovalborderwidth.ForeColor = System.Drawing.Color.Black; this.txtovalborderwidth.Location = new System.Drawing.Point(133, 33); @@ -2150,13 +2150,13 @@ // // pnleracertoolsettings // - this.pnleracertoolsettings.Controls.Add(this.Label28); - this.pnleracertoolsettings.Controls.Add(this.btneracersquare); - this.pnleracertoolsettings.Controls.Add(this.btneracercircle); - this.pnleracertoolsettings.Controls.Add(this.Label24); - this.pnleracertoolsettings.Controls.Add(this.txteracersize); - this.pnleracertoolsettings.Controls.Add(this.Label26); - this.pnleracertoolsettings.Controls.Add(this.Label27); + this.pnleracertoolsettings.Widgets.Add(this.Label28); + this.pnleracertoolsettings.Widgets.Add(this.btneracersquare); + this.pnleracertoolsettings.Widgets.Add(this.btneracercircle); + this.pnleracertoolsettings.Widgets.Add(this.Label24); + this.pnleracertoolsettings.Widgets.Add(this.txteracersize); + this.pnleracertoolsettings.Widgets.Add(this.Label26); + this.pnleracertoolsettings.Widgets.Add(this.Label27); this.pnleracertoolsettings.Location = new System.Drawing.Point(0, 1); this.pnleracertoolsettings.Name = "pnleracertoolsettings"; this.pnleracertoolsettings.Size = new System.Drawing.Size(459, 96); @@ -2177,10 +2177,10 @@ // this.btneracersquare.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadsquarerubberselected; this.btneracersquare.FlatAppearance.BorderSize = 0; - this.btneracersquare.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btneracersquare.FlatStyle = ShiftUI.FlatStyle.Flat; this.btneracersquare.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btneracersquare.Location = new System.Drawing.Point(75, 21); - this.btneracersquare.Margin = new System.Windows.Forms.Padding(6, 6, 0, 0); + this.btneracersquare.Margin = new ShiftUI.Padding(6, 6, 0, 0); this.btneracersquare.Name = "btneracersquare"; this.btneracersquare.Size = new System.Drawing.Size(60, 50); this.btneracersquare.TabIndex = 17; @@ -2192,10 +2192,10 @@ // this.btneracercircle.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadcirclerubber; this.btneracercircle.FlatAppearance.BorderSize = 0; - this.btneracercircle.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btneracercircle.FlatStyle = ShiftUI.FlatStyle.Flat; this.btneracercircle.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btneracercircle.Location = new System.Drawing.Point(9, 21); - this.btneracercircle.Margin = new System.Windows.Forms.Padding(6, 6, 0, 0); + this.btneracercircle.Margin = new ShiftUI.Padding(6, 6, 0, 0); this.btneracercircle.Name = "btneracercircle"; this.btneracercircle.Size = new System.Drawing.Size(60, 50); this.btneracercircle.TabIndex = 16; @@ -2216,7 +2216,7 @@ // txteracersize // this.txteracersize.BackColor = System.Drawing.Color.White; - this.txteracersize.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.txteracersize.BorderStyle = ShiftUI.BorderStyle.FixedSingle; this.txteracersize.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txteracersize.ForeColor = System.Drawing.Color.Black; this.txteracersize.Location = new System.Drawing.Point(198, 70); @@ -2247,10 +2247,10 @@ // // pnllinetoolsettings // - this.pnllinetoolsettings.Controls.Add(this.Label29); - this.pnllinetoolsettings.Controls.Add(this.txtlinewidth); - this.pnllinetoolsettings.Controls.Add(this.Label30); - this.pnllinetoolsettings.Controls.Add(this.Label31); + this.pnllinetoolsettings.Widgets.Add(this.Label29); + this.pnllinetoolsettings.Widgets.Add(this.txtlinewidth); + this.pnllinetoolsettings.Widgets.Add(this.Label30); + this.pnllinetoolsettings.Widgets.Add(this.Label31); this.pnllinetoolsettings.Location = new System.Drawing.Point(168, 32); this.pnllinetoolsettings.Name = "pnllinetoolsettings"; this.pnllinetoolsettings.Size = new System.Drawing.Size(60, 28); @@ -2269,7 +2269,7 @@ // txtlinewidth // this.txtlinewidth.BackColor = System.Drawing.Color.White; - this.txtlinewidth.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.txtlinewidth.BorderStyle = ShiftUI.BorderStyle.FixedSingle; this.txtlinewidth.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txtlinewidth.ForeColor = System.Drawing.Color.Black; this.txtlinewidth.Location = new System.Drawing.Point(114, 33); @@ -2300,13 +2300,13 @@ // // pnlpaintbrushtoolsettings // - this.pnlpaintbrushtoolsettings.Controls.Add(this.Label36); - this.pnlpaintbrushtoolsettings.Controls.Add(this.btnpaintsquareshape); - this.pnlpaintbrushtoolsettings.Controls.Add(this.btnpaintcircleshape); - this.pnlpaintbrushtoolsettings.Controls.Add(this.Label37); - this.pnlpaintbrushtoolsettings.Controls.Add(this.txtpaintbrushsize); - this.pnlpaintbrushtoolsettings.Controls.Add(this.Label38); - this.pnlpaintbrushtoolsettings.Controls.Add(this.Label39); + this.pnlpaintbrushtoolsettings.Widgets.Add(this.Label36); + this.pnlpaintbrushtoolsettings.Widgets.Add(this.btnpaintsquareshape); + this.pnlpaintbrushtoolsettings.Widgets.Add(this.btnpaintcircleshape); + this.pnlpaintbrushtoolsettings.Widgets.Add(this.Label37); + this.pnlpaintbrushtoolsettings.Widgets.Add(this.txtpaintbrushsize); + this.pnlpaintbrushtoolsettings.Widgets.Add(this.Label38); + this.pnlpaintbrushtoolsettings.Widgets.Add(this.Label39); this.pnlpaintbrushtoolsettings.Location = new System.Drawing.Point(0, 1); this.pnlpaintbrushtoolsettings.Name = "pnlpaintbrushtoolsettings"; this.pnlpaintbrushtoolsettings.Size = new System.Drawing.Size(457, 97); @@ -2326,12 +2326,12 @@ // btnpaintsquareshape // this.btnpaintsquareshape.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadsquarerubber; - this.btnpaintsquareshape.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.btnpaintsquareshape.BackgroundImageLayout = ShiftUI.ImageLayout.Stretch; this.btnpaintsquareshape.FlatAppearance.BorderSize = 0; - this.btnpaintsquareshape.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnpaintsquareshape.FlatStyle = ShiftUI.FlatStyle.Flat; this.btnpaintsquareshape.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnpaintsquareshape.Location = new System.Drawing.Point(69, 27); - this.btnpaintsquareshape.Margin = new System.Windows.Forms.Padding(6, 6, 0, 0); + this.btnpaintsquareshape.Margin = new ShiftUI.Padding(6, 6, 0, 0); this.btnpaintsquareshape.Name = "btnpaintsquareshape"; this.btnpaintsquareshape.Size = new System.Drawing.Size(48, 40); this.btnpaintsquareshape.TabIndex = 17; @@ -2342,12 +2342,12 @@ // btnpaintcircleshape // this.btnpaintcircleshape.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadcirclerubberselected; - this.btnpaintcircleshape.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.btnpaintcircleshape.BackgroundImageLayout = ShiftUI.ImageLayout.Stretch; this.btnpaintcircleshape.FlatAppearance.BorderSize = 0; - this.btnpaintcircleshape.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnpaintcircleshape.FlatStyle = ShiftUI.FlatStyle.Flat; this.btnpaintcircleshape.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnpaintcircleshape.Location = new System.Drawing.Point(16, 27); - this.btnpaintcircleshape.Margin = new System.Windows.Forms.Padding(6, 6, 0, 0); + this.btnpaintcircleshape.Margin = new ShiftUI.Padding(6, 6, 0, 0); this.btnpaintcircleshape.Name = "btnpaintcircleshape"; this.btnpaintcircleshape.Size = new System.Drawing.Size(48, 40); this.btnpaintcircleshape.TabIndex = 16; @@ -2368,7 +2368,7 @@ // txtpaintbrushsize // this.txtpaintbrushsize.BackColor = System.Drawing.Color.White; - this.txtpaintbrushsize.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.txtpaintbrushsize.BorderStyle = ShiftUI.BorderStyle.FixedSingle; this.txtpaintbrushsize.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txtpaintbrushsize.ForeColor = System.Drawing.Color.Black; this.txtpaintbrushsize.Location = new System.Drawing.Point(194, 68); @@ -2399,16 +2399,16 @@ // // pnltexttoolsettings // - this.pnltexttoolsettings.Controls.Add(this.Label35); - this.pnltexttoolsettings.Controls.Add(this.combofontstyle); - this.pnltexttoolsettings.Controls.Add(this.txtdrawstringtext); - this.pnltexttoolsettings.Controls.Add(this.combodrawtextfont); - this.pnltexttoolsettings.Controls.Add(this.Label25); - this.pnltexttoolsettings.Controls.Add(this.txtdrawtextsize); - this.pnltexttoolsettings.Controls.Add(this.Label32); - this.pnltexttoolsettings.Controls.Add(this.Label33); - this.pnltexttoolsettings.Controls.Add(this.Label34); - this.pnltexttoolsettings.Dock = System.Windows.Forms.DockStyle.Fill; + this.pnltexttoolsettings.Widgets.Add(this.Label35); + this.pnltexttoolsettings.Widgets.Add(this.combofontstyle); + this.pnltexttoolsettings.Widgets.Add(this.txtdrawstringtext); + this.pnltexttoolsettings.Widgets.Add(this.combodrawtextfont); + this.pnltexttoolsettings.Widgets.Add(this.Label25); + this.pnltexttoolsettings.Widgets.Add(this.txtdrawtextsize); + this.pnltexttoolsettings.Widgets.Add(this.Label32); + this.pnltexttoolsettings.Widgets.Add(this.Label33); + this.pnltexttoolsettings.Widgets.Add(this.Label34); + this.pnltexttoolsettings.Dock = ShiftUI.DockStyle.Fill; this.pnltexttoolsettings.Location = new System.Drawing.Point(0, 1); this.pnltexttoolsettings.Name = "pnltexttoolsettings"; this.pnltexttoolsettings.Size = new System.Drawing.Size(456, 99); @@ -2427,7 +2427,7 @@ // // combofontstyle // - this.combofontstyle.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.combofontstyle.FlatStyle = ShiftUI.FlatStyle.Flat; this.combofontstyle.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.combofontstyle.FormattingEnabled = true; this.combofontstyle.Items.AddRange(new object[] { @@ -2444,7 +2444,7 @@ // // txtdrawstringtext // - this.txtdrawstringtext.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.txtdrawstringtext.BorderStyle = ShiftUI.BorderStyle.FixedSingle; this.txtdrawstringtext.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txtdrawstringtext.Location = new System.Drawing.Point(265, 52); this.txtdrawstringtext.Multiline = true; @@ -2456,7 +2456,7 @@ // // combodrawtextfont // - this.combodrawtextfont.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.combodrawtextfont.FlatStyle = ShiftUI.FlatStyle.Flat; this.combodrawtextfont.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.combodrawtextfont.FormattingEnabled = true; this.combodrawtextfont.Location = new System.Drawing.Point(64, 68); @@ -2478,7 +2478,7 @@ // txtdrawtextsize // this.txtdrawtextsize.BackColor = System.Drawing.Color.White; - this.txtdrawtextsize.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.txtdrawtextsize.BorderStyle = ShiftUI.BorderStyle.FixedSingle; this.txtdrawtextsize.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txtdrawtextsize.ForeColor = System.Drawing.Color.Black; this.txtdrawtextsize.Location = new System.Drawing.Point(61, 33); @@ -2519,12 +2519,12 @@ // // pnlpixelsettersettings // - this.pnlpixelsettersettings.Controls.Add(this.btnpixelsettersetpixel); - this.pnlpixelsettersettings.Controls.Add(this.txtpixelsetterycoordinate); - this.pnlpixelsettersettings.Controls.Add(this.txtpixelsetterxcoordinate); - this.pnlpixelsettersettings.Controls.Add(this.Label3); - this.pnlpixelsettersettings.Controls.Add(this.Label2); - this.pnlpixelsettersettings.Controls.Add(this.Label1); + this.pnlpixelsettersettings.Widgets.Add(this.btnpixelsettersetpixel); + this.pnlpixelsettersettings.Widgets.Add(this.txtpixelsetterycoordinate); + this.pnlpixelsettersettings.Widgets.Add(this.txtpixelsetterxcoordinate); + this.pnlpixelsettersettings.Widgets.Add(this.Label3); + this.pnlpixelsettersettings.Widgets.Add(this.Label2); + this.pnlpixelsettersettings.Widgets.Add(this.Label1); this.pnlpixelsettersettings.Location = new System.Drawing.Point(0, 1); this.pnlpixelsettersettings.Name = "pnlpixelsettersettings"; this.pnlpixelsettersettings.Size = new System.Drawing.Size(457, 99); @@ -2533,7 +2533,7 @@ // // btnpixelsettersetpixel // - this.btnpixelsettersetpixel.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnpixelsettersetpixel.FlatStyle = ShiftUI.FlatStyle.Flat; this.btnpixelsettersetpixel.Font = new System.Drawing.Font("Microsoft Sans Serif", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnpixelsettersetpixel.Location = new System.Drawing.Point(215, 34); this.btnpixelsettersetpixel.Name = "btnpixelsettersetpixel"; @@ -2546,7 +2546,7 @@ // txtpixelsetterycoordinate // this.txtpixelsetterycoordinate.BackColor = System.Drawing.Color.White; - this.txtpixelsetterycoordinate.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.txtpixelsetterycoordinate.BorderStyle = ShiftUI.BorderStyle.FixedSingle; this.txtpixelsetterycoordinate.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txtpixelsetterycoordinate.ForeColor = System.Drawing.Color.Black; this.txtpixelsetterycoordinate.Location = new System.Drawing.Point(136, 64); @@ -2557,7 +2557,7 @@ // txtpixelsetterxcoordinate // this.txtpixelsetterxcoordinate.BackColor = System.Drawing.Color.White; - this.txtpixelsetterxcoordinate.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.txtpixelsetterxcoordinate.BorderStyle = ShiftUI.BorderStyle.FixedSingle; this.txtpixelsetterxcoordinate.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txtpixelsetterxcoordinate.ForeColor = System.Drawing.Color.Black; this.txtpixelsetterxcoordinate.Location = new System.Drawing.Point(136, 34); @@ -2597,10 +2597,10 @@ // // pnlmagnifiersettings // - this.pnlmagnifiersettings.Controls.Add(this.btnzoomout); - this.pnlmagnifiersettings.Controls.Add(this.btnzoomin); - this.pnlmagnifiersettings.Controls.Add(this.lblzoomlevel); - this.pnlmagnifiersettings.Controls.Add(this.Label7); + this.pnlmagnifiersettings.Widgets.Add(this.btnzoomout); + this.pnlmagnifiersettings.Widgets.Add(this.btnzoomin); + this.pnlmagnifiersettings.Widgets.Add(this.lblzoomlevel); + this.pnlmagnifiersettings.Widgets.Add(this.Label7); this.pnlmagnifiersettings.Location = new System.Drawing.Point(78, 50); this.pnlmagnifiersettings.Name = "pnlmagnifiersettings"; this.pnlmagnifiersettings.Size = new System.Drawing.Size(67, 44); @@ -2609,7 +2609,7 @@ // // btnzoomout // - this.btnzoomout.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnzoomout.FlatStyle = ShiftUI.FlatStyle.Flat; this.btnzoomout.Font = new System.Drawing.Font("Microsoft Sans Serif", 27.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnzoomout.Location = new System.Drawing.Point(16, 33); this.btnzoomout.Name = "btnzoomout"; @@ -2621,7 +2621,7 @@ // // btnzoomin // - this.btnzoomin.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnzoomin.FlatStyle = ShiftUI.FlatStyle.Flat; this.btnzoomin.Font = new System.Drawing.Font("Microsoft Sans Serif", 27.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnzoomin.Location = new System.Drawing.Point(313, 33); this.btnzoomin.Name = "btnzoomin"; @@ -2653,8 +2653,8 @@ // // pnlfloodfillsettings // - this.pnlfloodfillsettings.Controls.Add(this.Label12); - this.pnlfloodfillsettings.Controls.Add(this.Label15); + this.pnlfloodfillsettings.Widgets.Add(this.Label12); + this.pnlfloodfillsettings.Widgets.Add(this.Label15); this.pnlfloodfillsettings.Location = new System.Drawing.Point(162, 65); this.pnlfloodfillsettings.Name = "pnlfloodfillsettings"; this.pnlfloodfillsettings.Size = new System.Drawing.Size(71, 31); @@ -2682,13 +2682,13 @@ // // pnlsquaretoolsettings // - this.pnlsquaretoolsettings.Controls.Add(this.Label19); - this.pnlsquaretoolsettings.Controls.Add(this.btnsquarefillonoff); - this.pnlsquaretoolsettings.Controls.Add(this.pnlsquarefillcolour); - this.pnlsquaretoolsettings.Controls.Add(this.txtsquareborderwidth); - this.pnlsquaretoolsettings.Controls.Add(this.Label16); - this.pnlsquaretoolsettings.Controls.Add(this.Label18); - this.pnlsquaretoolsettings.Controls.Add(this.Label17); + this.pnlsquaretoolsettings.Widgets.Add(this.Label19); + this.pnlsquaretoolsettings.Widgets.Add(this.btnsquarefillonoff); + this.pnlsquaretoolsettings.Widgets.Add(this.pnlsquarefillcolour); + this.pnlsquaretoolsettings.Widgets.Add(this.txtsquareborderwidth); + this.pnlsquaretoolsettings.Widgets.Add(this.Label16); + this.pnlsquaretoolsettings.Widgets.Add(this.Label18); + this.pnlsquaretoolsettings.Widgets.Add(this.Label17); this.pnlsquaretoolsettings.Location = new System.Drawing.Point(16, 39); this.pnlsquaretoolsettings.Name = "pnlsquaretoolsettings"; this.pnlsquaretoolsettings.Size = new System.Drawing.Size(42, 31); @@ -2709,7 +2709,7 @@ // btnsquarefillonoff // this.btnsquarefillonoff.FlatAppearance.BorderColor = System.Drawing.Color.Black; - this.btnsquarefillonoff.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnsquarefillonoff.FlatStyle = ShiftUI.FlatStyle.Flat; this.btnsquarefillonoff.Location = new System.Drawing.Point(150, 64); this.btnsquarefillonoff.Name = "btnsquarefillonoff"; this.btnsquarefillonoff.Size = new System.Drawing.Size(56, 28); @@ -2720,7 +2720,7 @@ // // pnlsquarefillcolour // - this.pnlsquarefillcolour.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.pnlsquarefillcolour.BorderStyle = ShiftUI.BorderStyle.FixedSingle; this.pnlsquarefillcolour.Location = new System.Drawing.Point(109, 64); this.pnlsquarefillcolour.Name = "pnlsquarefillcolour"; this.pnlsquarefillcolour.Size = new System.Drawing.Size(34, 28); @@ -2730,7 +2730,7 @@ // txtsquareborderwidth // this.txtsquareborderwidth.BackColor = System.Drawing.Color.White; - this.txtsquareborderwidth.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.txtsquareborderwidth.BorderStyle = ShiftUI.BorderStyle.FixedSingle; this.txtsquareborderwidth.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txtsquareborderwidth.ForeColor = System.Drawing.Color.Black; this.txtsquareborderwidth.Location = new System.Drawing.Point(133, 33); @@ -2771,9 +2771,9 @@ // // pnlpixelplacersettings // - this.pnlpixelplacersettings.Controls.Add(this.lblpixelplacerhelp); - this.pnlpixelplacersettings.Controls.Add(this.btnpixelplacermovementmode); - this.pnlpixelplacersettings.Controls.Add(this.Label8); + this.pnlpixelplacersettings.Widgets.Add(this.lblpixelplacerhelp); + this.pnlpixelplacersettings.Widgets.Add(this.btnpixelplacermovementmode); + this.pnlpixelplacersettings.Widgets.Add(this.Label8); this.pnlpixelplacersettings.Location = new System.Drawing.Point(0, 1); this.pnlpixelplacersettings.Name = "pnlpixelplacersettings"; this.pnlpixelplacersettings.Size = new System.Drawing.Size(454, 98); @@ -2793,7 +2793,7 @@ // // btnpixelplacermovementmode // - this.btnpixelplacermovementmode.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnpixelplacermovementmode.FlatStyle = ShiftUI.FlatStyle.Flat; this.btnpixelplacermovementmode.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnpixelplacermovementmode.Location = new System.Drawing.Point(312, 26); this.btnpixelplacermovementmode.Name = "btnpixelplacermovementmode"; @@ -2815,10 +2815,10 @@ // // pnlpencilsettings // - this.pnlpencilsettings.Controls.Add(this.btnpencilsize3); - this.pnlpencilsettings.Controls.Add(this.btnpencilsize2); - this.pnlpencilsettings.Controls.Add(this.btnpencilsize1); - this.pnlpencilsettings.Controls.Add(this.Label14); + this.pnlpencilsettings.Widgets.Add(this.btnpencilsize3); + this.pnlpencilsettings.Widgets.Add(this.btnpencilsize2); + this.pnlpencilsettings.Widgets.Add(this.btnpencilsize1); + this.pnlpencilsettings.Widgets.Add(this.Label14); this.pnlpencilsettings.Location = new System.Drawing.Point(422, 13); this.pnlpencilsettings.Name = "pnlpencilsettings"; this.pnlpencilsettings.Size = new System.Drawing.Size(28, 22); @@ -2827,7 +2827,7 @@ // // btnpencilsize3 // - this.btnpencilsize3.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnpencilsize3.FlatStyle = ShiftUI.FlatStyle.Flat; this.btnpencilsize3.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnpencilsize3.Location = new System.Drawing.Point(298, 30); this.btnpencilsize3.Name = "btnpencilsize3"; @@ -2839,7 +2839,7 @@ // // btnpencilsize2 // - this.btnpencilsize2.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnpencilsize2.FlatStyle = ShiftUI.FlatStyle.Flat; this.btnpencilsize2.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnpencilsize2.Location = new System.Drawing.Point(165, 30); this.btnpencilsize2.Name = "btnpencilsize2"; @@ -2851,7 +2851,7 @@ // // btnpencilsize1 // - this.btnpencilsize1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnpencilsize1.FlatStyle = ShiftUI.FlatStyle.Flat; this.btnpencilsize1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnpencilsize1.Location = new System.Drawing.Point(30, 30); this.btnpencilsize1.Name = "btnpencilsize1"; @@ -2893,7 +2893,7 @@ // line5 // this.line5.BackColor = System.Drawing.Color.Black; - this.line5.Dock = System.Windows.Forms.DockStyle.Top; + this.line5.Dock = ShiftUI.DockStyle.Top; this.line5.Location = new System.Drawing.Point(0, 0); this.line5.Name = "line5"; this.line5.Size = new System.Drawing.Size(456, 1); @@ -2902,7 +2902,7 @@ // line3 // this.line3.BackColor = System.Drawing.Color.Black; - this.line3.Dock = System.Windows.Forms.DockStyle.Right; + this.line3.Dock = ShiftUI.DockStyle.Right; this.line3.Location = new System.Drawing.Point(456, 0); this.line3.Name = "line3"; this.line3.Size = new System.Drawing.Size(1, 100); @@ -2911,10 +2911,10 @@ // pnltools // this.pnltools.BackColor = System.Drawing.Color.White; - this.pnltools.Controls.Add(this.pnltoolpositioner); - this.pnltools.Controls.Add(this.line1); - this.pnltools.Controls.Add(this.pnltoolpreview); - this.pnltools.Dock = System.Windows.Forms.DockStyle.Left; + this.pnltools.Widgets.Add(this.pnltoolpositioner); + this.pnltools.Widgets.Add(this.line1); + this.pnltools.Widgets.Add(this.pnltoolpreview); + this.pnltools.Dock = ShiftUI.DockStyle.Left; this.pnltools.Location = new System.Drawing.Point(0, 0); this.pnltools.Name = "pnltools"; this.pnltools.Size = new System.Drawing.Size(120, 598); @@ -2922,23 +2922,23 @@ // // pnltoolpositioner // - this.pnltoolpositioner.Controls.Add(this.btnpixelsetter); - this.pnltoolpositioner.Controls.Add(this.btnpixelplacer); - this.pnltoolpositioner.Controls.Add(this.btnpencil); - this.pnltoolpositioner.Controls.Add(this.btnfloodfill); - this.pnltoolpositioner.Controls.Add(this.btnoval); - this.pnltoolpositioner.Controls.Add(this.btnsquare); - this.pnltoolpositioner.Controls.Add(this.btnlinetool); - this.pnltoolpositioner.Controls.Add(this.btnpaintbrush); - this.pnltoolpositioner.Controls.Add(this.btntexttool); - this.pnltoolpositioner.Controls.Add(this.btneracer); - this.pnltoolpositioner.Controls.Add(this.btnnew); - this.pnltoolpositioner.Controls.Add(this.btnmagnify); - this.pnltoolpositioner.Controls.Add(this.btnopen); - this.pnltoolpositioner.Controls.Add(this.btnsave); - this.pnltoolpositioner.Controls.Add(this.btnundo); - this.pnltoolpositioner.Controls.Add(this.btnredo); - this.pnltoolpositioner.Dock = System.Windows.Forms.DockStyle.Fill; + this.pnltoolpositioner.Widgets.Add(this.btnpixelsetter); + this.pnltoolpositioner.Widgets.Add(this.btnpixelplacer); + this.pnltoolpositioner.Widgets.Add(this.btnpencil); + this.pnltoolpositioner.Widgets.Add(this.btnfloodfill); + this.pnltoolpositioner.Widgets.Add(this.btnoval); + this.pnltoolpositioner.Widgets.Add(this.btnsquare); + this.pnltoolpositioner.Widgets.Add(this.btnlinetool); + this.pnltoolpositioner.Widgets.Add(this.btnpaintbrush); + this.pnltoolpositioner.Widgets.Add(this.btntexttool); + this.pnltoolpositioner.Widgets.Add(this.btneracer); + this.pnltoolpositioner.Widgets.Add(this.btnnew); + this.pnltoolpositioner.Widgets.Add(this.btnmagnify); + this.pnltoolpositioner.Widgets.Add(this.btnopen); + this.pnltoolpositioner.Widgets.Add(this.btnsave); + this.pnltoolpositioner.Widgets.Add(this.btnundo); + this.pnltoolpositioner.Widgets.Add(this.btnredo); + this.pnltoolpositioner.Dock = ShiftUI.DockStyle.Fill; this.pnltoolpositioner.Location = new System.Drawing.Point(0, 0); this.pnltoolpositioner.Name = "pnltoolpositioner"; this.pnltoolpositioner.Size = new System.Drawing.Size(119, 498); @@ -2947,10 +2947,10 @@ // btnpixelsetter // this.btnpixelsetter.FlatAppearance.BorderSize = 0; - this.btnpixelsetter.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnpixelsetter.FlatStyle = ShiftUI.FlatStyle.Flat; this.btnpixelsetter.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnpixelsetter.Location = new System.Drawing.Point(6, 6); - this.btnpixelsetter.Margin = new System.Windows.Forms.Padding(6, 6, 0, 0); + this.btnpixelsetter.Margin = new ShiftUI.Padding(6, 6, 0, 0); this.btnpixelsetter.Name = "btnpixelsetter"; this.btnpixelsetter.Size = new System.Drawing.Size(50, 50); this.btnpixelsetter.TabIndex = 2; @@ -2961,10 +2961,10 @@ // this.btnpixelplacer.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadpixelplacer; this.btnpixelplacer.FlatAppearance.BorderSize = 0; - this.btnpixelplacer.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnpixelplacer.FlatStyle = ShiftUI.FlatStyle.Flat; this.btnpixelplacer.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnpixelplacer.Location = new System.Drawing.Point(62, 6); - this.btnpixelplacer.Margin = new System.Windows.Forms.Padding(6, 6, 0, 0); + this.btnpixelplacer.Margin = new ShiftUI.Padding(6, 6, 0, 0); this.btnpixelplacer.Name = "btnpixelplacer"; this.btnpixelplacer.Size = new System.Drawing.Size(50, 50); this.btnpixelplacer.TabIndex = 4; @@ -2975,10 +2975,10 @@ // this.btnpencil.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadpencil; this.btnpencil.FlatAppearance.BorderSize = 0; - this.btnpencil.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnpencil.FlatStyle = ShiftUI.FlatStyle.Flat; this.btnpencil.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnpencil.Location = new System.Drawing.Point(6, 62); - this.btnpencil.Margin = new System.Windows.Forms.Padding(6, 6, 0, 0); + this.btnpencil.Margin = new ShiftUI.Padding(6, 6, 0, 0); this.btnpencil.Name = "btnpencil"; this.btnpencil.Size = new System.Drawing.Size(50, 50); this.btnpencil.TabIndex = 7; @@ -2990,10 +2990,10 @@ // this.btnfloodfill.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadfloodfill; this.btnfloodfill.FlatAppearance.BorderSize = 0; - this.btnfloodfill.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnfloodfill.FlatStyle = ShiftUI.FlatStyle.Flat; this.btnfloodfill.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnfloodfill.Location = new System.Drawing.Point(62, 62); - this.btnfloodfill.Margin = new System.Windows.Forms.Padding(6, 6, 0, 0); + this.btnfloodfill.Margin = new ShiftUI.Padding(6, 6, 0, 0); this.btnfloodfill.Name = "btnfloodfill"; this.btnfloodfill.Size = new System.Drawing.Size(50, 50); this.btnfloodfill.TabIndex = 11; @@ -3004,10 +3004,10 @@ // this.btnoval.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadOval; this.btnoval.FlatAppearance.BorderSize = 0; - this.btnoval.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnoval.FlatStyle = ShiftUI.FlatStyle.Flat; this.btnoval.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnoval.Location = new System.Drawing.Point(6, 118); - this.btnoval.Margin = new System.Windows.Forms.Padding(6, 6, 0, 0); + this.btnoval.Margin = new ShiftUI.Padding(6, 6, 0, 0); this.btnoval.Name = "btnoval"; this.btnoval.Size = new System.Drawing.Size(50, 50); this.btnoval.TabIndex = 13; @@ -3019,10 +3019,10 @@ // this.btnsquare.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadRectangle; this.btnsquare.FlatAppearance.BorderSize = 0; - this.btnsquare.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnsquare.FlatStyle = ShiftUI.FlatStyle.Flat; this.btnsquare.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnsquare.Location = new System.Drawing.Point(62, 118); - this.btnsquare.Margin = new System.Windows.Forms.Padding(6, 6, 0, 0); + this.btnsquare.Margin = new ShiftUI.Padding(6, 6, 0, 0); this.btnsquare.Name = "btnsquare"; this.btnsquare.Size = new System.Drawing.Size(50, 50); this.btnsquare.TabIndex = 12; @@ -3034,10 +3034,10 @@ // this.btnlinetool.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadlinetool; this.btnlinetool.FlatAppearance.BorderSize = 0; - this.btnlinetool.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnlinetool.FlatStyle = ShiftUI.FlatStyle.Flat; this.btnlinetool.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnlinetool.Location = new System.Drawing.Point(6, 174); - this.btnlinetool.Margin = new System.Windows.Forms.Padding(6, 6, 0, 0); + this.btnlinetool.Margin = new ShiftUI.Padding(6, 6, 0, 0); this.btnlinetool.Name = "btnlinetool"; this.btnlinetool.Size = new System.Drawing.Size(50, 50); this.btnlinetool.TabIndex = 15; @@ -3049,10 +3049,10 @@ // this.btnpaintbrush.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadpaintbrush; this.btnpaintbrush.FlatAppearance.BorderSize = 0; - this.btnpaintbrush.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnpaintbrush.FlatStyle = ShiftUI.FlatStyle.Flat; this.btnpaintbrush.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnpaintbrush.Location = new System.Drawing.Point(62, 174); - this.btnpaintbrush.Margin = new System.Windows.Forms.Padding(6, 6, 0, 0); + this.btnpaintbrush.Margin = new ShiftUI.Padding(6, 6, 0, 0); this.btnpaintbrush.Name = "btnpaintbrush"; this.btnpaintbrush.Size = new System.Drawing.Size(50, 50); this.btnpaintbrush.TabIndex = 17; @@ -3064,10 +3064,10 @@ // this.btntexttool.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadtexttool; this.btntexttool.FlatAppearance.BorderSize = 0; - this.btntexttool.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btntexttool.FlatStyle = ShiftUI.FlatStyle.Flat; this.btntexttool.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btntexttool.Location = new System.Drawing.Point(6, 230); - this.btntexttool.Margin = new System.Windows.Forms.Padding(6, 6, 0, 0); + this.btntexttool.Margin = new ShiftUI.Padding(6, 6, 0, 0); this.btntexttool.Name = "btntexttool"; this.btntexttool.Size = new System.Drawing.Size(50, 50); this.btntexttool.TabIndex = 16; @@ -3079,10 +3079,10 @@ // this.btneracer.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPaderacer; this.btneracer.FlatAppearance.BorderSize = 0; - this.btneracer.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btneracer.FlatStyle = ShiftUI.FlatStyle.Flat; this.btneracer.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btneracer.Location = new System.Drawing.Point(62, 230); - this.btneracer.Margin = new System.Windows.Forms.Padding(6, 6, 0, 0); + this.btneracer.Margin = new ShiftUI.Padding(6, 6, 0, 0); this.btneracer.Name = "btneracer"; this.btneracer.Size = new System.Drawing.Size(50, 50); this.btneracer.TabIndex = 14; @@ -3094,10 +3094,10 @@ // this.btnnew.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadnew; this.btnnew.FlatAppearance.BorderSize = 0; - 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.Location = new System.Drawing.Point(6, 286); - this.btnnew.Margin = new System.Windows.Forms.Padding(6, 6, 0, 0); + this.btnnew.Margin = new ShiftUI.Padding(6, 6, 0, 0); this.btnnew.Name = "btnnew"; this.btnnew.Size = new System.Drawing.Size(50, 50); this.btnnew.TabIndex = 6; @@ -3109,10 +3109,10 @@ // this.btnmagnify.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadmagnify; this.btnmagnify.FlatAppearance.BorderSize = 0; - this.btnmagnify.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnmagnify.FlatStyle = ShiftUI.FlatStyle.Flat; this.btnmagnify.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnmagnify.Location = new System.Drawing.Point(62, 286); - this.btnmagnify.Margin = new System.Windows.Forms.Padding(6, 6, 0, 0); + this.btnmagnify.Margin = new ShiftUI.Padding(6, 6, 0, 0); this.btnmagnify.Name = "btnmagnify"; this.btnmagnify.Size = new System.Drawing.Size(50, 50); this.btnmagnify.TabIndex = 3; @@ -3124,10 +3124,10 @@ // this.btnopen.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadopen; this.btnopen.FlatAppearance.BorderSize = 0; - 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.Location = new System.Drawing.Point(6, 342); - this.btnopen.Margin = new System.Windows.Forms.Padding(6, 6, 0, 0); + this.btnopen.Margin = new ShiftUI.Padding(6, 6, 0, 0); this.btnopen.Name = "btnopen"; this.btnopen.Size = new System.Drawing.Size(50, 50); this.btnopen.TabIndex = 10; @@ -3139,10 +3139,10 @@ // this.btnsave.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadsave; this.btnsave.FlatAppearance.BorderSize = 0; - 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.Location = new System.Drawing.Point(62, 342); - this.btnsave.Margin = new System.Windows.Forms.Padding(6, 6, 0, 0); + this.btnsave.Margin = new ShiftUI.Padding(6, 6, 0, 0); this.btnsave.Name = "btnsave"; this.btnsave.Size = new System.Drawing.Size(50, 50); this.btnsave.TabIndex = 5; @@ -3154,10 +3154,10 @@ // this.btnundo.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadundo; this.btnundo.FlatAppearance.BorderSize = 0; - this.btnundo.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnundo.FlatStyle = ShiftUI.FlatStyle.Flat; this.btnundo.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnundo.Location = new System.Drawing.Point(6, 398); - this.btnundo.Margin = new System.Windows.Forms.Padding(6, 6, 0, 0); + this.btnundo.Margin = new ShiftUI.Padding(6, 6, 0, 0); this.btnundo.Name = "btnundo"; this.btnundo.Size = new System.Drawing.Size(50, 50); this.btnundo.TabIndex = 8; @@ -3169,10 +3169,10 @@ // this.btnredo.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadredo; this.btnredo.FlatAppearance.BorderSize = 0; - this.btnredo.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnredo.FlatStyle = ShiftUI.FlatStyle.Flat; this.btnredo.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnredo.Location = new System.Drawing.Point(62, 398); - this.btnredo.Margin = new System.Windows.Forms.Padding(6, 6, 0, 0); + this.btnredo.Margin = new ShiftUI.Padding(6, 6, 0, 0); this.btnredo.Name = "btnredo"; this.btnredo.Size = new System.Drawing.Size(50, 50); this.btnredo.TabIndex = 9; @@ -3183,7 +3183,7 @@ // line1 // this.line1.BackColor = System.Drawing.Color.Black; - this.line1.Dock = System.Windows.Forms.DockStyle.Right; + this.line1.Dock = ShiftUI.DockStyle.Right; this.line1.Location = new System.Drawing.Point(119, 0); this.line1.Name = "line1"; this.line1.Size = new System.Drawing.Size(1, 498); @@ -3191,12 +3191,12 @@ // // pnltoolpreview // - this.pnltoolpreview.Controls.Add(this.Label13); - this.pnltoolpreview.Controls.Add(this.picpreview); - this.pnltoolpreview.Controls.Add(this.lbltoolselected); - this.pnltoolpreview.Controls.Add(this.line4); - this.pnltoolpreview.Controls.Add(this.line2); - this.pnltoolpreview.Dock = System.Windows.Forms.DockStyle.Bottom; + this.pnltoolpreview.Widgets.Add(this.Label13); + this.pnltoolpreview.Widgets.Add(this.picpreview); + this.pnltoolpreview.Widgets.Add(this.lbltoolselected); + this.pnltoolpreview.Widgets.Add(this.line4); + this.pnltoolpreview.Widgets.Add(this.line2); + this.pnltoolpreview.Dock = ShiftUI.DockStyle.Bottom; this.pnltoolpreview.Location = new System.Drawing.Point(0, 498); this.pnltoolpreview.Name = "pnltoolpreview"; this.pnltoolpreview.Size = new System.Drawing.Size(120, 100); @@ -3234,7 +3234,7 @@ // line4 // this.line4.BackColor = System.Drawing.Color.Black; - this.line4.Dock = System.Windows.Forms.DockStyle.Top; + this.line4.Dock = ShiftUI.DockStyle.Top; this.line4.Location = new System.Drawing.Point(0, 0); this.line4.Name = "line4"; this.line4.Size = new System.Drawing.Size(119, 1); @@ -3243,7 +3243,7 @@ // line2 // this.line2.BackColor = System.Drawing.Color.Black; - this.line2.Dock = System.Windows.Forms.DockStyle.Right; + this.line2.Dock = ShiftUI.DockStyle.Right; this.line2.Location = new System.Drawing.Point(119, 0); this.line2.Name = "line2"; this.line2.Size = new System.Drawing.Size(1, 100); @@ -3276,10 +3276,10 @@ // Artpad // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.AutoScaleMode = ShiftUI.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(802, 598); - 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(502, 398); this.Name = "Artpad"; this.Text = "ArtPad"; @@ -3322,268 +3322,268 @@ this.ResumeLayout(false); } - internal System.Windows.Forms.Panel pgcontents; - internal System.Windows.Forms.Panel pnlbottompanel; - internal System.Windows.Forms.Panel pnltoolproperties; - internal System.Windows.Forms.Panel pnlpallet; - internal System.Windows.Forms.Panel line3; - internal System.Windows.Forms.Panel line5; - internal System.Windows.Forms.Panel line6; - internal System.Windows.Forms.Panel pnldrawingbackground; - internal System.Windows.Forms.PictureBox picdrawingdisplay; - internal System.Windows.Forms.Button btnpixelsetter; - internal System.Windows.Forms.Panel pnlpixelsettersettings; - internal System.Windows.Forms.Label Label3; - internal System.Windows.Forms.Label Label2; - internal System.Windows.Forms.Label Label1; - internal System.Windows.Forms.Button btnpixelsettersetpixel; - internal System.Windows.Forms.TextBox txtpixelsetterycoordinate; - internal System.Windows.Forms.TextBox txtpixelsetterxcoordinate; - internal System.Windows.Forms.Button btnmagnify; - internal System.Windows.Forms.Panel colourpallet32; - internal System.Windows.Forms.Panel colourpallet31; - internal System.Windows.Forms.Panel colourpallet30; - internal System.Windows.Forms.Panel colourpallet29; - internal System.Windows.Forms.Panel colourpallet28; - internal System.Windows.Forms.Panel colourpallet26; - internal System.Windows.Forms.Panel colourpallet25; - internal System.Windows.Forms.Panel colourpallet23; - internal System.Windows.Forms.Panel colourpallet21; - internal System.Windows.Forms.Panel colourpallet19; - internal System.Windows.Forms.Panel colourpallet8; - internal System.Windows.Forms.Panel colourpallet6; - internal System.Windows.Forms.Panel colourpallet16; - internal System.Windows.Forms.Panel colourpallet14; - internal System.Windows.Forms.Panel colourpallet7; - internal System.Windows.Forms.Panel colourpallet5; - internal System.Windows.Forms.Panel colourpallet10; - internal System.Windows.Forms.Panel colourpallet9; - internal System.Windows.Forms.Panel colourpallet11; - internal System.Windows.Forms.Panel colourpallet12; - internal System.Windows.Forms.Panel colourpallet13; - internal System.Windows.Forms.Panel colourpallet15; - internal System.Windows.Forms.Panel colourpallet4; - internal System.Windows.Forms.Panel colourpallet3; - internal System.Windows.Forms.Panel colourpallet17; - internal System.Windows.Forms.Panel colourpallet18; - internal System.Windows.Forms.Panel colourpallet20; - internal System.Windows.Forms.Panel colourpallet22; - internal System.Windows.Forms.Panel colourpallet24; - internal System.Windows.Forms.Panel colourpallet2; - internal System.Windows.Forms.Panel colourpallet27; - internal System.Windows.Forms.Label Label4; - internal System.Windows.Forms.Panel colourpallet1; - internal System.Windows.Forms.Panel pnlmagnifiersettings; - internal System.Windows.Forms.Button btnzoomin; - internal System.Windows.Forms.Label lblzoomlevel; - internal System.Windows.Forms.Label Label7; - internal System.Windows.Forms.Button btnzoomout; - internal System.Windows.Forms.Button btnpixelplacer; - internal System.Windows.Forms.Panel pnlpixelplacersettings; - internal System.Windows.Forms.Button btnpixelplacermovementmode; - internal System.Windows.Forms.Label Label8; - internal System.Windows.Forms.Label lblpixelplacerhelp; - internal System.Windows.Forms.Label Label6; - internal System.Windows.Forms.Label Label5; - internal System.Windows.Forms.Button btnnew; - internal System.Windows.Forms.FlowLayoutPanel flowcolours; - internal System.Windows.Forms.Button btnpencil; - internal System.Windows.Forms.Panel pnlpencilsettings; - internal System.Windows.Forms.Button btnpencilsize3; - internal System.Windows.Forms.Button btnpencilsize2; - internal System.Windows.Forms.Button btnpencilsize1; - internal System.Windows.Forms.Label Label14; - internal System.Windows.Forms.Button btnfloodfill; - internal System.Windows.Forms.Panel pnlfloodfillsettings; - internal System.Windows.Forms.Label Label12; - internal System.Windows.Forms.Label Label15; - internal System.Windows.Forms.Button btnsquare; - internal System.Windows.Forms.Panel pnlsquaretoolsettings; - internal System.Windows.Forms.TextBox txtsquareborderwidth; - internal System.Windows.Forms.Label Label16; - internal System.Windows.Forms.Label Label18; - internal System.Windows.Forms.Label Label17; - internal System.Windows.Forms.Button btnsquarefillonoff; - internal System.Windows.Forms.Panel pnlsquarefillcolour; - internal System.Windows.Forms.Label Label19; - internal System.Windows.Forms.Button btnoval; - internal System.Windows.Forms.Panel pnlovaltoolsettings; - internal System.Windows.Forms.Label Label20; - internal System.Windows.Forms.Button btnovalfillonoff; - internal System.Windows.Forms.Panel pnlovalfillcolour; - internal System.Windows.Forms.TextBox txtovalborderwidth; - internal System.Windows.Forms.Label Label21; - internal System.Windows.Forms.Label Label22; - internal System.Windows.Forms.Label Label23; - internal System.Windows.Forms.Panel pnltools; - internal System.Windows.Forms.FlowLayoutPanel pnltoolpositioner; - internal System.Windows.Forms.Panel line1; - internal System.Windows.Forms.Panel pnltoolpreview; - internal System.Windows.Forms.Label Label13; - internal System.Windows.Forms.PictureBox picpreview; - internal System.Windows.Forms.Label lbltoolselected; - internal System.Windows.Forms.Panel line4; - internal System.Windows.Forms.Panel line2; - internal System.Windows.Forms.Button btnopen; - internal System.Windows.Forms.Button btnsave; - internal System.Windows.Forms.Button btnundo; - internal System.Windows.Forms.Button btnredo; - internal System.Windows.Forms.Button btneracer; - internal System.Windows.Forms.Button btnlinetool; - internal System.Windows.Forms.Panel pnllinetoolsettings; - internal System.Windows.Forms.Label Label29; - internal System.Windows.Forms.TextBox txtlinewidth; - internal System.Windows.Forms.Label Label30; - internal System.Windows.Forms.Label Label31; - internal System.Windows.Forms.Panel pnleracertoolsettings; - internal System.Windows.Forms.Label Label28; - internal System.Windows.Forms.Button btneracersquare; - internal System.Windows.Forms.Button btneracercircle; - internal System.Windows.Forms.Label Label24; - internal System.Windows.Forms.TextBox txteracersize; - internal System.Windows.Forms.Label Label26; - internal System.Windows.Forms.Label Label27; - internal System.Windows.Forms.Button btntexttool; - internal System.Windows.Forms.Button btnpaintbrush; - internal System.Windows.Forms.Panel pnltexttoolsettings; - internal System.Windows.Forms.Label Label25; - internal System.Windows.Forms.TextBox txtdrawtextsize; - internal System.Windows.Forms.Label Label32; - internal System.Windows.Forms.Label Label33; - internal System.Windows.Forms.Label Label34; - internal System.Windows.Forms.ComboBox combodrawtextfont; - internal System.Windows.Forms.TextBox txtdrawstringtext; - internal System.Windows.Forms.ComboBox combofontstyle; - internal System.Windows.Forms.Label Label35; - internal System.Windows.Forms.Panel pnlpaintbrushtoolsettings; - internal System.Windows.Forms.Label Label36; - internal System.Windows.Forms.Button btnpaintsquareshape; - internal System.Windows.Forms.Button btnpaintcircleshape; - internal System.Windows.Forms.Label Label37; - internal System.Windows.Forms.TextBox txtpaintbrushsize; - internal System.Windows.Forms.Label Label38; - internal System.Windows.Forms.Label Label39; - internal System.Windows.Forms.Timer tmrcodepointcooldown; - internal System.Windows.Forms.Timer tmrshowearnedcodepoints; - internal System.Windows.Forms.Panel pnlpalletsize; - internal System.Windows.Forms.Button btnchangesizecancel; - internal System.Windows.Forms.Button btnsetsize; - internal System.Windows.Forms.TextBox txtcolorpalletheight; - internal System.Windows.Forms.Label Label42; - internal System.Windows.Forms.TextBox txtcolorpalletwidth; - internal System.Windows.Forms.Label Label43; - internal System.Windows.Forms.Panel pnlinitialcanvassettings; - internal System.Windows.Forms.Button btncancel; - internal System.Windows.Forms.Button btncreate; - internal System.Windows.Forms.Label Label11; - internal System.Windows.Forms.Label lbltotalpixels; - internal System.Windows.Forms.TextBox txtnewcanvasheight; - internal System.Windows.Forms.Label Label10; - internal System.Windows.Forms.TextBox txtnewcanvaswidth; - internal System.Windows.Forms.Label Label9; - internal System.Windows.Forms.Panel colourpallet33; - internal System.Windows.Forms.Panel colourpallet34; - internal System.Windows.Forms.Panel colourpallet35; - internal System.Windows.Forms.Panel colourpallet36; - internal System.Windows.Forms.Panel colourpallet37; - internal System.Windows.Forms.Panel colourpallet38; - internal System.Windows.Forms.Panel colourpallet39; - internal System.Windows.Forms.Panel colourpallet40; - internal System.Windows.Forms.Panel colourpallet41; - internal System.Windows.Forms.Panel colourpallet42; - internal System.Windows.Forms.Panel colourpallet43; - internal System.Windows.Forms.Panel colourpallet44; - internal System.Windows.Forms.Panel colourpallet45; - internal System.Windows.Forms.Panel colourpallet46; - internal System.Windows.Forms.Panel colourpallet47; - internal System.Windows.Forms.Panel colourpallet48; - internal System.Windows.Forms.Panel colourpallet49; - internal System.Windows.Forms.Panel colourpallet50; - internal System.Windows.Forms.Panel colourpallet51; - internal System.Windows.Forms.Panel colourpallet52; - internal System.Windows.Forms.Panel colourpallet53; - internal System.Windows.Forms.Panel colourpallet54; - internal System.Windows.Forms.Panel colourpallet55; - internal System.Windows.Forms.Panel colourpallet56; - internal System.Windows.Forms.Panel colourpallet57; - internal System.Windows.Forms.Panel colourpallet58; - internal System.Windows.Forms.Panel colourpallet59; - internal System.Windows.Forms.Panel colourpallet60; - internal System.Windows.Forms.Panel colourpallet61; - internal System.Windows.Forms.Panel colourpallet62; - internal System.Windows.Forms.Panel colourpallet63; - internal System.Windows.Forms.Panel colourpallet64; - internal System.Windows.Forms.Panel colourpallet65; - internal System.Windows.Forms.Panel colourpallet66; - internal System.Windows.Forms.Panel colourpallet67; - internal System.Windows.Forms.Panel colourpallet68; - internal System.Windows.Forms.Panel colourpallet69; - internal System.Windows.Forms.Panel colourpallet70; - internal System.Windows.Forms.Panel colourpallet71; - internal System.Windows.Forms.Panel colourpallet72; - internal System.Windows.Forms.Panel colourpallet73; - internal System.Windows.Forms.Panel colourpallet74; - internal System.Windows.Forms.Panel colourpallet75; - internal System.Windows.Forms.Panel colourpallet76; - internal System.Windows.Forms.Panel colourpallet77; - internal System.Windows.Forms.Panel colourpallet78; - internal System.Windows.Forms.Panel colourpallet79; - internal System.Windows.Forms.Panel colourpallet80; - internal System.Windows.Forms.Panel colourpallet81; - internal System.Windows.Forms.Panel colourpallet82; - internal System.Windows.Forms.Panel colourpallet83; - internal System.Windows.Forms.Panel colourpallet84; - internal System.Windows.Forms.Panel colourpallet85; - internal System.Windows.Forms.Panel colourpallet86; - internal System.Windows.Forms.Panel colourpallet87; - internal System.Windows.Forms.Panel colourpallet88; - internal System.Windows.Forms.Panel colourpallet89; - internal System.Windows.Forms.Panel colourpallet90; - internal System.Windows.Forms.Panel colourpallet91; - internal System.Windows.Forms.Panel colourpallet92; - internal System.Windows.Forms.Panel colourpallet93; - internal System.Windows.Forms.Panel colourpallet94; - internal System.Windows.Forms.Panel colourpallet95; - internal System.Windows.Forms.Panel colourpallet96; - internal System.Windows.Forms.Panel colourpallet97; - internal System.Windows.Forms.Panel colourpallet98; - internal System.Windows.Forms.Panel colourpallet99; - internal System.Windows.Forms.Panel colourpallet100; - internal System.Windows.Forms.Panel colourpallet101; - internal System.Windows.Forms.Panel colourpallet102; - internal System.Windows.Forms.Panel colourpallet103; - internal System.Windows.Forms.Panel colourpallet104; - internal System.Windows.Forms.Panel colourpallet105; - internal System.Windows.Forms.Panel colourpallet106; - internal System.Windows.Forms.Panel colourpallet107; - internal System.Windows.Forms.Panel colourpallet108; - internal System.Windows.Forms.Panel colourpallet109; - internal System.Windows.Forms.Panel colourpallet110; - internal System.Windows.Forms.Panel colourpallet111; - internal System.Windows.Forms.Panel colourpallet112; - internal System.Windows.Forms.Panel colourpallet113; - internal System.Windows.Forms.Panel colourpallet114; - internal System.Windows.Forms.Panel colourpallet115; - internal System.Windows.Forms.Panel colourpallet116; - internal System.Windows.Forms.Panel colourpallet117; - internal System.Windows.Forms.Panel colourpallet118; - internal System.Windows.Forms.Panel colourpallet119; - internal System.Windows.Forms.Panel colourpallet120; - internal System.Windows.Forms.Panel colourpallet121; - internal System.Windows.Forms.Panel colourpallet122; - internal System.Windows.Forms.Panel colourpallet123; - internal System.Windows.Forms.Panel colourpallet124; - internal System.Windows.Forms.Panel colourpallet125; - internal System.Windows.Forms.Panel colourpallet126; - internal System.Windows.Forms.Panel colourpallet127; - internal System.Windows.Forms.Panel colourpallet128; - internal System.Windows.Forms.TextBox txttopspace; - internal System.Windows.Forms.Label Label40; - internal System.Windows.Forms.TextBox txtsidespace; - internal System.Windows.Forms.Label Label41; - internal System.Windows.Forms.Timer pullbs; - internal System.Windows.Forms.Timer pullbottom; - internal System.Windows.Forms.Timer pullside; - private System.Windows.Forms.Timer tmrsetupui; + internal ShiftUI.Panel pgcontents; + internal ShiftUI.Panel pnlbottompanel; + internal ShiftUI.Panel pnltoolproperties; + internal ShiftUI.Panel pnlpallet; + internal ShiftUI.Panel line3; + internal ShiftUI.Panel line5; + internal ShiftUI.Panel line6; + internal ShiftUI.Panel pnldrawingbackground; + internal ShiftUI.PictureBox picdrawingdisplay; + internal ShiftUI.Button btnpixelsetter; + internal ShiftUI.Panel pnlpixelsettersettings; + internal ShiftUI.Label Label3; + internal ShiftUI.Label Label2; + internal ShiftUI.Label Label1; + internal ShiftUI.Button btnpixelsettersetpixel; + internal ShiftUI.TextBox txtpixelsetterycoordinate; + internal ShiftUI.TextBox txtpixelsetterxcoordinate; + internal ShiftUI.Button btnmagnify; + internal ShiftUI.Panel colourpallet32; + internal ShiftUI.Panel colourpallet31; + internal ShiftUI.Panel colourpallet30; + internal ShiftUI.Panel colourpallet29; + internal ShiftUI.Panel colourpallet28; + internal ShiftUI.Panel colourpallet26; + internal ShiftUI.Panel colourpallet25; + internal ShiftUI.Panel colourpallet23; + internal ShiftUI.Panel colourpallet21; + internal ShiftUI.Panel colourpallet19; + internal ShiftUI.Panel colourpallet8; + internal ShiftUI.Panel colourpallet6; + internal ShiftUI.Panel colourpallet16; + internal ShiftUI.Panel colourpallet14; + internal ShiftUI.Panel colourpallet7; + internal ShiftUI.Panel colourpallet5; + internal ShiftUI.Panel colourpallet10; + internal ShiftUI.Panel colourpallet9; + internal ShiftUI.Panel colourpallet11; + internal ShiftUI.Panel colourpallet12; + internal ShiftUI.Panel colourpallet13; + internal ShiftUI.Panel colourpallet15; + internal ShiftUI.Panel colourpallet4; + internal ShiftUI.Panel colourpallet3; + internal ShiftUI.Panel colourpallet17; + internal ShiftUI.Panel colourpallet18; + internal ShiftUI.Panel colourpallet20; + internal ShiftUI.Panel colourpallet22; + internal ShiftUI.Panel colourpallet24; + internal ShiftUI.Panel colourpallet2; + internal ShiftUI.Panel colourpallet27; + internal ShiftUI.Label Label4; + internal ShiftUI.Panel colourpallet1; + internal ShiftUI.Panel pnlmagnifiersettings; + internal ShiftUI.Button btnzoomin; + internal ShiftUI.Label lblzoomlevel; + internal ShiftUI.Label Label7; + internal ShiftUI.Button btnzoomout; + internal ShiftUI.Button btnpixelplacer; + internal ShiftUI.Panel pnlpixelplacersettings; + internal ShiftUI.Button btnpixelplacermovementmode; + internal ShiftUI.Label Label8; + internal ShiftUI.Label lblpixelplacerhelp; + internal ShiftUI.Label Label6; + internal ShiftUI.Label Label5; + internal ShiftUI.Button btnnew; + internal ShiftUI.FlowLayoutPanel flowcolours; + internal ShiftUI.Button btnpencil; + internal ShiftUI.Panel pnlpencilsettings; + internal ShiftUI.Button btnpencilsize3; + internal ShiftUI.Button btnpencilsize2; + internal ShiftUI.Button btnpencilsize1; + internal ShiftUI.Label Label14; + internal ShiftUI.Button btnfloodfill; + internal ShiftUI.Panel pnlfloodfillsettings; + internal ShiftUI.Label Label12; + internal ShiftUI.Label Label15; + internal ShiftUI.Button btnsquare; + internal ShiftUI.Panel pnlsquaretoolsettings; + internal ShiftUI.TextBox txtsquareborderwidth; + internal ShiftUI.Label Label16; + internal ShiftUI.Label Label18; + internal ShiftUI.Label Label17; + internal ShiftUI.Button btnsquarefillonoff; + internal ShiftUI.Panel pnlsquarefillcolour; + internal ShiftUI.Label Label19; + internal ShiftUI.Button btnoval; + internal ShiftUI.Panel pnlovaltoolsettings; + internal ShiftUI.Label Label20; + internal ShiftUI.Button btnovalfillonoff; + internal ShiftUI.Panel pnlovalfillcolour; + internal ShiftUI.TextBox txtovalborderwidth; + internal ShiftUI.Label Label21; + internal ShiftUI.Label Label22; + internal ShiftUI.Label Label23; + internal ShiftUI.Panel pnltools; + internal ShiftUI.FlowLayoutPanel pnltoolpositioner; + internal ShiftUI.Panel line1; + internal ShiftUI.Panel pnltoolpreview; + internal ShiftUI.Label Label13; + internal ShiftUI.PictureBox picpreview; + internal ShiftUI.Label lbltoolselected; + internal ShiftUI.Panel line4; + internal ShiftUI.Panel line2; + internal ShiftUI.Button btnopen; + internal ShiftUI.Button btnsave; + internal ShiftUI.Button btnundo; + internal ShiftUI.Button btnredo; + internal ShiftUI.Button btneracer; + internal ShiftUI.Button btnlinetool; + internal ShiftUI.Panel pnllinetoolsettings; + internal ShiftUI.Label Label29; + internal ShiftUI.TextBox txtlinewidth; + internal ShiftUI.Label Label30; + internal ShiftUI.Label Label31; + internal ShiftUI.Panel pnleracertoolsettings; + internal ShiftUI.Label Label28; + internal ShiftUI.Button btneracersquare; + internal ShiftUI.Button btneracercircle; + internal ShiftUI.Label Label24; + internal ShiftUI.TextBox txteracersize; + internal ShiftUI.Label Label26; + internal ShiftUI.Label Label27; + internal ShiftUI.Button btntexttool; + internal ShiftUI.Button btnpaintbrush; + internal ShiftUI.Panel pnltexttoolsettings; + internal ShiftUI.Label Label25; + internal ShiftUI.TextBox txtdrawtextsize; + internal ShiftUI.Label Label32; + internal ShiftUI.Label Label33; + internal ShiftUI.Label Label34; + internal ShiftUI.ComboBox combodrawtextfont; + internal ShiftUI.TextBox txtdrawstringtext; + internal ShiftUI.ComboBox combofontstyle; + internal ShiftUI.Label Label35; + internal ShiftUI.Panel pnlpaintbrushtoolsettings; + internal ShiftUI.Label Label36; + internal ShiftUI.Button btnpaintsquareshape; + internal ShiftUI.Button btnpaintcircleshape; + internal ShiftUI.Label Label37; + internal ShiftUI.TextBox txtpaintbrushsize; + internal ShiftUI.Label Label38; + internal ShiftUI.Label Label39; + internal ShiftUI.Timer tmrcodepointcooldown; + internal ShiftUI.Timer tmrshowearnedcodepoints; + internal ShiftUI.Panel pnlpalletsize; + internal ShiftUI.Button btnchangesizecancel; + internal ShiftUI.Button btnsetsize; + internal ShiftUI.TextBox txtcolorpalletheight; + internal ShiftUI.Label Label42; + internal ShiftUI.TextBox txtcolorpalletwidth; + internal ShiftUI.Label Label43; + internal ShiftUI.Panel pnlinitialcanvassettings; + internal ShiftUI.Button btncancel; + internal ShiftUI.Button btncreate; + internal ShiftUI.Label Label11; + internal ShiftUI.Label lbltotalpixels; + internal ShiftUI.TextBox txtnewcanvasheight; + internal ShiftUI.Label Label10; + internal ShiftUI.TextBox txtnewcanvaswidth; + internal ShiftUI.Label Label9; + internal ShiftUI.Panel colourpallet33; + internal ShiftUI.Panel colourpallet34; + internal ShiftUI.Panel colourpallet35; + internal ShiftUI.Panel colourpallet36; + internal ShiftUI.Panel colourpallet37; + internal ShiftUI.Panel colourpallet38; + internal ShiftUI.Panel colourpallet39; + internal ShiftUI.Panel colourpallet40; + internal ShiftUI.Panel colourpallet41; + internal ShiftUI.Panel colourpallet42; + internal ShiftUI.Panel colourpallet43; + internal ShiftUI.Panel colourpallet44; + internal ShiftUI.Panel colourpallet45; + internal ShiftUI.Panel colourpallet46; + internal ShiftUI.Panel colourpallet47; + internal ShiftUI.Panel colourpallet48; + internal ShiftUI.Panel colourpallet49; + internal ShiftUI.Panel colourpallet50; + internal ShiftUI.Panel colourpallet51; + internal ShiftUI.Panel colourpallet52; + internal ShiftUI.Panel colourpallet53; + internal ShiftUI.Panel colourpallet54; + internal ShiftUI.Panel colourpallet55; + internal ShiftUI.Panel colourpallet56; + internal ShiftUI.Panel colourpallet57; + internal ShiftUI.Panel colourpallet58; + internal ShiftUI.Panel colourpallet59; + internal ShiftUI.Panel colourpallet60; + internal ShiftUI.Panel colourpallet61; + internal ShiftUI.Panel colourpallet62; + internal ShiftUI.Panel colourpallet63; + internal ShiftUI.Panel colourpallet64; + internal ShiftUI.Panel colourpallet65; + internal ShiftUI.Panel colourpallet66; + internal ShiftUI.Panel colourpallet67; + internal ShiftUI.Panel colourpallet68; + internal ShiftUI.Panel colourpallet69; + internal ShiftUI.Panel colourpallet70; + internal ShiftUI.Panel colourpallet71; + internal ShiftUI.Panel colourpallet72; + internal ShiftUI.Panel colourpallet73; + internal ShiftUI.Panel colourpallet74; + internal ShiftUI.Panel colourpallet75; + internal ShiftUI.Panel colourpallet76; + internal ShiftUI.Panel colourpallet77; + internal ShiftUI.Panel colourpallet78; + internal ShiftUI.Panel colourpallet79; + internal ShiftUI.Panel colourpallet80; + internal ShiftUI.Panel colourpallet81; + internal ShiftUI.Panel colourpallet82; + internal ShiftUI.Panel colourpallet83; + internal ShiftUI.Panel colourpallet84; + internal ShiftUI.Panel colourpallet85; + internal ShiftUI.Panel colourpallet86; + internal ShiftUI.Panel colourpallet87; + internal ShiftUI.Panel colourpallet88; + internal ShiftUI.Panel colourpallet89; + internal ShiftUI.Panel colourpallet90; + internal ShiftUI.Panel colourpallet91; + internal ShiftUI.Panel colourpallet92; + internal ShiftUI.Panel colourpallet93; + internal ShiftUI.Panel colourpallet94; + internal ShiftUI.Panel colourpallet95; + internal ShiftUI.Panel colourpallet96; + internal ShiftUI.Panel colourpallet97; + internal ShiftUI.Panel colourpallet98; + internal ShiftUI.Panel colourpallet99; + internal ShiftUI.Panel colourpallet100; + internal ShiftUI.Panel colourpallet101; + internal ShiftUI.Panel colourpallet102; + internal ShiftUI.Panel colourpallet103; + internal ShiftUI.Panel colourpallet104; + internal ShiftUI.Panel colourpallet105; + internal ShiftUI.Panel colourpallet106; + internal ShiftUI.Panel colourpallet107; + internal ShiftUI.Panel colourpallet108; + internal ShiftUI.Panel colourpallet109; + internal ShiftUI.Panel colourpallet110; + internal ShiftUI.Panel colourpallet111; + internal ShiftUI.Panel colourpallet112; + internal ShiftUI.Panel colourpallet113; + internal ShiftUI.Panel colourpallet114; + internal ShiftUI.Panel colourpallet115; + internal ShiftUI.Panel colourpallet116; + internal ShiftUI.Panel colourpallet117; + internal ShiftUI.Panel colourpallet118; + internal ShiftUI.Panel colourpallet119; + internal ShiftUI.Panel colourpallet120; + internal ShiftUI.Panel colourpallet121; + internal ShiftUI.Panel colourpallet122; + internal ShiftUI.Panel colourpallet123; + internal ShiftUI.Panel colourpallet124; + internal ShiftUI.Panel colourpallet125; + internal ShiftUI.Panel colourpallet126; + internal ShiftUI.Panel colourpallet127; + internal ShiftUI.Panel colourpallet128; + internal ShiftUI.TextBox txttopspace; + internal ShiftUI.Label Label40; + internal ShiftUI.TextBox txtsidespace; + internal ShiftUI.Label Label41; + internal ShiftUI.Timer pullbs; + internal ShiftUI.Timer pullbottom; + internal ShiftUI.Timer pullside; + private ShiftUI.Timer tmrsetupui; } } \ No newline at end of file -- cgit v1.2.3 From f1856e8ed30ed882229fd3fa2a4038122a5fb441 Mon Sep 17 00:00:00 2001 From: MichaelTheShifter Date: Wed, 20 Jul 2016 09:17:10 -0400 Subject: Fix graphical glitch with buttons. This glitch has been prevelant ever since ShiftOS first had Knowledge Input. And I don't mean 0.1.0, I mean all the way back before 0.0.5 when OSFirstTimer was developing it. Basically, buttons would show light gray backgrounds when you click on them. Now they show black (and it's skinnable :D) --- source/WindowsFormsApplication1/API.cs | 2 +- .../Apps/Appscape.Designer.cs | 24 ++++---- .../Apps/AppscapeUploader.Designer.cs | 18 +++--- .../Apps/Artpad.Designer.cs | 70 +++++++++++----------- .../Apps/BitnoteConverter.Designer.cs | 2 +- .../Apps/BitnoteDigger.Designer.cs | 10 ++-- .../Apps/BitnoteWallet.Designer.cs | 4 +- .../Apps/HoloChat.Designer.cs | 4 +- .../Apps/IconManager.Designer.cs | 6 +- .../Apps/KnowledgeInput.Designer.cs | 2 +- .../Apps/NameChanger.Designer.cs | 6 +- .../Apps/NetGen.Designer.cs | 22 +++---- .../Apps/NetworkBrowser.Designer.cs | 10 ++-- .../Apps/PanelManager.Designer.cs | 2 +- .../WindowsFormsApplication1/Apps/Pong.Designer.cs | 10 ++-- .../Apps/Shifter.Designer.cs | 56 ++++++++--------- source/WindowsFormsApplication1/Apps/Shifter.cs | 2 +- .../Apps/Shiftnet.Designer.cs | 4 +- .../Apps/ShiftnetDecryptor.Designer.cs | 2 +- .../Apps/Shiftorium.Designer.cs | 8 +-- .../Apps/SkinLoader.Designer.cs | 14 ++--- .../Apps/TextPad.Designer.cs | 6 +- .../Apps/WidgetManager.Designer.cs | 8 +-- .../Controls/ImageSelector.Designer.cs | 2 +- .../Controls/infobox.Designer.cs | 6 +- .../CreditScroller.Designer.cs | 2 +- .../Dialogs/Graphic_Picker.Designer.cs | 20 +++---- .../WindowsFormsApplication1/Engine/Lua_Interp.cs | 15 ++++- .../FinalMission/ChooseYourApproach.Designer.cs | 8 +-- .../FinalMission/MissionGuide.Designer.cs | 2 +- .../Gameplay/HackUI.Designer.cs | 22 +++---- .../Gameplay/HijackScreen.Designer.cs | 2 +- .../WindowsFormsApplication1/SkinEngine/skins.cs | 12 ++-- 33 files changed, 199 insertions(+), 184 deletions(-) (limited to 'source/WindowsFormsApplication1/Apps/Artpad.Designer.cs') diff --git a/source/WindowsFormsApplication1/API.cs b/source/WindowsFormsApplication1/API.cs index 27625bd..6ce59f3 100644 --- a/source/WindowsFormsApplication1/API.cs +++ b/source/WindowsFormsApplication1/API.cs @@ -124,7 +124,7 @@ namespace ShiftOS if(c is Button) { var b = c as Button; - b.FlatStyle = FlatStyle.Flat; + b.FlatStyle = FlatStyle.Standard; } if(c is Panel || c is FlowLayoutPanel) { diff --git a/source/WindowsFormsApplication1/Apps/Appscape.Designer.cs b/source/WindowsFormsApplication1/Apps/Appscape.Designer.cs index 3ba0488..9f789fa 100644 --- a/source/WindowsFormsApplication1/Apps/Appscape.Designer.cs +++ b/source/WindowsFormsApplication1/Apps/Appscape.Designer.cs @@ -134,7 +134,7 @@ // btnrequest // this.btnrequest.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right))); - this.btnrequest.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnrequest.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnrequest.Font = new System.Drawing.Font("Times New Roman", 8.25F); this.btnrequest.Location = new System.Drawing.Point(799, 385); this.btnrequest.Name = "btnrequest"; @@ -218,7 +218,7 @@ this.btndonecustomizing.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right))); this.btndonecustomizing.AutoSize = true; this.btndonecustomizing.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink; - this.btndonecustomizing.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btndonecustomizing.FlatStyle = ShiftUI.FlatStyle.Standard; this.btndonecustomizing.Font = new System.Drawing.Font("Times New Roman", 10F); this.btndonecustomizing.Location = new System.Drawing.Point(824, 385); this.btndonecustomizing.Name = "btndonecustomizing"; @@ -232,7 +232,7 @@ // this.btnsaa.AutoSize = true; this.btnsaa.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink; - this.btnsaa.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnsaa.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnsaa.Font = new System.Drawing.Font("Times New Roman", 10F); this.btnsaa.Location = new System.Drawing.Point(99, 318); this.btnsaa.Name = "btnsaa"; @@ -274,7 +274,7 @@ // this.cbsell.Appearance = ShiftUI.Appearance.Button; this.cbsell.AutoSize = true; - this.cbsell.FlatStyle = ShiftUI.FlatStyle.Flat; + this.cbsell.FlatStyle = ShiftUI.FlatStyle.Standard; this.cbsell.Font = new System.Drawing.Font("Times New Roman", 8.25F); this.cbsell.Location = new System.Drawing.Point(97, 263); this.cbsell.Name = "cbsell"; @@ -355,7 +355,7 @@ // btnedit // this.btnedit.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left))); - this.btnedit.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnedit.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnedit.Location = new System.Drawing.Point(239, 377); this.btnedit.Name = "btnedit"; this.btnedit.Size = new System.Drawing.Size(75, 23); @@ -367,7 +367,7 @@ // btnupload // this.btnupload.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left))); - this.btnupload.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnupload.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnupload.Location = new System.Drawing.Point(320, 377); this.btnupload.Name = "btnupload"; this.btnupload.Size = new System.Drawing.Size(75, 23); @@ -379,7 +379,7 @@ // btnsave // this.btnsave.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right))); - this.btnsave.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnsave.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnsave.Font = new System.Drawing.Font("Times New Roman", 8.25F); this.btnsave.Location = new System.Drawing.Point(799, 390); this.btnsave.Name = "btnsave"; @@ -596,7 +596,7 @@ // // btndownload // - this.btndownload.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btndownload.FlatStyle = ShiftUI.FlatStyle.Standard; this.btndownload.Font = new System.Drawing.Font("Times New Roman", 8.25F); this.btndownload.Location = new System.Drawing.Point(112, 13); this.btndownload.Name = "btndownload"; @@ -684,7 +684,7 @@ // // btnlounge // - this.btnlounge.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnlounge.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnlounge.Font = new System.Drawing.Font("Times New Roman", 8.25F); this.btnlounge.Location = new System.Drawing.Point(377, 14); this.btnlounge.Name = "btnlounge"; @@ -706,7 +706,7 @@ // // btngetkey // - this.btngetkey.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btngetkey.FlatStyle = ShiftUI.FlatStyle.Standard; this.btngetkey.Font = new System.Drawing.Font("Times New Roman", 8.25F); this.btngetkey.Location = new System.Drawing.Point(296, 14); this.btngetkey.Name = "btngetkey"; @@ -736,7 +736,7 @@ // // btnskins // - this.btnskins.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnskins.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnskins.Font = new System.Drawing.Font("Times New Roman", 10F); this.btnskins.Location = new System.Drawing.Point(86, 4); this.btnskins.Name = "btnskins"; @@ -748,7 +748,7 @@ // // btnapps // - this.btnapps.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnapps.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnapps.Font = new System.Drawing.Font("Times New Roman", 10F); this.btnapps.Location = new System.Drawing.Point(4, 4); this.btnapps.Name = "btnapps"; diff --git a/source/WindowsFormsApplication1/Apps/AppscapeUploader.Designer.cs b/source/WindowsFormsApplication1/Apps/AppscapeUploader.Designer.cs index e246978..0e47c1c 100644 --- a/source/WindowsFormsApplication1/Apps/AppscapeUploader.Designer.cs +++ b/source/WindowsFormsApplication1/Apps/AppscapeUploader.Designer.cs @@ -140,7 +140,7 @@ // this.cbsell.Appearance = ShiftUI.Appearance.Button; this.cbsell.AutoSize = true; - this.cbsell.FlatStyle = ShiftUI.FlatStyle.Flat; + this.cbsell.FlatStyle = ShiftUI.FlatStyle.Standard; this.cbsell.Font = new System.Drawing.Font("Times New Roman", 8.25F); this.cbsell.Location = new System.Drawing.Point(98, 235); this.cbsell.Name = "cbsell"; @@ -206,7 +206,7 @@ this.btncompilesaa.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left))); this.btncompilesaa.AutoSize = true; this.btncompilesaa.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink; - this.btncompilesaa.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btncompilesaa.FlatStyle = ShiftUI.FlatStyle.Standard; this.btncompilesaa.Font = new System.Drawing.Font("Times New Roman", 8.25F); this.btncompilesaa.Location = new System.Drawing.Point(4, 282); this.btncompilesaa.Name = "btncompilesaa"; @@ -220,7 +220,7 @@ // this.btnscreenshot.AutoSize = true; this.btnscreenshot.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink; - this.btnscreenshot.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnscreenshot.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnscreenshot.Font = new System.Drawing.Font("Times New Roman", 8.25F); this.btnscreenshot.Location = new System.Drawing.Point(12, 76); this.btnscreenshot.Name = "btnscreenshot"; @@ -234,7 +234,7 @@ // this.btnicon.AutoSize = true; this.btnicon.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink; - this.btnicon.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnicon.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnicon.Font = new System.Drawing.Font("Times New Roman", 8.25F); this.btnicon.Location = new System.Drawing.Point(12, 44); this.btnicon.Name = "btnicon"; @@ -248,7 +248,7 @@ // this.btnsaa.AutoSize = true; this.btnsaa.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink; - this.btnsaa.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnsaa.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnsaa.Font = new System.Drawing.Font("Times New Roman", 8.25F); this.btnsaa.Location = new System.Drawing.Point(12, 9); this.btnsaa.Name = "btnsaa"; @@ -318,7 +318,7 @@ // this.btndone.AutoSize = true; this.btndone.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink; - this.btndone.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btndone.FlatStyle = ShiftUI.FlatStyle.Standard; this.btndone.Font = new System.Drawing.Font("Times New Roman", 8.25F); this.btndone.Location = new System.Drawing.Point(660, 3); this.btndone.Name = "btndone"; @@ -332,7 +332,7 @@ // this.btnnext.AutoSize = true; this.btnnext.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink; - this.btnnext.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnnext.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnnext.Font = new System.Drawing.Font("Times New Roman", 8.25F); this.btnnext.Location = new System.Drawing.Point(612, 3); this.btnnext.Name = "btnnext"; @@ -346,7 +346,7 @@ // this.btnback.AutoSize = true; this.btnback.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink; - this.btnback.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnback.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnback.Font = new System.Drawing.Font("Times New Roman", 8.25F); this.btnback.Location = new System.Drawing.Point(564, 3); this.btnback.Name = "btnback"; @@ -360,7 +360,7 @@ // this.btncancel.AutoSize = true; this.btncancel.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink; - this.btncancel.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btncancel.FlatStyle = ShiftUI.FlatStyle.Standard; this.btncancel.Font = new System.Drawing.Font("Times New Roman", 8.25F); this.btncancel.Location = new System.Drawing.Point(508, 3); this.btncancel.Name = "btncancel"; diff --git a/source/WindowsFormsApplication1/Apps/Artpad.Designer.cs b/source/WindowsFormsApplication1/Apps/Artpad.Designer.cs index dead4c0..f6a62cf 100644 --- a/source/WindowsFormsApplication1/Apps/Artpad.Designer.cs +++ b/source/WindowsFormsApplication1/Apps/Artpad.Designer.cs @@ -355,7 +355,7 @@ // // btncancel // - this.btncancel.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btncancel.FlatStyle = ShiftUI.FlatStyle.Standard; this.btncancel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btncancel.Location = new System.Drawing.Point(7, 66); this.btncancel.Name = "btncancel"; @@ -367,7 +367,7 @@ // // btncreate // - this.btncreate.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btncreate.FlatStyle = ShiftUI.FlatStyle.Standard; this.btncreate.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btncreate.Location = new System.Drawing.Point(114, 66); this.btncreate.Name = "btncreate"; @@ -502,7 +502,7 @@ // // btnchangesizecancel // - this.btnchangesizecancel.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnchangesizecancel.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnchangesizecancel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnchangesizecancel.Location = new System.Drawing.Point(7, 66); this.btnchangesizecancel.Name = "btnchangesizecancel"; @@ -513,7 +513,7 @@ // // btnsetsize // - this.btnsetsize.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnsetsize.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnsetsize.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnsetsize.Location = new System.Drawing.Point(133, 66); this.btnsetsize.Name = "btnsetsize"; @@ -2088,7 +2088,7 @@ // btnovalfillonoff // this.btnovalfillonoff.FlatAppearance.BorderColor = System.Drawing.Color.Black; - this.btnovalfillonoff.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnovalfillonoff.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnovalfillonoff.Location = new System.Drawing.Point(150, 64); this.btnovalfillonoff.Name = "btnovalfillonoff"; this.btnovalfillonoff.Size = new System.Drawing.Size(56, 28); @@ -2177,7 +2177,7 @@ // this.btneracersquare.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadsquarerubberselected; this.btneracersquare.FlatAppearance.BorderSize = 0; - this.btneracersquare.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btneracersquare.FlatStyle = ShiftUI.FlatStyle.Standard; this.btneracersquare.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btneracersquare.Location = new System.Drawing.Point(75, 21); this.btneracersquare.Margin = new ShiftUI.Padding(6, 6, 0, 0); @@ -2192,7 +2192,7 @@ // this.btneracercircle.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadcirclerubber; this.btneracercircle.FlatAppearance.BorderSize = 0; - this.btneracercircle.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btneracercircle.FlatStyle = ShiftUI.FlatStyle.Standard; this.btneracercircle.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btneracercircle.Location = new System.Drawing.Point(9, 21); this.btneracercircle.Margin = new ShiftUI.Padding(6, 6, 0, 0); @@ -2328,7 +2328,7 @@ this.btnpaintsquareshape.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadsquarerubber; this.btnpaintsquareshape.BackgroundImageLayout = ShiftUI.ImageLayout.Stretch; this.btnpaintsquareshape.FlatAppearance.BorderSize = 0; - this.btnpaintsquareshape.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnpaintsquareshape.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnpaintsquareshape.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnpaintsquareshape.Location = new System.Drawing.Point(69, 27); this.btnpaintsquareshape.Margin = new ShiftUI.Padding(6, 6, 0, 0); @@ -2344,7 +2344,7 @@ this.btnpaintcircleshape.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadcirclerubberselected; this.btnpaintcircleshape.BackgroundImageLayout = ShiftUI.ImageLayout.Stretch; this.btnpaintcircleshape.FlatAppearance.BorderSize = 0; - this.btnpaintcircleshape.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnpaintcircleshape.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnpaintcircleshape.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnpaintcircleshape.Location = new System.Drawing.Point(16, 27); this.btnpaintcircleshape.Margin = new ShiftUI.Padding(6, 6, 0, 0); @@ -2427,7 +2427,7 @@ // // combofontstyle // - this.combofontstyle.FlatStyle = ShiftUI.FlatStyle.Flat; + this.combofontstyle.FlatStyle = ShiftUI.FlatStyle.Standard; this.combofontstyle.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.combofontstyle.FormattingEnabled = true; this.combofontstyle.Items.AddRange(new object[] { @@ -2456,7 +2456,7 @@ // // combodrawtextfont // - this.combodrawtextfont.FlatStyle = ShiftUI.FlatStyle.Flat; + this.combodrawtextfont.FlatStyle = ShiftUI.FlatStyle.Standard; this.combodrawtextfont.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.combodrawtextfont.FormattingEnabled = true; this.combodrawtextfont.Location = new System.Drawing.Point(64, 68); @@ -2533,7 +2533,7 @@ // // btnpixelsettersetpixel // - this.btnpixelsettersetpixel.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnpixelsettersetpixel.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnpixelsettersetpixel.Font = new System.Drawing.Font("Microsoft Sans Serif", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnpixelsettersetpixel.Location = new System.Drawing.Point(215, 34); this.btnpixelsettersetpixel.Name = "btnpixelsettersetpixel"; @@ -2609,7 +2609,7 @@ // // btnzoomout // - this.btnzoomout.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnzoomout.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnzoomout.Font = new System.Drawing.Font("Microsoft Sans Serif", 27.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnzoomout.Location = new System.Drawing.Point(16, 33); this.btnzoomout.Name = "btnzoomout"; @@ -2621,7 +2621,7 @@ // // btnzoomin // - this.btnzoomin.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnzoomin.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnzoomin.Font = new System.Drawing.Font("Microsoft Sans Serif", 27.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnzoomin.Location = new System.Drawing.Point(313, 33); this.btnzoomin.Name = "btnzoomin"; @@ -2709,7 +2709,7 @@ // btnsquarefillonoff // this.btnsquarefillonoff.FlatAppearance.BorderColor = System.Drawing.Color.Black; - this.btnsquarefillonoff.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnsquarefillonoff.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnsquarefillonoff.Location = new System.Drawing.Point(150, 64); this.btnsquarefillonoff.Name = "btnsquarefillonoff"; this.btnsquarefillonoff.Size = new System.Drawing.Size(56, 28); @@ -2793,7 +2793,7 @@ // // btnpixelplacermovementmode // - this.btnpixelplacermovementmode.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnpixelplacermovementmode.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnpixelplacermovementmode.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnpixelplacermovementmode.Location = new System.Drawing.Point(312, 26); this.btnpixelplacermovementmode.Name = "btnpixelplacermovementmode"; @@ -2827,7 +2827,7 @@ // // btnpencilsize3 // - this.btnpencilsize3.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnpencilsize3.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnpencilsize3.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnpencilsize3.Location = new System.Drawing.Point(298, 30); this.btnpencilsize3.Name = "btnpencilsize3"; @@ -2839,7 +2839,7 @@ // // btnpencilsize2 // - this.btnpencilsize2.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnpencilsize2.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnpencilsize2.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnpencilsize2.Location = new System.Drawing.Point(165, 30); this.btnpencilsize2.Name = "btnpencilsize2"; @@ -2851,7 +2851,7 @@ // // btnpencilsize1 // - this.btnpencilsize1.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnpencilsize1.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnpencilsize1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnpencilsize1.Location = new System.Drawing.Point(30, 30); this.btnpencilsize1.Name = "btnpencilsize1"; @@ -2947,7 +2947,7 @@ // btnpixelsetter // this.btnpixelsetter.FlatAppearance.BorderSize = 0; - this.btnpixelsetter.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnpixelsetter.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnpixelsetter.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnpixelsetter.Location = new System.Drawing.Point(6, 6); this.btnpixelsetter.Margin = new ShiftUI.Padding(6, 6, 0, 0); @@ -2961,7 +2961,7 @@ // this.btnpixelplacer.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadpixelplacer; this.btnpixelplacer.FlatAppearance.BorderSize = 0; - this.btnpixelplacer.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnpixelplacer.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnpixelplacer.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnpixelplacer.Location = new System.Drawing.Point(62, 6); this.btnpixelplacer.Margin = new ShiftUI.Padding(6, 6, 0, 0); @@ -2975,7 +2975,7 @@ // this.btnpencil.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadpencil; this.btnpencil.FlatAppearance.BorderSize = 0; - this.btnpencil.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnpencil.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnpencil.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnpencil.Location = new System.Drawing.Point(6, 62); this.btnpencil.Margin = new ShiftUI.Padding(6, 6, 0, 0); @@ -2990,7 +2990,7 @@ // this.btnfloodfill.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadfloodfill; this.btnfloodfill.FlatAppearance.BorderSize = 0; - this.btnfloodfill.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnfloodfill.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnfloodfill.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnfloodfill.Location = new System.Drawing.Point(62, 62); this.btnfloodfill.Margin = new ShiftUI.Padding(6, 6, 0, 0); @@ -3004,7 +3004,7 @@ // this.btnoval.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadOval; this.btnoval.FlatAppearance.BorderSize = 0; - this.btnoval.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnoval.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnoval.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnoval.Location = new System.Drawing.Point(6, 118); this.btnoval.Margin = new ShiftUI.Padding(6, 6, 0, 0); @@ -3019,7 +3019,7 @@ // this.btnsquare.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadRectangle; this.btnsquare.FlatAppearance.BorderSize = 0; - this.btnsquare.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnsquare.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnsquare.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnsquare.Location = new System.Drawing.Point(62, 118); this.btnsquare.Margin = new ShiftUI.Padding(6, 6, 0, 0); @@ -3034,7 +3034,7 @@ // this.btnlinetool.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadlinetool; this.btnlinetool.FlatAppearance.BorderSize = 0; - this.btnlinetool.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnlinetool.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnlinetool.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnlinetool.Location = new System.Drawing.Point(6, 174); this.btnlinetool.Margin = new ShiftUI.Padding(6, 6, 0, 0); @@ -3049,7 +3049,7 @@ // this.btnpaintbrush.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadpaintbrush; this.btnpaintbrush.FlatAppearance.BorderSize = 0; - this.btnpaintbrush.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnpaintbrush.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnpaintbrush.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnpaintbrush.Location = new System.Drawing.Point(62, 174); this.btnpaintbrush.Margin = new ShiftUI.Padding(6, 6, 0, 0); @@ -3064,7 +3064,7 @@ // this.btntexttool.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadtexttool; this.btntexttool.FlatAppearance.BorderSize = 0; - this.btntexttool.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btntexttool.FlatStyle = ShiftUI.FlatStyle.Standard; this.btntexttool.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btntexttool.Location = new System.Drawing.Point(6, 230); this.btntexttool.Margin = new ShiftUI.Padding(6, 6, 0, 0); @@ -3079,7 +3079,7 @@ // this.btneracer.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPaderacer; this.btneracer.FlatAppearance.BorderSize = 0; - this.btneracer.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btneracer.FlatStyle = ShiftUI.FlatStyle.Standard; this.btneracer.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btneracer.Location = new System.Drawing.Point(62, 230); this.btneracer.Margin = new ShiftUI.Padding(6, 6, 0, 0); @@ -3094,7 +3094,7 @@ // this.btnnew.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadnew; this.btnnew.FlatAppearance.BorderSize = 0; - this.btnnew.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnnew.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnnew.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnnew.Location = new System.Drawing.Point(6, 286); this.btnnew.Margin = new ShiftUI.Padding(6, 6, 0, 0); @@ -3109,7 +3109,7 @@ // this.btnmagnify.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadmagnify; this.btnmagnify.FlatAppearance.BorderSize = 0; - this.btnmagnify.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnmagnify.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnmagnify.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnmagnify.Location = new System.Drawing.Point(62, 286); this.btnmagnify.Margin = new ShiftUI.Padding(6, 6, 0, 0); @@ -3124,7 +3124,7 @@ // this.btnopen.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadopen; this.btnopen.FlatAppearance.BorderSize = 0; - this.btnopen.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnopen.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnopen.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnopen.Location = new System.Drawing.Point(6, 342); this.btnopen.Margin = new ShiftUI.Padding(6, 6, 0, 0); @@ -3139,7 +3139,7 @@ // this.btnsave.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadsave; this.btnsave.FlatAppearance.BorderSize = 0; - this.btnsave.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnsave.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnsave.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnsave.Location = new System.Drawing.Point(62, 342); this.btnsave.Margin = new ShiftUI.Padding(6, 6, 0, 0); @@ -3154,7 +3154,7 @@ // this.btnundo.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadundo; this.btnundo.FlatAppearance.BorderSize = 0; - this.btnundo.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnundo.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnundo.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnundo.Location = new System.Drawing.Point(6, 398); this.btnundo.Margin = new ShiftUI.Padding(6, 6, 0, 0); @@ -3169,7 +3169,7 @@ // this.btnredo.BackgroundImage = global::ShiftOS.Properties.Resources.ArtPadredo; this.btnredo.FlatAppearance.BorderSize = 0; - this.btnredo.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnredo.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnredo.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnredo.Location = new System.Drawing.Point(62, 398); this.btnredo.Margin = new ShiftUI.Padding(6, 6, 0, 0); diff --git a/source/WindowsFormsApplication1/Apps/BitnoteConverter.Designer.cs b/source/WindowsFormsApplication1/Apps/BitnoteConverter.Designer.cs index 11e1ddc..515022e 100644 --- a/source/WindowsFormsApplication1/Apps/BitnoteConverter.Designer.cs +++ b/source/WindowsFormsApplication1/Apps/BitnoteConverter.Designer.cs @@ -60,7 +60,7 @@ // btnconvert // this.btnconvert.Dock = ShiftUI.DockStyle.Bottom; - this.btnconvert.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnconvert.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnconvert.Location = new System.Drawing.Point(0, 76); this.btnconvert.Name = "btnconvert"; this.btnconvert.Size = new System.Drawing.Size(229, 23); diff --git a/source/WindowsFormsApplication1/Apps/BitnoteDigger.Designer.cs b/source/WindowsFormsApplication1/Apps/BitnoteDigger.Designer.cs index e6489c9..ec89dc7 100644 --- a/source/WindowsFormsApplication1/Apps/BitnoteDigger.Designer.cs +++ b/source/WindowsFormsApplication1/Apps/BitnoteDigger.Designer.cs @@ -82,7 +82,7 @@ namespace ShiftOS // btnsend // this.btnsend.FlatAppearance.BorderColor = System.Drawing.Color.Black; - this.btnsend.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnsend.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnsend.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnsend.Location = new System.Drawing.Point(472, 181); this.btnsend.Name = "btnsend"; @@ -216,7 +216,7 @@ namespace ShiftOS // // btnturbomode // - this.btnturbomode.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnturbomode.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnturbomode.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnturbomode.Location = new System.Drawing.Point(6, 188); this.btnturbomode.Name = "btnturbomode"; @@ -228,7 +228,7 @@ namespace ShiftOS // // btnstop // - this.btnstop.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnstop.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnstop.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnstop.Location = new System.Drawing.Point(101, 156); this.btnstop.Name = "btnstop"; @@ -240,7 +240,7 @@ namespace ShiftOS // // btnstart // - this.btnstart.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnstart.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnstart.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnstart.Location = new System.Drawing.Point(6, 156); this.btnstart.Name = "btnstart"; @@ -282,7 +282,7 @@ namespace ShiftOS // // btnupgrade // - this.btnupgrade.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnupgrade.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnupgrade.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnupgrade.Location = new System.Drawing.Point(6, 223); this.btnupgrade.Name = "btnupgrade"; diff --git a/source/WindowsFormsApplication1/Apps/BitnoteWallet.Designer.cs b/source/WindowsFormsApplication1/Apps/BitnoteWallet.Designer.cs index f9eb9b1..b9fb91d 100644 --- a/source/WindowsFormsApplication1/Apps/BitnoteWallet.Designer.cs +++ b/source/WindowsFormsApplication1/Apps/BitnoteWallet.Designer.cs @@ -65,7 +65,7 @@ // btnsend // this.btnsend.BackgroundImageLayout = ShiftUI.ImageLayout.None; - this.btnsend.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnsend.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnsend.Font = new System.Drawing.Font("Times New Roman", 8.25F); this.btnsend.Location = new System.Drawing.Point(3, 3); this.btnsend.Name = "btnsend"; @@ -77,7 +77,7 @@ // // btnsync // - this.btnsync.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnsync.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnsync.Font = new System.Drawing.Font("Times New Roman", 8.25F); this.btnsync.Location = new System.Drawing.Point(84, 3); this.btnsync.Name = "btnsync"; diff --git a/source/WindowsFormsApplication1/Apps/HoloChat.Designer.cs b/source/WindowsFormsApplication1/Apps/HoloChat.Designer.cs index f141556..d8f6b8e 100644 --- a/source/WindowsFormsApplication1/Apps/HoloChat.Designer.cs +++ b/source/WindowsFormsApplication1/Apps/HoloChat.Designer.cs @@ -95,7 +95,7 @@ // // btnconnect // - this.btnconnect.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnconnect.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnconnect.Location = new System.Drawing.Point(272, 3); this.btnconnect.Name = "btnconnect"; this.btnconnect.Size = new System.Drawing.Size(75, 33); @@ -106,7 +106,7 @@ // // btnrefresh // - this.btnrefresh.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnrefresh.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnrefresh.Location = new System.Drawing.Point(191, 3); this.btnrefresh.Name = "btnrefresh"; this.btnrefresh.Size = new System.Drawing.Size(75, 33); diff --git a/source/WindowsFormsApplication1/Apps/IconManager.Designer.cs b/source/WindowsFormsApplication1/Apps/IconManager.Designer.cs index d933a96..0aebdb1 100644 --- a/source/WindowsFormsApplication1/Apps/IconManager.Designer.cs +++ b/source/WindowsFormsApplication1/Apps/IconManager.Designer.cs @@ -75,7 +75,7 @@ // btnsave // this.btnsave.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom))); - this.btnsave.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnsave.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnsave.Location = new System.Drawing.Point(3, 3); this.btnsave.Name = "btnsave"; this.btnsave.Size = new System.Drawing.Size(75, 35); @@ -87,7 +87,7 @@ // button1 // this.button1.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom))); - this.button1.FlatStyle = ShiftUI.FlatStyle.Flat; + this.button1.FlatStyle = ShiftUI.FlatStyle.Standard; this.button1.Location = new System.Drawing.Point(84, 3); this.button1.Name = "button1"; this.button1.Size = new System.Drawing.Size(75, 35); @@ -99,7 +99,7 @@ // button2 // this.button2.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom))); - this.button2.FlatStyle = ShiftUI.FlatStyle.Flat; + this.button2.FlatStyle = ShiftUI.FlatStyle.Standard; this.button2.Location = new System.Drawing.Point(165, 3); this.button2.Name = "button2"; this.button2.Size = new System.Drawing.Size(75, 35); diff --git a/source/WindowsFormsApplication1/Apps/KnowledgeInput.Designer.cs b/source/WindowsFormsApplication1/Apps/KnowledgeInput.Designer.cs index 89fc0b5..28d8cf1 100644 --- a/source/WindowsFormsApplication1/Apps/KnowledgeInput.Designer.cs +++ b/source/WindowsFormsApplication1/Apps/KnowledgeInput.Designer.cs @@ -194,7 +194,7 @@ namespace ShiftOS // // btnstart // - this.btnstart.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnstart.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnstart.Font = new System.Drawing.Font("Microsoft Sans Serif", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnstart.Location = new System.Drawing.Point(11, 198); this.btnstart.Name = "btnstart"; diff --git a/source/WindowsFormsApplication1/Apps/NameChanger.Designer.cs b/source/WindowsFormsApplication1/Apps/NameChanger.Designer.cs index cc092e0..bceea8c 100644 --- a/source/WindowsFormsApplication1/Apps/NameChanger.Designer.cs +++ b/source/WindowsFormsApplication1/Apps/NameChanger.Designer.cs @@ -75,7 +75,7 @@ // // btnapply // - this.btnapply.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnapply.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnapply.ForeColor = System.Drawing.Color.White; this.btnapply.Location = new System.Drawing.Point(3, 3); this.btnapply.Name = "btnapply"; @@ -87,7 +87,7 @@ // // btnload // - this.btnload.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnload.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnload.ForeColor = System.Drawing.Color.White; this.btnload.Location = new System.Drawing.Point(84, 3); this.btnload.Name = "btnload"; @@ -99,7 +99,7 @@ // // btnsave // - this.btnsave.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnsave.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnsave.ForeColor = System.Drawing.Color.White; this.btnsave.Location = new System.Drawing.Point(165, 3); this.btnsave.Name = "btnsave"; diff --git a/source/WindowsFormsApplication1/Apps/NetGen.Designer.cs b/source/WindowsFormsApplication1/Apps/NetGen.Designer.cs index 5f52096..4e6ddcd 100644 --- a/source/WindowsFormsApplication1/Apps/NetGen.Designer.cs +++ b/source/WindowsFormsApplication1/Apps/NetGen.Designer.cs @@ -125,7 +125,7 @@ this.btndelete.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right))); this.btndelete.AutoSize = true; this.btndelete.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink; - this.btndelete.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btndelete.FlatStyle = ShiftUI.FlatStyle.Standard; this.btndelete.Location = new System.Drawing.Point(106, 254); this.btndelete.Name = "btndelete"; this.btndelete.Size = new System.Drawing.Size(59, 23); @@ -156,7 +156,7 @@ this.btncloseinfo.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right))); this.btncloseinfo.AutoSize = true; this.btncloseinfo.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink; - this.btncloseinfo.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btncloseinfo.FlatStyle = ShiftUI.FlatStyle.Standard; this.btncloseinfo.Location = new System.Drawing.Point(327, 254); this.btncloseinfo.Name = "btncloseinfo"; this.btncloseinfo.Size = new System.Drawing.Size(52, 23); @@ -178,7 +178,7 @@ // this.btnaddmodule.AutoSize = true; this.btnaddmodule.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink; - this.btnaddmodule.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnaddmodule.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnaddmodule.Location = new System.Drawing.Point(3, 3); this.btnaddmodule.Name = "btnaddmodule"; this.btnaddmodule.Size = new System.Drawing.Size(87, 23); @@ -255,7 +255,7 @@ // this.cmbbuyable.BackColor = System.Drawing.Color.Black; this.cmbbuyable.DropDownStyle = ShiftUI.ComboBoxStyle.DropDownList; - this.cmbbuyable.FlatStyle = ShiftUI.FlatStyle.Flat; + this.cmbbuyable.FlatStyle = ShiftUI.FlatStyle.Standard; this.cmbbuyable.ForeColor = System.Drawing.Color.White; this.cmbbuyable.FormattingEnabled = true; this.cmbbuyable.Location = new System.Drawing.Point(12, 38); @@ -278,7 +278,7 @@ this.btndonebuying.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right))); this.btndonebuying.AutoSize = true; this.btndonebuying.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink; - this.btndonebuying.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btndonebuying.FlatStyle = ShiftUI.FlatStyle.Standard; this.btndonebuying.Location = new System.Drawing.Point(341, 273); this.btndonebuying.Name = "btndonebuying"; this.btndonebuying.Size = new System.Drawing.Size(38, 23); @@ -318,7 +318,7 @@ // this.cbdifficulty.BackColor = System.Drawing.Color.Black; this.cbdifficulty.DropDownStyle = ShiftUI.ComboBoxStyle.DropDownList; - this.cbdifficulty.FlatStyle = ShiftUI.FlatStyle.Flat; + this.cbdifficulty.FlatStyle = ShiftUI.FlatStyle.Standard; this.cbdifficulty.ForeColor = System.Drawing.Color.Green; this.cbdifficulty.FormattingEnabled = true; this.cbdifficulty.Items.AddRange(new object[] { @@ -423,7 +423,7 @@ // this.btnnext.AutoSize = true; this.btnnext.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink; - this.btnnext.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnnext.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnnext.Location = new System.Drawing.Point(846, 3); this.btnnext.Name = "btnnext"; this.btnnext.Size = new System.Drawing.Size(45, 23); @@ -436,7 +436,7 @@ // this.btnback.AutoSize = true; this.btnback.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink; - this.btnback.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnback.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnback.Location = new System.Drawing.Point(795, 3); this.btnback.Name = "btnback"; this.btnback.Size = new System.Drawing.Size(45, 23); @@ -481,7 +481,7 @@ this.btnloadfromtemplate.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right))); this.btnloadfromtemplate.AutoSize = true; this.btnloadfromtemplate.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink; - this.btnloadfromtemplate.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnloadfromtemplate.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnloadfromtemplate.Location = new System.Drawing.Point(683, 47); this.btnloadfromtemplate.Name = "btnloadfromtemplate"; this.btnloadfromtemplate.Size = new System.Drawing.Size(199, 23); @@ -517,7 +517,7 @@ // this.cbnets.BackColor = System.Drawing.Color.Black; this.cbnets.DropDownStyle = ShiftUI.ComboBoxStyle.DropDownList; - this.cbnets.FlatStyle = ShiftUI.FlatStyle.Flat; + this.cbnets.FlatStyle = ShiftUI.FlatStyle.Standard; this.cbnets.ForeColor = System.Drawing.Color.White; this.cbnets.FormattingEnabled = true; this.cbnets.Location = new System.Drawing.Point(12, 38); @@ -539,7 +539,7 @@ this.btnrecreate.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right))); this.btnrecreate.AutoSize = true; this.btnrecreate.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink; - this.btnrecreate.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnrecreate.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnrecreate.Location = new System.Drawing.Point(334, 273); this.btnrecreate.Name = "btnrecreate"; this.btnrecreate.Size = new System.Drawing.Size(45, 23); diff --git a/source/WindowsFormsApplication1/Apps/NetworkBrowser.Designer.cs b/source/WindowsFormsApplication1/Apps/NetworkBrowser.Designer.cs index 498d57a..89b6cfa 100644 --- a/source/WindowsFormsApplication1/Apps/NetworkBrowser.Designer.cs +++ b/source/WindowsFormsApplication1/Apps/NetworkBrowser.Designer.cs @@ -97,7 +97,7 @@ // this.btnjoinlobby.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left))); this.btnjoinlobby.Enabled = false; - this.btnjoinlobby.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnjoinlobby.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnjoinlobby.Location = new System.Drawing.Point(306, 415); this.btnjoinlobby.Name = "btnjoinlobby"; this.btnjoinlobby.Size = new System.Drawing.Size(84, 23); @@ -142,7 +142,7 @@ // button1 // this.button1.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right))); - this.button1.FlatStyle = ShiftUI.FlatStyle.Flat; + this.button1.FlatStyle = ShiftUI.FlatStyle.Standard; this.button1.Location = new System.Drawing.Point(549, 465); this.button1.Name = "button1"; this.button1.Size = new System.Drawing.Size(83, 23); @@ -164,7 +164,7 @@ // btnscreen // this.btnscreen.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left))); - this.btnscreen.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnscreen.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnscreen.Location = new System.Drawing.Point(332, 465); this.btnscreen.Name = "btnscreen"; this.btnscreen.Size = new System.Drawing.Size(84, 23); @@ -226,7 +226,7 @@ // btntier // this.btntier.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left))); - this.btntier.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btntier.FlatStyle = ShiftUI.FlatStyle.Standard; this.btntier.Location = new System.Drawing.Point(47, 465); this.btntier.Name = "btntier"; this.btntier.Size = new System.Drawing.Size(75, 23); @@ -257,7 +257,7 @@ // btnstartbattle // this.btnstartbattle.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right))); - this.btnstartbattle.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnstartbattle.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnstartbattle.Location = new System.Drawing.Point(638, 465); this.btnstartbattle.Name = "btnstartbattle"; this.btnstartbattle.Size = new System.Drawing.Size(75, 23); diff --git a/source/WindowsFormsApplication1/Apps/PanelManager.Designer.cs b/source/WindowsFormsApplication1/Apps/PanelManager.Designer.cs index 12d808b..2c274a3 100644 --- a/source/WindowsFormsApplication1/Apps/PanelManager.Designer.cs +++ b/source/WindowsFormsApplication1/Apps/PanelManager.Designer.cs @@ -55,7 +55,7 @@ // btndone // this.btndone.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right))); - this.btndone.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btndone.FlatStyle = ShiftUI.FlatStyle.Standard; this.btndone.Location = new System.Drawing.Point(273, 343); this.btndone.Name = "btndone"; this.btndone.Size = new System.Drawing.Size(75, 23); diff --git a/source/WindowsFormsApplication1/Apps/Pong.Designer.cs b/source/WindowsFormsApplication1/Apps/Pong.Designer.cs index 4f75e30..4ba9fc7 100644 --- a/source/WindowsFormsApplication1/Apps/Pong.Designer.cs +++ b/source/WindowsFormsApplication1/Apps/Pong.Designer.cs @@ -155,7 +155,7 @@ namespace ShiftOS // // btnplayon // - this.btnplayon.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnplayon.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnplayon.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnplayon.Location = new System.Drawing.Point(32, 162); this.btnplayon.Name = "btnplayon"; @@ -177,7 +177,7 @@ namespace ShiftOS // // btncashout // - this.btncashout.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btncashout.FlatStyle = ShiftUI.FlatStyle.Standard; this.btncashout.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btncashout.Location = new System.Drawing.Point(32, 73); this.btncashout.Name = "btncashout"; @@ -231,7 +231,7 @@ namespace ShiftOS // // btnlosetryagain // - this.btnlosetryagain.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnlosetryagain.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnlosetryagain.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnlosetryagain.Location = new System.Drawing.Point(155, 176); this.btnlosetryagain.Name = "btnlosetryagain"; @@ -281,7 +281,7 @@ namespace ShiftOS // // btnstartgame // - this.btnstartgame.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnstartgame.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnstartgame.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnstartgame.Location = new System.Drawing.Point(186, 273); this.btnstartgame.Name = "btnstartgame"; @@ -320,7 +320,7 @@ namespace ShiftOS // // btnplayagain // - this.btnplayagain.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnplayagain.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnplayagain.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnplayagain.Location = new System.Drawing.Point(5, 194); this.btnplayagain.Name = "btnplayagain"; diff --git a/source/WindowsFormsApplication1/Apps/Shifter.Designer.cs b/source/WindowsFormsApplication1/Apps/Shifter.Designer.cs index 03398e3..04a61d3 100644 --- a/source/WindowsFormsApplication1/Apps/Shifter.Designer.cs +++ b/source/WindowsFormsApplication1/Apps/Shifter.Designer.cs @@ -519,7 +519,7 @@ namespace ShiftOS // btnapply // this.btnapply.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left))); - this.btnapply.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnapply.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnapply.Font = new System.Drawing.Font("Cambria", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnapply.Location = new System.Drawing.Point(7, 286); this.btnapply.Name = "btnapply"; @@ -551,7 +551,7 @@ namespace ShiftOS // this.btnmore.BackColor = System.Drawing.Color.White; this.btnmore.Dock = ShiftUI.DockStyle.Top; - this.btnmore.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnmore.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnmore.Font = new System.Drawing.Font("Cambria", 12F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnmore.Location = new System.Drawing.Point(0, 174); this.btnmore.Name = "btnmore"; @@ -566,7 +566,7 @@ namespace ShiftOS // this.btnreset.BackColor = System.Drawing.Color.White; this.btnreset.Dock = ShiftUI.DockStyle.Top; - this.btnreset.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnreset.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnreset.Font = new System.Drawing.Font("Cambria", 12F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnreset.Location = new System.Drawing.Point(0, 145); this.btnreset.Name = "btnreset"; @@ -581,7 +581,7 @@ namespace ShiftOS // this.btnwindowcomposition.BackColor = System.Drawing.Color.White; this.btnwindowcomposition.Dock = ShiftUI.DockStyle.Top; - this.btnwindowcomposition.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnwindowcomposition.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnwindowcomposition.Font = new System.Drawing.Font("Cambria", 12F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnwindowcomposition.Location = new System.Drawing.Point(0, 116); this.btnwindowcomposition.Name = "btnwindowcomposition"; @@ -597,7 +597,7 @@ namespace ShiftOS // this.btndesktopicons.BackColor = System.Drawing.Color.White; this.btndesktopicons.Dock = ShiftUI.DockStyle.Top; - this.btndesktopicons.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btndesktopicons.FlatStyle = ShiftUI.FlatStyle.Standard; this.btndesktopicons.Font = new System.Drawing.Font("Cambria", 12F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btndesktopicons.Location = new System.Drawing.Point(0, 87); this.btndesktopicons.Name = "btndesktopicons"; @@ -612,7 +612,7 @@ namespace ShiftOS // this.btnmenus.BackColor = System.Drawing.Color.White; this.btnmenus.Dock = ShiftUI.DockStyle.Top; - this.btnmenus.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnmenus.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnmenus.Font = new System.Drawing.Font("Cambria", 12F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnmenus.Location = new System.Drawing.Point(0, 58); this.btnmenus.Name = "btnmenus"; @@ -628,7 +628,7 @@ namespace ShiftOS // this.btnwindows.BackColor = System.Drawing.Color.White; this.btnwindows.Dock = ShiftUI.DockStyle.Top; - this.btnwindows.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnwindows.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnwindows.Font = new System.Drawing.Font("Cambria", 12F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnwindows.Location = new System.Drawing.Point(0, 29); this.btnwindows.Name = "btnwindows"; @@ -643,7 +643,7 @@ namespace ShiftOS // this.btndesktop.BackColor = System.Drawing.Color.White; this.btndesktop.Dock = ShiftUI.DockStyle.Top; - this.btndesktop.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btndesktop.FlatStyle = ShiftUI.FlatStyle.Standard; this.btndesktop.Font = new System.Drawing.Font("Cambria", 12F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btndesktop.Location = new System.Drawing.Point(0, 0); this.btndesktop.Name = "btndesktop"; @@ -753,7 +753,7 @@ namespace ShiftOS // btnpanelbuttons // this.btnpanelbuttons.BackColor = System.Drawing.Color.White; - this.btnpanelbuttons.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnpanelbuttons.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnpanelbuttons.Font = new System.Drawing.Font("Cambria", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnpanelbuttons.Location = new System.Drawing.Point(193, 101); this.btnpanelbuttons.Name = "btnpanelbuttons"; @@ -1959,7 +1959,7 @@ namespace ShiftOS // btndesktopitself // this.btndesktopitself.BackColor = System.Drawing.Color.White; - this.btndesktopitself.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btndesktopitself.FlatStyle = ShiftUI.FlatStyle.Standard; this.btndesktopitself.Font = new System.Drawing.Font("Cambria", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btndesktopitself.Location = new System.Drawing.Point(4, 105); this.btndesktopitself.Name = "btndesktopitself"; @@ -1972,7 +1972,7 @@ namespace ShiftOS // btnpanelclock // this.btnpanelclock.BackColor = System.Drawing.Color.White; - this.btnpanelclock.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnpanelclock.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnpanelclock.Font = new System.Drawing.Font("Cambria", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnpanelclock.Location = new System.Drawing.Point(4, 70); this.btnpanelclock.Name = "btnpanelclock"; @@ -1985,7 +1985,7 @@ namespace ShiftOS // btnapplauncher // this.btnapplauncher.BackColor = System.Drawing.Color.White; - this.btnapplauncher.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnapplauncher.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnapplauncher.Font = new System.Drawing.Font("Cambria", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnapplauncher.Location = new System.Drawing.Point(4, 35); this.btnapplauncher.Name = "btnapplauncher"; @@ -1998,7 +1998,7 @@ namespace ShiftOS // btndesktoppanel // this.btndesktoppanel.BackColor = System.Drawing.Color.White; - this.btndesktoppanel.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btndesktoppanel.FlatStyle = ShiftUI.FlatStyle.Standard; this.btndesktoppanel.Font = new System.Drawing.Font("Cambria", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btndesktoppanel.Location = new System.Drawing.Point(4, 0); this.btndesktoppanel.Name = "btndesktoppanel"; @@ -2786,7 +2786,7 @@ namespace ShiftOS this.cboxtitlebarcorners.AutoSize = true; this.cboxtitlebarcorners.FlatAppearance.BorderColor = System.Drawing.Color.Black; this.cboxtitlebarcorners.FlatAppearance.CheckedBackColor = System.Drawing.Color.Black; - this.cboxtitlebarcorners.FlatStyle = ShiftUI.FlatStyle.Flat; + this.cboxtitlebarcorners.FlatStyle = ShiftUI.FlatStyle.Standard; this.cboxtitlebarcorners.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.25F); this.cboxtitlebarcorners.Location = new System.Drawing.Point(166, 4); this.cboxtitlebarcorners.Name = "cboxtitlebarcorners"; @@ -2879,7 +2879,7 @@ namespace ShiftOS this.cbindividualbordercolours.AutoSize = true; this.cbindividualbordercolours.FlatAppearance.BorderColor = System.Drawing.Color.Black; this.cbindividualbordercolours.FlatAppearance.CheckedBackColor = System.Drawing.Color.Black; - this.cbindividualbordercolours.FlatStyle = ShiftUI.FlatStyle.Flat; + this.cbindividualbordercolours.FlatStyle = ShiftUI.FlatStyle.Standard; this.cbindividualbordercolours.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.25F); this.cbindividualbordercolours.Location = new System.Drawing.Point(161, 4); this.cbindividualbordercolours.Name = "cbindividualbordercolours"; @@ -3265,7 +3265,7 @@ namespace ShiftOS // btnborders // this.btnborders.BackColor = System.Drawing.Color.White; - this.btnborders.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnborders.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnborders.Font = new System.Drawing.Font("Cambria", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnborders.Location = new System.Drawing.Point(4, 105); this.btnborders.Name = "btnborders"; @@ -3279,7 +3279,7 @@ namespace ShiftOS // btnbuttons // this.btnbuttons.BackColor = System.Drawing.Color.White; - this.btnbuttons.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnbuttons.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnbuttons.Font = new System.Drawing.Font("Cambria", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnbuttons.Location = new System.Drawing.Point(4, 70); this.btnbuttons.Name = "btnbuttons"; @@ -3293,7 +3293,7 @@ namespace ShiftOS // btntitletext // this.btntitletext.BackColor = System.Drawing.Color.White; - this.btntitletext.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btntitletext.FlatStyle = ShiftUI.FlatStyle.Standard; this.btntitletext.Font = new System.Drawing.Font("Cambria", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btntitletext.Location = new System.Drawing.Point(4, 35); this.btntitletext.Name = "btntitletext"; @@ -3307,7 +3307,7 @@ namespace ShiftOS // btntitlebar // this.btntitlebar.BackColor = System.Drawing.Color.White; - this.btntitlebar.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btntitlebar.FlatStyle = ShiftUI.FlatStyle.Standard; this.btntitlebar.Font = new System.Drawing.Font("Cambria", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btntitlebar.Location = new System.Drawing.Point(4, 0); this.btntitlebar.Name = "btntitlebar"; @@ -3494,7 +3494,7 @@ namespace ShiftOS // // btnresetallsettings // - this.btnresetallsettings.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnresetallsettings.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnresetallsettings.Font = new System.Drawing.Font("Cambria", 20.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnresetallsettings.Location = new System.Drawing.Point(101, 145); this.btnresetallsettings.Name = "btnresetallsettings"; @@ -4218,7 +4218,7 @@ namespace ShiftOS // btnfancydragging // this.btnfancydragging.BackColor = System.Drawing.Color.White; - this.btnfancydragging.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnfancydragging.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnfancydragging.Font = new System.Drawing.Font("Cambria", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnfancydragging.Location = new System.Drawing.Point(4, 35); this.btnfancydragging.Name = "btnfancydragging"; @@ -4231,7 +4231,7 @@ namespace ShiftOS // btnfancywindows // this.btnfancywindows.BackColor = System.Drawing.Color.White; - this.btnfancywindows.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnfancywindows.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnfancywindows.Font = new System.Drawing.Font("Cambria", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnfancywindows.Location = new System.Drawing.Point(4, 0); this.btnfancywindows.Name = "btnfancywindows"; @@ -4293,7 +4293,7 @@ namespace ShiftOS // // btnmorebuttons // - this.btnmorebuttons.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnmorebuttons.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnmorebuttons.Font = new System.Drawing.Font("Cambria", 11.25F); this.btnmorebuttons.Location = new System.Drawing.Point(216, 195); this.btnmorebuttons.Name = "btnmorebuttons"; @@ -4481,7 +4481,7 @@ namespace ShiftOS // btnback // this.btnback.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left))); - this.btnback.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnback.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnback.Font = new System.Drawing.Font("Cambria", 11.25F); this.btnback.Location = new System.Drawing.Point(6, 184); this.btnback.Name = "btnback"; @@ -5013,7 +5013,7 @@ namespace ShiftOS // btnmisc // this.btnmisc.BackColor = System.Drawing.Color.White; - this.btnmisc.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnmisc.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnmisc.Font = new System.Drawing.Font("Cambria", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnmisc.Location = new System.Drawing.Point(4, 105); this.btnmisc.Name = "btnmisc"; @@ -5025,7 +5025,7 @@ namespace ShiftOS // btnadvanced // this.btnadvanced.BackColor = System.Drawing.Color.White; - this.btnadvanced.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnadvanced.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnadvanced.Font = new System.Drawing.Font("Cambria", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnadvanced.Location = new System.Drawing.Point(4, 70); this.btnadvanced.Name = "btnadvanced"; @@ -5038,7 +5038,7 @@ namespace ShiftOS // btndropdown // this.btndropdown.BackColor = System.Drawing.Color.White; - this.btndropdown.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btndropdown.FlatStyle = ShiftUI.FlatStyle.Standard; this.btndropdown.Font = new System.Drawing.Font("Cambria", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btndropdown.Location = new System.Drawing.Point(4, 35); this.btndropdown.Name = "btndropdown"; @@ -5051,7 +5051,7 @@ namespace ShiftOS // btnbasic // this.btnbasic.BackColor = System.Drawing.Color.White; - this.btnbasic.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnbasic.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnbasic.Font = new System.Drawing.Font("Cambria", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnbasic.Location = new System.Drawing.Point(4, 0); this.btnbasic.Name = "btnbasic"; diff --git a/source/WindowsFormsApplication1/Apps/Shifter.cs b/source/WindowsFormsApplication1/Apps/Shifter.cs index bef33c7..2130b4b 100644 --- a/source/WindowsFormsApplication1/Apps/Shifter.cs +++ b/source/WindowsFormsApplication1/Apps/Shifter.cs @@ -3021,7 +3021,7 @@ You can add options in the Lua interpreter using the shifter_add_category(string { var b = new Button(); b.Text = kv.Key; - b.FlatStyle = FlatStyle.Flat; + b.FlatStyle = FlatStyle.Standard; b.AutoSize = true; b.AutoSizeMode = AutoSizeMode.GrowAndShrink; flmorebuttons.Widgets.Add(b); diff --git a/source/WindowsFormsApplication1/Apps/Shiftnet.Designer.cs b/source/WindowsFormsApplication1/Apps/Shiftnet.Designer.cs index 876f57a..64e36f3 100644 --- a/source/WindowsFormsApplication1/Apps/Shiftnet.Designer.cs +++ b/source/WindowsFormsApplication1/Apps/Shiftnet.Designer.cs @@ -56,7 +56,7 @@ namespace ShiftOS // this.btngo.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Right))); this.btngo.DialogResult = ShiftUI.DialogResult.Cancel; - this.btngo.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btngo.FlatStyle = ShiftUI.FlatStyle.Standard; this.btngo.Font = new System.Drawing.Font("Times New Roman", 8.25F); this.btngo.ForeColor = System.Drawing.Color.White; this.btngo.Location = new System.Drawing.Point(731, 9); @@ -70,7 +70,7 @@ namespace ShiftOS // btnhome // this.btnhome.DialogResult = ShiftUI.DialogResult.Cancel; - this.btnhome.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnhome.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnhome.Font = new System.Drawing.Font("Times New Roman", 8.25F); this.btnhome.ForeColor = System.Drawing.Color.White; this.btnhome.Location = new System.Drawing.Point(4, 12); diff --git a/source/WindowsFormsApplication1/Apps/ShiftnetDecryptor.Designer.cs b/source/WindowsFormsApplication1/Apps/ShiftnetDecryptor.Designer.cs index 23e2245..92b9766 100644 --- a/source/WindowsFormsApplication1/Apps/ShiftnetDecryptor.Designer.cs +++ b/source/WindowsFormsApplication1/Apps/ShiftnetDecryptor.Designer.cs @@ -91,7 +91,7 @@ // btnstart // this.btnstart.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Right))); - this.btnstart.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnstart.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnstart.Location = new System.Drawing.Point(697, 119); this.btnstart.Name = "btnstart"; this.btnstart.Size = new System.Drawing.Size(60, 23); diff --git a/source/WindowsFormsApplication1/Apps/Shiftorium.Designer.cs b/source/WindowsFormsApplication1/Apps/Shiftorium.Designer.cs index 9edf69b..32f3827 100644 --- a/source/WindowsFormsApplication1/Apps/Shiftorium.Designer.cs +++ b/source/WindowsFormsApplication1/Apps/Shiftorium.Designer.cs @@ -166,7 +166,7 @@ namespace Shiftorium // btnbuy // this.btnbuy.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right))); - this.btnbuy.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnbuy.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnbuy.Font = new System.Drawing.Font("Microsoft Sans Serif", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnbuy.ForeColor = System.Drawing.Color.Black; this.btnbuy.Location = new System.Drawing.Point(160, 362); @@ -227,7 +227,7 @@ namespace Shiftorium // // btnback // - this.btnback.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnback.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnback.Location = new System.Drawing.Point(22, 72); this.btnback.Name = "btnback"; this.btnback.Size = new System.Drawing.Size(36, 23); @@ -239,7 +239,7 @@ namespace Shiftorium // btnforward // this.btnforward.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Right))); - this.btnforward.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnforward.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnforward.Location = new System.Drawing.Point(289, 72); this.btnforward.Name = "btnforward"; this.btnforward.Size = new System.Drawing.Size(36, 23); @@ -267,7 +267,7 @@ namespace Shiftorium | ShiftUI.AnchorStyles.Left) | ShiftUI.AnchorStyles.Right))); this.btnhack.AutoSize = true; - this.btnhack.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnhack.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnhack.Location = new System.Drawing.Point(143, 218); this.btnhack.Name = "btnhack"; this.btnhack.Size = new System.Drawing.Size(68, 25); diff --git a/source/WindowsFormsApplication1/Apps/SkinLoader.Designer.cs b/source/WindowsFormsApplication1/Apps/SkinLoader.Designer.cs index 35b2f2d..0c9cdee 100644 --- a/source/WindowsFormsApplication1/Apps/SkinLoader.Designer.cs +++ b/source/WindowsFormsApplication1/Apps/SkinLoader.Designer.cs @@ -127,7 +127,7 @@ namespace ShiftOS // btnapplyskin // this.btnapplyskin.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right))); - this.btnapplyskin.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnapplyskin.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnapplyskin.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnapplyskin.Location = new System.Drawing.Point(352, 418); this.btnapplyskin.Name = "btnapplyskin"; @@ -140,7 +140,7 @@ namespace ShiftOS // btnsaveskin // this.btnsaveskin.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right))); - this.btnsaveskin.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnsaveskin.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnsaveskin.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnsaveskin.Location = new System.Drawing.Point(239, 418); this.btnsaveskin.Name = "btnsaveskin"; @@ -153,7 +153,7 @@ namespace ShiftOS // btnloadskin // this.btnloadskin.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left))); - this.btnloadskin.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnloadskin.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnloadskin.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnloadskin.Location = new System.Drawing.Point(126, 418); this.btnloadskin.Name = "btnloadskin"; @@ -178,7 +178,7 @@ namespace ShiftOS // btnclose // this.btnclose.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left))); - this.btnclose.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnclose.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnclose.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnclose.Location = new System.Drawing.Point(13, 418); this.btnclose.Name = "btnclose"; @@ -554,7 +554,7 @@ namespace ShiftOS // btnapplypackskin // this.btnapplypackskin.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left))); - this.btnapplypackskin.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnapplypackskin.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnapplypackskin.Location = new System.Drawing.Point(379, 418); this.btnapplypackskin.Name = "btnapplypackskin"; this.btnapplypackskin.Size = new System.Drawing.Size(94, 41); @@ -584,7 +584,7 @@ namespace ShiftOS // btnbrowse // this.btnbrowse.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Right))); - this.btnbrowse.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnbrowse.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnbrowse.Location = new System.Drawing.Point(389, 138); this.btnbrowse.Name = "btnbrowse"; this.btnbrowse.Size = new System.Drawing.Size(75, 23); @@ -606,7 +606,7 @@ namespace ShiftOS // btnbacktoskinloader // this.btnbacktoskinloader.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left))); - this.btnbacktoskinloader.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnbacktoskinloader.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnbacktoskinloader.Location = new System.Drawing.Point(3, 418); this.btnbacktoskinloader.Name = "btnbacktoskinloader"; this.btnbacktoskinloader.Size = new System.Drawing.Size(94, 41); diff --git a/source/WindowsFormsApplication1/Apps/TextPad.Designer.cs b/source/WindowsFormsApplication1/Apps/TextPad.Designer.cs index 69ac78d..07590ee 100644 --- a/source/WindowsFormsApplication1/Apps/TextPad.Designer.cs +++ b/source/WindowsFormsApplication1/Apps/TextPad.Designer.cs @@ -94,7 +94,7 @@ namespace ShiftOS // btnsave // this.btnsave.BackColor = System.Drawing.Color.White; - this.btnsave.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnsave.FlatStyle = ShiftUI.FlatStyle.Standard; 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 = ShiftUI.FlatStyle.Flat; + this.btnopen.FlatStyle = ShiftUI.FlatStyle.Standard; 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 = ShiftUI.FlatStyle.Flat; + this.btnnew.FlatStyle = ShiftUI.FlatStyle.Standard; 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); diff --git a/source/WindowsFormsApplication1/Apps/WidgetManager.Designer.cs b/source/WindowsFormsApplication1/Apps/WidgetManager.Designer.cs index e375a18..ec676f7 100644 --- a/source/WindowsFormsApplication1/Apps/WidgetManager.Designer.cs +++ b/source/WindowsFormsApplication1/Apps/WidgetManager.Designer.cs @@ -86,7 +86,7 @@ // this.btndone.AutoSize = true; this.btndone.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink; - this.btndone.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btndone.FlatStyle = ShiftUI.FlatStyle.Standard; this.btndone.Location = new System.Drawing.Point(649, 3); this.btndone.Name = "btndone"; this.btndone.Size = new System.Drawing.Size(45, 25); @@ -99,7 +99,7 @@ // this.btnadd.AutoSize = true; this.btnadd.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink; - this.btnadd.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnadd.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnadd.Location = new System.Drawing.Point(605, 3); this.btnadd.Name = "btnadd"; this.btnadd.Size = new System.Drawing.Size(38, 25); @@ -111,7 +111,7 @@ // cbpanel // this.cbpanel.DropDownStyle = ShiftUI.ComboBoxStyle.DropDownList; - this.cbpanel.FlatStyle = ShiftUI.FlatStyle.Flat; + this.cbpanel.FlatStyle = ShiftUI.FlatStyle.Standard; this.cbpanel.FormattingEnabled = true; this.cbpanel.Location = new System.Drawing.Point(478, 3); this.cbpanel.Name = "cbpanel"; @@ -205,7 +205,7 @@ // this.btninstallwidgets.AutoSize = true; this.btninstallwidgets.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink; - this.btninstallwidgets.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btninstallwidgets.FlatStyle = ShiftUI.FlatStyle.Standard; this.btninstallwidgets.Location = new System.Drawing.Point(152, 3); this.btninstallwidgets.Name = "btninstallwidgets"; this.btninstallwidgets.Size = new System.Drawing.Size(88, 25); diff --git a/source/WindowsFormsApplication1/Controls/ImageSelector.Designer.cs b/source/WindowsFormsApplication1/Controls/ImageSelector.Designer.cs index df1ed0c..0d79e51 100644 --- a/source/WindowsFormsApplication1/Controls/ImageSelector.Designer.cs +++ b/source/WindowsFormsApplication1/Controls/ImageSelector.Designer.cs @@ -48,7 +48,7 @@ // btnselect // this.btnselect.Dock = ShiftUI.DockStyle.Fill; - this.btnselect.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnselect.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnselect.Location = new System.Drawing.Point(186, 0); this.btnselect.Name = "btnselect"; this.btnselect.Size = new System.Drawing.Size(40, 33); diff --git a/source/WindowsFormsApplication1/Controls/infobox.Designer.cs b/source/WindowsFormsApplication1/Controls/infobox.Designer.cs index 7c4ddb5..2952a4b 100644 --- a/source/WindowsFormsApplication1/Controls/infobox.Designer.cs +++ b/source/WindowsFormsApplication1/Controls/infobox.Designer.cs @@ -70,7 +70,7 @@ namespace ShiftOS // this.btnok.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left) | ShiftUI.AnchorStyles.Right))); - this.btnok.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnok.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnok.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnok.ForeColor = System.Drawing.Color.Black; this.btnok.Location = new System.Drawing.Point(134, 118); @@ -128,7 +128,7 @@ namespace ShiftOS // // btnno // - this.btnno.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnno.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnno.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnno.ForeColor = System.Drawing.Color.Black; this.btnno.Location = new System.Drawing.Point(142, 2); @@ -142,7 +142,7 @@ namespace ShiftOS // // btnyes // - this.btnyes.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnyes.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnyes.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnyes.ForeColor = System.Drawing.Color.Black; this.btnyes.Location = new System.Drawing.Point(29, 2); diff --git a/source/WindowsFormsApplication1/CreditScroller.Designer.cs b/source/WindowsFormsApplication1/CreditScroller.Designer.cs index 785e9e4..4c03266 100644 --- a/source/WindowsFormsApplication1/CreditScroller.Designer.cs +++ b/source/WindowsFormsApplication1/CreditScroller.Designer.cs @@ -78,7 +78,7 @@ this.btnclose.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right))); this.btnclose.AutoSize = true; this.btnclose.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink; - this.btnclose.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnclose.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnclose.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F); this.btnclose.Location = new System.Drawing.Point(843, 418); this.btnclose.Name = "btnclose"; diff --git a/source/WindowsFormsApplication1/Dialogs/Graphic_Picker.Designer.cs b/source/WindowsFormsApplication1/Dialogs/Graphic_Picker.Designer.cs index 5544a56..613bdd9 100644 --- a/source/WindowsFormsApplication1/Dialogs/Graphic_Picker.Designer.cs +++ b/source/WindowsFormsApplication1/Dialogs/Graphic_Picker.Designer.cs @@ -90,7 +90,7 @@ namespace ShiftOS // btncancel // this.btncancel.Anchor = ShiftUI.AnchorStyles.Bottom; - this.btncancel.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btncancel.FlatStyle = ShiftUI.FlatStyle.Standard; this.btncancel.Location = new System.Drawing.Point(21, 546); this.btncancel.Name = "btncancel"; this.btncancel.Size = new System.Drawing.Size(109, 32); @@ -102,7 +102,7 @@ namespace ShiftOS // btnreset // this.btnreset.Anchor = ShiftUI.AnchorStyles.Bottom; - this.btnreset.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnreset.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnreset.Location = new System.Drawing.Point(136, 546); this.btnreset.Name = "btnreset"; this.btnreset.Size = new System.Drawing.Size(109, 32); @@ -114,7 +114,7 @@ namespace ShiftOS // btnapply // this.btnapply.Anchor = ShiftUI.AnchorStyles.Bottom; - this.btnapply.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnapply.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnapply.Location = new System.Drawing.Point(251, 546); this.btnapply.Name = "btnapply"; this.btnapply.Size = new System.Drawing.Size(118, 32); @@ -135,7 +135,7 @@ namespace ShiftOS // // btnmousedownbrowse // - this.btnmousedownbrowse.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnmousedownbrowse.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnmousedownbrowse.Location = new System.Drawing.Point(295, 411); this.btnmousedownbrowse.Name = "btnmousedownbrowse"; this.btnmousedownbrowse.Size = new System.Drawing.Size(73, 60); @@ -179,7 +179,7 @@ namespace ShiftOS // // btnmouseoverbrowse // - this.btnmouseoverbrowse.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnmouseoverbrowse.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnmouseoverbrowse.Location = new System.Drawing.Point(295, 336); this.btnmouseoverbrowse.Name = "btnmouseoverbrowse"; this.btnmouseoverbrowse.Size = new System.Drawing.Size(73, 60); @@ -233,7 +233,7 @@ namespace ShiftOS // // btnidlebrowse // - this.btnidlebrowse.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnidlebrowse.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnidlebrowse.Location = new System.Drawing.Point(295, 260); this.btnidlebrowse.Name = "btnidlebrowse"; this.btnidlebrowse.Size = new System.Drawing.Size(73, 60); @@ -271,7 +271,7 @@ namespace ShiftOS this.btnzoom.BackgroundImage = global::ShiftOS.Properties.Resources.zoombutton; this.btnzoom.FlatAppearance.BorderColor = System.Drawing.Color.Black; this.btnzoom.FlatAppearance.BorderSize = 0; - this.btnzoom.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnzoom.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnzoom.Location = new System.Drawing.Point(286, 144); this.btnzoom.Name = "btnzoom"; this.btnzoom.Size = new System.Drawing.Size(82, 65); @@ -284,7 +284,7 @@ namespace ShiftOS this.btnstretch.BackgroundImage = global::ShiftOS.Properties.Resources.stretchbutton; this.btnstretch.FlatAppearance.BorderColor = System.Drawing.Color.Black; this.btnstretch.FlatAppearance.BorderSize = 0; - this.btnstretch.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnstretch.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnstretch.Location = new System.Drawing.Point(197, 144); this.btnstretch.Name = "btnstretch"; this.btnstretch.Size = new System.Drawing.Size(82, 65); @@ -297,7 +297,7 @@ namespace ShiftOS this.btncentre.BackgroundImage = global::ShiftOS.Properties.Resources.centrebutton; this.btncentre.FlatAppearance.BorderColor = System.Drawing.Color.Black; this.btncentre.FlatAppearance.BorderSize = 0; - this.btncentre.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btncentre.FlatStyle = ShiftUI.FlatStyle.Standard; this.btncentre.Location = new System.Drawing.Point(108, 144); this.btncentre.Name = "btncentre"; this.btncentre.Size = new System.Drawing.Size(82, 65); @@ -310,7 +310,7 @@ namespace ShiftOS this.btntile.BackgroundImage = global::ShiftOS.Properties.Resources.tilebutton; this.btntile.FlatAppearance.BorderColor = System.Drawing.Color.Black; this.btntile.FlatAppearance.BorderSize = 0; - this.btntile.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btntile.FlatStyle = ShiftUI.FlatStyle.Standard; this.btntile.Location = new System.Drawing.Point(19, 144); this.btntile.Name = "btntile"; this.btntile.Size = new System.Drawing.Size(82, 65); diff --git a/source/WindowsFormsApplication1/Engine/Lua_Interp.cs b/source/WindowsFormsApplication1/Engine/Lua_Interp.cs index be37449..fabc1be 100644 --- a/source/WindowsFormsApplication1/Engine/Lua_Interp.cs +++ b/source/WindowsFormsApplication1/Engine/Lua_Interp.cs @@ -1113,7 +1113,7 @@ end"); break; case "button": var btn = new Button(); - btn.FlatStyle = FlatStyle.Flat; + btn.FlatStyle = FlatStyle.Standard; if(darkmode) { //Set dark button @@ -1451,6 +1451,19 @@ end"); public static class Extensions { + /// + /// Attempts to convert a Windows Forms control to a ShiftUI widget + /// using JSON.NET. + /// + /// This may fail due to architecture differences in the WinForms and + /// ShiftUI code. + /// + /// Exceptions: + /// - JsonSerializationException: Occurs when a control has some + /// data that JSON.NET can't serialize. + /// + /// The Windows Forms control to convert + /// The converted widget. public static Widget ToWidget(this System.Windows.Forms.Control ctrl) { string json = JsonConvert.SerializeObject(ctrl); diff --git a/source/WindowsFormsApplication1/FinalMission/ChooseYourApproach.Designer.cs b/source/WindowsFormsApplication1/FinalMission/ChooseYourApproach.Designer.cs index ebff523..2cba002 100644 --- a/source/WindowsFormsApplication1/FinalMission/ChooseYourApproach.Designer.cs +++ b/source/WindowsFormsApplication1/FinalMission/ChooseYourApproach.Designer.cs @@ -130,7 +130,7 @@ // this.btnbegin.AutoSize = true; this.btnbegin.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink; - this.btnbegin.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnbegin.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnbegin.Location = new System.Drawing.Point(3, 3); this.btnbegin.Name = "btnbegin"; this.btnbegin.Size = new System.Drawing.Size(62, 32); @@ -246,7 +246,7 @@ this.button1.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right))); this.button1.AutoSize = true; this.button1.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink; - this.button1.FlatStyle = ShiftUI.FlatStyle.Flat; + this.button1.FlatStyle = ShiftUI.FlatStyle.Standard; this.button1.Location = new System.Drawing.Point(1233, 510); this.button1.Name = "button1"; this.button1.Size = new System.Drawing.Size(83, 25); @@ -260,7 +260,7 @@ this.button2.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Right))); this.button2.AutoSize = true; this.button2.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink; - this.button2.FlatStyle = ShiftUI.FlatStyle.Flat; + this.button2.FlatStyle = ShiftUI.FlatStyle.Standard; this.button2.Location = new System.Drawing.Point(1210, 12); this.button2.Name = "button2"; this.button2.Size = new System.Drawing.Size(106, 25); @@ -283,7 +283,7 @@ // this.button3.AutoSize = true; this.button3.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink; - this.button3.FlatStyle = ShiftUI.FlatStyle.Flat; + this.button3.FlatStyle = ShiftUI.FlatStyle.Standard; this.button3.Location = new System.Drawing.Point(3, 3); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(71, 32); diff --git a/source/WindowsFormsApplication1/FinalMission/MissionGuide.Designer.cs b/source/WindowsFormsApplication1/FinalMission/MissionGuide.Designer.cs index 8c0739e..8e0f629 100644 --- a/source/WindowsFormsApplication1/FinalMission/MissionGuide.Designer.cs +++ b/source/WindowsFormsApplication1/FinalMission/MissionGuide.Designer.cs @@ -63,7 +63,7 @@ // this.btnstart.AutoSize = true; this.btnstart.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink; - this.btnstart.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnstart.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnstart.Location = new System.Drawing.Point(435, 3); this.btnstart.Name = "btnstart"; this.btnstart.Size = new System.Drawing.Size(80, 23); diff --git a/source/WindowsFormsApplication1/Gameplay/HackUI.Designer.cs b/source/WindowsFormsApplication1/Gameplay/HackUI.Designer.cs index 7e426e0..217935c 100644 --- a/source/WindowsFormsApplication1/Gameplay/HackUI.Designer.cs +++ b/source/WindowsFormsApplication1/Gameplay/HackUI.Designer.cs @@ -211,7 +211,7 @@ this.btnnext.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Right))); this.btnnext.AutoSize = true; this.btnnext.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink; - this.btnnext.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnnext.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnnext.Location = new System.Drawing.Point(294, 161); this.btnnext.Name = "btnnext"; this.btnnext.Size = new System.Drawing.Size(66, 23); @@ -289,7 +289,7 @@ // this.cmbbuyable.BackColor = System.Drawing.Color.Black; this.cmbbuyable.DropDownStyle = ShiftUI.ComboBoxStyle.DropDownList; - this.cmbbuyable.FlatStyle = ShiftUI.FlatStyle.Flat; + this.cmbbuyable.FlatStyle = ShiftUI.FlatStyle.Standard; this.cmbbuyable.ForeColor = System.Drawing.Color.White; this.cmbbuyable.FormattingEnabled = true; this.cmbbuyable.Location = new System.Drawing.Point(12, 38); @@ -312,7 +312,7 @@ this.btndonebuying.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right))); this.btndonebuying.AutoSize = true; this.btndonebuying.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink; - this.btndonebuying.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btndonebuying.FlatStyle = ShiftUI.FlatStyle.Standard; this.btndonebuying.Location = new System.Drawing.Point(341, 273); this.btndonebuying.Name = "btndonebuying"; this.btndonebuying.Size = new System.Drawing.Size(38, 23); @@ -340,7 +340,7 @@ this.btnbuy.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right))); this.btnbuy.AutoSize = true; this.btnbuy.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink; - this.btnbuy.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnbuy.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnbuy.Location = new System.Drawing.Point(199, 254); this.btnbuy.Name = "btnbuy"; this.btnbuy.Size = new System.Drawing.Size(122, 23); @@ -361,7 +361,7 @@ // this.cmbmodules.BackColor = System.Drawing.Color.Black; this.cmbmodules.DropDownStyle = ShiftUI.ComboBoxStyle.DropDownList; - this.cmbmodules.FlatStyle = ShiftUI.FlatStyle.Flat; + this.cmbmodules.FlatStyle = ShiftUI.FlatStyle.Standard; this.cmbmodules.ForeColor = System.Drawing.Color.White; this.cmbmodules.FormattingEnabled = true; this.cmbmodules.Location = new System.Drawing.Point(12, 38); @@ -383,7 +383,7 @@ this.button1.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right))); this.button1.AutoSize = true; this.button1.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink; - this.button1.FlatStyle = ShiftUI.FlatStyle.Flat; + this.button1.FlatStyle = ShiftUI.FlatStyle.Standard; this.button1.Location = new System.Drawing.Point(327, 254); this.button1.Name = "button1"; this.button1.Size = new System.Drawing.Size(52, 23); @@ -420,7 +420,7 @@ this.btnpoweroff.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right))); this.btnpoweroff.AutoSize = true; this.btnpoweroff.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink; - this.btnpoweroff.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnpoweroff.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnpoweroff.Location = new System.Drawing.Point(85, 254); this.btnpoweroff.Name = "btnpoweroff"; this.btnpoweroff.Size = new System.Drawing.Size(80, 23); @@ -434,7 +434,7 @@ this.btnupgrade.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right))); this.btnupgrade.AutoSize = true; this.btnupgrade.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink; - this.btnupgrade.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnupgrade.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnupgrade.Location = new System.Drawing.Point(171, 254); this.btnupgrade.Name = "btnupgrade"; this.btnupgrade.Size = new System.Drawing.Size(150, 23); @@ -465,7 +465,7 @@ this.btncloseinfo.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right))); this.btncloseinfo.AutoSize = true; this.btncloseinfo.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink; - this.btncloseinfo.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btncloseinfo.FlatStyle = ShiftUI.FlatStyle.Standard; this.btncloseinfo.Location = new System.Drawing.Point(327, 254); this.btncloseinfo.Name = "btncloseinfo"; this.btncloseinfo.Size = new System.Drawing.Size(52, 23); @@ -490,7 +490,7 @@ // this.btnaddmodule.AutoSize = true; this.btnaddmodule.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink; - this.btnaddmodule.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnaddmodule.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnaddmodule.Location = new System.Drawing.Point(3, 3); this.btnaddmodule.Name = "btnaddmodule"; this.btnaddmodule.Size = new System.Drawing.Size(87, 23); @@ -512,7 +512,7 @@ // this.btntogglemusic.AutoSize = true; this.btntogglemusic.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink; - this.btntogglemusic.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btntogglemusic.FlatStyle = ShiftUI.FlatStyle.Standard; this.btntogglemusic.Location = new System.Drawing.Point(229, 3); this.btntogglemusic.Name = "btntogglemusic"; this.btntogglemusic.Size = new System.Drawing.Size(101, 23); diff --git a/source/WindowsFormsApplication1/Gameplay/HijackScreen.Designer.cs b/source/WindowsFormsApplication1/Gameplay/HijackScreen.Designer.cs index 3fa136b..5e7be79 100644 --- a/source/WindowsFormsApplication1/Gameplay/HijackScreen.Designer.cs +++ b/source/WindowsFormsApplication1/Gameplay/HijackScreen.Designer.cs @@ -75,7 +75,7 @@ namespace ShiftOS // // btnskip // - this.btnskip.FlatStyle = ShiftUI.FlatStyle.Flat; + this.btnskip.FlatStyle = ShiftUI.FlatStyle.Standard; this.btnskip.ForeColor = System.Drawing.Color.White; this.btnskip.Location = new System.Drawing.Point(566, 422); this.btnskip.Name = "btnskip"; diff --git a/source/WindowsFormsApplication1/SkinEngine/skins.cs b/source/WindowsFormsApplication1/SkinEngine/skins.cs index f23a7b5..d18770d 100644 --- a/source/WindowsFormsApplication1/SkinEngine/skins.cs +++ b/source/WindowsFormsApplication1/SkinEngine/skins.cs @@ -12,11 +12,13 @@ namespace Skinning { public class Skin : ShiftUI.ShiftOS.Skin { - //ShiftUI inherits: Anything marked with 'public new' is inherited - //from ShiftUI.ShiftOS.Skin, and is marked this way to provide a - //default value that JSON.NET can deserialize but also have - //ShiftUI see it. - + public Skin() + { + //We need to set our base skin settings here because the 'new' keyword + //hides the variable from ShiftUI. + base.ButtonBackColor_Pressed = this.ButtonBackColor_Pressed; + base.ProgressBar_BackgroundColor = this.ProgressBar_BackgroundColor; + } public new Color ButtonBackColor_Pressed = Color.Black; -- cgit v1.2.3