Changed edit-form layout

Updated RyzStudio package

AddBatchPageForm.cs

@@ -71,7 +71,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, 321);
+            tHorizontalSeparator3.Location = new System.Drawing.Point(10, 361);
             tHorizontalSeparator3.Margin = new Padding(0, 10, 0, 0);
             tHorizontalSeparator3.MaximumSize = new System.Drawing.Size(4920, 2);
             tHorizontalSeparator3.MinimumSize = new System.Drawing.Size(0, 22);
@@ -90,8 +90,9 @@ namespace FizzyLauncher
             button3.HoverImage = null;
             button3.IdleImage = null;
             button3.LabelText = "&Add Pages";
-            button3.Location = new System.Drawing.Point(306, 393);
+            button3.Location = new System.Drawing.Point(306, 433);
             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;
@@ -105,10 +106,11 @@ namespace FizzyLauncher
             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, 353);
+            progressBar2.Location = new System.Drawing.Point(10, 393);
             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);
@@ -123,7 +125,7 @@ namespace FizzyLauncher
             dialogFooter1.Dialog = this;
             dialogFooter1.Dock = DockStyle.Bottom;
             dialogFooter1.IsBusy = false;
-            dialogFooter1.Location = new System.Drawing.Point(0, 437);
+            dialogFooter1.Location = new System.Drawing.Point(0, 477);
             dialogFooter1.Name = "dialogFooter1";
             dialogFooter1.Size = new System.Drawing.Size(444, 84);
             // 
@@ -137,9 +139,10 @@ namespace FizzyLauncher
             memoBox1.Font = new System.Drawing.Font("Segoe UI", 9F);
             memoBox1.Location = new System.Drawing.Point(10, 53);
             memoBox1.Name = "memoBox1";
+            memoBox1.Padding = new Padding(4, 4, 3, 3);
             memoBox1.ReadOnly = false;
             memoBox1.ScrollBars = ScrollBars.Vertical;
-            memoBox1.Size = new System.Drawing.Size(424, 258);
+            memoBox1.Size = new System.Drawing.Size(424, 298);
             memoBox1.TabIndex = 211;
             memoBox1.TabStop = false;
             memoBox1.WordWrap = false;
@@ -149,7 +152,7 @@ namespace FizzyLauncher
             AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
             AutoScaleMode = AutoScaleMode.Font;
             BackColor = System.Drawing.Color.White;
-            ClientSize = new System.Drawing.Size(444, 521);
+            ClientSize = new System.Drawing.Size(444, 561);
             Controls.Add(memoBox1);
             Controls.Add(dialogFooter1);
             Controls.Add(progressBar2);
@@ -157,7 +160,7 @@ namespace FizzyLauncher
             Controls.Add(tHorizontalSeparator3);
             Controls.Add(label1);
             KeyPreview = true;
-            MinimumSize = new System.Drawing.Size(460, 560);
+            MinimumSize = new System.Drawing.Size(460, 600);
             Name = "AddBatchPageForm";
             Text = "Add Pages (Batch)";
             ResumeLayout(false);

BookmarkManager.csproj

@@ -14,7 +14,7 @@
     <Copyright>Ray Lam</Copyright>
     <AssemblyVersion>1.0.0.0</AssemblyVersion>
     <FileVersion>1.0.0.0</FileVersion>
-    <Version>0.6.2.092</Version>
+    <Version>0.6.5.144</Version>
     <PackageId>bukkubuddy</PackageId>
     <RunAnalyzersDuringLiveAnalysis>True</RunAnalyzersDuringLiveAnalysis>
     <SupportedOSPlatformVersion>8.0</SupportedOSPlatformVersion>
@@ -123,8 +123,8 @@
 
   <ItemGroup>
     <PackageReference Include="HtmlAgilityPack" Version="1.11.61" />
-    <PackageReference Include="RyzStudio" Version="8.1.2.366" />
+    <PackageReference Include="RyzStudio" Version="8.1.5.141" />
-    <PackageReference Include="RyzStudio.Windows.Forms" Version="8.1.3.689" />
+    <PackageReference Include="RyzStudio.Windows.Forms" Version="8.1.5.141" />
   </ItemGroup>
 
 </Project>

EditBookmarkForm.cs

@@ -26,12 +26,12 @@ namespace FizzyLauncher
         private System.ComponentModel.IContainer components;
         private ThClearableTextBox textBox3;
         private ThUserControl thUserControl1;
