HiImRay_Public/bukkubuddy-bookmark-manager
HiImRay_Public/bukkubuddy-bookmark-manager
1
0
Fork 0
forked from Ray/bookmark-manager-r4
Code Pull Requests Activity

Compare commits

base: HiImRay_Public:release/0.6.5.149
Branches Tags
HiImRay_Public:master
HiImRay_Public:release/0.6.5.149
HiImRay_Public:release/0.6.5
HiImRay_Public:release/0.6.4
HiImRay_Public:release/0.6.3
Ray:master
Ray:release/0.6.2
Ray:release/0.6.1
Ray:release/0.6.0.1042
Ray:release/0.6.0
HiImRay_Public:release-0.4.0.130
Ray:release-0.4.0.130
..
compare: Ray:master
Branches Tags
Ray:master
Ray:release/0.6.2
Ray:release/0.6.1
Ray:release/0.6.0.1042
Ray:release/0.6.0
HiImRay_Public:master
HiImRay_Public:release/0.6.5.149
HiImRay_Public:release/0.6.5
HiImRay_Public:release/0.6.4
HiImRay_Public:release/0.6.3
Ray:release-0.4.0.130
HiImRay_Public:release-0.4.0.130

No commits in common. "release/0.6.5.149" and "master" have entirely different histories.
release/0. ... master

13 changed files with 256 additions and 248 deletions
Show Stats Expand all files Collapse all files

45
AddBatchPageForm.cs
View File

