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. --- .../WindowsFormsApplication1/Engine/Lua_Interp.cs | 92 ++++++++++++---------- 1 file changed, 50 insertions(+), 42 deletions(-) (limited to 'source/WindowsFormsApplication1/Engine/Lua_Interp.cs') diff --git a/source/WindowsFormsApplication1/Engine/Lua_Interp.cs b/source/WindowsFormsApplication1/Engine/Lua_Interp.cs index 813bcd3..be37449 100644 --- a/source/WindowsFormsApplication1/Engine/Lua_Interp.cs +++ b/source/WindowsFormsApplication1/Engine/Lua_Interp.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; using DynamicLua; using System.IO; using System.Drawing; -using System.Windows.Forms; +using ShiftUI; using Gecko; using System.Net; using System.IO.Compression; @@ -40,7 +40,7 @@ namespace ShiftOS RegisterCore(); //Parse the file contents. var lua = File.ReadAllText(modfile); - var t = new System.Windows.Forms.Timer(); + var t = new ShiftUI.Timer(); ThisDirectory = Directory.GetParent(modfile).FullName; t.Interval = 50; t.Tick += (object se, EventArgs ea) => @@ -81,7 +81,7 @@ namespace ShiftOS mod = new DynamicLua.DynamicLua(); //Register core functions with the interpreter RegisterCore(); - var t = new System.Windows.Forms.Timer(); + var t = new ShiftUI.Timer(); t.Interval = 50; ThisDirectory = Paths.SaveRoot; t.Tick += (object se, EventArgs ea) => @@ -133,7 +133,7 @@ namespace ShiftOS mod(func + $"(get_panel_from_guid(\"{c}\"))"); }; }); - mod.get_panel_from_guid = new Func((guid) => + mod.get_panel_from_guid = new Func((guid) => { foreach(var kv in API.DEF_PanelGUIDs) { @@ -208,7 +208,7 @@ namespace ShiftOS mod.get_border = new Func((Form win) => { WindowBorder b = null; - foreach(Control c in win.Controls) + foreach(Widget c in win.Widgets) { if (c is WindowBorder) b = c as WindowBorder; @@ -374,7 +374,7 @@ end"); mod.json_serialize = new Func((objectToSerialize) => Newtonsoft.Json.JsonConvert.SerializeObject(objectToSerialize)); mod.json_unserialize = new Func((json_string) => Newtonsoft.Json.JsonConvert.DeserializeObject(json_string)); mod.open_image = new Func((filename) => OpenImage(filename)); - mod.list_add = new Action((lst, itm) => + mod.list_add = new Action((lst, itm) => { if(lst is ListBox) { @@ -382,7 +382,7 @@ end"); box.Items.Add(itm); } }); - mod.list_get_selected = new Func((lst) => + mod.list_get_selected = new Func((lst) => { if(lst is ListBox) { @@ -402,14 +402,14 @@ end"); return API.CurrentSkinImages; }); mod.upgrades = new Func((id) => GetUpgrade(id)); - mod.create_widget = new Func((type, text, x, y, width, height, dark_mode) => ConstructControl(type, text, x, y, width, height, dark_mode)); + mod.create_widget = new Func((type, text, x, y, width, height, dark_mode) => ConstructWidget(type, text, x, y, width, height, dark_mode)); mod.screen_get_width = new Func(() => { - return System.Windows.Forms.Screen.PrimaryScreen.Bounds.Width; + return ShiftUI.Screen.PrimaryScreen.Bounds.Width; }); mod.screen_get_height = new Func(() => { - return System.Windows.Forms.Screen.PrimaryScreen.Bounds.Height; + return ShiftUI.Screen.PrimaryScreen.Bounds.Height; }); mod.create_window_borderless = new Func((x, y, width, height) => CreateForm(x, y, width, height)); @@ -487,7 +487,7 @@ end"); return null; } }); - mod.set_anchor = new Action((ctrl, anchorstyle) => SetAnchor(ctrl, anchorstyle)); + mod.set_anchor = new Action((ctrl, anchorstyle) => SetAnchor(ctrl, anchorstyle)); //Standard API Functions mod.include = new Action((filepath) => IncludeScript(filepath)); @@ -502,25 +502,25 @@ end"); mod.update_ui = new Action(() => { API.UpdateWindows(); API.CurrentSession.SetupDesktop(); }); mod.load_skin = new Action((filepath) => Skinning.Utilities.loadsknfile(filepath)); mod.save_to_skin_file = new Action((filepath) => Skinning.Utilities.saveskintofile(filepath)); - mod.on_click = new Action((ctrl, funcname) => RegClick(ctrl, funcname)); - mod.add_widget_to_window = new Action((win, ctrl) => AddCtrl(win, ctrl)); + mod.on_click = new Action((ctrl, funcname) => RegClick(ctrl, funcname)); + mod.add_widget_to_window = new Action((win, ctrl) => AddCtrl(win, ctrl)); mod.open_file = new Action((filters, function) => OpenFile(filters, function)); - mod.panel_add_widget = new Action((ctrl, parent) => + mod.panel_add_widget = new Action((ctrl, parent) => { try { var p = (Panel)parent; - p.Controls.Add(ctrl); + p.Widgets.Add(ctrl); } catch(Exception ex) { Errors.Add(ex.Message); } }); - mod.flow_add_widget = new Action((ctrl, parent) => + mod.flow_add_widget = new Action((ctrl, parent) => { try { var p = (FlowLayoutPanel)parent; - p.Controls.Add(ctrl); + p.Widgets.Add(ctrl); } catch (Exception ex) { @@ -539,13 +539,13 @@ end"); mod($"{function}()"); }; }); - mod.create_timer = new Func((interval) => + mod.create_timer = new Func((interval) => { - var t = new System.Windows.Forms.Timer(); + var t = new ShiftUI.Timer(); t.Interval = interval; return t; }); - mod.timer_on_tick = new Action((tmr, func) => + mod.timer_on_tick = new Action((tmr, func) => { try { @@ -559,8 +559,8 @@ end"); Errors.Add(ex.Message); } }); - mod.add_widget_to_desktop = new Action((ctrl) => AddToDesktop(ctrl)); - mod.set_dock = new Action((ctrl, dstyle) => + mod.add_widget_to_desktop = new Action((ctrl) => AddToDesktop(ctrl)); + mod.set_dock = new Action((ctrl, dstyle) => { API.CurrentSession.Invoke(new Action(() => { @@ -623,7 +623,7 @@ end"); }); mod.notify = new Action((title, message) => API.CurrentSession.AddNotification(title, message)); mod.download_file = new Action((web_address, local) => DownloadFile(web_address, local)); - mod.on_key_down = new Action((ctrl, action) => RegKeyDown(ctrl, action)); + mod.on_key_down = new Action((ctrl, action) => RegKeyDown(ctrl, action)); mod.get_files = new Func>((path) => GetFiles(path)); mod.get_folders = new Func>((path) => GetFolders(path)); mod.zip = new Action((source, destination) => @@ -770,9 +770,9 @@ end"); /// /// Sends a keydown event to Lua when you press a key on the specified control. /// - /// Control to assign the event to. + /// Widget to assign the event to. /// Function to call on keydown. - public void RegKeyDown(Control ctrl, string action) + public void RegKeyDown(Widget ctrl, string action) { /* */ ctrl.KeyDown += (object s, KeyEventArgs a) => { @@ -918,7 +918,7 @@ end"); /// /// Target control /// Anchor string (for example "top;left;bottom;right" or "top;left" or "top") - public void SetAnchor(Control ctrl, string anchor) + public void SetAnchor(Widget ctrl, string anchor) { var a = AnchorStyles.None; var l = anchor.ToLower(); @@ -955,9 +955,9 @@ end"); /// Add a control to the desktop. /// /// The control to add. - public void AddToDesktop(Control ctrl) + public void AddToDesktop(Widget ctrl) { - API.CurrentSession.Controls.Add(ctrl); + API.CurrentSession.Widgets.Add(ctrl); } /// @@ -1088,17 +1088,17 @@ end"); /// /// Constructs a WinForms control. /// - /// Control type. - /// Control text. + /// Widget type. + /// Widget text. /// X coordinate. /// Y coordinate. /// Width. /// Height. /// Is it dark? /// The control, all ShiftOS-ified for you. - public Control ConstructControl(string type, string text, int x, int y, int width, int height, bool darkmode) + public Widget ConstructWidget(string type, string text, int x, int y, int width, int height, bool darkmode) { - var ctrl = new Control(); + var ctrl = new Widget(); switch(type.ToLower()) { case "luatextbox": @@ -1125,12 +1125,12 @@ end"); btn.BackColor = Color.White; btn.ForeColor = Color.Black; } - ctrl = (Control)btn; + ctrl = (Widget)btn; break; case "webview": var g = new Gecko.GeckoWebBrowser(); g.NoDefaultContextMenu = true; - ctrl = (Gecko.GeckoWebBrowser)g; + ctrl = g.ToWidget(); //This control renders HTML, so therefore a dark theme is futile. break; case "menustrip": @@ -1195,7 +1195,7 @@ end"); } break; default: - ctrl = new Control(); + ctrl = new Widget(); if(darkmode) { ctrl.BackColor = API.CurrentSkin.titlebarcolour; @@ -1232,24 +1232,24 @@ end"); /// Adds a control to a window. /// /// Target window - /// Control to add. - public void AddCtrl(Form win, Control ctrl) + /// Widget to add. + public void AddCtrl(Form win, Widget ctrl) { List borders = new List(); - foreach(Control c in win.Controls) + foreach(Widget c in win.Widgets) { if(c.Name == "api_brdr") { var b = (WindowBorder)c; - b.pgcontents.Controls.Add(ctrl); + b.pgcontents.Widgets.Add(ctrl); ctrl.BringToFront(); borders.Add(b); } } if(borders.Count == 0) { - win.Controls.Add(ctrl); + win.Widgets.Add(ctrl); } } @@ -1259,7 +1259,7 @@ end"); /// /// Target control /// Function to call. - public void RegClick(Control ctrl, string funcname) + public void RegClick(Widget ctrl, string funcname) { ctrl.MouseDown += (object s, MouseEventArgs a) => { @@ -1449,5 +1449,13 @@ end"); } } - + public static class Extensions + { + public static Widget ToWidget(this System.Windows.Forms.Control ctrl) + { + string json = JsonConvert.SerializeObject(ctrl); + json = json.Replace("Control", "Widget"); + return JsonConvert.DeserializeObject(json); + } + } } -- 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/Engine/Lua_Interp.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 From b52090021ff0ae61db652e8a486cbff6732f5ec5 Mon Sep 17 00:00:00 2001 From: MichaelTheShifter Date: Wed, 20 Jul 2016 13:52:12 -0400 Subject: Move ShiftUI designer to ShiftOS and add prober for ShiftOS to allow ShiftUI designer to design ShiftOS forms. --- source/ShiftOS.sln | 6 ++ source/ShiftUI/Theming/ShiftOS.cs | 5 ++ source/ShiftUI/Theming/ThemeSkinnable.cs | 33 +++++----- source/WindowsFormsApplication1/API.cs | 1 + .../WindowsFormsApplication1/Apps/BitnoteWallet.cs | 15 +++-- .../Apps/Shifter.Designer.cs | 9 +-- .../Controls/ProgressBarEX.cs | 8 +-- .../WindowsFormsApplication1/Engine/Lua_Interp.cs | 4 +- source/WindowsFormsApplication1/Program.cs | 72 ++++++++++++---------- 9 files changed, 80 insertions(+), 73 deletions(-) (limited to 'source/WindowsFormsApplication1/Engine/Lua_Interp.cs') diff --git a/source/ShiftOS.sln b/source/ShiftOS.sln index ccf69a3..ef829cd 100644 --- a/source/ShiftOS.sln +++ b/source/ShiftOS.sln @@ -12,6 +12,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShiftUI", "ShiftUI\ShiftUI.csproj", "{C56E34D0-4749-4A73-9469-BCCD063569CD}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShiftUI Designer", "..\..\Project-Circle\ShiftUI Designer\ShiftUI Designer.csproj", "{20C1A600-B5C2-4226-B5B6-3F17716D2669}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -26,6 +28,10 @@ Global {C56E34D0-4749-4A73-9469-BCCD063569CD}.Debug|Any CPU.Build.0 = Debug|Any CPU {C56E34D0-4749-4A73-9469-BCCD063569CD}.Release|Any CPU.ActiveCfg = Release|Any CPU {C56E34D0-4749-4A73-9469-BCCD063569CD}.Release|Any CPU.Build.0 = Release|Any CPU + {20C1A600-B5C2-4226-B5B6-3F17716D2669}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {20C1A600-B5C2-4226-B5B6-3F17716D2669}.Debug|Any CPU.Build.0 = Debug|Any CPU + {20C1A600-B5C2-4226-B5B6-3F17716D2669}.Release|Any CPU.ActiveCfg = Release|Any CPU + {20C1A600-B5C2-4226-B5B6-3F17716D2669}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/source/ShiftUI/Theming/ShiftOS.cs b/source/ShiftUI/Theming/ShiftOS.cs index 00e9b1a..7950c18 100644 --- a/source/ShiftUI/Theming/ShiftOS.cs +++ b/source/ShiftUI/Theming/ShiftOS.cs @@ -14,6 +14,7 @@ namespace ShiftUI.ShiftOS public Color ButtonBorderColor = Color.Black; public Color ButtonBackColor = Color.White; public Color ButtonBackColor_Pressed = Color.Gray; + public Color ButtonBackColor_Checked = Color.Black; #endregion #region Global @@ -55,6 +56,10 @@ namespace ShiftUI.ShiftOS #endregion + #region ListView + public Color ListViewBackground = Color.White; + #endregion + // No reason to have ShiftOS deal with window borders itself // when I can do it inside ShiftUI. #region Form diff --git a/source/ShiftUI/Theming/ThemeSkinnable.cs b/source/ShiftUI/Theming/ThemeSkinnable.cs index 6772251..5ea8a4d 100644 --- a/source/ShiftUI/Theming/ThemeSkinnable.cs +++ b/source/ShiftUI/Theming/ThemeSkinnable.cs @@ -2973,7 +2973,7 @@ namespace ShiftUI // border is drawn directly in the Paint method if (details && control.HeaderStyle != ColumnHeaderStyle.None) { - dc.FillRectangle(SystemBrushes.Control, + dc.FillRectangle(new SolidBrush(Application.CurrentSkin.ListViewBackground), 0, 0, control.TotalWidth, control.Font.Height + 5); if (control.Columns.Count > 0) { @@ -6923,67 +6923,64 @@ namespace ShiftUI private void CPDrawButtonInternal(Graphics dc, Rectangle rectangle, ButtonState state, Pen DarkPen, Pen NormalPen, Pen LightPen) { // sadly enough, the rectangle gets always filled with a hatchbrush - dc.FillRectangle(ResPool.GetHatchBrush(HatchStyle.Percent50, - Color.FromArgb(Clamp(ColorControl.R + 3, 0, 255), - ColorControl.G, ColorControl.B), - ColorControl), + dc.FillRectangle(new SolidBrush(Application.CurrentSkin.ButtonBackColor), rectangle.X + 1, rectangle.Y + 1, rectangle.Width - 2, rectangle.Height - 2); if ((state & ButtonState.All) == ButtonState.All || ((state & ButtonState.Checked) == ButtonState.Checked && (state & ButtonState.Flat) == ButtonState.Flat)) { - dc.FillRectangle(ResPool.GetHatchBrush(HatchStyle.Percent50, ColorControlLight, ColorControl), rectangle.X + 2, rectangle.Y + 2, rectangle.Width - 4, rectangle.Height - 4); + dc.FillRectangle(new SolidBrush(Application.CurrentSkin.ButtonBackColor_Checked), rectangle.X + 2, rectangle.Y + 2, rectangle.Width - 4, rectangle.Height - 4); - dc.DrawRectangle(SystemPens.ControlDark, rectangle.X, rectangle.Y, rectangle.Width - 1, rectangle.Height - 1); + dc.DrawRectangle(new Pen(new SolidBrush(Application.CurrentSkin.ButtonBorderColor), Application.CurrentSkin.ButtonBorderWidth), rectangle.X, rectangle.Y, rectangle.Width - 1, rectangle.Height - 1); } else if ((state & ButtonState.Flat) == ButtonState.Flat) { - dc.DrawRectangle(SystemPens.ControlDark, rectangle.X, rectangle.Y, rectangle.Width - 1, rectangle.Height - 1); + dc.DrawRectangle(new Pen(new SolidBrush(Application.CurrentSkin.ButtonBorderColor), Application.CurrentSkin.ButtonBorderWidth), rectangle.X, rectangle.Y, rectangle.Width - 1, rectangle.Height - 1); } else if ((state & ButtonState.Checked) == ButtonState.Checked) { - dc.FillRectangle(ResPool.GetHatchBrush(HatchStyle.Percent50, ColorControlLight, ColorControl), rectangle.X + 2, rectangle.Y + 2, rectangle.Width - 4, rectangle.Height - 4); + dc.FillRectangle(new SolidBrush(Application.CurrentSkin.ButtonBackColor_Checked), rectangle.X + 2, rectangle.Y + 2, rectangle.Width - 4, rectangle.Height - 4); - Pen pen = DarkPen; + Pen pen = new Pen(new SolidBrush(Application.CurrentSkin.Border3DTopLeftInner)); dc.DrawLine(pen, rectangle.X, rectangle.Y, rectangle.X, rectangle.Bottom - 2); dc.DrawLine(pen, rectangle.X + 1, rectangle.Y, rectangle.Right - 2, rectangle.Y); - pen = NormalPen; + pen = new Pen(new SolidBrush(Application.CurrentSkin.Border3DBottomRight)); dc.DrawLine(pen, rectangle.X + 1, rectangle.Y + 1, rectangle.X + 1, rectangle.Bottom - 3); dc.DrawLine(pen, rectangle.X + 2, rectangle.Y + 1, rectangle.Right - 3, rectangle.Y + 1); - pen = LightPen; + pen = new Pen(new SolidBrush(Application.CurrentSkin.Border3DBottomRightInner)); dc.DrawLine(pen, rectangle.X, rectangle.Bottom - 1, rectangle.Right - 2, rectangle.Bottom - 1); dc.DrawLine(pen, rectangle.Right - 1, rectangle.Y, rectangle.Right - 1, rectangle.Bottom - 1); } else if (((state & ButtonState.Pushed) == ButtonState.Pushed) && ((state & ButtonState.Normal) == ButtonState.Normal)) { - Pen pen = DarkPen; + Pen pen = new Pen(new SolidBrush(Application.CurrentSkin.Border3DTopLeftInner)); dc.DrawLine(pen, rectangle.X, rectangle.Y, rectangle.X, rectangle.Bottom - 2); dc.DrawLine(pen, rectangle.X + 1, rectangle.Y, rectangle.Right - 2, rectangle.Y); - pen = NormalPen; + pen = new Pen(new SolidBrush(Application.CurrentSkin.Border3DBottomRight)); dc.DrawLine(pen, rectangle.X + 1, rectangle.Y + 1, rectangle.X + 1, rectangle.Bottom - 3); dc.DrawLine(pen, rectangle.X + 2, rectangle.Y + 1, rectangle.Right - 3, rectangle.Y + 1); - pen = LightPen; + pen = new Pen(new SolidBrush(Application.CurrentSkin.Border3DBottomRightInner)); dc.DrawLine(pen, rectangle.X, rectangle.Bottom - 1, rectangle.Right - 2, rectangle.Bottom - 1); dc.DrawLine(pen, rectangle.Right - 1, rectangle.Y, rectangle.Right - 1, rectangle.Bottom - 1); } else if (((state & ButtonState.Inactive) == ButtonState.Inactive) || ((state & ButtonState.Normal) == ButtonState.Normal)) { - Pen pen = LightPen; + Pen pen = new Pen(new SolidBrush(Application.CurrentSkin.Border3DTopLeftInner)); dc.DrawLine(pen, rectangle.X, rectangle.Y, rectangle.Right - 2, rectangle.Y); dc.DrawLine(pen, rectangle.X, rectangle.Y, rectangle.X, rectangle.Bottom - 2); - pen = NormalPen; + pen = new Pen(new SolidBrush(Application.CurrentSkin.Border3DBottomRight)); dc.DrawLine(pen, rectangle.X + 1, rectangle.Bottom - 2, rectangle.Right - 2, rectangle.Bottom - 2); dc.DrawLine(pen, rectangle.Right - 2, rectangle.Y + 1, rectangle.Right - 2, rectangle.Bottom - 3); - pen = DarkPen; + pen = new Pen(new SolidBrush(Application.CurrentSkin.Border3DBottomRightInner)); dc.DrawLine(pen, rectangle.X, rectangle.Bottom - 1, rectangle.Right - 1, rectangle.Bottom - 1); dc.DrawLine(pen, rectangle.Right - 1, rectangle.Y, rectangle.Right - 1, rectangle.Bottom - 2); } diff --git a/source/WindowsFormsApplication1/API.cs b/source/WindowsFormsApplication1/API.cs index 4434fc7..ce0ad8c 100644 --- a/source/WindowsFormsApplication1/API.cs +++ b/source/WindowsFormsApplication1/API.cs @@ -1926,6 +1926,7 @@ namespace ShiftOS public static Color[] yellowmemory = new Color[16]; public static Color[] pinkmemory = new Color[16]; internal static Dictionary> LuaShifterRegistry = null; + public static bool ShouldLoadEngine = true; #endregion } diff --git a/source/WindowsFormsApplication1/Apps/BitnoteWallet.cs b/source/WindowsFormsApplication1/Apps/BitnoteWallet.cs index 7b19c70..3a7164e 100644 --- a/source/WindowsFormsApplication1/Apps/BitnoteWallet.cs +++ b/source/WindowsFormsApplication1/Apps/BitnoteWallet.cs @@ -22,14 +22,17 @@ namespace ShiftOS public BitnoteWallet() { InitializeComponent(); - Clients = new List(); - foreach(var c in Package_Grabber.clients) + if (API.ShouldLoadEngine) { - if(c.Value.IsConnected) + Clients = new List(); + foreach (var c in Package_Grabber.clients) { - var client = new BitnoteClient(c.Key); - client.GetBank(); - Clients.Add(client); + if (c.Value.IsConnected) + { + var client = new BitnoteClient(c.Key); + client.GetBank(); + Clients.Add(client); + } } } } diff --git a/source/WindowsFormsApplication1/Apps/Shifter.Designer.cs b/source/WindowsFormsApplication1/Apps/Shifter.Designer.cs index 04a61d3..568822e 100644 --- a/source/WindowsFormsApplication1/Apps/Shifter.Designer.cs +++ b/source/WindowsFormsApplication1/Apps/Shifter.Designer.cs @@ -443,7 +443,6 @@ namespace ShiftOS this.pnlshifterintro.SuspendLayout(); this.pnldesktopoptions.SuspendLayout(); this.pnldesktoppaneloptions.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.txtdesktoppanelheight)).BeginInit(); this.pnlapplauncheroptions.SuspendLayout(); this.pnldesktopintro.SuspendLayout(); this.pnlpanelbuttonsoptions.SuspendLayout(); @@ -453,7 +452,6 @@ namespace ShiftOS this.predesktoppanel.SuspendLayout(); this.prepnlpanelbuttonholder.SuspendLayout(); this.prepnlpanelbutton.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pretbicon)).BeginInit(); this.pretimepanel.SuspendLayout(); this.preapplaunchermenuholder.SuspendLayout(); this.predesktopappmenu.SuspendLayout(); @@ -472,7 +470,6 @@ namespace ShiftOS this.prepgleft.SuspendLayout(); this.prepgright.SuspendLayout(); this.pretitlebar.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.prepnlicon)).BeginInit(); this.pnlreset.SuspendLayout(); this.pgcontents.SuspendLayout(); this.pnldesktopcomposition.SuspendLayout(); @@ -5123,7 +5120,7 @@ namespace ShiftOS this.pnldesktopoptions.ResumeLayout(false); this.pnldesktoppaneloptions.ResumeLayout(false); this.pnldesktoppaneloptions.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.txtdesktoppanelheight)).EndInit(); + //((System.ComponentModel.ISupportInitialize)(this.txtdesktoppanelheight)).EndInit(); this.pnlapplauncheroptions.ResumeLayout(false); this.pnlapplauncheroptions.PerformLayout(); this.pnldesktopintro.ResumeLayout(false); @@ -5139,7 +5136,7 @@ namespace ShiftOS this.prepnlpanelbuttonholder.ResumeLayout(false); this.prepnlpanelbutton.ResumeLayout(false); this.prepnlpanelbutton.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pretbicon)).EndInit(); + //((System.ComponentModel.ISupportInitialize)(this.pretbicon)).EndInit(); this.pretimepanel.ResumeLayout(false); this.pretimepanel.PerformLayout(); this.preapplaunchermenuholder.ResumeLayout(false); @@ -5169,7 +5166,7 @@ namespace ShiftOS this.prepgright.ResumeLayout(false); this.pretitlebar.ResumeLayout(false); this.pretitlebar.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.prepnlicon)).EndInit(); + //((System.ComponentModel.ISupportInitialize)(this.prepnlicon)).EndInit(); this.pnlreset.ResumeLayout(false); this.pgcontents.ResumeLayout(false); this.pgcontents.PerformLayout(); diff --git a/source/WindowsFormsApplication1/Controls/ProgressBarEX.cs b/source/WindowsFormsApplication1/Controls/ProgressBarEX.cs index d89969e..8febdcd 100644 --- a/source/WindowsFormsApplication1/Controls/ProgressBarEX.cs +++ b/source/WindowsFormsApplication1/Controls/ProgressBarEX.cs @@ -102,13 +102,7 @@ namespace ShiftOS get { return _MaxValue; } set { - if (value > this.MinValue) - { - _MaxValue = value; - } - else { - throw new ArgumentOutOfRangeException("The maximum value must be more than the minimum value."); - } + _MaxValue = value; } } diff --git a/source/WindowsFormsApplication1/Engine/Lua_Interp.cs b/source/WindowsFormsApplication1/Engine/Lua_Interp.cs index fabc1be..d36b4d9 100644 --- a/source/WindowsFormsApplication1/Engine/Lua_Interp.cs +++ b/source/WindowsFormsApplication1/Engine/Lua_Interp.cs @@ -1466,9 +1466,7 @@ end"); /// The converted widget. public static Widget ToWidget(this System.Windows.Forms.Control ctrl) { - string json = JsonConvert.SerializeObject(ctrl); - json = json.Replace("Control", "Widget"); - return JsonConvert.DeserializeObject(json); + return new Controls.WinFormsHost(ctrl); } } } diff --git a/source/WindowsFormsApplication1/Program.cs b/source/WindowsFormsApplication1/Program.cs index 5f3f1ad..af294db 100644 --- a/source/WindowsFormsApplication1/Program.cs +++ b/source/WindowsFormsApplication1/Program.cs @@ -12,24 +12,24 @@ using Newtonsoft.Json; namespace ShiftOS { - static class Program + public static class Program { /// /// The main entry point for the application. /// [STAThread] - static void Main(string[] args) + public static void Main(string[] args) { - Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); //Extract all dependencies before starting the engine. ExtractDependencies(); - var poolThread = new Thread(new ThreadStart(new Action(() => { + var poolThread = new Thread(new ThreadStart(new Action(() => + { try { - //Download ShiftOS server startup-pool - string pool = new WebClient().DownloadString("http://playshiftos.ml/server/startup_pool"); + //Download ShiftOS server startup-pool + string pool = new WebClient().DownloadString("http://playshiftos.ml/server/startup_pool"); string[] splitter = pool.Split(';'); foreach (string address in splitter) { @@ -55,13 +55,14 @@ namespace ShiftOS //Start the Windows Forms backend Paths.RegisterPaths(); //Sets ShiftOS path variables based on the current OS. SaveSystem.Utilities.CheckForOlderSaves(); //Backs up C:\ShiftOS on Windows systems if it exists and doesn't contain a _engineInfo.txt file telling ShiftOS what engine created it. - //If there isn't a save folder at the directory specified by ShiftOS.Paths.SaveRoot, create a new save. - //If not, load that save. + //If there isn't a save folder at the directory specified by ShiftOS.Paths.SaveRoot, create a new save. + //If not, load that save. if (Directory.Exists(Paths.SaveRoot)) { API.Log("Loading ShiftOS save..."); SaveSystem.Utilities.loadGame(); - } else + } + else { SaveSystem.Utilities.NewGame(); } @@ -80,44 +81,48 @@ namespace ShiftOS Skinning.Utilities.loadskin(); SaveSystem.ShiftoriumRegistry.UpdateShiftorium(); //Lua bootscreen. - if(File.Exists(Paths.SaveRoot + "BOOT")) + if (File.Exists(Paths.SaveRoot + "BOOT")) { string lua = File.ReadAllText(Paths.SaveRoot + "BOOT"); var l = new LuaInterpreter(); l.mod(lua); } //Start recieving calls from the Modding API... - Application.Run(new ShiftOSDesktop()); - //By now, the API receiver has been loaded, - //and the desktop is shown. So, let's check - //for auto-start mods. - if(Directory.Exists(Paths.AutoStart)) + if (!args.Contains("nodisplay")) { - foreach(string file in Directory.GetFiles(Paths.AutoStart)) + Application.Run(new ShiftOSDesktop()); + //By now, the API receiver has been loaded, + //and the desktop is shown. So, let's check + //for auto-start mods. + if (Directory.Exists(Paths.AutoStart)) { - var inf = new FileInfo(file); - switch(inf.Extension) + foreach (string file in Directory.GetFiles(Paths.AutoStart)) { - case ".saa": - if (API.Upgrades["shiftnet"] == true) - { - API.Log("Starting start-up mod \"" + inf.FullName + "\"..."); - API.LaunchMod(inf.FullName); - } - break; - case ".trm": - var t = new Terminal(); - t.runterminalfile(inf.FullName); - API.Log("Started terminal file \"" + inf.FullName + "\"..."); - break; - } } + var inf = new FileInfo(file); + switch (inf.Extension) + { + case ".saa": + if (API.Upgrades["shiftnet"] == true) + { + API.Log("Starting start-up mod \"" + inf.FullName + "\"..."); + API.LaunchMod(inf.FullName); + } + break; + case ".trm": + var t = new Terminal(); + t.runterminalfile(inf.FullName); + API.Log("Started terminal file \"" + inf.FullName + "\"..."); + break; + } + } + } } //Now, for some ShiftOS launcher integration. try { - if(args[0] != null) + if (args[0] != null) { - if(args[0] != "") + if (args[0] != "") { API.CurrentSave.username = args[0]; //Username set. @@ -130,6 +135,7 @@ namespace ShiftOS } } + static void ExtractDependencies() { //Wow. This'll make it easy for people... -- cgit v1.2.3