-        private Label label5;
 
 
         private readonly WebProvider _webProvider;
         private BookmarkModel result = null;
         private RyzStudio.Windows.ThemedForms.Composite.DialogFooter dialogFooter1;
+        private THorizontalSeparator tHorizontalSeparator1;
         private bool _isBusy = false;
 
 
@@ -88,9 +88,8 @@ namespace FizzyLauncher
             pictureBox1 = new PictureBox();
             toolTip1 = new ToolTip(components);
             textBox3 = new ThClearableTextBox();
-            thUserControl1 = new ThUserControl();
-            label5 = new Label();
             dialogFooter1 = new RyzStudio.Windows.ThemedForms.Composite.DialogFooter();
+            tHorizontalSeparator1 = new THorizontalSeparator();
             ((ISupportInitialize)pictureBox1).BeginInit();
             SuspendLayout();
             // 
@@ -99,7 +98,7 @@ namespace FizzyLauncher
             label1.AutoSize = true;
             label1.BackColor = Color.Transparent;
             label1.ForeColor = SystemColors.ControlText;
-            label1.Location = new Point(10, 21);
+            label1.Location = new Point(9, 21);
             label1.Margin = new Padding(0);
             label1.Name = "label1";
             label1.Padding = new Padding(0, 8, 0, 0);
@@ -117,9 +116,10 @@ namespace FizzyLauncher
             textBox1.Font = new Font("Segoe UI", 9F);
             textBox1.Icon = "O";
             textBox1.IconSize = 13F;
-            textBox1.Location = new Point(109, 20);
+            textBox1.Location = new Point(115, 20);
             textBox1.Name = "textBox1";
-            textBox1.Size = new Size(260, 32);
+            textBox1.Padding = new Padding(4, 4, 3, 3);
+            textBox1.Size = new Size(314, 32);
             textBox1.TabIndex = 0;
             textBox1.TabStop = false;
             textBox1.UseSystemPasswordChar = false;
@@ -129,7 +129,7 @@ namespace FizzyLauncher
             label2.AutoSize = true;
             label2.BackColor = Color.Transparent;
             label2.ForeColor = SystemColors.ControlText;
-            label2.Location = new Point(10, 61);
+            label2.Location = new Point(9, 61);
             label2.Margin = new Padding(0);
             label2.Name = "label2";
             label2.Padding = new Padding(0, 8, 0, 0);
@@ -143,7 +143,7 @@ namespace FizzyLauncher
             label3.AutoSize = true;
             label3.BackColor = Color.Transparent;
             label3.ForeColor = SystemColors.ControlText;
-            label3.Location = new Point(10, 104);
+            label3.Location = new Point(9, 104);
             label3.Margin = new Padding(0);
             label3.Name = "label3";
             label3.Padding = new Padding(0, 8, 0, 0);
@@ -160,11 +160,12 @@ namespace FizzyLauncher
             memoBox1.ClearedValue = "";
             memoBox1.EnableReactiveVisual = true;
             memoBox1.Font = new Font("Segoe UI", 9F);
-            memoBox1.Location = new Point(110, 196);
+            memoBox1.Location = new Point(87, 166);
             memoBox1.Name = "memoBox1";
+            memoBox1.Padding = new Padding(4, 4, 3, 3);
             memoBox1.ReadOnly = false;
             memoBox1.ScrollBars = ScrollBars.Vertical;
-            memoBox1.Size = new Size(259, 232);
+            memoBox1.Size = new Size(342, 302);
             memoBox1.TabIndex = 3;
             memoBox1.TabStop = false;
             memoBox1.WordWrap = false;
@@ -174,7 +175,7 @@ namespace FizzyLauncher
             label4.AutoSize = true;
             label4.BackColor = Color.Transparent;
             label4.ForeColor = SystemColors.ControlText;
-            label4.Location = new Point(10, 196);
+            label4.Location = new Point(9, 166);
             label4.Margin = new Padding(0);
             label4.Name = "label4";
             label4.Padding = new Padding(0, 8, 0, 0);
@@ -191,9 +192,10 @@ namespace FizzyLauncher
             textBox2.Font = new Font("Segoe UI", 9F);
             textBox2.Icon = "M";
             textBox2.IconSize = 13F;
-            textBox2.Location = new Point(110, 62);
+            textBox2.Location = new Point(98, 62);
             textBox2.Name = "textBox2";
