From d0eda9ff29c13882f9d6d7d5f4f091b7f0f1eaad Mon Sep 17 00:00:00 2001 From: Ray Date: Sat, 20 Jul 2024 18:09:44 +0100 Subject: [PATCH] Upgraded to new RyzStudio8 --- BookmarkManager.csproj | 2 +- EditBookmarkForm.cs | 123 +++++++++++++++++---------------------- OptionsForm.cs | 127 ++++++++++++++--------------------------- UpdateIconsForm.cs | 98 +++++++++---------------------- 4 files changed, 126 insertions(+), 224 deletions(-) diff --git a/BookmarkManager.csproj b/BookmarkManager.csproj index 08674b0..bba7952 100644 --- a/BookmarkManager.csproj +++ b/BookmarkManager.csproj @@ -121,7 +121,7 @@ - + \ No newline at end of file diff --git a/EditBookmarkForm.cs b/EditBookmarkForm.cs index 653935f..b2becff 100644 --- a/EditBookmarkForm.cs +++ b/EditBookmarkForm.cs @@ -1,4 +1,5 @@ using System; +using System.ComponentModel; using System.Drawing; using System.Windows.Forms; using BookmarkManager.Services; @@ -9,11 +10,9 @@ using RyzStudio.Windows.ThemedForms.ButtonTextBox; namespace FizzyLauncher { - public class EditBookmarkForm : TDialog + public class EditBookmarkForm : Form { private System.Windows.Forms.Label label1; - private ThButton button1; - private RyzStudio.Windows.Forms.THorizontalSeparator tHorizontalSeparator1; private ThClearableTextBox textBox1; private Label label2; private Label label3; @@ -31,6 +30,7 @@ namespace FizzyLauncher private readonly WebProvider _webProvider; private BookmarkModel result = null; + private RyzStudio.Windows.ThemedForms.Composite.DialogFooter dialogFooter1; private bool _isBusy = false; @@ -38,36 +38,38 @@ namespace FizzyLauncher { InitializeComponent(); - this.StartPosition = FormStartPosition.WindowsDefaultLocation; - this.OkButton = button1; + UISetup.Dialog(this); + + this.Text = (result == null) ? "Add Bookmark" : "Edit Bookmark"; + + result = model; _webProvider = new WebProvider(); _webProvider.IgnoreSSL = true; - result = model; - if (result != null) { - Text = "Edit Bookmark"; - textBox1.Text = model.Title?.Trim() ?? string.Empty; textBox2.Text = model.Address?.Trim() ?? string.Empty; textBox3.Text = model.Description?.Trim() ?? string.Empty; - pictureBox1.Image = model.Icon; + + try + { + pictureBox1.Image = model.Icon; + } + catch (Exception) + { + // do nothing + } + memoBox1.Text = model.Notes?.Trim() ?? string.Empty; } - else - { - Text = "Add Bookmark"; - } } private void InitializeComponent() { components = new System.ComponentModel.Container(); label1 = new Label(); - button1 = new ThButton(); - tHorizontalSeparator1 = new THorizontalSeparator(); textBox1 = new ThClearableTextBox(); label2 = new Label(); label3 = new Label(); @@ -80,6 +82,7 @@ namespace FizzyLauncher textBox3 = new ThClearableTextBox(); thUserControl1 = new ThUserControl(); label5 = new Label(); + dialogFooter1 = new RyzStudio.Windows.ThemedForms.Composite.DialogFooter(); ((System.ComponentModel.ISupportInitialize)pictureBox1).BeginInit(); ((System.ComponentModel.ISupportInitialize)pictureBox2).BeginInit(); SuspendLayout(); @@ -98,43 +101,8 @@ namespace FizzyLauncher label1.Text = "Title"; label1.TextAlign = ContentAlignment.MiddleLeft; // - // button1 - // - button1.AcceptButton = null; - button1.ActiveImage = null; - button1.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; - button1.BackColor = Color.Transparent; - button1.EnableMenuOnClick = false; - button1.EnableReactiveVisual = true; - button1.HoverImage = null; - button1.IdleImage = null; - button1.LabelText = "&Save"; - button1.Location = new Point(241, 469); - button1.Margin = new Padding(10, 10, 10, 0); - button1.Name = "button1"; - button1.Padding = new Padding(4, 4, 3, 3); - button1.Size = new Size(128, 32); - button1.TabIndex = 4; - button1.TabStop = false; - // - // tHorizontalSeparator1 - // - tHorizontalSeparator1.Anchor = AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; - tHorizontalSeparator1.AutoScrollMargin = new Size(0, 0); - tHorizontalSeparator1.AutoScrollMinSize = new Size(0, 0); - tHorizontalSeparator1.BackColor = Color.Transparent; - tHorizontalSeparator1.Location = new Point(10, 437); - tHorizontalSeparator1.Margin = new Padding(0, 10, 0, 0); - tHorizontalSeparator1.MaximumSize = new Size(4920, 2); - tHorizontalSeparator1.MinimumSize = new Size(0, 22); - tHorizontalSeparator1.Name = "tHorizontalSeparator1"; - tHorizontalSeparator1.Size = new Size(364, 22); - tHorizontalSeparator1.TabIndex = 188; - tHorizontalSeparator1.TabStop = false; - // // textBox1 // - textBox1.AcceptButton = null; textBox1.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; textBox1.BackColor = Color.Transparent; textBox1.ClearedValue = ""; @@ -143,9 +111,7 @@ namespace FizzyLauncher textBox1.Icon = "O"; textBox1.IconSize = 13F; textBox1.Location = new Point(109, 20); - textBox1.Margin = new Padding(10, 10, 10, 0); textBox1.Name = "textBox1"; - textBox1.Padding = new Padding(4, 4, 3, 3); textBox1.Size = new Size(260, 32); textBox1.TabIndex = 0; textBox1.TabStop = false; @@ -181,7 +147,6 @@ namespace FizzyLauncher // // memoBox1 // - memoBox1.AcceptButton = null; memoBox1.AllowDrop = true; memoBox1.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; memoBox1.BackColor = Color.Transparent; @@ -189,9 +154,7 @@ namespace FizzyLauncher memoBox1.EnableReactiveVisual = true; memoBox1.Font = new Font("Segoe UI", 9F); memoBox1.Location = new Point(110, 196); - memoBox1.Margin = new Padding(10, 10, 10, 0); memoBox1.Name = "memoBox1"; - memoBox1.Padding = new Padding(4, 4, 3, 3); memoBox1.ReadOnly = false; memoBox1.ScrollBars = ScrollBars.Vertical; memoBox1.Size = new Size(259, 232); @@ -215,7 +178,6 @@ namespace FizzyLauncher // // textBox2 // - textBox2.AcceptButton = null; textBox2.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; textBox2.BackColor = Color.Transparent; textBox2.EnableReactiveVisual = true; @@ -223,9 +185,7 @@ namespace FizzyLauncher textBox2.Icon = "M"; textBox2.IconSize = 13F; textBox2.Location = new Point(110, 62); - textBox2.Margin = new Padding(10, 10, 10, 0); textBox2.Name = "textBox2"; - textBox2.Padding = new Padding(4, 4, 3, 3); textBox2.Size = new Size(259, 32); textBox2.TabIndex = 1; textBox2.TabStop = false; @@ -247,11 +207,11 @@ namespace FizzyLauncher // // pictureBox2 // - pictureBox2.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + pictureBox2.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; pictureBox2.BackColor = Color.Transparent; pictureBox2.ErrorImage = null; pictureBox2.InitialImage = null; - pictureBox2.Location = new Point(196, 469); + pictureBox2.Location = new Point(10, 396); pictureBox2.Name = "pictureBox2"; pictureBox2.Size = new Size(32, 32); pictureBox2.SizeMode = PictureBoxSizeMode.CenterImage; @@ -260,7 +220,6 @@ namespace FizzyLauncher // // textBox3 // - textBox3.AcceptButton = null; textBox3.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; textBox3.BackColor = Color.Transparent; textBox3.ClearedValue = ""; @@ -269,9 +228,7 @@ namespace FizzyLauncher textBox3.Icon = "O"; textBox3.IconSize = 13F; textBox3.Location = new Point(109, 104); - textBox3.Margin = new Padding(10, 10, 10, 0); textBox3.Name = "textBox3"; - textBox3.Padding = new Padding(4, 4, 3, 3); textBox3.Size = new Size(260, 32); textBox3.TabIndex = 203; textBox3.TabStop = false; @@ -279,14 +236,13 @@ namespace FizzyLauncher // // thUserControl1 // - thUserControl1.AcceptButton = null; thUserControl1.BackColor = Color.Transparent; thUserControl1.EnableReactiveVisual = true; thUserControl1.Location = new Point(109, 146); thUserControl1.Name = "thUserControl1"; - thUserControl1.Padding = new Padding(4, 4, 3, 3); thUserControl1.Size = new Size(40, 40); thUserControl1.TabIndex = 204; + thUserControl1.TabStop = false; // // label5 // @@ -302,11 +258,23 @@ namespace FizzyLauncher label5.Text = "Icon"; label5.TextAlign = ContentAlignment.MiddleLeft; // + // dialogFooter1 + // + dialogFooter1.BackColor = Color.FromArgb(240, 240, 240); + dialogFooter1.Button1Text = "&OK"; + dialogFooter1.Dialog = this; + dialogFooter1.Dock = DockStyle.Bottom; + dialogFooter1.Location = new Point(0, 437); + dialogFooter1.Name = "dialogFooter1"; + dialogFooter1.Size = new Size(384, 84); + // // EditBookmarkForm // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; + BackColor = Color.White; ClientSize = new Size(384, 521); + Controls.Add(dialogFooter1); Controls.Add(textBox3); Controls.Add(pictureBox2); Controls.Add(pictureBox1); @@ -317,8 +285,6 @@ namespace FizzyLauncher Controls.Add(label3); Controls.Add(label2); Controls.Add(textBox1); - Controls.Add(tHorizontalSeparator1); - Controls.Add(button1); Controls.Add(label1); Controls.Add(thUserControl1); KeyPreview = true; @@ -338,6 +304,15 @@ namespace FizzyLauncher textBox2.Focus(); } + protected override void OnClosing(CancelEventArgs e) + { + base.OnClosing(e); + + if (this.IsBusy) + { + e.Cancel = true; + } + } public BookmarkModel Result { @@ -351,7 +326,16 @@ namespace FizzyLauncher result.Title = textBox1.Text?.Trim() ?? string.Empty; result.Address = textBox2.Text?.Trim() ?? string.Empty; result.Description = textBox3.Text?.Trim() ?? string.Empty; - result.Icon = pictureBox1.Image; + + try + { + result.Icon = pictureBox1.Image; + } + catch (Exception) + { + // do nothing + } + result.Notes = memoBox1.Text?.Trim() ?? string.Empty; return result; @@ -370,7 +354,6 @@ namespace FizzyLauncher UIControl.SetEnable(textBox3, !this.IsBusy); UIControl.SetValue(pictureBox2, (this.IsBusy ? RyzStudio.Windows.ThemedForms.Resource2.loading_block : null)); UIControl.SetEnable(memoBox1, !this.IsBusy); - UIControl.SetEnable(button1, !this.IsBusy); } } diff --git a/OptionsForm.cs b/OptionsForm.cs index 3bfae83..cbbeef2 100644 --- a/OptionsForm.cs +++ b/OptionsForm.cs @@ -8,10 +8,8 @@ using RyzStudio.Windows.ThemedForms.PickerBox; namespace FizzyLauncher { - public class OptionsForm : TDialog + public class OptionsForm : Form { - private ThButton button1; - private RyzStudio.Windows.Forms.THorizontalSeparator tHorizontalSeparator1; private FlowLayoutPanel flowLayoutPanel1; private TTogglePanel panel1; private TTogglePanel panel3; @@ -23,7 +21,7 @@ namespace FizzyLauncher private ThYesNoPickerBox yesNoPickerBox2; private Label label3; private RyzStudio.Windows.ThemedForms.ButtonTextBox.ThClearableTextBox textBox1; - + private RyzStudio.Windows.ThemedForms.Composite.DialogFooter dialogFooter1; private AppOptions _appSession = null; @@ -31,9 +29,9 @@ namespace FizzyLauncher { InitializeComponent(); - _appSession = appSession; + UISetup.Dialog(this); - this.OkButton = button1; + _appSession = appSession; if (_appSession != null) { @@ -47,8 +45,6 @@ namespace FizzyLauncher private void InitializeComponent() { - button1 = new ThButton(); - tHorizontalSeparator1 = new THorizontalSeparator(); flowLayoutPanel1 = new FlowLayoutPanel(); panel1 = new TTogglePanel(); yesNoPickerBox1 = new ThYesNoPickerBox(); @@ -60,48 +56,15 @@ namespace FizzyLauncher panel3 = new TTogglePanel(); textBox1 = new RyzStudio.Windows.ThemedForms.ButtonTextBox.ThClearableTextBox(); label3 = new Label(); + dialogFooter1 = new RyzStudio.Windows.ThemedForms.Composite.DialogFooter(); flowLayoutPanel1.SuspendLayout(); panel1.SuspendLayout(); panel2.SuspendLayout(); panel3.SuspendLayout(); SuspendLayout(); - // - // button1 - // - button1.AcceptButton = null; - button1.ActiveImage = null; - button1.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; - button1.BackColor = System.Drawing.Color.Transparent; - button1.EnableMenuOnClick = false; - button1.EnableReactiveVisual = true; - button1.HoverImage = null; - button1.IdleImage = null; - button1.LabelText = "&Save"; - button1.Location = new System.Drawing.Point(301, 469); - button1.Margin = new Padding(10, 10, 10, 0); - button1.Name = "button1"; - button1.Padding = new Padding(4, 4, 3, 3); - button1.Size = new System.Drawing.Size(128, 32); - button1.TabIndex = 6; - button1.TabStop = false; - // - // tHorizontalSeparator1 - // - tHorizontalSeparator1.Anchor = AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; - tHorizontalSeparator1.AutoScrollMargin = new System.Drawing.Size(0, 0); - tHorizontalSeparator1.AutoScrollMinSize = new System.Drawing.Size(0, 0); - tHorizontalSeparator1.BackColor = System.Drawing.Color.Transparent; - tHorizontalSeparator1.Location = new System.Drawing.Point(10, 437); - tHorizontalSeparator1.Margin = new Padding(0, 10, 0, 0); - tHorizontalSeparator1.MaximumSize = new System.Drawing.Size(4920, 2); - tHorizontalSeparator1.MinimumSize = new System.Drawing.Size(0, 22); - tHorizontalSeparator1.Name = "tHorizontalSeparator1"; - tHorizontalSeparator1.Size = new System.Drawing.Size(424, 22); - tHorizontalSeparator1.TabIndex = 188; - tHorizontalSeparator1.TabStop = false; - // + // // flowLayoutPanel1 - // + // flowLayoutPanel1.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; flowLayoutPanel1.AutoScroll = true; flowLayoutPanel1.BackColor = System.Drawing.Color.Transparent; @@ -115,9 +78,9 @@ namespace FizzyLauncher flowLayoutPanel1.TabIndex = 194; flowLayoutPanel1.WrapContents = false; flowLayoutPanel1.Resize += flowLayoutPanel1_Resize; - // + // // panel1 - // + // panel1.AutoScrollMargin = new System.Drawing.Size(0, 0); panel1.AutoScrollMinSize = new System.Drawing.Size(0, 0); panel1.Controls.Add(yesNoPickerBox1); @@ -128,33 +91,30 @@ namespace FizzyLauncher panel1.Location = new System.Drawing.Point(0, 0); panel1.Margin = new Padding(0); panel1.Name = "panel1"; - panel1.PaddingBottom = 2; + panel1.PaddingBottom = 0; panel1.PaddingLeft = 4; panel1.Size = new System.Drawing.Size(401, 77); panel1.TabIndex = 0; panel1.Title = "On Start-Up"; panel1.TitleContextMenuStrip = null; panel1.TitleCursor = Cursors.Default; - // + // // yesNoPickerBox1 - // - yesNoPickerBox1.AcceptButton = null; + // yesNoPickerBox1.Anchor = AnchorStyles.Top | AnchorStyles.Right; yesNoPickerBox1.BackColor = System.Drawing.Color.Transparent; yesNoPickerBox1.EnableReactiveVisual = true; yesNoPickerBox1.Font = new System.Drawing.Font("Segoe UI", 9F); yesNoPickerBox1.Location = new System.Drawing.Point(307, 22); - yesNoPickerBox1.Margin = new Padding(10, 10, 10, 0); yesNoPickerBox1.Name = "yesNoPickerBox1"; - yesNoPickerBox1.Padding = new Padding(4, 4, 3, 3); yesNoPickerBox1.SelectedIndex = 1; yesNoPickerBox1.Size = new System.Drawing.Size(84, 34); yesNoPickerBox1.TabIndex = 197; yesNoPickerBox1.TabStop = false; yesNoPickerBox1.Value = true; - // + // // label2 - // + // label2.AutoSize = true; label2.BackColor = System.Drawing.Color.Transparent; label2.ForeColor = System.Drawing.SystemColors.ControlText; @@ -166,9 +126,9 @@ namespace FizzyLauncher label2.TabIndex = 196; label2.Text = "Restore Position"; label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // + // // panel2 - // + // panel2.AutoScrollMargin = new System.Drawing.Size(0, 0); panel2.AutoScrollMinSize = new System.Drawing.Size(0, 0); panel2.Controls.Add(yesNoPickerBox2); @@ -180,50 +140,44 @@ namespace FizzyLauncher panel2.Location = new System.Drawing.Point(0, 77); panel2.Margin = new Padding(0); panel2.Name = "panel2"; - panel2.PaddingBottom = 2; + panel2.PaddingBottom = 0; panel2.PaddingLeft = 4; panel2.Size = new System.Drawing.Size(401, 77); panel2.TabIndex = 2; panel2.Title = "Appearance"; panel2.TitleContextMenuStrip = null; panel2.TitleCursor = Cursors.Default; - // + // // yesNoPickerBox2 - // - yesNoPickerBox2.AcceptButton = null; + // yesNoPickerBox2.Anchor = AnchorStyles.Top | AnchorStyles.Right; yesNoPickerBox2.BackColor = System.Drawing.Color.Transparent; yesNoPickerBox2.EnableReactiveVisual = true; yesNoPickerBox2.Font = new System.Drawing.Font("Segoe UI", 9F); yesNoPickerBox2.Location = new System.Drawing.Point(307, 22); - yesNoPickerBox2.Margin = new Padding(10, 10, 10, 0); yesNoPickerBox2.Name = "yesNoPickerBox2"; - yesNoPickerBox2.Padding = new Padding(4, 4, 3, 3); yesNoPickerBox2.SelectedIndex = 1; yesNoPickerBox2.Size = new System.Drawing.Size(84, 34); yesNoPickerBox2.TabIndex = 198; yesNoPickerBox2.TabStop = false; yesNoPickerBox2.Value = true; - // + // // thYesNoPickerBox1 - // - thYesNoPickerBox1.AcceptButton = null; + // thYesNoPickerBox1.Anchor = AnchorStyles.Top | AnchorStyles.Right; thYesNoPickerBox1.BackColor = System.Drawing.Color.Transparent; thYesNoPickerBox1.EnableReactiveVisual = true; thYesNoPickerBox1.Font = new System.Drawing.Font("Segoe UI", 9F); thYesNoPickerBox1.Location = new System.Drawing.Point(508, 22); - thYesNoPickerBox1.Margin = new Padding(10, 10, 10, 0); thYesNoPickerBox1.Name = "thYesNoPickerBox1"; - thYesNoPickerBox1.Padding = new Padding(4, 4, 3, 3); thYesNoPickerBox1.SelectedIndex = 1; thYesNoPickerBox1.Size = new System.Drawing.Size(84, 34); thYesNoPickerBox1.TabIndex = 197; thYesNoPickerBox1.TabStop = false; thYesNoPickerBox1.Value = true; - // + // // label1 - // + // label1.AutoSize = true; label1.BackColor = System.Drawing.Color.Transparent; label1.ForeColor = System.Drawing.SystemColors.ControlText; @@ -235,9 +189,9 @@ namespace FizzyLauncher label1.TabIndex = 196; label1.Text = "Always On Top"; label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // + // // panel3 - // + // panel3.AutoScrollMargin = new System.Drawing.Size(0, 0); panel3.AutoScrollMinSize = new System.Drawing.Size(0, 0); panel3.Controls.Add(textBox1); @@ -248,17 +202,16 @@ namespace FizzyLauncher panel3.Location = new System.Drawing.Point(0, 154); panel3.Margin = new Padding(0); panel3.Name = "panel3"; - panel3.PaddingBottom = 2; + panel3.PaddingBottom = 0; panel3.PaddingLeft = 4; panel3.Size = new System.Drawing.Size(401, 77); panel3.TabIndex = 1; panel3.Title = "Behaviour"; panel3.TitleContextMenuStrip = null; panel3.TitleCursor = Cursors.Default; - // + // // textBox1 - // - textBox1.AcceptButton = null; + // textBox1.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; textBox1.BackColor = System.Drawing.Color.Transparent; textBox1.ClearedValue = "{0}"; @@ -267,16 +220,14 @@ namespace FizzyLauncher textBox1.Icon = "O"; textBox1.IconSize = 13F; textBox1.Location = new System.Drawing.Point(161, 21); - textBox1.Margin = new Padding(10, 10, 10, 0); textBox1.Name = "textBox1"; - textBox1.Padding = new Padding(4, 4, 3, 3); textBox1.Size = new System.Drawing.Size(230, 32); textBox1.TabIndex = 203; textBox1.TabStop = false; textBox1.UseSystemPasswordChar = false; - // + // // label3 - // + // label3.AutoSize = true; label3.BackColor = System.Drawing.Color.Transparent; label3.ForeColor = System.Drawing.SystemColors.ControlText; @@ -288,15 +239,25 @@ namespace FizzyLauncher label3.TabIndex = 199; label3.Text = "Run Command"; label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // + // + // dialogFooter1 + // + dialogFooter1.BackColor = System.Drawing.Color.FromArgb(240, 240, 240); + dialogFooter1.Button1Text = "&Save"; + dialogFooter1.Dialog = this; + dialogFooter1.Dock = DockStyle.Bottom; + dialogFooter1.Location = new System.Drawing.Point(0, 437); + dialogFooter1.Name = "dialogFooter1"; + dialogFooter1.Size = new System.Drawing.Size(444, 84); + // // OptionsForm - // + // AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; + BackColor = System.Drawing.Color.White; ClientSize = new System.Drawing.Size(444, 521); + Controls.Add(dialogFooter1); Controls.Add(flowLayoutPanel1); - Controls.Add(tHorizontalSeparator1); - Controls.Add(button1); MinimumSize = new System.Drawing.Size(460, 560); Name = "OptionsForm"; Text = "Options"; diff --git a/UpdateIconsForm.cs b/UpdateIconsForm.cs index 9ca145b..606fd69 100644 --- a/UpdateIconsForm.cs +++ b/UpdateIconsForm.cs @@ -12,11 +12,9 @@ using RyzStudio.Windows.ThemedForms.PickerBox; namespace FizzyLauncher { - public class UpdateIconsForm : TDialog + public class UpdateIconsForm : Form { private System.Windows.Forms.Label label1; - private ThButton button1; - private RyzStudio.Windows.Forms.THorizontalSeparator tHorizontalSeparator1; private RyzStudio.Windows.Forms.THorizontalSeparator tHorizontalSeparator2; private Label label2; private PictureBox pictureBox2; @@ -32,6 +30,7 @@ namespace FizzyLauncher private THorizontalSeparator tHorizontalSeparator3; private ThButton button3; private ThProgressBar progressBar2; + private RyzStudio.Windows.ThemedForms.Composite.DialogFooter dialogFooter1; private bool _requestCancel = false; @@ -39,7 +38,7 @@ namespace FizzyLauncher { InitializeComponent(); - this.OkButton = button1; + UISetup.Dialog(this); _webProvider = new WebProvider(); _webProvider.IgnoreSSL = true; @@ -50,8 +49,6 @@ namespace FizzyLauncher private void InitializeComponent() { label1 = new Label(); - button1 = new ThButton(); - tHorizontalSeparator1 = new THorizontalSeparator(); tHorizontalSeparator2 = new THorizontalSeparator(); label2 = new Label(); pictureBox2 = new PictureBox(); @@ -62,6 +59,7 @@ namespace FizzyLauncher tHorizontalSeparator3 = new THorizontalSeparator(); button3 = new ThButton(); progressBar2 = new ThProgressBar(); + dialogFooter1 = new RyzStudio.Windows.ThemedForms.Composite.DialogFooter(); ((ISupportInitialize)pictureBox2).BeginInit(); SuspendLayout(); // @@ -70,7 +68,7 @@ namespace FizzyLauncher label1.AutoSize = true; label1.BackColor = System.Drawing.Color.Transparent; label1.ForeColor = System.Drawing.SystemColors.ControlText; - label1.Location = new System.Drawing.Point(10, 21); + label1.Location = new System.Drawing.Point(10, 20); label1.Margin = new Padding(0); label1.Name = "label1"; label1.Padding = new Padding(0, 8, 0, 0); @@ -79,47 +77,13 @@ namespace FizzyLauncher label1.Text = "Update Missing Icons (Only)"; label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // button1 - // - button1.AcceptButton = null; - button1.ActiveImage = null; - button1.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; - button1.BackColor = System.Drawing.Color.Transparent; - button1.EnableMenuOnClick = false; - button1.EnableReactiveVisual = true; - button1.HoverImage = null; - button1.IdleImage = null; - button1.LabelText = "&Close"; - button1.Location = new System.Drawing.Point(301, 469); - button1.Margin = new Padding(10, 10, 10, 0); - button1.Name = "button1"; - button1.Padding = new Padding(4, 4, 3, 3); - button1.Size = new System.Drawing.Size(128, 32); - button1.TabIndex = 2; - button1.TabStop = false; - // - // tHorizontalSeparator1 - // - tHorizontalSeparator1.Anchor = AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; - tHorizontalSeparator1.AutoScrollMargin = new System.Drawing.Size(0, 0); - tHorizontalSeparator1.AutoScrollMinSize = new System.Drawing.Size(0, 0); - tHorizontalSeparator1.BackColor = System.Drawing.Color.Transparent; - tHorizontalSeparator1.Location = new System.Drawing.Point(10, 437); - tHorizontalSeparator1.Margin = new Padding(0, 10, 0, 0); - tHorizontalSeparator1.MaximumSize = new System.Drawing.Size(4920, 2); - tHorizontalSeparator1.MinimumSize = new System.Drawing.Size(0, 22); - tHorizontalSeparator1.Name = "tHorizontalSeparator1"; - tHorizontalSeparator1.Size = new System.Drawing.Size(424, 22); - tHorizontalSeparator1.TabIndex = 188; - tHorizontalSeparator1.TabStop = false; - // // tHorizontalSeparator2 // tHorizontalSeparator2.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; tHorizontalSeparator2.AutoScrollMargin = new System.Drawing.Size(0, 0); tHorizontalSeparator2.AutoScrollMinSize = new System.Drawing.Size(0, 0); tHorizontalSeparator2.BackColor = System.Drawing.Color.Transparent; - tHorizontalSeparator2.Location = new System.Drawing.Point(10, 65); + tHorizontalSeparator2.Location = new System.Drawing.Point(10, 64); tHorizontalSeparator2.Margin = new Padding(0, 10, 0, 0); tHorizontalSeparator2.MaximumSize = new System.Drawing.Size(4920, 2); tHorizontalSeparator2.MinimumSize = new System.Drawing.Size(0, 22); @@ -133,7 +97,7 @@ namespace FizzyLauncher label2.AutoSize = true; label2.BackColor = System.Drawing.Color.Transparent; label2.ForeColor = System.Drawing.SystemColors.ControlText; - label2.Location = new System.Drawing.Point(10, 137); + label2.Location = new System.Drawing.Point(10, 136); label2.Margin = new Padding(0); label2.Name = "label2"; label2.Padding = new Padding(0, 8, 0, 0); @@ -144,11 +108,11 @@ namespace FizzyLauncher // // pictureBox2 // - pictureBox2.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; + pictureBox2.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; pictureBox2.BackColor = System.Drawing.Color.Transparent; pictureBox2.ErrorImage = null; pictureBox2.InitialImage = null; - pictureBox2.Location = new System.Drawing.Point(10, 469); + pictureBox2.Location = new System.Drawing.Point(402, 294); pictureBox2.Name = "pictureBox2"; pictureBox2.Size = new System.Drawing.Size(32, 32); pictureBox2.SizeMode = PictureBoxSizeMode.CenterImage; @@ -157,15 +121,12 @@ namespace FizzyLauncher // // pickerBox1 // - pickerBox1.AcceptButton = null; pickerBox1.Anchor = AnchorStyles.Top | AnchorStyles.Right; pickerBox1.BackColor = System.Drawing.Color.Transparent; pickerBox1.EnableReactiveVisual = true; pickerBox1.Font = new System.Drawing.Font("Segoe UI", 9F); - pickerBox1.Location = new System.Drawing.Point(350, 21); - pickerBox1.Margin = new Padding(10, 10, 10, 0); + pickerBox1.Location = new System.Drawing.Point(350, 20); pickerBox1.Name = "pickerBox1"; - pickerBox1.Padding = new Padding(4, 4, 3, 3); pickerBox1.SelectedIndex = 1; pickerBox1.Size = new System.Drawing.Size(84, 35); pickerBox1.TabIndex = 0; @@ -174,7 +135,6 @@ namespace FizzyLauncher // // button2 // - button2.AcceptButton = null; button2.ActiveImage = null; button2.Anchor = AnchorStyles.Top | AnchorStyles.Right; button2.BackColor = System.Drawing.Color.Transparent; @@ -183,10 +143,8 @@ namespace FizzyLauncher button2.HoverImage = null; button2.IdleImage = null; button2.LabelText = "&Run"; - button2.Location = new System.Drawing.Point(306, 137); - button2.Margin = new Padding(10, 10, 10, 0); + button2.Location = new System.Drawing.Point(306, 136); button2.Name = "button2"; - button2.Padding = new Padding(4, 4, 3, 3); button2.Size = new System.Drawing.Size(128, 32); button2.TabIndex = 1; button2.TabStop = false; @@ -194,19 +152,16 @@ namespace FizzyLauncher // // progressBar1 // - progressBar1.AcceptButton = null; progressBar1.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; progressBar1.BackColor = System.Drawing.Color.Transparent; progressBar1.BarColour = System.Drawing.Color.FromArgb(79, 202, 130); progressBar1.BarTextColour = System.Drawing.Color.Black; progressBar1.EnableReactiveVisual = false; progressBar1.Font = new System.Drawing.Font("Segoe UI", 9F); - progressBar1.Location = new System.Drawing.Point(10, 97); - progressBar1.Margin = new Padding(10, 10, 10, 0); + progressBar1.Location = new System.Drawing.Point(10, 96); progressBar1.Maximum = 100; progressBar1.Minimum = 0; progressBar1.Name = "progressBar1"; - progressBar1.Padding = new Padding(4, 4, 3, 3); progressBar1.ProgressText = "50/100"; progressBar1.ShowProgressText = true; progressBar1.Size = new System.Drawing.Size(424, 20); @@ -219,7 +174,7 @@ namespace FizzyLauncher label4.AutoSize = true; label4.BackColor = System.Drawing.Color.Transparent; label4.ForeColor = System.Drawing.SystemColors.ControlText; - label4.Location = new System.Drawing.Point(10, 251); + label4.Location = new System.Drawing.Point(10, 250); label4.Margin = new Padding(0); label4.Name = "label4"; label4.Padding = new Padding(0, 8, 0, 0); @@ -234,7 +189,7 @@ namespace FizzyLauncher tHorizontalSeparator3.AutoScrollMargin = new System.Drawing.Size(0, 0); tHorizontalSeparator3.AutoScrollMinSize = new System.Drawing.Size(0, 0); tHorizontalSeparator3.BackColor = System.Drawing.Color.Transparent; - tHorizontalSeparator3.Location = new System.Drawing.Point(10, 179); + tHorizontalSeparator3.Location = new System.Drawing.Point(10, 178); tHorizontalSeparator3.Margin = new Padding(0, 10, 0, 0); tHorizontalSeparator3.MaximumSize = new System.Drawing.Size(4920, 2); tHorizontalSeparator3.MinimumSize = new System.Drawing.Size(0, 22); @@ -245,7 +200,6 @@ namespace FizzyLauncher // // button3 // - button3.AcceptButton = null; button3.ActiveImage = null; button3.BackColor = System.Drawing.Color.Transparent; button3.EnableMenuOnClick = false; @@ -253,10 +207,8 @@ namespace FizzyLauncher button3.HoverImage = null; button3.IdleImage = null; button3.LabelText = "Clear &All"; - button3.Location = new System.Drawing.Point(306, 251); - button3.Margin = new Padding(10, 10, 10, 0); + button3.Location = new System.Drawing.Point(306, 250); button3.Name = "button3"; - button3.Padding = new Padding(4, 4, 3, 3); button3.Size = new System.Drawing.Size(128, 32); button3.TabIndex = 209; button3.TabStop = false; @@ -264,19 +216,16 @@ namespace FizzyLauncher // // progressBar2 // - progressBar2.AcceptButton = null; progressBar2.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; progressBar2.BackColor = System.Drawing.Color.Transparent; progressBar2.BarColour = System.Drawing.Color.FromArgb(79, 193, 203); progressBar2.BarTextColour = System.Drawing.Color.Black; progressBar2.EnableReactiveVisual = false; progressBar2.Font = new System.Drawing.Font("Segoe UI", 9F); - progressBar2.Location = new System.Drawing.Point(10, 211); - progressBar2.Margin = new Padding(10, 10, 10, 0); + progressBar2.Location = new System.Drawing.Point(10, 210); progressBar2.Maximum = 100; progressBar2.Minimum = 0; progressBar2.Name = "progressBar2"; - progressBar2.Padding = new Padding(4, 4, 3, 3); progressBar2.ProgressText = "50/100"; progressBar2.ShowProgressText = true; progressBar2.Size = new System.Drawing.Size(424, 20); @@ -284,11 +233,23 @@ namespace FizzyLauncher progressBar2.TabStop = false; progressBar2.Value = 50; // + // dialogFooter1 + // + dialogFooter1.BackColor = System.Drawing.Color.FromArgb(240, 240, 240); + dialogFooter1.Button1Text = "&Close"; + dialogFooter1.Dialog = null; + dialogFooter1.Dock = DockStyle.Bottom; + dialogFooter1.Location = new System.Drawing.Point(0, 437); + dialogFooter1.Name = "dialogFooter1"; + dialogFooter1.Size = new System.Drawing.Size(444, 84); + // // UpdateIconsForm // AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; + BackColor = System.Drawing.Color.White; ClientSize = new System.Drawing.Size(444, 521); + Controls.Add(dialogFooter1); Controls.Add(progressBar2); Controls.Add(button3); Controls.Add(label4); @@ -299,8 +260,6 @@ namespace FizzyLauncher Controls.Add(pictureBox2); Controls.Add(label2); Controls.Add(tHorizontalSeparator2); - Controls.Add(tHorizontalSeparator1); - Controls.Add(button1); Controls.Add(label1); KeyPreview = true; MinimumSize = new System.Drawing.Size(460, 560); @@ -360,7 +319,6 @@ namespace FizzyLauncher { button3.LabelText = (this.IsBusy ? "&Stop" : "Clear &All"); }); - UIControl.SetEnable(button1, !this.IsBusy); UIControl.SetValue(pictureBox2, (this.IsBusy ? RyzStudio.Windows.ThemedForms.Resource2.loading_block : null)); } }