@ -50,9 +50,9 @@ namespace FizzyLauncher
dialogFooter1 = new RyzStudio.Windows.ThemedForms.Composite.DialogFooter(); dialogFooter1 = new RyzStudio.Windows.ThemedForms.Composite.DialogFooter();
memoBox1 = new ThToolbarMemoBox(); memoBox1 = new ThToolbarMemoBox();
SuspendLayout(); SuspendLayout();
// //
// label1 // label1
// //
label1.AutoSize = true; label1.AutoSize = true;
label1.BackColor = System.Drawing.Color.Transparent; label1.BackColor = System.Drawing.Color.Transparent;
label1.ForeColor = System.Drawing.SystemColors.ControlText; label1.ForeColor = System.Drawing.SystemColors.ControlText;
@ -64,14 +64,14 @@ namespace FizzyLauncher
label1.TabIndex = 153; label1.TabIndex = 153;
label1.Text = "Add pages (one URL on each line)"; label1.Text = "Add pages (one URL on each line)";
label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
// //
// tHorizontalSeparator3 // tHorizontalSeparator3
// //
tHorizontalSeparator3.Anchor = AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; tHorizontalSeparator3.Anchor = AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
tHorizontalSeparator3.AutoScrollMargin = new System.Drawing.Size(0, 0); tHorizontalSeparator3.AutoScrollMargin = new System.Drawing.Size(0, 0);
tHorizontalSeparator3.AutoScrollMinSize = new System.Drawing.Size(0, 0); tHorizontalSeparator3.AutoScrollMinSize = new System.Drawing.Size(0, 0);
tHorizontalSeparator3.BackColor = System.Drawing.Color.Transparent; tHorizontalSeparator3.BackColor = System.Drawing.Color.Transparent;
tHorizontalSeparator3.Location = new System.Drawing.Point(10, 361); tHorizontalSeparator3.Location = new System.Drawing.Point(10, 321);
tHorizontalSeparator3.Margin = new Padding(0, 10, 0, 0); tHorizontalSeparator3.Margin = new Padding(0, 10, 0, 0);
tHorizontalSeparator3.MaximumSize = new System.Drawing.Size(4920, 2); tHorizontalSeparator3.MaximumSize = new System.Drawing.Size(4920, 2);
tHorizontalSeparator3.MinimumSize = new System.Drawing.Size(0, 22); tHorizontalSeparator3.MinimumSize = new System.Drawing.Size(0, 22);
@ -79,9 +79,9 @@ namespace FizzyLauncher
tHorizontalSeparator3.Size = new System.Drawing.Size(424, 22); tHorizontalSeparator3.Size = new System.Drawing.Size(424, 22);
tHorizontalSeparator3.TabIndex = 207; tHorizontalSeparator3.TabIndex = 207;
tHorizontalSeparator3.TabStop = false; tHorizontalSeparator3.TabStop = false;
// //
// button3 // button3
// //
button3.ActiveImage = null; button3.ActiveImage = null;
button3.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; button3.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
button3.BackColor = System.Drawing.Color.Transparent; button3.BackColor = System.Drawing.Color.Transparent;
@ -90,47 +90,45 @@ namespace FizzyLauncher
button3.HoverImage = null; button3.HoverImage = null;
button3.IdleImage = null; button3.IdleImage = null;
button3.LabelText = "&Add Pages"; button3.LabelText = "&Add Pages";
button3.Location = new System.Drawing.Point(306, 433); button3.Location = new System.Drawing.Point(306, 393);
button3.Name = "button3"; button3.Name = "button3";
button3.Padding = new Padding(4, 4, 3, 3);
button3.Size = new System.Drawing.Size(128, 32); button3.Size = new System.Drawing.Size(128, 32);
button3.TabIndex = 209; button3.TabIndex = 209;
button3.TabStop = false; button3.TabStop = false;
button3.MouseClick += button3_MouseClick; button3.MouseClick += button3_MouseClick;
// //
// progressBar2 // progressBar2
// //
progressBar2.Anchor = AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; progressBar2.Anchor = AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
progressBar2.BackColor = System.Drawing.Color.Transparent; progressBar2.BackColor = System.Drawing.Color.Transparent;
progressBar2.BarColour = System.Drawing.Color.FromArgb(79, 193, 203); progressBar2.BarColour = System.Drawing.Color.FromArgb(79, 193, 203);
progressBar2.BarTextColour = System.Drawing.Color.Black; progressBar2.BarTextColour = System.Drawing.Color.Black;
progressBar2.EnableReactiveVisual = false; progressBar2.EnableReactiveVisual = false;
progressBar2.Font = new System.Drawing.Font("Segoe UI", 9F); progressBar2.Font = new System.Drawing.Font("Segoe UI", 9F);
progressBar2.Location = new System.Drawing.Point(10, 393); progressBar2.Location = new System.Drawing.Point(10, 353);
progressBar2.Maximum = 100; progressBar2.Maximum = 100;
progressBar2.Minimum = 0; progressBar2.Minimum = 0;
progressBar2.Name = "progressBar2"; progressBar2.Name = "progressBar2";
progressBar2.Padding = new Padding(4, 4, 3, 3);
progressBar2.ProgressText = "50/100"; progressBar2.ProgressText = "50/100";
progressBar2.ShowProgressText = true; progressBar2.ShowProgressText = true;
progressBar2.Size = new System.Drawing.Size(424, 20); progressBar2.Size = new System.Drawing.Size(424, 20);
progressBar2.TabIndex = 210; progressBar2.TabIndex = 210;
progressBar2.TabStop = false; progressBar2.TabStop = false;
progressBar2.Value = 50; progressBar2.Value = 50;
// //
// dialogFooter1 // dialogFooter1
// //
dialogFooter1.BackColor = System.Drawing.Color.FromArgb(240, 240, 240); dialogFooter1.BackColor = System.Drawing.Color.FromArgb(240, 240, 240);
dialogFooter1.Button1Text = "&Close"; dialogFooter1.Button1Text = "&Close";
dialogFooter1.Dialog = this; dialogFooter1.Dialog = this;
dialogFooter1.Dock = DockStyle.Bottom; dialogFooter1.Dock = DockStyle.Bottom;
dialogFooter1.IsBusy = false; dialogFooter1.IsBusy = false;
dialogFooter1.Location = new System.Drawing.Point(0, 477); dialogFooter1.Location = new System.Drawing.Point(0, 437);
dialogFooter1.Name = "dialogFooter1"; dialogFooter1.Name = "dialogFooter1";
dialogFooter1.Size = new System.Drawing.Size(444, 84); dialogFooter1.Size = new System.Drawing.Size(444, 84);
// //
// memoBox1 // memoBox1
// //
memoBox1.AllowDrop = true; memoBox1.AllowDrop = true;
memoBox1.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; memoBox1.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
memoBox1.BackColor = System.Drawing.Color.Transparent; memoBox1.BackColor = System.Drawing.Color.Transparent;
@ -139,20 +137,19 @@ namespace FizzyLauncher
memoBox1.Font = new System.Drawing.Font("Segoe UI", 9F); memoBox1.Font = new System.Drawing.Font("Segoe UI", 9F);
memoBox1.Location = new System.Drawing.Point(10, 53); memoBox1.Location = new System.Drawing.Point(10, 53);
memoBox1.Name = "memoBox1"; memoBox1.Name = "memoBox1";
memoBox1.Padding = new Padding(4, 4, 3, 3);
memoBox1.ReadOnly = false; memoBox1.ReadOnly = false;
memoBox1.ScrollBars = ScrollBars.Vertical; memoBox1.ScrollBars = ScrollBars.Vertical;
memoBox1.Size = new System.Drawing.Size(424, 298); memoBox1.Size = new System.Drawing.Size(424, 258);
memoBox1.TabIndex = 211; memoBox1.TabIndex = 211;
memoBox1.TabStop = false; memoBox1.TabStop = false;
memoBox1.WordWrap = false; memoBox1.WordWrap = false;
// //
// AddBatchPageForm // AddBatchPageForm
// //
AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
AutoScaleMode = AutoScaleMode.Font; AutoScaleMode = AutoScaleMode.Font;
BackColor = System.Drawing.Color.White; BackColor = System.Drawing.Color.White;
ClientSize = new System.Drawing.Size(444, 561); ClientSize = new System.Drawing.Size(444, 521);
Controls.Add(memoBox1); Controls.Add(memoBox1);
Controls.Add(dialogFooter1); Controls.Add(dialogFooter1);
Controls.Add(progressBar2); Controls.Add(progressBar2);
@ -160,7 +157,7 @@ namespace FizzyLauncher
Controls.Add(tHorizontalSeparator3); Controls.Add(tHorizontalSeparator3);
Controls.Add(label1); Controls.Add(label1);
KeyPreview = true; KeyPreview = true;
MinimumSize = new System.Drawing.Size(460, 600); MinimumSize = new System.Drawing.Size(460, 560);
Name = "AddBatchPageForm"; Name = "AddBatchPageForm";
Text = "Add Pages (Batch)"; Text = "Add Pages (Batch)";
ResumeLayout(false); ResumeLayout(false);