-            textBox2.Size = new Size(259, 32);
+            textBox2.Padding = new Padding(4, 4, 3, 3);
+            textBox2.Size = new Size(331, 32);
             textBox2.TabIndex = 1;
             textBox2.TabStop = false;
             textBox2.UseSystemPasswordChar = false;
@@ -204,7 +206,7 @@ namespace FizzyLauncher
             pictureBox1.BackColor = Color.White;
             pictureBox1.ErrorImage = null;
             pictureBox1.InitialImage = null;
-            pictureBox1.Location = new Point(113, 150);
+            pictureBox1.Location = new Point(78, 20);
             pictureBox1.Name = "pictureBox1";
             pictureBox1.Size = new Size(32, 32);
             pictureBox1.SizeMode = PictureBoxSizeMode.CenterImage;
@@ -222,37 +224,14 @@ namespace FizzyLauncher
             textBox3.Font = new Font("Segoe UI", 9F);
             textBox3.Icon = "O";
             textBox3.IconSize = 13F;
-            textBox3.Location = new Point(109, 104);
+            textBox3.Location = new Point(116, 104);
             textBox3.Name = "textBox3";
-            textBox3.Size = new Size(260, 32);
+            textBox3.Padding = new Padding(4, 4, 3, 3);
+            textBox3.Size = new Size(313, 32);
             textBox3.TabIndex = 203;
             textBox3.TabStop = false;
             textBox3.UseSystemPasswordChar = false;
             // 
-            // thUserControl1
-            //
-            thUserControl1.BackColor = Color.Transparent;
-            thUserControl1.EnableReactiveVisual = true;
-            thUserControl1.Location = new Point(109, 146);
-            thUserControl1.Name = "thUserControl1";
-            thUserControl1.Size = new Size(40, 40);
-            thUserControl1.TabIndex = 204;
-            thUserControl1.TabStop = false;
-            //
-            // label5
-            //
-            label5.AutoSize = true;
-            label5.BackColor = Color.Transparent;
-            label5.ForeColor = SystemColors.ControlText;
-            label5.Location = new Point(10, 146);
-            label5.Margin = new Padding(0);
-            label5.Name = "label5";
-            label5.Padding = new Padding(0, 8, 0, 0);
-            label5.Size = new Size(30, 23);
-            label5.TabIndex = 195;
-            label5.Text = "Icon";
-            label5.TextAlign = ContentAlignment.MiddleLeft;
-            //
             // dialogFooter1
             // 
             dialogFooter1.BackColor = Color.FromArgb(240, 240, 240);
@@ -260,30 +239,42 @@ namespace FizzyLauncher
             dialogFooter1.Dialog = this;
             dialogFooter1.Dock = DockStyle.Bottom;
             dialogFooter1.IsBusy = false;
-            dialogFooter1.Location = new Point(0, 437);
+            dialogFooter1.Location = new Point(0, 477);
             dialogFooter1.Name = "dialogFooter1";
-            dialogFooter1.Size = new Size(384, 84);
+            dialogFooter1.Size = new Size(444, 84);
+            // 
+            // tHorizontalSeparator1
+            // 
+            tHorizontalSeparator1.AutoScrollMargin = new Size(0, 0);
+            tHorizontalSeparator1.AutoScrollMinSize = new Size(0, 0);
+            tHorizontalSeparator1.BackColor = Color.Transparent;
+            tHorizontalSeparator1.Location = new Point(9, 139);
+            tHorizontalSeparator1.MaximumSize = new Size(3840, 22);
+            tHorizontalSeparator1.MinimumSize = new Size(0, 22);
+            tHorizontalSeparator1.Name = "tHorizontalSeparator1";
+            tHorizontalSeparator1.Size = new Size(423, 22);
+            tHorizontalSeparator1.TabIndex = 209;
+            tHorizontalSeparator1.TabStop = false;
             // 
             // EditBookmarkForm
             // 
             AutoScaleDimensions = new SizeF(7F, 15F);
             AutoScaleMode = AutoScaleMode.Font;
             BackColor = Color.White;
-            ClientSize = new Size(384, 521);
+            ClientSize = new Size(444, 561);
+            Controls.Add(tHorizontalSeparator1);
+            Controls.Add(pictureBox1);
             Controls.Add(dialogFooter1);
             Controls.Add(textBox3);
-            Controls.Add(pictureBox1);
             Controls.Add(textBox2);
             Controls.Add(memoBox1);
             Controls.Add(label4);
