From 32868a71ff1e463282447f28ab3a1f2799ed304f Mon Sep 17 00:00:00 2001 From: Ray Date: Sat, 20 Jul 2024 17:40:30 +0100 Subject: [PATCH] Changed to RyzStudio.Windows.Forms.8.1.3.614 --- AppResource.Designer.cs | 4 +- AppResource.resx | 4 +- EditGroupForm.cs | 105 +++++++------------- EditGroupForm.resx | 21 ---- EditTileFolderForm.cs | 140 +++++++++----------------- EditTileForm.cs | 213 +++++++++++++++++++--------------------- MainForm.Designer.cs | 2 +- MainForm.cs | 11 ++- NewForm.cs | 97 ++++++------------ OptionsForm.cs | 135 +++++++++++-------------- OptionsForm.resx | 21 ---- RokettoLaunch.csproj | 5 +- build-installer.iss | 2 +- 13 files changed, 293 insertions(+), 467 deletions(-) diff --git a/AppResource.Designer.cs b/AppResource.Designer.cs index 7e137ef..9cf055e 100644 --- a/AppResource.Designer.cs +++ b/AppResource.Designer.cs @@ -79,7 +79,7 @@ namespace RokettoLaunch { } /// - /// Looks up a localized string similar to https://www.hiimray.co.uk/software-fizzy-launcher. + /// Looks up a localized string similar to https://www.hiimray.co.uk/software-rokettolaunch. /// internal static string AppHelpURL { get { @@ -88,7 +88,7 @@ namespace RokettoLaunch { } /// - /// Looks up a localized string similar to https://www.hiimray.co.uk/software-fizzy-launcher. + /// Looks up a localized string similar to https://www.hiimray.co.uk/software-rokettolaunch. /// internal static string AppProductURL { get { diff --git a/AppResource.resx b/AppResource.resx index cd59975..22ca018 100644 --- a/AppResource.resx +++ b/AppResource.resx @@ -124,10 +124,10 @@ https://www.hiimray.co.uk - https://www.hiimray.co.uk/software-fizzy-launcher + https://www.hiimray.co.uk/software-rokettolaunch - https://www.hiimray.co.uk/software-fizzy-launcher + https://www.hiimray.co.uk/software-rokettolaunch diff --git a/EditGroupForm.cs b/EditGroupForm.cs index e68a3fa..68e0228 100644 --- a/EditGroupForm.cs +++ b/EditGroupForm.cs @@ -1,20 +1,19 @@ using System.Windows.Forms; using RokettoLaunch.Models; using RyzStudio.Windows.Forms; -using RyzStudio.Windows.ThemedForms; using RyzStudio.Windows.ThemedForms.ButtonTextBox; using RyzStudio.Windows.ThemedForms.PickerBox; namespace RokettoLaunch { - public class EditGroupForm : TDialog + public class EditGroupForm : Form { private Label label2; private Label label1; - private ThButton button1; private ThYesNoPickerBox pickerBox1; - private THorizontalSeparator horizontalSeparator2; private ThClearableTextBox textBox1; + private RyzStudio.Windows.ThemedForms.Composite.DialogFooter dialogFooter1; + private TileGroupModel result = null; @@ -23,11 +22,11 @@ namespace RokettoLaunch { InitializeComponent(); - result = model; + UISetup.Dialog(this); - StartPosition = FormStartPosition.WindowsDefaultLocation; - Text = result == null ? "Add Group" : "Edit Group"; - OkButton = button1; + this.Text = (result == null) ? "Add Group" : "Edit Group"; + + result = model; pickerBox1.ComboBox.Items.Clear(); pickerBox1.ComboBox.Items.AddRange(new string[] { "No", "Yes" }); @@ -45,115 +44,87 @@ namespace RokettoLaunch private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(EditGroupForm)); textBox1 = new ThClearableTextBox(); label2 = new Label(); label1 = new Label(); - button1 = new ThButton(); pickerBox1 = new ThYesNoPickerBox(); - horizontalSeparator2 = new THorizontalSeparator(); + dialogFooter1 = new RyzStudio.Windows.ThemedForms.Composite.DialogFooter(); SuspendLayout(); - // + // // textBox1 - // - textBox1.AcceptButton = null; + // textBox1.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; textBox1.BackColor = System.Drawing.Color.Transparent; textBox1.ClearedValue = ""; textBox1.EnableReactiveVisual = true; textBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); + textBox1.Icon = "O"; + textBox1.IconSize = 13F; textBox1.Location = new System.Drawing.Point(192, 20); - 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(177, 32); textBox1.TabIndex = 152; textBox1.TabStop = false; textBox1.UseSystemPasswordChar = false; - // + // // label2 - // + // label2.AutoSize = true; label2.BackColor = System.Drawing.Color.Transparent; label2.ForeColor = System.Drawing.SystemColors.ControlText; label2.Location = new System.Drawing.Point(10, 62); + label2.Margin = new Padding(0); label2.Name = "label2"; - label2.Padding = new Padding(0, 9, 0, 10); - label2.Size = new System.Drawing.Size(91, 34); + label2.Padding = new Padding(0, 9, 0, 0); + label2.Size = new System.Drawing.Size(91, 24); label2.TabIndex = 155; label2.Text = "Show Expanded"; label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // + // // label1 - // + // 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, 9, 0, 10); - label1.Size = new System.Drawing.Size(29, 34); + label1.Padding = new Padding(0, 9, 0, 0); + label1.Size = new System.Drawing.Size(29, 24); label1.TabIndex = 153; label1.Text = "Title"; 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 = "&Save"; - button1.Location = new System.Drawing.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 System.Drawing.Size(128, 32); - button1.TabIndex = 173; - button1.TabStop = false; - // + // // 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("Microsoft Sans Serif", 8.25F); pickerBox1.Location = new System.Drawing.Point(285, 62); pickerBox1.Name = "pickerBox1"; - pickerBox1.Padding = new Padding(4, 4, 3, 3); pickerBox1.SelectedIndex = 0; pickerBox1.Size = new System.Drawing.Size(84, 34); pickerBox1.TabIndex = 174; pickerBox1.TabStop = false; pickerBox1.Value = false; - // - // horizontalSeparator2 - // - horizontalSeparator2.Anchor = AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; - horizontalSeparator2.AutoScrollMargin = new System.Drawing.Size(0, 0); - horizontalSeparator2.AutoScrollMinSize = new System.Drawing.Size(0, 0); - horizontalSeparator2.BackColor = System.Drawing.Color.Transparent; - horizontalSeparator2.Location = new System.Drawing.Point(10, 437); - horizontalSeparator2.Margin = new Padding(0, 10, 0, 0); - horizontalSeparator2.MaximumSize = new System.Drawing.Size(4920, 2); - horizontalSeparator2.MinimumSize = new System.Drawing.Size(0, 22); - horizontalSeparator2.Name = "horizontalSeparator2"; - horizontalSeparator2.Size = new System.Drawing.Size(364, 22); - horizontalSeparator2.TabIndex = 182; - horizontalSeparator2.TabStop = false; - // + // + // 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(384, 84); + // // EditGroupForm - // + // + BackColor = System.Drawing.Color.White; ClientSize = new System.Drawing.Size(384, 521); - Controls.Add(horizontalSeparator2); + Controls.Add(dialogFooter1); Controls.Add(pickerBox1); - Controls.Add(button1); Controls.Add(label2); Controls.Add(label1); Controls.Add(textBox1); diff --git a/EditGroupForm.resx b/EditGroupForm.resx index 0386da6..af32865 100644 --- a/EditGroupForm.resx +++ b/EditGroupForm.resx @@ -117,25 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAAN5JREFUOE/tUzsKwkAUXLCyFMHjeIvdB4Gk8ALamU4rsbLaTWz0AOYGOYMewTqe - QLEQnZc8WRMSsBYHhrzPzJBin2pC60PPGLs3xl3Bp5DrHe9E1g2tHUH8QMjKmGReketyZkRWh9abfhTZ - YRimI4jWRPYSBMngkzzjHWtYyx6xK4X0Anz/7rcsxM4BdoxBTuTOqCdEaUyU6DrTuNqxxuXsEXsFDLfg - UdpOsIa10nr8A34p4CRtJ1jTGoC3PsPiBi78ETXplqzBwU3F5sHHgWWGJ3rHt+3tg+Uu84ek1AsYYd8q - EsfwCwAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAANFJREFUOE/tkzEKAjEURANWliJ4HG+h9l5AO7fTSjyCxWpCIBB2b+AZ9AjW6wlc - LGSdWb9Elw1YiwOP/Pw/E1Ikqqksyzpa670x5goqgfWOM7HFhfAE5jvWNdYFkZq9sdg+laZp13vfBwOY - NjBfnHO9d9jjjB56mZG4UhgW4HXdbykkXl97iMYBnFFPrbUJGDVIOKOHXmYk/hSaW3CUbVT00CvboP8B - v3TASbZR0RM7YA5KsAT1J2phBUq8wpnEgvg5MMwxvGFte/uVzPLwkZR6AInAKK6aICfTAAAAAElFTkSu - QmCC - - \ No newline at end of file diff --git a/EditTileFolderForm.cs b/EditTileFolderForm.cs index a79e0e6..7e0dcb9 100644 --- a/EditTileFolderForm.cs +++ b/EditTileFolderForm.cs @@ -12,15 +12,14 @@ using RyzStudio.Windows.ThemedForms.ButtonTextBox; namespace RokettoLaunch { - public class EditTileFolderForm : TDialog + public class EditTileFolderForm : Form { private Label label1; - private ThButton button1; - private THorizontalSeparator horizontalSeparator2; private ThClearableTextBox textBox1; private ThListBox listBox1; - private THorizontalSeparator tHorizontalSeparator1; private Label label2; + private RyzStudio.Windows.ThemedForms.Composite.DialogFooter dialogFooter1; + private TileModel result = null; @@ -29,15 +28,14 @@ namespace RokettoLaunch { InitializeComponent(); - StartPosition = FormStartPosition.WindowsDefaultLocation; - OkButton = button1; + UISetup.Dialog(this); + + this.Text = (result == null) ? "Add Folder" : "Edit Folder"; result = model; if (result != null) { - Text = "Edit Folder"; - textBox1.Text = result?.Title ?? string.Empty; foreach (TileModel item in result.Items ?? new List()) @@ -50,139 +48,95 @@ namespace RokettoLaunch listBox1.ListBox.Items.Add(item); } } - else - { - Text = "Add Folder"; - } } private void InitializeComponent() { textBox1 = new ThClearableTextBox(); label1 = new Label(); - button1 = new ThButton(); - horizontalSeparator2 = new THorizontalSeparator(); listBox1 = new ThListBox(); label2 = new Label(); - tHorizontalSeparator1 = new THorizontalSeparator(); + dialogFooter1 = new RyzStudio.Windows.ThemedForms.Composite.DialogFooter(); SuspendLayout(); - // + // // textBox1 - // + // textBox1.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; textBox1.BackColor = Color.Transparent; + textBox1.ClearedValue = ""; textBox1.EnableReactiveVisual = true; textBox1.Font = new Font("Microsoft Sans Serif", 8.25F); + textBox1.Icon = "O"; + textBox1.IconSize = 13F; textBox1.Location = new Point(109, 20); textBox1.Name = "textBox1"; - textBox1.Size = new Size(260, 35); + textBox1.Size = new Size(275, 32); textBox1.TabIndex = 152; textBox1.TabStop = false; textBox1.UseSystemPasswordChar = false; - // + // // label1 - // + // label1.AutoSize = true; label1.BackColor = Color.Transparent; label1.ForeColor = SystemColors.ControlText; - label1.Location = new Point(10, 21); + label1.Location = new Point(10, 20); label1.Margin = new Padding(0); label1.Name = "label1"; - label1.Padding = new Padding(0, 9, 0, 10); - label1.Size = new Size(29, 34); + label1.Padding = new Padding(0, 9, 0, 0); + label1.Size = new Size(29, 24); label1.TabIndex = 153; 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 = 173; - button1.TabStop = false; - // - // horizontalSeparator2 - // - horizontalSeparator2.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - horizontalSeparator2.AutoScrollMargin = new Size(0, 0); - horizontalSeparator2.AutoScrollMinSize = new Size(0, 0); - horizontalSeparator2.BackColor = Color.Transparent; - horizontalSeparator2.Location = new Point(10, 61); - horizontalSeparator2.Margin = new Padding(0, 10, 0, 0); - horizontalSeparator2.MaximumSize = new Size(4920, 2); - horizontalSeparator2.MinimumSize = new Size(0, 22); - horizontalSeparator2.Name = "horizontalSeparator2"; - horizontalSeparator2.Size = new Size(364, 22); - horizontalSeparator2.TabIndex = 177; - horizontalSeparator2.TabStop = false; - // + // // listBox1 - // - listBox1.AcceptButton = null; + // listBox1.AllowDrop = true; listBox1.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; listBox1.BackColor = Color.Transparent; listBox1.EnableReactiveVisual = true; listBox1.Font = new Font("Microsoft Sans Serif", 8.25F); - listBox1.Location = new Point(109, 87); - listBox1.Margin = new Padding(10, 10, 10, 0); + listBox1.Location = new Point(109, 62); listBox1.Name = "listBox1"; - listBox1.Padding = new Padding(4, 4, 3, 3); - listBox1.Size = new Size(260, 346); + listBox1.Size = new Size(260, 366); listBox1.TabIndex = 180; listBox1.OnAdd += listBox1_OnAdd; listBox1.OnEdit += listBox1_OnEdit; + listBox1.OnCopy += listBox1_OnCopy; listBox1.DragDrop += listBox1_DragDrop; listBox1.DragOver += listBox1_DragOver; - // + // // label2 - // + // label2.AutoSize = true; label2.BackColor = Color.Transparent; label2.ForeColor = SystemColors.ControlText; - label2.Location = new Point(8, 87); + label2.Location = new Point(10, 62); + label2.Margin = new Padding(0); label2.Name = "label2"; - label2.Padding = new Padding(0, 9, 0, 10); - label2.Size = new Size(30, 34); + label2.Padding = new Padding(0, 9, 0, 0); + label2.Size = new Size(82, 24); label2.TabIndex = 181; - label2.Text = "Tiles"; + label2.Text = "Tile Collection"; label2.TextAlign = ContentAlignment.MiddleLeft; - // - // 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 = 182; - tHorizontalSeparator1.TabStop = false; - // + // + // dialogFooter1 + // + dialogFooter1.BackColor = Color.FromArgb(240, 240, 240); + dialogFooter1.Button1Text = "&Save"; + dialogFooter1.Dialog = this; + dialogFooter1.Dock = DockStyle.Bottom; + dialogFooter1.Location = new Point(0, 437); + dialogFooter1.Name = "dialogFooter1"; + dialogFooter1.Size = new Size(384, 84); + // // EditTileFolderForm - // + // + BackColor = Color.White; ClientSize = new Size(384, 521); - Controls.Add(tHorizontalSeparator1); + Controls.Add(dialogFooter1); Controls.Add(label2); Controls.Add(listBox1); - Controls.Add(horizontalSeparator2); - Controls.Add(button1); Controls.Add(label1); Controls.Add(textBox1); MinimumSize = new Size(400, 560); @@ -192,7 +146,6 @@ namespace RokettoLaunch PerformLayout(); } - public TileModel Result { get @@ -256,6 +209,11 @@ namespace RokettoLaunch }; } + private void listBox1_OnCopy(object sender, EventArgs e) + { + listBox1.ListBox.CopyItem(); + } + private void listBox1_DragOver(object sender, DragEventArgs e) { if (e.Data.GetDataPresent(DataFormats.FileDrop)) diff --git a/EditTileForm.cs b/EditTileForm.cs index 9df9579..29b6bd9 100644 --- a/EditTileForm.cs +++ b/EditTileForm.cs @@ -8,7 +8,7 @@ using RyzStudio.Windows.ThemedForms.PickerBox; namespace RokettoLaunch { - public class EditTileForm : TDialog + public class EditTileForm : Form { private Label label6; private Label label7; @@ -19,12 +19,12 @@ namespace RokettoLaunch private ThPathDialogTextBox textBox2; private ThClearableTextBox textBox3; private ThPathDialogTextBox textBox4; - private ThButton button1; private ThPickerBox pickerBox1; private ThYesNoPickerBox pickerBox2; private THorizontalSeparator horizontalSeparator1; - private THorizontalSeparator horizontalSeparator2; private ThClearableTextBox textBox1; + private RyzStudio.Windows.ThemedForms.Composite.DialogFooter dialogFooter1; + private TileModel result = null; @@ -33,8 +33,9 @@ namespace RokettoLaunch { InitializeComponent(); - StartPosition = FormStartPosition.WindowsDefaultLocation; - OkButton = button1; + UISetup.Dialog(this); + + this.Text = (result == null) ? "Add Tile" : "Edit Tile"; result = model; @@ -47,8 +48,6 @@ namespace RokettoLaunch if (result != null) { - Text = "Edit Tile"; - textBox1.Text = result?.Title ?? string.Empty; textBox2.Text = result?.ProcessFilename ?? string.Empty; textBox3.Text = result?.ProcessArgument ?? string.Empty; @@ -56,10 +55,6 @@ namespace RokettoLaunch pickerBox1.ComboBox.SelectedIndex = (int)result.ProcessWindowStyle; pickerBox2.Value = result.ProcessAsAdmin; } - else - { - Text = "Add Tile"; - } } private void InitializeComponent() @@ -74,200 +69,200 @@ namespace RokettoLaunch textBox2 = new ThPathDialogTextBox(); textBox3 = new ThClearableTextBox(); textBox4 = new ThPathDialogTextBox(); - button1 = new ThButton(); pickerBox1 = new ThPickerBox(); pickerBox2 = new ThYesNoPickerBox(); horizontalSeparator1 = new THorizontalSeparator(); - horizontalSeparator2 = new THorizontalSeparator(); + dialogFooter1 = new RyzStudio.Windows.ThemedForms.Composite.DialogFooter(); SuspendLayout(); - // + // // textBox1 - // + // textBox1.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; textBox1.BackColor = Color.Transparent; + textBox1.ClearedValue = ""; textBox1.EnableReactiveVisual = true; textBox1.Font = new Font("Segoe UI", 9F); - textBox1.Location = new Point(126, 20); + textBox1.Icon = "O"; + textBox1.IconSize = 13F; + textBox1.Location = new Point(109, 20); textBox1.Name = "textBox1"; - textBox1.Size = new Size(243, 35); + textBox1.Size = new Size(260, 32); textBox1.TabIndex = 152; textBox1.TabStop = false; textBox1.UseSystemPasswordChar = false; - // + // // label6 - // + // label6.AutoSize = true; label6.BackColor = Color.Transparent; label6.ForeColor = SystemColors.ControlText; - label6.Location = new Point(10, 250); + label6.Location = new Point(10, 264); + label6.Margin = new Padding(0); label6.Name = "label6"; - label6.Padding = new Padding(0, 9, 0, 10); - label6.Size = new Size(83, 34); + label6.Padding = new Padding(0, 9, 0, 0); + label6.Size = new Size(83, 24); label6.TabIndex = 163; label6.Text = "Run As Admin"; label6.TextAlign = ContentAlignment.MiddleLeft; - // + // // label7 - // + // label7.AutoSize = true; label7.BackColor = Color.Transparent; label7.ForeColor = SystemColors.ControlText; - label7.Location = new Point(10, 209); + label7.Location = new Point(10, 220); + label7.Margin = new Padding(0); label7.Name = "label7"; - label7.Padding = new Padding(0, 9, 0, 10); - label7.Size = new Size(79, 34); + label7.Padding = new Padding(0, 9, 0, 0); + label7.Size = new Size(79, 24); label7.TabIndex = 161; label7.Text = "Window Style"; label7.TextAlign = ContentAlignment.MiddleLeft; - // + // // label4 - // + // label4.AutoSize = true; label4.BackColor = Color.Transparent; label4.ForeColor = SystemColors.ControlText; - label4.Location = new Point(10, 144); + label4.Location = new Point(10, 146); + label4.Margin = new Padding(0); label4.Name = "label4"; - label4.Padding = new Padding(0, 9, 0, 10); - label4.Size = new Size(103, 34); + label4.Padding = new Padding(0, 9, 0, 0); + label4.Size = new Size(103, 24); label4.TabIndex = 159; label4.Text = "Working Directory"; label4.TextAlign = ContentAlignment.MiddleLeft; - // + // // label3 - // + // label3.AutoSize = true; label3.BackColor = Color.Transparent; label3.ForeColor = SystemColors.ControlText; - label3.Location = new Point(10, 103); + label3.Location = new Point(10, 104); + label3.Margin = new Padding(0); label3.Name = "label3"; - label3.Padding = new Padding(0, 9, 0, 10); - label3.Size = new Size(61, 34); + label3.Padding = new Padding(0, 9, 0, 0); + label3.Size = new Size(61, 24); label3.TabIndex = 157; label3.Text = "Argument"; label3.TextAlign = ContentAlignment.MiddleLeft; - // + // // label2 - // + // label2.AutoSize = true; label2.BackColor = Color.Transparent; label2.ForeColor = SystemColors.ControlText; label2.Location = new Point(10, 62); + label2.Margin = new Padding(0); label2.Name = "label2"; - label2.Padding = new Padding(0, 9, 0, 10); - label2.Size = new Size(55, 34); + label2.Padding = new Padding(0, 9, 0, 0); + label2.Size = new Size(55, 24); label2.TabIndex = 155; label2.Text = "Filename"; label2.TextAlign = ContentAlignment.MiddleLeft; - // + // // label1 - // + // label1.AutoSize = true; label1.BackColor = Color.Transparent; label1.ForeColor = SystemColors.ControlText; - label1.Location = new Point(10, 21); + label1.Location = new Point(10, 20); label1.Margin = new Padding(0); label1.Name = "label1"; - label1.Padding = new Padding(0, 9, 0, 10); - label1.Size = new Size(29, 34); + label1.Padding = new Padding(0, 9, 0, 0); + label1.Size = new Size(29, 24); label1.TabIndex = 153; label1.Text = "Title"; label1.TextAlign = ContentAlignment.MiddleLeft; - // + // // textBox2 - // + // textBox2.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; textBox2.BackColor = Color.Transparent; textBox2.DialogMode = ThPathDialogTextBox.DialogType.OpenFile; textBox2.EnableReactiveVisual = true; + textBox2.FolderBrowserDialog = null; textBox2.Font = new Font("Segoe UI", 9F); - textBox2.Location = new Point(126, 61); - textBox2.Margin = new Padding(10, 10, 10, 0); + textBox2.Icon = "C"; + textBox2.IconSize = 13F; + textBox2.Location = new Point(109, 62); textBox2.Name = "textBox2"; - textBox2.Size = new Size(243, 32); + textBox2.OpenFileDialog = null; + textBox2.SaveFileDialog = null; + textBox2.Size = new Size(260, 32); textBox2.TabIndex = 170; textBox2.TabStop = false; textBox2.UseSystemPasswordChar = false; - // + // // textBox3 - // + // textBox3.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; textBox3.BackColor = Color.Transparent; + textBox3.ClearedValue = ""; textBox3.EnableReactiveVisual = true; textBox3.Font = new Font("Segoe UI", 9F); - textBox3.Location = new Point(147, 102); + textBox3.Icon = "O"; + textBox3.IconSize = 13F; + textBox3.Location = new Point(149, 104); textBox3.Name = "textBox3"; - textBox3.Size = new Size(222, 35); + textBox3.Size = new Size(220, 32); textBox3.TabIndex = 171; textBox3.TabStop = false; - // + textBox3.UseSystemPasswordChar = false; + // // textBox4 - // + // textBox4.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; textBox4.BackColor = Color.Transparent; textBox4.DialogMode = ThPathDialogTextBox.DialogType.FolderBrowser; textBox4.EnableReactiveVisual = true; + textBox4.FolderBrowserDialog = null; textBox4.Font = new Font("Segoe UI", 9F); - textBox4.Location = new Point(147, 143); + textBox4.Icon = "D"; + textBox4.IconSize = 13F; + textBox4.Location = new Point(149, 146); textBox4.Name = "textBox4"; - textBox4.Size = new Size(222, 32); + textBox4.OpenFileDialog = null; + textBox4.SaveFileDialog = null; + textBox4.Size = new Size(220, 32); textBox4.TabIndex = 172; textBox4.TabStop = false; textBox4.UseSystemPasswordChar = false; - // - // 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 = 173; - button1.TabStop = false; - // + // // pickerBox1 - // - pickerBox1.AcceptButton = null; + // pickerBox1.Anchor = AnchorStyles.Top | AnchorStyles.Right; pickerBox1.BackColor = Color.Transparent; pickerBox1.EnableReactiveVisual = true; pickerBox1.Font = new Font("Segoe UI", 9F); - pickerBox1.Location = new Point(241, 209); - pickerBox1.Margin = new Padding(10, 10, 10, 0); + pickerBox1.Location = new Point(249, 220); pickerBox1.Name = "pickerBox1"; - pickerBox1.Padding = new Padding(4, 4, 3, 3); pickerBox1.SelectedIndex = -1; - pickerBox1.Size = new Size(128, 34); + pickerBox1.Size = new Size(120, 34); pickerBox1.TabIndex = 174; pickerBox1.TabStop = false; - // + // // pickerBox2 - // + // pickerBox2.Anchor = AnchorStyles.Top | AnchorStyles.Right; pickerBox2.BackColor = Color.Transparent; pickerBox2.EnableReactiveVisual = true; pickerBox2.Font = new Font("Segoe UI", 9F); - pickerBox2.Location = new Point(285, 250); + pickerBox2.Location = new Point(289, 264); pickerBox2.Name = "pickerBox2"; - pickerBox2.Size = new Size(84, 34); + pickerBox2.SelectedIndex = 0; + pickerBox2.Size = new Size(80, 34); pickerBox2.TabIndex = 175; pickerBox2.TabStop = false; - // + pickerBox2.Value = false; + // // horizontalSeparator1 - // + // horizontalSeparator1.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; horizontalSeparator1.AutoScrollMargin = new Size(0, 0); horizontalSeparator1.AutoScrollMinSize = new Size(0, 0); horizontalSeparator1.BackColor = Color.Transparent; - horizontalSeparator1.Location = new Point(10, 181); + horizontalSeparator1.Location = new Point(10, 187); horizontalSeparator1.Margin = new Padding(0, 10, 0, 0); horizontalSeparator1.MaximumSize = new Size(4920, 2); horizontalSeparator1.MinimumSize = new Size(0, 22); @@ -275,30 +270,25 @@ namespace RokettoLaunch horizontalSeparator1.Size = new Size(364, 22); horizontalSeparator1.TabIndex = 176; horizontalSeparator1.TabStop = false; - // - // horizontalSeparator2 - // - horizontalSeparator2.Anchor = AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; - horizontalSeparator2.AutoScrollMargin = new Size(0, 0); - horizontalSeparator2.AutoScrollMinSize = new Size(0, 0); - horizontalSeparator2.BackColor = Color.Transparent; - horizontalSeparator2.Location = new Point(10, 437); - horizontalSeparator2.Margin = new Padding(0, 10, 0, 0); - horizontalSeparator2.MaximumSize = new Size(4920, 2); - horizontalSeparator2.MinimumSize = new Size(0, 22); - horizontalSeparator2.Name = "horizontalSeparator2"; - horizontalSeparator2.Size = new Size(364, 22); - horizontalSeparator2.TabIndex = 177; - horizontalSeparator2.TabStop = false; - // + // + // dialogFooter1 + // + dialogFooter1.BackColor = Color.FromArgb(240, 240, 240); + dialogFooter1.Button1Text = "&Save"; + dialogFooter1.Dialog = this; + dialogFooter1.Dock = DockStyle.Bottom; + dialogFooter1.Location = new Point(0, 437); + dialogFooter1.Name = "dialogFooter1"; + dialogFooter1.Size = new Size(384, 84); + // // EditTileForm - // + // + BackColor = Color.White; ClientSize = new Size(384, 521); - Controls.Add(horizontalSeparator2); + Controls.Add(dialogFooter1); Controls.Add(horizontalSeparator1); Controls.Add(pickerBox2); Controls.Add(pickerBox1); - Controls.Add(button1); Controls.Add(textBox4); Controls.Add(textBox3); Controls.Add(textBox2); @@ -316,7 +306,6 @@ namespace RokettoLaunch PerformLayout(); } - public TileModel Result { get diff --git a/MainForm.Designer.cs b/MainForm.Designer.cs index ead3ea7..819c016 100644 --- a/MainForm.Designer.cs +++ b/MainForm.Designer.cs @@ -451,7 +451,7 @@ namespace RokettoLaunch // MainForm // AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - BackColor = System.Drawing.Color.FromArgb(250, 250, 250); + BackColor = System.Drawing.Color.White; BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; ClientSize = new System.Drawing.Size(404, 441); Controls.Add(panel1); diff --git a/MainForm.cs b/MainForm.cs index 5eb559a..915f3d6 100644 --- a/MainForm.cs +++ b/MainForm.cs @@ -8,6 +8,7 @@ using System.Windows.Forms; using RokettoLaunch.Models; using RyzStudio; using RyzStudio.Windows.Forms; +using RyzStudio.Windows.ThemedForms; using RyzStudio.Windows.ThemedForms.ButtonTextBox; using RyzStudio.Windows.TileForms; @@ -423,7 +424,7 @@ namespace RokettoLaunch }); } - private async Task fileSessionManager_OnLoadSession(FileSessionManager sender, string filename) + private async Task fileSessionManager_OnLoadSession(FileSessionManager sender, string filename, int formatType) { return await Task.Run(async () => { @@ -445,7 +446,7 @@ namespace RokettoLaunch if (this.CurrentSession == null) { - MessageBox.Show("Unable to read session", "Load session"); + ThMessageBox.Show(this, "Unable to read session", "Load session"); return false; } @@ -479,7 +480,7 @@ namespace RokettoLaunch }); } - private async Task fileSessionManager_OnSaveSession(FileSessionManager sender, string filename, bool showNotices) + private async Task fileSessionManager_OnSaveSession(FileSessionManager sender, string filename, int formatType, bool showNotices) { if (string.IsNullOrWhiteSpace(filename)) { @@ -544,14 +545,14 @@ namespace RokettoLaunch { if (showNotices) { - MessageBox.Show("Session saved!", "Save session", MessageBoxButtons.OK, MessageBoxIcon.Information); + ThMessageBox.Show(this, "Session saved!", "Save session", MessageBoxButtons.OK, MessageBoxIcon.Information); } } else { if (showNotices) { - MessageBox.Show(result.Message, "Save session"); + ThMessageBox.Show(this, "Session saved!", "Save session"); } } diff --git a/NewForm.cs b/NewForm.cs index c0b5adc..d899ef5 100644 --- a/NewForm.cs +++ b/NewForm.cs @@ -5,21 +5,20 @@ using RyzStudio.Windows.ThemedForms; namespace RokettoLaunch { - public class NewForm : TDialog + public class NewForm : Form { private System.Windows.Forms.Label label1; - private ThButton button1; private ThNumericBox numericBox1; private ThNumericBox numericBox2; + private RyzStudio.Windows.ThemedForms.Composite.DialogFooter dialogFooter1; private Label label2; - private RyzStudio.Windows.Forms.THorizontalSeparator tHorizontalSeparator1; public NewForm() { InitializeComponent(); - this.OkButton = button1; + UISetup.Dialog(this); numericBox1.Minimum = 4; numericBox1.Maximum = 24; @@ -32,121 +31,90 @@ namespace RokettoLaunch private void InitializeComponent() { label1 = new Label(); - button1 = new ThButton(); - tHorizontalSeparator1 = new THorizontalSeparator(); numericBox1 = new ThNumericBox(); numericBox2 = new ThNumericBox(); label2 = new Label(); + dialogFooter1 = new RyzStudio.Windows.ThemedForms.Composite.DialogFooter(); SuspendLayout(); - // + // // label1 - // + // 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, 9, 0, 10); - label1.Size = new System.Drawing.Size(76, 34); + label1.Padding = new Padding(0, 9, 0, 0); + label1.Size = new System.Drawing.Size(76, 24); label1.TabIndex = 153; label1.Text = "Tiles Per Row"; 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 = "&OK"; - button1.Location = new System.Drawing.Point(241, 369); - 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 = 173; - 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, 337); - 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(364, 22); - tHorizontalSeparator1.TabIndex = 188; - tHorizontalSeparator1.TabStop = false; - // + // // numericBox1 - // - numericBox1.AcceptButton = null; + // numericBox1.Anchor = AnchorStyles.Top | AnchorStyles.Right; numericBox1.BackColor = System.Drawing.Color.Transparent; numericBox1.EnableReactiveVisual = true; numericBox1.Font = new System.Drawing.Font("Segoe UI", 9F); numericBox1.Location = new System.Drawing.Point(285, 20); - numericBox1.Margin = new Padding(10, 10, 10, 0); numericBox1.Maximum = 100; numericBox1.Minimum = 1; numericBox1.Name = "numericBox1"; - numericBox1.Padding = new Padding(4, 4, 3, 3); numericBox1.Size = new System.Drawing.Size(84, 32); numericBox1.TabIndex = 189; numericBox1.TabStop = false; numericBox1.Value = 1; - // + // // numericBox2 - // - numericBox2.AcceptButton = null; + // numericBox2.Anchor = AnchorStyles.Top | AnchorStyles.Right; numericBox2.BackColor = System.Drawing.Color.Transparent; numericBox2.EnableReactiveVisual = true; numericBox2.Font = new System.Drawing.Font("Segoe UI", 9F); - numericBox2.Location = new System.Drawing.Point(285, 62); - numericBox2.Margin = new Padding(10, 10, 10, 0); + numericBox2.Location = new System.Drawing.Point(285, 63); numericBox2.Maximum = 100; numericBox2.Minimum = 1; numericBox2.Name = "numericBox2"; - numericBox2.Padding = new Padding(4, 4, 3, 3); numericBox2.Size = new System.Drawing.Size(84, 32); numericBox2.TabIndex = 191; numericBox2.TabStop = false; numericBox2.Value = 1; - // + // // label2 - // + // label2.AutoSize = true; label2.BackColor = System.Drawing.Color.Transparent; label2.ForeColor = System.Drawing.SystemColors.ControlText; label2.Location = new System.Drawing.Point(10, 63); label2.Margin = new Padding(0); label2.Name = "label2"; - label2.Padding = new Padding(0, 9, 0, 10); - label2.Size = new System.Drawing.Size(106, 34); + label2.Padding = new Padding(0, 9, 0, 0); + label2.Size = new System.Drawing.Size(106, 24); label2.TabIndex = 190; label2.Text = "Number of Groups"; label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // + // + // dialogFooter1 + // + dialogFooter1.BackColor = System.Drawing.Color.FromArgb(240, 240, 240); + dialogFooter1.Button1Text = "&OK"; + dialogFooter1.Dialog = this; + dialogFooter1.Dock = DockStyle.Bottom; + dialogFooter1.Location = new System.Drawing.Point(0, 337); + dialogFooter1.Name = "dialogFooter1"; + dialogFooter1.Size = new System.Drawing.Size(384, 84); + // // NewForm - // + // AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; + BackColor = System.Drawing.Color.White; ClientSize = new System.Drawing.Size(384, 421); + Controls.Add(dialogFooter1); Controls.Add(numericBox2); Controls.Add(label2); Controls.Add(numericBox1); - Controls.Add(tHorizontalSeparator1); - Controls.Add(button1); Controls.Add(label1); MinimumSize = new System.Drawing.Size(400, 200); Name = "NewForm"; @@ -155,7 +123,6 @@ namespace RokettoLaunch PerformLayout(); } - public NewFormModel Result { get => new NewFormModel() diff --git a/OptionsForm.cs b/OptionsForm.cs index 931d8d3..226cd2a 100644 --- a/OptionsForm.cs +++ b/OptionsForm.cs @@ -9,15 +9,13 @@ using RyzStudio.Windows.ThemedForms.PickerBox; namespace RokettoLaunch { - public class OptionsForm : TDialog + public class OptionsForm : Form { private System.Windows.Forms.Label label1; - private ThButton button1; private ThYesNoPickerBox yesNoPickerBox2; private System.Windows.Forms.Label label6; private ThYesNoPickerBox yesNoPickerBox3; private System.Windows.Forms.Label label7; - private RyzStudio.Windows.Forms.THorizontalSeparator tHorizontalSeparator1; private ThKeyCodeTextBox textBox1; private ThNumericBox numericBox1; private Label label4; @@ -28,6 +26,8 @@ namespace RokettoLaunch private Label label2; private ThYesNoPickerBox yesNoPickerBox4; private Label label3; + private RyzStudio.Windows.ThemedForms.Composite.DialogFooter dialogFooter1; + private AppOptions _appSession = null; @@ -36,13 +36,13 @@ namespace RokettoLaunch { InitializeComponent(); - this.OkButton = button1; + UISetup.Dialog(this); + + _appSession = appSession; numericBox1.Minimum = 4; numericBox1.Maximum = 24; - _appSession = appSession; - if (_appSession != null) { numericBox1.Value = _appSession.TilesPerRow; @@ -56,15 +56,12 @@ namespace RokettoLaunch private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(OptionsForm)); ThKeyCodeTextBox.Results results1 = new ThKeyCodeTextBox.Results(); label1 = new Label(); - button1 = new ThButton(); yesNoPickerBox2 = new ThYesNoPickerBox(); label6 = new Label(); yesNoPickerBox3 = new ThYesNoPickerBox(); label7 = new Label(); - tHorizontalSeparator1 = new THorizontalSeparator(); textBox1 = new ThKeyCodeTextBox(); numericBox1 = new ThNumericBox(); label4 = new Label(); @@ -75,13 +72,14 @@ namespace RokettoLaunch tTogglePanel2 = new TTogglePanel(); yesNoPickerBox4 = new ThYesNoPickerBox(); label3 = new Label(); + dialogFooter1 = new RyzStudio.Windows.ThemedForms.Composite.DialogFooter(); flowLayoutPanel1.SuspendLayout(); tTogglePanel1.SuspendLayout(); tTogglePanel2.SuspendLayout(); SuspendLayout(); - // + // // label1 - // + // label1.AutoSize = true; label1.BackColor = System.Drawing.Color.Transparent; label1.ForeColor = System.Drawing.SystemColors.ControlText; @@ -93,28 +91,9 @@ namespace RokettoLaunch label1.TabIndex = 153; label1.Text = "Show Toggle Hotkey"; 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 = "&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 = 173; - button1.TabStop = false; - // + // // yesNoPickerBox2 - // + // yesNoPickerBox2.AcceptButton = null; yesNoPickerBox2.Anchor = AnchorStyles.Top | AnchorStyles.Right; yesNoPickerBox2.BackColor = System.Drawing.Color.Transparent; @@ -129,9 +108,9 @@ namespace RokettoLaunch yesNoPickerBox2.TabIndex = 183; yesNoPickerBox2.TabStop = false; yesNoPickerBox2.Value = true; - // + // // label6 - // + // label6.AutoSize = true; label6.BackColor = System.Drawing.Color.Transparent; label6.ForeColor = System.Drawing.SystemColors.ControlText; @@ -143,9 +122,9 @@ namespace RokettoLaunch label6.TabIndex = 182; label6.Text = "Hide On Close"; label6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // + // // yesNoPickerBox3 - // + // yesNoPickerBox3.AcceptButton = null; yesNoPickerBox3.Anchor = AnchorStyles.Top | AnchorStyles.Right; yesNoPickerBox3.BackColor = System.Drawing.Color.Transparent; @@ -160,9 +139,9 @@ namespace RokettoLaunch yesNoPickerBox3.TabIndex = 185; yesNoPickerBox3.TabStop = false; yesNoPickerBox3.Value = true; - // + // // label7 - // + // label7.AutoSize = true; label7.BackColor = System.Drawing.Color.Transparent; label7.ForeColor = System.Drawing.SystemColors.ControlText; @@ -174,29 +153,16 @@ namespace RokettoLaunch label7.TabIndex = 184; label7.Text = "Hide On Execute"; label7.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // 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; - // + // // textBox1 - // + // textBox1.AcceptButton = null; textBox1.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; textBox1.BackColor = System.Drawing.Color.Transparent; textBox1.EnableReactiveVisual = true; textBox1.Font = new System.Drawing.Font("Segoe UI", 9F); + textBox1.Icon = "O"; + textBox1.IconSize = 13F; results1.IsAlt = false; results1.IsCtrl = false; results1.IsShift = false; @@ -210,9 +176,9 @@ namespace RokettoLaunch textBox1.TabIndex = 189; textBox1.TabStop = false; textBox1.UseSystemPasswordChar = false; - // + // // numericBox1 - // + // numericBox1.AcceptButton = null; numericBox1.Anchor = AnchorStyles.Top | AnchorStyles.Right; numericBox1.BackColor = System.Drawing.Color.Transparent; @@ -228,9 +194,9 @@ namespace RokettoLaunch numericBox1.TabIndex = 192; numericBox1.TabStop = false; numericBox1.Value = 1; - // + // // label4 - // + // label4.AutoSize = true; label4.BackColor = System.Drawing.Color.Transparent; label4.ForeColor = System.Drawing.SystemColors.ControlText; @@ -242,9 +208,9 @@ namespace RokettoLaunch label4.TabIndex = 193; label4.Text = "Tiles Per Row"; label4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // + // // flowLayoutPanel1 - // + // flowLayoutPanel1.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; flowLayoutPanel1.AutoScroll = true; flowLayoutPanel1.BackColor = System.Drawing.Color.Transparent; @@ -257,9 +223,9 @@ namespace RokettoLaunch flowLayoutPanel1.TabIndex = 194; flowLayoutPanel1.WrapContents = false; flowLayoutPanel1.Resize += flowLayoutPanel1_Resize; - // + // // tTogglePanel1 - // + // tTogglePanel1.AutoScrollMargin = new System.Drawing.Size(0, 0); tTogglePanel1.AutoScrollMinSize = new System.Drawing.Size(0, 0); tTogglePanel1.Controls.Add(yesNoPickerBox1); @@ -273,14 +239,16 @@ namespace RokettoLaunch tTogglePanel1.Margin = new Padding(0); tTogglePanel1.Name = "tTogglePanel1"; tTogglePanel1.Padding = new Padding(0, 22, 0, 0); + tTogglePanel1.PaddingBottom = 0; + tTogglePanel1.PaddingLeft = 4; tTogglePanel1.Size = new System.Drawing.Size(401, 119); tTogglePanel1.TabIndex = 0; tTogglePanel1.Title = "Appearance"; tTogglePanel1.TitleContextMenuStrip = null; tTogglePanel1.TitleCursor = Cursors.Default; - // + // // yesNoPickerBox1 - // + // yesNoPickerBox1.AcceptButton = null; yesNoPickerBox1.Anchor = AnchorStyles.Top | AnchorStyles.Right; yesNoPickerBox1.BackColor = System.Drawing.Color.Transparent; @@ -295,9 +263,9 @@ namespace RokettoLaunch yesNoPickerBox1.TabIndex = 195; yesNoPickerBox1.TabStop = false; yesNoPickerBox1.Value = true; - // + // // label2 - // + // label2.AutoSize = true; label2.BackColor = System.Drawing.Color.Transparent; label2.ForeColor = System.Drawing.SystemColors.ControlText; @@ -309,9 +277,9 @@ namespace RokettoLaunch label2.TabIndex = 194; label2.Text = "Show Big Icons"; label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // + // // tTogglePanel2 - // + // tTogglePanel2.AutoScrollMargin = new System.Drawing.Size(0, 0); tTogglePanel2.AutoScrollMinSize = new System.Drawing.Size(0, 0); tTogglePanel2.Controls.Add(yesNoPickerBox4); @@ -329,14 +297,16 @@ namespace RokettoLaunch tTogglePanel2.Margin = new Padding(0); tTogglePanel2.Name = "tTogglePanel2"; tTogglePanel2.Padding = new Padding(0, 22, 0, 0); + tTogglePanel2.PaddingBottom = 0; + tTogglePanel2.PaddingLeft = 4; tTogglePanel2.Size = new System.Drawing.Size(401, 206); tTogglePanel2.TabIndex = 1; tTogglePanel2.Title = "Behaviour"; tTogglePanel2.TitleContextMenuStrip = null; tTogglePanel2.TitleCursor = Cursors.Default; - // + // // yesNoPickerBox4 - // + // yesNoPickerBox4.AcceptButton = null; yesNoPickerBox4.Anchor = AnchorStyles.Top | AnchorStyles.Right; yesNoPickerBox4.BackColor = System.Drawing.Color.Transparent; @@ -351,9 +321,9 @@ namespace RokettoLaunch yesNoPickerBox4.TabIndex = 191; yesNoPickerBox4.TabStop = false; yesNoPickerBox4.Value = true; - // + // // label3 - // + // label3.AutoSize = true; label3.BackColor = System.Drawing.Color.Transparent; label3.ForeColor = System.Drawing.SystemColors.ControlText; @@ -365,15 +335,25 @@ namespace RokettoLaunch label3.TabIndex = 190; label3.Text = "Always On Top"; 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"; @@ -402,6 +382,7 @@ namespace RokettoLaunch } } + public AppOptions Result { get diff --git a/OptionsForm.resx b/OptionsForm.resx index 0386da6..af32865 100644 --- a/OptionsForm.resx +++ b/OptionsForm.resx @@ -117,25 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAAN5JREFUOE/tUzsKwkAUXLCyFMHjeIvdB4Gk8ALamU4rsbLaTWz0AOYGOYMewTqe - QLEQnZc8WRMSsBYHhrzPzJBin2pC60PPGLs3xl3Bp5DrHe9E1g2tHUH8QMjKmGReketyZkRWh9abfhTZ - YRimI4jWRPYSBMngkzzjHWtYyx6xK4X0Anz/7rcsxM4BdoxBTuTOqCdEaUyU6DrTuNqxxuXsEXsFDLfg - UdpOsIa10nr8A34p4CRtJ1jTGoC3PsPiBi78ETXplqzBwU3F5sHHgWWGJ3rHt+3tg+Uu84ek1AsYYd8q - EsfwCwAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAANFJREFUOE/tkzEKAjEURANWliJ4HG+h9l5AO7fTSjyCxWpCIBB2b+AZ9AjW6wlc - LGSdWb9Elw1YiwOP/Pw/E1Ikqqksyzpa670x5goqgfWOM7HFhfAE5jvWNdYFkZq9sdg+laZp13vfBwOY - NjBfnHO9d9jjjB56mZG4UhgW4HXdbykkXl97iMYBnFFPrbUJGDVIOKOHXmYk/hSaW3CUbVT00CvboP8B - v3TASbZR0RM7YA5KsAT1J2phBUq8wpnEgvg5MMwxvGFte/uVzPLwkZR6AInAKK6aICfTAAAAAElFTkSu - QmCC - - \ No newline at end of file diff --git a/RokettoLaunch.csproj b/RokettoLaunch.csproj index a8efd28..b1f7025 100644 --- a/RokettoLaunch.csproj +++ b/RokettoLaunch.csproj @@ -14,7 +14,7 @@ Ray Lam 1.0.0.0 1.0.0.0 - 0.3.3.038 + 0.3.4.163 False x64 icon-128.png @@ -75,11 +75,12 @@ + - + diff --git a/build-installer.iss b/build-installer.iss index 71e6ba0..94f2ada 100644 --- a/build-installer.iss +++ b/build-installer.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "RokettoLaunch" -#define MyAppVersion "0.3.0.153" +#define MyAppVersion "0.3.4.163" #define MyAppPublisher "Hi, I'm Ray" #define MyAppURL "https://www.hiimray.co.uk/software-fizzy-launcher" #define MyAppExeName "rokettolaunch.exe"