6
BookmarkManager.csproj
View File

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

129
EditBookmarkForm.cs
View File

@ -26,12 +26,12 @@ namespace FizzyLauncher
private System.ComponentModel.IContainer components; private System.ComponentModel.IContainer components;
private ThClearableTextBox textBox3; private ThClearableTextBox textBox3;
private ThUserControl thUserControl1; private ThUserControl thUserControl1;
private Label label5;
private readonly WebProvider _webProvider; private readonly WebProvider _webProvider;
private BookmarkModel result = null; private BookmarkModel result = null;
private RyzStudio.Windows.ThemedForms.Composite.DialogFooter dialogFooter1; private RyzStudio.Windows.ThemedForms.Composite.DialogFooter dialogFooter1;
private THorizontalSeparator tHorizontalSeparator1;
private bool _isBusy = false; private bool _isBusy = false;
@ -88,17 +88,18 @@ namespace FizzyLauncher
pictureBox1 = new PictureBox(); pictureBox1 = new PictureBox();
toolTip1 = new ToolTip(components); toolTip1 = new ToolTip(components);
textBox3 = new ThClearableTextBox(); textBox3 = new ThClearableTextBox();
thUserControl1 = new ThUserControl();
label5 = new Label();
dialogFooter1 = new RyzStudio.Windows.ThemedForms.Composite.DialogFooter(); dialogFooter1 = new RyzStudio.Windows.ThemedForms.Composite.DialogFooter();
tHorizontalSeparator1 = new THorizontalSeparator();
((ISupportInitialize)pictureBox1).BeginInit(); ((ISupportInitialize)pictureBox1).BeginInit();
SuspendLayout(); SuspendLayout();
// //
// label1 // label1
// //
label1.AutoSize = true; label1.AutoSize = true;
label1.BackColor = Color.Transparent; label1.BackColor = Color.Transparent;
label1.ForeColor = SystemColors.ControlText; label1.ForeColor = SystemColors.ControlText;
label1.Location = new Point(9, 21); label1.Location = new Point(10, 21);
label1.Margin = new Padding(0); label1.Margin = new Padding(0);
label1.Name = "label1"; label1.Name = "label1";
label1.Padding = new Padding(0, 8, 0, 0); label1.Padding = new Padding(0, 8, 0, 0);
@ -106,9 +107,9 @@ namespace FizzyLauncher
label1.TabIndex = 153; label1.TabIndex = 153;
label1.Text = "Title"; label1.Text = "Title";
label1.TextAlign = ContentAlignment.MiddleLeft; label1.TextAlign = ContentAlignment.MiddleLeft;
// //
// textBox1 // textBox1
// //
textBox1.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; textBox1.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
textBox1.BackColor = Color.Transparent; textBox1.BackColor = Color.Transparent;
textBox1.ClearedValue = ""; textBox1.ClearedValue = "";
@ -116,20 +117,19 @@ namespace FizzyLauncher
textBox1.Font = new Font("Segoe UI", 9F); textBox1.Font = new Font("Segoe UI", 9F);
textBox1.Icon = "O"; textBox1.Icon = "O";
textBox1.IconSize = 13F; textBox1.IconSize = 13F;
textBox1.Location = new Point(115, 20); textBox1.Location = new Point(109, 20);
textBox1.Name = "textBox1"; textBox1.Name = "textBox1";
textBox1.Padding = new Padding(4, 4, 3, 3); textBox1.Size = new Size(260, 32);
textBox1.Size = new Size(314, 32);
textBox1.TabIndex = 0; textBox1.TabIndex = 0;
textBox1.TabStop = false; textBox1.TabStop = false;
textBox1.UseSystemPasswordChar = false; textBox1.UseSystemPasswordChar = false;
// //
// label2 // label2
// //
label2.AutoSize = true; label2.AutoSize = true;
label2.BackColor = Color.Transparent; label2.BackColor = Color.Transparent;
label2.ForeColor = SystemColors.ControlText; label2.ForeColor = SystemColors.ControlText;
label2.Location = new Point(9, 61); label2.Location = new Point(10, 61);
label2.Margin = new Padding(0); label2.Margin = new Padding(0);
label2.Name = "label2"; label2.Name = "label2";
label2.Padding = new Padding(0, 8, 0, 0); label2.Padding = new Padding(0, 8, 0, 0);
@ -137,13 +137,13 @@ namespace FizzyLauncher
label2.TabIndex = 193; label2.TabIndex = 193;
label2.Text = "Address"; label2.Text = "Address";
label2.TextAlign = ContentAlignment.MiddleLeft; label2.TextAlign = ContentAlignment.MiddleLeft;
// //
// label3 // label3
// //
label3.AutoSize = true; label3.AutoSize = true;
label3.BackColor = Color.Transparent; label3.BackColor = Color.Transparent;
label3.ForeColor = SystemColors.ControlText; label3.ForeColor = SystemColors.ControlText;
label3.Location = new Point(9, 104); label3.Location = new Point(10, 104);
label3.Margin = new Padding(0); label3.Margin = new Padding(0);
label3.Name = "label3"; label3.Name = "label3";
label3.Padding = new Padding(0, 8, 0, 0); label3.Padding = new Padding(0, 8, 0, 0);
@ -151,31 +151,30 @@ namespace FizzyLauncher
label3.TabIndex = 195; label3.TabIndex = 195;
label3.Text = "Description"; label3.Text = "Description";
label3.TextAlign = ContentAlignment.MiddleLeft; label3.TextAlign = ContentAlignment.MiddleLeft;
// //
// memoBox1 // memoBox1
// //
memoBox1.AllowDrop = true; memoBox1.AllowDrop = true;
memoBox1.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; memoBox1.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
memoBox1.BackColor = Color.Transparent; memoBox1.BackColor = Color.Transparent;
memoBox1.ClearedValue = ""; memoBox1.ClearedValue = "";
memoBox1.EnableReactiveVisual = true; memoBox1.EnableReactiveVisual = true;
memoBox1.Font = new Font("Segoe UI", 9F); memoBox1.Font = new Font("Segoe UI", 9F);
memoBox1.Location = new Point(87, 166); memoBox1.Location = new Point(110, 196);
memoBox1.Name = "memoBox1"; memoBox1.Name = "memoBox1";
memoBox1.Padding = new Padding(4, 4, 3, 3);
memoBox1.ReadOnly = false; memoBox1.ReadOnly = false;
memoBox1.ScrollBars = ScrollBars.Vertical; memoBox1.ScrollBars = ScrollBars.Vertical;
memoBox1.Size = new Size(342, 302); memoBox1.Size = new Size(259, 232);
memoBox1.TabIndex = 3; memoBox1.TabIndex = 3;
memoBox1.TabStop = false; memoBox1.TabStop = false;
memoBox1.WordWrap = false; memoBox1.WordWrap = false;
// //
// label4 // label4
// //
label4.AutoSize = true; label4.AutoSize = true;
label4.BackColor = Color.Transparent; label4.BackColor = Color.Transparent;
label4.ForeColor = SystemColors.ControlText; label4.ForeColor = SystemColors.ControlText;
label4.Location = new Point(9, 166); label4.Location = new Point(10, 196);
label4.Margin = new Padding(0); label4.Margin = new Padding(0);
label4.Name = "label4"; label4.Name = "label4";
label4.Padding = new Padding(0, 8, 0, 0); label4.Padding = new Padding(0, 8, 0, 0);
@ -183,30 +182,29 @@ namespace FizzyLauncher
label4.TabIndex = 198; label4.TabIndex = 198;
label4.Text = "Notes"; label4.Text = "Notes";
label4.TextAlign = ContentAlignment.MiddleLeft; label4.TextAlign = ContentAlignment.MiddleLeft;
// //
// textBox2 // textBox2
// //
textBox2.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; textBox2.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
textBox2.BackColor = Color.Transparent; textBox2.BackColor = Color.Transparent;
textBox2.EnableReactiveVisual = true; textBox2.EnableReactiveVisual = true;
textBox2.Font = new Font("Segoe UI", 9F); textBox2.Font = new Font("Segoe UI", 9F);
textBox2.Icon = "M"; textBox2.Icon = "M";
textBox2.IconSize = 13F; textBox2.IconSize = 13F;
textBox2.Location = new Point(98, 62); textBox2.Location = new Point(110, 62);
textBox2.Name = "textBox2"; textBox2.Name = "textBox2";
textBox2.Padding = new Padding(4, 4, 3, 3); textBox2.Size = new Size(259, 32);
textBox2.Size = new Size(331, 32);
textBox2.TabIndex = 1; textBox2.TabIndex = 1;
textBox2.TabStop = false; textBox2.TabStop = false;
textBox2.UseSystemPasswordChar = false; textBox2.UseSystemPasswordChar = false;
textBox2.OnButtonClick += textBox2_OnButtonClick; textBox2.OnButtonClick += textBox2_OnButtonClick;
// //
// pictureBox1 // pictureBox1
// //
pictureBox1.BackColor = Color.White; pictureBox1.BackColor = Color.White;
pictureBox1.ErrorImage = null; pictureBox1.ErrorImage = null;
pictureBox1.InitialImage = null; pictureBox1.InitialImage = null;
pictureBox1.Location = new Point(78, 20); pictureBox1.Location = new Point(113, 150);
pictureBox1.Name = "pictureBox1"; pictureBox1.Name = "pictureBox1";
pictureBox1.Size = new Size(32, 32); pictureBox1.Size = new Size(32, 32);
pictureBox1.SizeMode = PictureBoxSizeMode.CenterImage; pictureBox1.SizeMode = PictureBoxSizeMode.CenterImage;
@ -214,9 +212,9 @@ namespace FizzyLauncher
pictureBox1.TabStop = false; pictureBox1.TabStop = false;
pictureBox1.MouseClick += pictureBox1_MouseClick; pictureBox1.MouseClick += pictureBox1_MouseClick;
pictureBox1.MouseDoubleClick += pictureBox1_MouseDoubleClick; pictureBox1.MouseDoubleClick += pictureBox1_MouseDoubleClick;
// //
// textBox3 // textBox3
// //
textBox3.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; textBox3.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
textBox3.BackColor = Color.Transparent; textBox3.BackColor = Color.Transparent;
textBox3.ClearedValue = ""; textBox3.ClearedValue = "";
@ -224,57 +222,68 @@ namespace FizzyLauncher
textBox3.Font = new Font("Segoe UI", 9F); textBox3.Font = new Font("Segoe UI", 9F);
textBox3.Icon = "O"; textBox3.Icon = "O";
textBox3.IconSize = 13F; textBox3.IconSize = 13F;
textBox3.Location = new Point(116, 104); textBox3.Location = new Point(109, 104);
textBox3.Name = "textBox3"; textBox3.Name = "textBox3";
textBox3.Padding = new Padding(4, 4, 3, 3); textBox3.Size = new Size(260, 32);
textBox3.Size = new Size(313, 32);
textBox3.TabIndex = 203; textBox3.TabIndex = 203;
textBox3.TabStop = false; textBox3.TabStop = false;
textBox3.UseSystemPasswordChar = 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
// //
dialogFooter1.BackColor = Color.FromArgb(240, 240, 240); dialogFooter1.BackColor = Color.FromArgb(240, 240, 240);
dialogFooter1.Button1Text = "&OK"; dialogFooter1.Button1Text = "&OK";
dialogFooter1.Dialog = this; dialogFooter1.Dialog = this;
dialogFooter1.Dock = DockStyle.Bottom; dialogFooter1.Dock = DockStyle.Bottom;
dialogFooter1.IsBusy = false; dialogFooter1.IsBusy = false;
dialogFooter1.Location = new Point(0, 477); dialogFooter1.Location = new Point(0, 437);
dialogFooter1.Name = "dialogFooter1"; dialogFooter1.Name = "dialogFooter1";
dialogFooter1.Size = new Size(444, 84); dialogFooter1.Size = new Size(384, 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 // EditBookmarkForm
// //
AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleMode = AutoScaleMode.Font; AutoScaleMode = AutoScaleMode.Font;
BackColor = Color.White; BackColor = Color.White;
ClientSize = new Size(444, 561); ClientSize = new Size(384, 521);
Controls.Add(tHorizontalSeparator1);
Controls.Add(pictureBox1);
Controls.Add(dialogFooter1); Controls.Add(dialogFooter1);
Controls.Add(textBox3); Controls.Add(textBox3);
Controls.Add(pictureBox1);
Controls.Add(textBox2); Controls.Add(textBox2);
Controls.Add(memoBox1); Controls.Add(memoBox1);
Controls.Add(label4); Controls.Add(label4);
Controls.Add(label5);
Controls.Add(label3); Controls.Add(label3);
Controls.Add(label2); Controls.Add(label2);
Controls.Add(textBox1); Controls.Add(textBox1);
Controls.Add(label1); Controls.Add(label1);
Controls.Add(thUserControl1);
KeyPreview = true; KeyPreview = true;
MinimumSize = new Size(460, 600); MinimumSize = new Size(400, 560);
Name = "EditBookmarkForm"; Name = "EditBookmarkForm";
Text = "Edit Bookmark"; Text = "Edit Bookmark";
((ISupportInitialize)pictureBox1).EndInit(); ((ISupportInitialize)pictureBox1).EndInit();

4
EditBookmarkForm.resx
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<root> <root>
<!-- <!--
Microsoft ResX Schema Microsoft ResX Schema
Version 2.0 Version 2.0
@ -48,7 +48,7 @@
value : The object must be serialized with value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding. : and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64 mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter : System.Runtime.Serialization.Formatters.Soap.SoapFormatter

31
MainForm.cs
View File

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

2
Models/AppOptions.cs
View File

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

160
OptionsForm.cs
View File

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

4
OptionsForm.resx
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<root> <root>
<!-- <!--
Microsoft ResX Schema Microsoft ResX Schema
Version 2.0 Version 2.0
@ -48,7 +48,7 @@
value : The object must be serialized with value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding. : and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64 mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter : System.Runtime.Serialization.Formatters.Soap.SoapFormatter

59
UpdateIconsForm.cs
View File

@ -59,9 +59,9 @@ namespace FizzyLauncher
progressBar2 = new ThProgressBar(); progressBar2 = new ThProgressBar();
dialogFooter1 = new RyzStudio.Windows.ThemedForms.Composite.DialogFooter(); dialogFooter1 = new RyzStudio.Windows.ThemedForms.Composite.DialogFooter();
SuspendLayout(); SuspendLayout();
// //
// label1 // label1
// //
label1.AutoSize = true; label1.AutoSize = true;
label1.BackColor = System.Drawing.Color.Transparent; label1.BackColor = System.Drawing.Color.Transparent;
label1.ForeColor = System.Drawing.SystemColors.ControlText; label1.ForeColor = System.Drawing.SystemColors.ControlText;
@ -73,9 +73,9 @@ namespace FizzyLauncher
label1.TabIndex = 153; label1.TabIndex = 153;
label1.Text = "Update Missing Icons (Only)"; label1.Text = "Update Missing Icons (Only)";
label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
// //
// tHorizontalSeparator2 // tHorizontalSeparator2
// //
tHorizontalSeparator2.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; tHorizontalSeparator2.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
tHorizontalSeparator2.AutoScrollMargin = new System.Drawing.Size(0, 0); tHorizontalSeparator2.AutoScrollMargin = new System.Drawing.Size(0, 0);
tHorizontalSeparator2.AutoScrollMinSize = new System.Drawing.Size(0, 0); tHorizontalSeparator2.AutoScrollMinSize = new System.Drawing.Size(0, 0);
@ -88,9 +88,9 @@ namespace FizzyLauncher
tHorizontalSeparator2.Size = new System.Drawing.Size(424, 22); tHorizontalSeparator2.Size = new System.Drawing.Size(424, 22);
tHorizontalSeparator2.TabIndex = 190; tHorizontalSeparator2.TabIndex = 190;
tHorizontalSeparator2.TabStop = false; tHorizontalSeparator2.TabStop = false;
// //
// label2 // label2
// //
label2.AutoSize = true; label2.AutoSize = true;
label2.BackColor = System.Drawing.Color.Transparent; label2.BackColor = System.Drawing.Color.Transparent;
label2.ForeColor = System.Drawing.SystemColors.ControlText; label2.ForeColor = System.Drawing.SystemColors.ControlText;
@ -102,24 +102,23 @@ namespace FizzyLauncher
label2.TabIndex = 195; label2.TabIndex = 195;
label2.Text = "Retrieve supported icons from bookmarks."; label2.Text = "Retrieve supported icons from bookmarks.";
label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
// //
// pickerBox1 // pickerBox1
// //
pickerBox1.Anchor = AnchorStyles.Top | AnchorStyles.Right; pickerBox1.Anchor = AnchorStyles.Top | AnchorStyles.Right;
pickerBox1.BackColor = System.Drawing.Color.Transparent; pickerBox1.BackColor = System.Drawing.Color.Transparent;
pickerBox1.EnableReactiveVisual = true; pickerBox1.EnableReactiveVisual = true;
pickerBox1.Font = new System.Drawing.Font("Segoe UI", 9F); pickerBox1.Font = new System.Drawing.Font("Segoe UI", 9F);
pickerBox1.Location = new System.Drawing.Point(350, 20); pickerBox1.Location = new System.Drawing.Point(350, 20);
pickerBox1.Name = "pickerBox1"; pickerBox1.Name = "pickerBox1";
pickerBox1.Padding = new Padding(4, 4, 3, 3);
pickerBox1.SelectedIndex = 1; pickerBox1.SelectedIndex = 1;
pickerBox1.Size = new System.Drawing.Size(84, 35); pickerBox1.Size = new System.Drawing.Size(84, 35);
pickerBox1.TabIndex = 0; pickerBox1.TabIndex = 0;
pickerBox1.TabStop = false; pickerBox1.TabStop = false;
pickerBox1.Value = true; pickerBox1.Value = true;
// //
// button2 // button2
// //
button2.ActiveImage = null; button2.ActiveImage = null;
button2.Anchor = AnchorStyles.Top | AnchorStyles.Right; button2.Anchor = AnchorStyles.Top | AnchorStyles.Right;
button2.BackColor = System.Drawing.Color.Transparent; button2.BackColor = System.Drawing.Color.Transparent;
@ -130,14 +129,13 @@ namespace FizzyLauncher
button2.LabelText = "&Run"; button2.LabelText = "&Run";
button2.Location = new System.Drawing.Point(306, 136); button2.Location = new System.Drawing.Point(306, 136);
button2.Name = "button2"; button2.Name = "button2";
button2.Padding = new Padding(4, 4, 3, 3);
button2.Size = new System.Drawing.Size(128, 32); button2.Size = new System.Drawing.Size(128, 32);
button2.TabIndex = 1; button2.TabIndex = 1;
button2.TabStop = false; button2.TabStop = false;
button2.MouseClick += button2_MouseClick; button2.MouseClick += button2_MouseClick;
// //
// progressBar1 // progressBar1
// //
progressBar1.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; progressBar1.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
progressBar1.BackColor = System.Drawing.Color.Transparent; progressBar1.BackColor = System.Drawing.Color.Transparent;
progressBar1.BarColour = System.Drawing.Color.FromArgb(79, 202, 130); progressBar1.BarColour = System.Drawing.Color.FromArgb(79, 202, 130);
@ -148,16 +146,15 @@ namespace FizzyLauncher
progressBar1.Maximum = 100; progressBar1.Maximum = 100;
progressBar1.Minimum = 0; progressBar1.Minimum = 0;
progressBar1.Name = "progressBar1"; progressBar1.Name = "progressBar1";
progressBar1.Padding = new Padding(4, 4, 3, 3);
progressBar1.ProgressText = "50/100"; progressBar1.ProgressText = "50/100";
progressBar1.ShowProgressText = true; progressBar1.ShowProgressText = true;
progressBar1.Size = new System.Drawing.Size(424, 20); progressBar1.Size = new System.Drawing.Size(424, 20);
progressBar1.TabIndex = 206; progressBar1.TabIndex = 206;
progressBar1.TabStop = false; progressBar1.TabStop = false;
progressBar1.Value = 50; progressBar1.Value = 50;
// //
// label4 // label4
// //
label4.AutoSize = true; label4.AutoSize = true;
label4.BackColor = System.Drawing.Color.Transparent; label4.BackColor = System.Drawing.Color.Transparent;
label4.ForeColor = System.Drawing.SystemColors.ControlText; label4.ForeColor = System.Drawing.SystemColors.ControlText;
@ -169,9 +166,9 @@ namespace FizzyLauncher
label4.TabIndex = 208; label4.TabIndex = 208;
label4.Text = "Clear all icons."; label4.Text = "Clear all icons.";
label4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; label4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
// //
// tHorizontalSeparator3 // tHorizontalSeparator3
// //
tHorizontalSeparator3.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; tHorizontalSeparator3.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
tHorizontalSeparator3.AutoScrollMargin = new System.Drawing.Size(0, 0); tHorizontalSeparator3.AutoScrollMargin = new System.Drawing.Size(0, 0);
tHorizontalSeparator3.AutoScrollMinSize = new System.Drawing.Size(0, 0); tHorizontalSeparator3.AutoScrollMinSize = new System.Drawing.Size(0, 0);
@ -184,9 +181,9 @@ namespace FizzyLauncher
tHorizontalSeparator3.Size = new System.Drawing.Size(424, 22); tHorizontalSeparator3.Size = new System.Drawing.Size(424, 22);
tHorizontalSeparator3.TabIndex = 207; tHorizontalSeparator3.TabIndex = 207;
tHorizontalSeparator3.TabStop = false; tHorizontalSeparator3.TabStop = false;
// //
// button3 // button3
// //
button3.ActiveImage = null; button3.ActiveImage = null;
button3.BackColor = System.Drawing.Color.Transparent; button3.BackColor = System.Drawing.Color.Transparent;
button3.EnableMenuOnClick = false; button3.EnableMenuOnClick = false;
@ -196,14 +193,13 @@ namespace FizzyLauncher
button3.LabelText = "Clear &All"; button3.LabelText = "Clear &All";
button3.Location = new System.Drawing.Point(306, 250); button3.Location = new System.Drawing.Point(306, 250);
button3.Name = "button3"; button3.Name = "button3";
button3.Padding = new Padding(4, 4, 3, 3);
button3.Size = new System.Drawing.Size(128, 32); button3.Size = new System.Drawing.Size(128, 32);
button3.TabIndex = 209; button3.TabIndex = 209;
button3.TabStop = false; button3.TabStop = false;
button3.MouseClick += button3_MouseClick; button3.MouseClick += button3_MouseClick;
// //
// progressBar2 // progressBar2
// //
progressBar2.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; progressBar2.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
progressBar2.BackColor = System.Drawing.Color.Transparent; progressBar2.BackColor = System.Drawing.Color.Transparent;
progressBar2.BarColour = System.Drawing.Color.FromArgb(79, 193, 203); progressBar2.BarColour = System.Drawing.Color.FromArgb(79, 193, 203);
@ -214,31 +210,30 @@ namespace FizzyLauncher
progressBar2.Maximum = 100; progressBar2.Maximum = 100;
progressBar2.Minimum = 0; progressBar2.Minimum = 0;
progressBar2.Name = "progressBar2"; progressBar2.Name = "progressBar2";
progressBar2.Padding = new Padding(4, 4, 3, 3);
progressBar2.ProgressText = "50/100"; progressBar2.ProgressText = "50/100";
progressBar2.ShowProgressText = true; progressBar2.ShowProgressText = true;
progressBar2.Size = new System.Drawing.Size(424, 20); progressBar2.Size = new System.Drawing.Size(424, 20);
progressBar2.TabIndex = 210; progressBar2.TabIndex = 210;
progressBar2.TabStop = false; progressBar2.TabStop = false;
progressBar2.Value = 50; progressBar2.Value = 50;
// //
// dialogFooter1 // dialogFooter1
// //
dialogFooter1.BackColor = System.Drawing.Color.FromArgb(240, 240, 240); dialogFooter1.BackColor = System.Drawing.Color.FromArgb(240, 240, 240);
dialogFooter1.Button1Text = "&Close"; dialogFooter1.Button1Text = "&Close";
dialogFooter1.Dialog = this; dialogFooter1.Dialog = this;
dialogFooter1.Dock = DockStyle.Bottom; dialogFooter1.Dock = DockStyle.Bottom;
dialogFooter1.IsBusy = false; dialogFooter1.IsBusy = false;
dialogFooter1.Location = new System.Drawing.Point(0, 477); dialogFooter1.Location = new System.Drawing.Point(0, 437);
dialogFooter1.Name = "dialogFooter1"; dialogFooter1.Name = "dialogFooter1";
dialogFooter1.Size = new System.Drawing.Size(444, 84); dialogFooter1.Size = new System.Drawing.Size(444, 84);
// //
// UpdateIconsForm // UpdateIconsForm
// //
AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
AutoScaleMode = AutoScaleMode.Font; AutoScaleMode = AutoScaleMode.Font;
BackColor = System.Drawing.Color.White; BackColor = System.Drawing.Color.White;
ClientSize = new System.Drawing.Size(444, 561); ClientSize = new System.Drawing.Size(444, 521);
Controls.Add(dialogFooter1); Controls.Add(dialogFooter1);
Controls.Add(progressBar2); Controls.Add(progressBar2);
Controls.Add(button3); Controls.Add(button3);
@ -251,7 +246,7 @@ namespace FizzyLauncher
Controls.Add(tHorizontalSeparator2); Controls.Add(tHorizontalSeparator2);
Controls.Add(label1); Controls.Add(label1);
KeyPreview = true; KeyPreview = true;
MinimumSize = new System.Drawing.Size(460, 600); MinimumSize = new System.Drawing.Size(460, 560);
Name = "UpdateIconsForm"; Name = "UpdateIconsForm";
Text = "Update Icons"; Text = "Update Icons";
ResumeLayout(false); ResumeLayout(false);

4
UpdateIconsForm.resx
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<root> <root>
<!-- <!--
Microsoft ResX Schema Microsoft ResX Schema
Version 2.0 Version 2.0
@ -48,7 +48,7 @@
value : The object must be serialized with value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding. : and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64 mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter : System.Runtime.Serialization.Formatters.Soap.SoapFormatter

51
Windows/Forms/BookmarkTreeView.cs
View File

@ -1,8 +1,7 @@
using System; using System;
using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using System.Drawing; using System.Drawing;
using System.Linq; using System.Reflection;
using System.Windows.Forms; using System.Windows.Forms;
using bzit.bomg.Models; using bzit.bomg.Models;
using FizzyLauncher; using FizzyLauncher;
@ -39,6 +38,17 @@ namespace RyzStudio.Windows.Forms
this.ImageList = new ImageList(); 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.ColorDepth = ColorDepth.Depth32Bit;
this.ImageList.ImageSize = new Size(16, 16); this.ImageList.ImageSize = new Size(16, 16);
this.ImageList.TransparentColor = Color.Transparent; this.ImageList.TransparentColor = Color.Transparent;
@ -411,30 +421,6 @@ namespace RyzStudio.Windows.Forms
this.HasChanged = true; 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() private void ClearImageList()
{ {
@ -482,18 +468,5 @@ namespace RyzStudio.Windows.Forms
return this.ImageList.Images.IndexOfKey(key); 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;
}
} }
} }

8
build-installer.iss
View File

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

1
build.bat
View File

@ -4,7 +4,6 @@ RMDIR /s /q "obj\"
MKDIR bin MKDIR bin
dotnet restore skye.sln 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\" 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" "C:\B\Portable Files (dev)\Inno Setup\v6.0.4-2\app\ISCC.exe" "build-installer.iss"