-            Controls.Add(label5);
             Controls.Add(label3);
             Controls.Add(label2);
             Controls.Add(textBox1);
             Controls.Add(label1);
-            Controls.Add(thUserControl1);
             KeyPreview = true;
-            MinimumSize = new Size(400, 560);
+            MinimumSize = new Size(460, 600);
             Name = "EditBookmarkForm";
             Text = "Edit Bookmark";
             ((ISupportInitialize)pictureBox1).EndInit();

MainForm.cs

@@ -748,9 +748,21 @@ namespace FizzyLauncher
 
                 InvalidateOptions();
 
-                // Load items
+                // Clear treeview
                 treeView1.Clear("New Session");
 
+                // Load directories
+                foreach (var item in this.CurrentSession.Directories ?? new List<string>())
+                {
+                    if (string.IsNullOrWhiteSpace(item))
+                    {
+                        continue;
+                    }
+
+                    treeView1.CreateNodePath(item, (int)NodeIcon.Folder1, (int)NodeIcon.Folder2);
+                }
+
+                // Load bookmarks
                 foreach (var item in this.CurrentSession.Items ?? new List<BookmarkModel>())
                 {
                     treeView1.AddNode(item);
@@ -798,18 +810,11 @@ namespace FizzyLauncher
                 this.CurrentSession.Width = this.Width;
                 this.CurrentSession.Height = this.Height;
 
-                var nodeList = treeView1.ToNodeList<BookmarkModel>() ?? new List<KeyValuePair<TreeNode, BookmarkModel>>();
+                var directoryList = treeView1.GetAllDirectories();
-                foreach (var node in nodeList)
+                var bookmarkList = treeView1.GetAllNodes();
-                {
-                    node.Value.Path = treeView1.GetNodePath(node.Key);
 
-                    if (node.Value.Path.Contains('\n'))
+                this.CurrentSession.Directories = directoryList ?? new List<string>();
-                    {
+                this.CurrentSession.Items = bookmarkList.Select(x => x.Value)?.ToList() ?? new List<BookmarkModel>();
-                        node.Value.Path = node.Value.Path.Substring(0, node.Value.Path.LastIndexOf('\n'));
-                    }
-                }
-
-                this.CurrentSession.Items = nodeList.Select(x => x.Value).ToList();
 
                 var result = GenericResult.Create();
 
@@ -825,7 +830,7 @@ namespace FizzyLauncher
                         if (result.IsSuccess)
                         {
                             // Add icons to save file
-                            var result2 = AddImagesToZipFile(filename, nodeList);
+                            var result2 = AddImagesToZipFile(filename, bookmarkList);
                             if (!result2.IsSuccess)
                             {
                                 if (showNotices)

Models/AppOptions.cs

@@ -20,6 +20,8 @@ namespace FizzyLauncher.Models
 
         public int Height { get; set; } = 0;
 
+        public List<string> Directories { get; set; } = new List<string>();
+
         public List<BookmarkModel> Items { get; set; } = new List<BookmarkModel>();
 
     }

OptionsForm.cs

@@ -1,27 +1,24 @@
-using System;
+using System.Windows.Forms;
-using System.Linq;
-using System.Windows.Forms;
 using FizzyLauncher.Models;
 using RyzStudio.Windows.Forms;
-using RyzStudio.Windows.ThemedForms;
 using RyzStudio.Windows.ThemedForms.PickerBox;
 
 namespace FizzyLauncher
 {
     public class OptionsForm : Form
     {
-        private FlowLayoutPanel flowLayoutPanel1;
+        private TTogglePanelC panel1;
-        private TTogglePanel panel1;
+        private TTogglePanelC panel3;
-        private TTogglePanel panel3;
         private ThYesNoPickerBox yesNoPickerBox1;
         private Label label2;
-        private TTogglePanel panel2;
+        private TTogglePanelC panel2;
-        private ThYesNoPickerBox thYesNoPickerBox1;
         private Label label1;
         private ThYesNoPickerBox yesNoPickerBox2;
         private Label label3;
         private RyzStudio.Windows.ThemedForms.ButtonTextBox.ThClearableTextBox textBox1;
         private RyzStudio.Windows.ThemedForms.Composite.DialogFooter dialogFooter1;
+        private TFlowLayoutContainer flowLayoutContainer1;
+
         private AppOptions _appSession = null;
 
 
@@ -36,64 +33,44 @@ namespace FizzyLauncher
             if (_appSession != null)
             {
                 yesNoPickerBox1.Value = _appSession.RestorePosition;
-
                 yesNoPickerBox2.Value = _appSession.AlwaysOnTop;
-
                 textBox1.Text = _appSession.RunCommand ?? string.Empty;
             }
         }
 
         private void InitializeComponent()
         {
-            flowLayoutPanel1 = new FlowLayoutPanel();
+            panel1 = new TTogglePanelC();
-            panel1 = new TTogglePanel();
             yesNoPickerBox1 = new ThYesNoPickerBox();
             label2 = new Label();
-            panel2 = new TTogglePanel();
+            panel2 = new TTogglePanelC();
             yesNoPickerBox2 = new ThYesNoPickerBox();
-            thYesNoPickerBox1 = new ThYesNoPickerBox();
             label1 = new Label();
-            panel3 = new TTogglePanel();
+            panel3 = new TTogglePanelC();
             textBox1 = new RyzStudio.Windows.ThemedForms.ButtonTextBox.ThClearableTextBox();
             label3 = new Label();
             dialogFooter1 = new RyzStudio.Windows.ThemedForms.Composite.DialogFooter();
-            flowLayoutPanel1.SuspendLayout();
+            flowLayoutContainer1 = new TFlowLayoutContainer();
             panel1.SuspendLayout();
             panel2.SuspendLayout();
             panel3.SuspendLayout();
+            flowLayoutContainer1.SuspendLayout();
             SuspendLayout();
             //
-            // flowLayoutPanel1
-            // 
-            flowLayoutPanel1.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
-            flowLayoutPanel1.AutoScroll = true;
-            flowLayoutPanel1.BackColor = System.Drawing.Color.Transparent;
-            flowLayoutPanel1.Controls.Add(panel1);
-            flowLayoutPanel1.Controls.Add(panel2);
-            flowLayoutPanel1.Controls.Add(panel3);
-            flowLayoutPanel1.FlowDirection = FlowDirection.TopDown;
-            flowLayoutPanel1.Location = new System.Drawing.Point(8, 12);
-            flowLayoutPanel1.Name = "flowLayoutPanel1";
-            flowLayoutPanel1.Size = new System.Drawing.Size(436, 412);
-            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);
             panel1.Controls.Add(label2);
-            panel1.ExpandedHeight = 100;
+            panel1.ExpandedHeight = 86;
-            panel1.ForeColor = System.Drawing.Color.FromArgb(99, 105, 119);
+            panel1.ForeColor = System.Drawing.Color.FromArgb(31, 31, 31);
             panel1.IsOpen = true;
-            panel1.Location = new System.Drawing.Point(0, 0);
+            panel1.Location = new System.Drawing.Point(10, 10);
-            panel1.Margin = new Padding(0);
+            panel1.Margin = new Padding(0, 0, 0, 5);
             panel1.Name = "panel1";
-            panel1.PaddingBottom = 0;
+            panel1.Padding = new Padding(4, 32, 3, 3);
-            panel1.PaddingLeft = 4;
+            panel1.Size = new System.Drawing.Size(427, 86);
-            panel1.Size = new System.Drawing.Size(401, 77);
             panel1.TabIndex = 0;
             panel1.Title = "On Start-Up";
             panel1.TitleContextMenuStrip = null;
@@ -105,8 +82,9 @@ namespace FizzyLauncher
             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.Location = new System.Drawing.Point(330, 42);
             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;
@@ -118,7 +96,7 @@ namespace FizzyLauncher
             label2.AutoSize = true;
             label2.BackColor = System.Drawing.Color.Transparent;
             label2.ForeColor = System.Drawing.SystemColors.ControlText;
-            label2.Location = new System.Drawing.Point(1, 22);
+            label2.Location = new System.Drawing.Point(9, 42);
             label2.Margin = new Padding(0);
             label2.Name = "label2";
             label2.Padding = new Padding(0, 8, 0, 0);
@@ -132,17 +110,15 @@ namespace FizzyLauncher
             panel2.AutoScrollMargin = new System.Drawing.Size(0, 0);
             panel2.AutoScrollMinSize = new System.Drawing.Size(0, 0);
             panel2.Controls.Add(yesNoPickerBox2);
-            panel2.Controls.Add(thYesNoPickerBox1);
             panel2.Controls.Add(label1);
-            panel2.ExpandedHeight = 100;
+            panel2.ExpandedHeight = 86;
-            panel2.ForeColor = System.Drawing.Color.FromArgb(99, 105, 119);
+            panel2.ForeColor = System.Drawing.Color.FromArgb(31, 31, 31);
             panel2.IsOpen = true;
-            panel2.Location = new System.Drawing.Point(0, 77);
+            panel2.Location = new System.Drawing.Point(10, 101);
-            panel2.Margin = new Padding(0);
+            panel2.Margin = new Padding(0, 0, 0, 5);
             panel2.Name = "panel2";
-            panel2.PaddingBottom = 0;
+            panel2.Padding = new Padding(4, 32, 3, 3);
-            panel2.PaddingLeft = 4;
+            panel2.Size = new System.Drawing.Size(427, 86);
-            panel2.Size = new System.Drawing.Size(401, 77);
             panel2.TabIndex = 2;
             panel2.Title = "Appearance";
             panel2.TitleContextMenuStrip = null;
@@ -154,34 +130,21 @@ namespace FizzyLauncher
             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.Location = new System.Drawing.Point(330, 42);
             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.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.Name = "thYesNoPickerBox1";
-            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;
-            label1.Location = new System.Drawing.Point(1, 22);
+            label1.Location = new System.Drawing.Point(9, 42);
             label1.Margin = new Padding(0);
             label1.Name = "label1";
             label1.Padding = new Padding(0, 8, 0, 0);
@@ -196,15 +159,14 @@ namespace FizzyLauncher
             panel3.AutoScrollMinSize = new System.Drawing.Size(0, 0);
             panel3.Controls.Add(textBox1);
             panel3.Controls.Add(label3);
-            panel3.ExpandedHeight = 100;
+            panel3.ExpandedHeight = 86;
-            panel3.ForeColor = System.Drawing.Color.FromArgb(99, 105, 119);
+            panel3.ForeColor = System.Drawing.Color.FromArgb(31, 31, 31);
             panel3.IsOpen = true;
-            panel3.Location = new System.Drawing.Point(0, 154);
+            panel3.Location = new System.Drawing.Point(10, 192);
-            panel3.Margin = new Padding(0);
+            panel3.Margin = new Padding(0, 0, 0, 5);
             panel3.Name = "panel3";
-            panel3.PaddingBottom = 0;
+            panel3.Padding = new Padding(4, 32, 3, 3);
-            panel3.PaddingLeft = 4;
+            panel3.Size = new System.Drawing.Size(427, 86);
-            panel3.Size = new System.Drawing.Size(401, 77);
             panel3.TabIndex = 1;
             panel3.Title = "Behaviour";
             panel3.TitleContextMenuStrip = null;
@@ -219,9 +181,10 @@ namespace FizzyLauncher
             textBox1.Font = new System.Drawing.Font("Segoe UI", 9F);
             textBox1.Icon = "O";
             textBox1.IconSize = 13F;
-            textBox1.Location = new System.Drawing.Point(161, 21);
+            textBox1.Location = new System.Drawing.Point(165, 42);
             textBox1.Name = "textBox1";
-            textBox1.Size = new System.Drawing.Size(230, 32);
+            textBox1.Padding = new Padding(4, 4, 3, 3);
+            textBox1.Size = new System.Drawing.Size(249, 32);
             textBox1.TabIndex = 203;
             textBox1.TabStop = false;
             textBox1.UseSystemPasswordChar = false;
@@ -231,7 +194,7 @@ namespace FizzyLauncher
             label3.AutoSize = true;
             label3.BackColor = System.Drawing.Color.Transparent;
             label3.ForeColor = System.Drawing.SystemColors.ControlText;
-            label3.Location = new System.Drawing.Point(1, 21);
+            label3.Location = new System.Drawing.Point(9, 42);
             label3.Margin = new Padding(0);
             label3.Name = "label3";
             label3.Padding = new Padding(0, 8, 0, 0);
@@ -246,48 +209,45 @@ namespace FizzyLauncher
             dialogFooter1.Button1Text = "&Save";
             dialogFooter1.Dialog = this;
             dialogFooter1.Dock = DockStyle.Bottom;
-            dialogFooter1.Location = new System.Drawing.Point(0, 437);
+            dialogFooter1.IsBusy = false;
+            dialogFooter1.Location = new System.Drawing.Point(0, 477);
             dialogFooter1.Name = "dialogFooter1";
             dialogFooter1.Size = new System.Drawing.Size(444, 84);
             //
+            // flowLayoutContainer1
+            //
+            flowLayoutContainer1.AutoScroll = true;
+            flowLayoutContainer1.Controls.Add(panel1);
+            flowLayoutContainer1.Controls.Add(panel2);
+            flowLayoutContainer1.Controls.Add(panel3);
+            flowLayoutContainer1.Dock = DockStyle.Fill;
+            flowLayoutContainer1.Location = new System.Drawing.Point(0, 0);
+            flowLayoutContainer1.Name = "flowLayoutContainer1";
+            flowLayoutContainer1.Padding = new Padding(10, 10, 10, 30);
+            flowLayoutContainer1.Size = new System.Drawing.Size(444, 477);
+            flowLayoutContainer1.TabIndex = 195;
+            //
             // OptionsForm
             //
             AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
             AutoScaleMode = AutoScaleMode.Font;
             BackColor = System.Drawing.Color.White;
-            ClientSize = new System.Drawing.Size(444, 521);
+            ClientSize = new System.Drawing.Size(444, 561);
+            Controls.Add(flowLayoutContainer1);
             Controls.Add(dialogFooter1);
-            Controls.Add(flowLayoutPanel1);
+            MinimumSize = new System.Drawing.Size(460, 600);
-            MinimumSize = new System.Drawing.Size(460, 560);
             Name = "OptionsForm";
             Text = "Options";
-            flowLayoutPanel1.ResumeLayout(false);
             panel1.ResumeLayout(false);
             panel1.PerformLayout();
             panel2.ResumeLayout(false);
             panel2.PerformLayout();
             panel3.ResumeLayout(false);
             panel3.PerformLayout();
+            flowLayoutContainer1.ResumeLayout(false);
             ResumeLayout(false);
         }
 
-        protected override void OnLoad(EventArgs e)
-        {
-            base.OnLoad(e);
-
-            flowLayoutPanel1_Resize(null, e);
-        }
-
-        private void flowLayoutPanel1_Resize(object sender, EventArgs e)
-        {
-            var width = flowLayoutPanel1.ClientRectangle.Width - SystemInformation.VerticalScrollBarWidth;
-
-            foreach (var item in flowLayoutPanel1.Controls.OfType<Control>())
-            {
-                item.Width = width;
-            }
-        }
-
         public AppOptions Result
         {
             get
@@ -298,9 +258,7 @@ namespace FizzyLauncher
                 }
 
                 _appSession.RestorePosition = yesNoPickerBox1.Value;
-
                 _appSession.AlwaysOnTop = yesNoPickerBox2.Value;
-
                 _appSession.RunCommand = textBox1.Text ?? string.Empty;
 
                 return _appSession;

UpdateIconsForm.cs

@@ -111,6 +111,7 @@ namespace FizzyLauncher
             pickerBox1.Font = new System.Drawing.Font("Segoe UI", 9F);
             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;
@@ -129,6 +130,7 @@ namespace FizzyLauncher
             button2.LabelText = "&Run";
             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;
@@ -146,6 +148,7 @@ namespace FizzyLauncher
             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);
@@ -193,6 +196,7 @@ namespace FizzyLauncher
             button3.LabelText = "Clear &All";
             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;
@@ -210,6 +214,7 @@ namespace FizzyLauncher
             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);
@@ -224,7 +229,7 @@ namespace FizzyLauncher
             dialogFooter1.Dialog = this;
             dialogFooter1.Dock = DockStyle.Bottom;
             dialogFooter1.IsBusy = false;
-            dialogFooter1.Location = new System.Drawing.Point(0, 437);
+            dialogFooter1.Location = new System.Drawing.Point(0, 477);
             dialogFooter1.Name = "dialogFooter1";
             dialogFooter1.Size = new System.Drawing.Size(444, 84);
             // 
@@ -233,7 +238,7 @@ namespace FizzyLauncher
             AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
             AutoScaleMode = AutoScaleMode.Font;
             BackColor = System.Drawing.Color.White;
-            ClientSize = new System.Drawing.Size(444, 521);
+            ClientSize = new System.Drawing.Size(444, 561);
             Controls.Add(dialogFooter1);
             Controls.Add(progressBar2);
             Controls.Add(button3);
@@ -246,7 +251,7 @@ namespace FizzyLauncher
             Controls.Add(tHorizontalSeparator2);
             Controls.Add(label1);
             KeyPreview = true;
-            MinimumSize = new System.Drawing.Size(460, 560);
+            MinimumSize = new System.Drawing.Size(460, 600);
             Name = "UpdateIconsForm";
             Text = "Update Icons";
             ResumeLayout(false);

Windows/Forms/BookmarkTreeView.cs

@@ -1,7 +1,8 @@
 using System;
+using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
-using System.Reflection;
+using System.Linq;
 using System.Windows.Forms;
 using bzit.bomg.Models;
 using FizzyLauncher;
@@ -38,17 +39,6 @@ namespace RyzStudio.Windows.Forms
                 this.ImageList = new ImageList();
             }
 
-            //this.PathSeparator = PATH_SEPARATOR;
-
-            //this.AllowDrop = true;
-            //this.HideSelection = false;
-            //this.HotTracking = true;
-            //this.ImageIndex = 0;
-            //this.LabelEdit = true;
-            //this.PathSeparator = "\n";
-            //this.SelectedImageIndex = 0;
-            //this.ShowNodeToolTips = true;
-
             this.ImageList.ColorDepth = ColorDepth.Depth32Bit;
             this.ImageList.ImageSize = new Size(16, 16);
             this.ImageList.TransparentColor = Color.Transparent;
@@ -421,6 +411,30 @@ namespace RyzStudio.Windows.Forms
             this.HasChanged = true;
         }
 
+        public List<string> GetAllDirectories()
+        {
+            var result = GetAllNodes(this.Nodes);
+
+            return result.Where(x => this.GetNodeType(x) == NodeType.Folder)
+                         .Select(x => this.GetNodePath(x))
+                         ?.ToList() ?? new List<string>();
+        }
+
+        public List<KeyValuePair<TreeNode, BookmarkModel>> GetAllNodes()
+        {
+            var result = this.ToNodeList<BookmarkModel>() ?? new List<KeyValuePair<TreeNode, BookmarkModel>>();
+            foreach (var node in result)
+            {
+                node.Value.Path = this.GetNodePath(node.Key);
+
+                if (node.Value.Path.Contains('\n'))
+                {
+                    node.Value.Path = node.Value.Path.Substring(0, node.Value.Path.LastIndexOf('\n'));
+                }
+            }
+
+            return result;
+        }
 
         private void ClearImageList()
         {
@@ -468,5 +482,18 @@ namespace RyzStudio.Windows.Forms
             return this.ImageList.Images.IndexOfKey(key);
         }
 
+        private List<TreeNode> GetAllNodes(TreeNodeCollection nodes)
+        {
+            var result = new List<TreeNode>();
+
+            foreach (TreeNode node in nodes)
+            {
+                result.Add(node);
+                result.AddRange(GetAllNodes(node.Nodes));
+            }
+
+            return result;
+        }
+
     }
 }

build-installer.iss

@@ -2,13 +2,13 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "BukkuBuddy Bookmark Manager"
-#define MyAppVersion "0.6.2.092"
+#define MyAppVersion "0.6.4.140"
 #define MyAppPublisher "Hi, I'm Ray"
-#define MyAppURL "https://www.hiimray.co.uk/software-bookmark-manager"
+#define MyAppURL "https://www.hiimray.co.uk/software-bukkubuddy-bookmark-manager"
 #define MyAppExeName "bukkubuddy.exe"
 
-#define AppSourcePath "L:\gitea-hiimray\bookmark-manager-r4\bin"
+#define AppSourcePath "L:\gitea-hiimray\bukkubuddy-bookmark-manager\bin"
-#define AppReleasePath "L:\gitea-hiimray\bookmark-manager-r4\bin"
+#define AppReleasePath "L:\gitea-hiimray\bukkubuddy-bookmark-manager\bin"
 #define AppReleaseName "bukkubuddy-installer"
 
 [Setup]

build.bat

@@ -4,6 +4,7 @@ RMDIR /s /q "obj\"
 MKDIR bin
 
 dotnet restore skye.sln
+dotnet build skye.sln -c Release -o ./bin/
 dotnet publish skye.sln -r win-x64 -c Release /p:PublishSingleFile=true /p:SelfContained=false /p:PublishReadyToRunfalse=true /p:PublishDir="bin\"
 
 "C:\B\Portable Files (dev)\Inno Setup\v6.0.4-2\app\ISCC.exe" "build-installer.iss"