Ray/bookmark-manager-r4
Ray/bookmark-manager-r4
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: Ray:7512811921427c280d987e9ab599526c585ee165
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
Ray:release-0.4.0.130
...
compare: Ray:476ada0b82b7fb66f09a0c0871a5f71e1d5ac2b9
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
Ray:release-0.4.0.130

7 Commits
7512811921 ... 476ada0b82

Author SHA1 Message Date
Ray
476ada0b82 Merge pull request 'release/0.5.0.011' (#1) from release/2022-12 into master 
Reviewed-on: #1
 2022-12-25 00:37:26 +00:00
Ray
5fccba35a8 Changed build no. to 0.5.0.011 2022-12-24 21:05:42 +00:00
Ray
61fcbb6230 Upgrade Ryz3ui + Ryz3core packages 2022-12-24 20:57:17 +00:00
Ray
cf6a45b637 WIP 2022-12-24 03:24:31 +00:00
Ray
e98111bf04 Upgrade to using RyzStudio3 package (WIP) 2022-12-23 22:20:26 +00:00
Ray
68a9f8e616 Upgrade to .net 6.0 2022-12-23 22:08:10 +00:00
Ray
e6818c28e8 Fixed label capitalisation on options dialog box 2022-12-23 22:00:50 +00:00
14 changed files with 152 additions and 102 deletions
Show Stats Expand all files Collapse all files

2
BookmarkForm.cs
View File

@ -333,7 +333,7 @@ namespace FizzyLauncher
{
base.IsBusy = value;
UIControl.SetValue(pictureBox2, (this.IsBusy ? UIcon.GetImage("loading_block") : null));
UIControl.SetValue(pictureBox2, (this.IsBusy ? UIResource1.loading_block : null));
UIControl.SetEnable(textBox1, !this.IsBusy);
UIControl.SetEnable(textBox2, !this.IsBusy);

18
BookmarkManager.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net5.0-windows</TargetFramework>
<TargetFramework>net6.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<NoWin32Manifest>true</NoWin32Manifest>
<ApplicationIcon>favicon.ico</ApplicationIcon>
@ -12,10 +12,11 @@
<Company>Hi, I'm Ray</Company>
<Product>Bookmark Manager</Product>
<Copyright>Ray Lam</Copyright>
<AssemblyVersion>0.4.4.026</AssemblyVersion>
<FileVersion>0.4.4.026</FileVersion>
<Version>0.4.4.026</Version>
<AssemblyVersion>1.0.0.0</AssemblyVersion>
<FileVersion>1.0.0.0</FileVersion>
<Version>0.5.0.011</Version>
<PackageId>bookmarkmanager</PackageId>
<RunAnalyzersDuringLiveAnalysis>True</RunAnalyzersDuringLiveAnalysis>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@ -110,15 +111,18 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="HtmlAgilityPack" Version="1.11.34" />
<PackageReference Include="HtmlAgilityPack" Version="1.11.46" />
<PackageReference Include="Microsoft.Data.Sqlite" Version="5.0.10" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="SharpZipLib" Version="1.3.2" />
</ItemGroup>
<ItemGroup>
<Reference Include="RyzStudio3">
<HintPath>References\RyzStudio3.dll</HintPath>
<Reference Include="Ryz3core">
<HintPath>References\Ryz3core.dll</HintPath>
</Reference>
<Reference Include="Ryz3ui">
<HintPath>References\Ryz3ui.dll</HintPath>
</Reference>
</ItemGroup>

2
Classes/Crypto.cs
View File

@ -10,7 +10,7 @@ namespace BookmarkManager
{
if (string.IsNullOrWhiteSpace(text)) return string.Empty;
using (var sha = new SHA256Managed())
using (var sha = SHA256.Create())
{
byte[] hash = sha.ComputeHash(Encoding.UTF8.GetBytes(text));

44
MainForm.cs
View File

@ -2,6 +2,7 @@
using bzit.bomg.Models;
using FizzyLauncher.Models;
using Newtonsoft.Json;
using RyzStudio.Drawing;
using RyzStudio.Windows.Forms;
using System;
using System.Collections.Generic;
@ -157,54 +158,21 @@ namespace FizzyLauncher
case AppMode.Clear:
UIControl.SetText(this, AppResource.app_name);
UIControl.SetEnable(closeToolStripMenuItem, false);
UIControl.SetEnable(saveToolStripMenuItem, false);
UIControl.SetEnable(toolStripButton3, false);
UIControl.SetEnable(saveAsToolStripMenuItem, false);
UIControl.SetEnable(findToolStripMenuItem, false);
UIControl.SetEnable(toolStripButton4, false);
UIControl.SetEnable(toolStripMenuItem9, false);
UIControl.SetEnable(expandAllToolStripMenuItem, false);
UIControl.SetEnable(collapseAllToolStripMenuItem, false);
UIControl.SetEnable(false, closeToolStripMenuItem, saveToolStripMenuItem, saveAsToolStripMenuItem, findToolStripMenuItem, toolStripMenuItem9, expandAllToolStripMenuItem, collapseAllToolStripMenuItem);
UIControl.SetEnable(false, toolStripButton3, toolStripButton4);
break;
case AppMode.Open:
UIControl.SetEnable(closeToolStripMenuItem, true);
UIControl.SetEnable(saveToolStripMenuItem, true);
UIControl.SetEnable(toolStripButton3, true);
UIControl.SetEnable(saveAsToolStripMenuItem, true);
UIControl.SetEnable(findToolStripMenuItem, true);
UIControl.SetEnable(toolStripButton4, true);
UIControl.SetEnable(toolStripMenuItem9, true);
UIControl.SetEnable(expandAllToolStripMenuItem, true);
UIControl.SetEnable(collapseAllToolStripMenuItem, true);
UIControl.SetEnable(true, closeToolStripMenuItem, saveToolStripMenuItem, saveAsToolStripMenuItem, findToolStripMenuItem, toolStripMenuItem9, expandAllToolStripMenuItem, collapseAllToolStripMenuItem);
UIControl.SetEnable(true, toolStripButton3, toolStripButton4);
break;
case AppMode.New:
UIControl.SetText(this, AppResource.app_name);
UIControl.SetEnable(closeToolStripMenuItem, true);
UIControl.SetEnable(true, closeToolStripMenuItem, saveAsToolStripMenuItem, findToolStripMenuItem, toolStripMenuItem9, expandAllToolStripMenuItem, collapseAllToolStripMenuItem);
UIControl.SetEnable(saveToolStripMenuItem, false);
UIControl.SetEnable(toolStripButton3, false);
UIControl.SetEnable(saveAsToolStripMenuItem, true);
UIControl.SetEnable(findToolStripMenuItem, true);
UIControl.SetEnable(toolStripButton4, true);
UIControl.SetEnable(toolStripMenuItem9, true);
UIControl.SetEnable(expandAllToolStripMenuItem, true);
UIControl.SetEnable(collapseAllToolStripMenuItem, true);
break;
default: break;
}

17
OptionsForm.cs
View File

@ -1,7 +1,8 @@
using FizzyLauncher.Models;
using System;
using System.Windows.Forms;
using FizzyLauncher.Models;
using RyzStudio.Windows.ThemedForms;
using System;
using RyzStudio.Windows.ThemedForms.PickerBox;
namespace FizzyLauncher
{
@ -46,9 +47,9 @@ namespace FizzyLauncher
{
this.label1 = new System.Windows.Forms.Label();
this.button1 = new RyzStudio.Windows.ThemedForms.TButton();
this.pickerBox1 = new RyzStudio.Windows.ThemedForms.TYesNoPickerBox();
this.pickerBox1 = new TYesNoPickerBox();
this.label6 = new System.Windows.Forms.Label();
this.pickerBox2 = new RyzStudio.Windows.ThemedForms.TYesNoPickerBox();
this.pickerBox2 = new TYesNoPickerBox();
this.label7 = new System.Windows.Forms.Label();
this.label8 = new System.Windows.Forms.Label();
this.pickerBox3 = new RyzStudio.Windows.ThemedForms.TPickerBox();
@ -56,9 +57,9 @@ namespace FizzyLauncher
this.tHorizontalSeparator2 = new RyzStudio.Windows.Forms.THorizontalSeparator();
this.tHorizontalSeparator3 = new RyzStudio.Windows.Forms.THorizontalSeparator();
this.textBox1 = new RyzStudio.Windows.ThemedForms.TTextBox();
this.pickerBox4 = new RyzStudio.Windows.ThemedForms.TYesNoPickerBox();
this.pickerBox4 = new TYesNoPickerBox();
this.label2 = new System.Windows.Forms.Label();
this.pickerBox5 = new RyzStudio.Windows.ThemedForms.TYesNoPickerBox();
this.pickerBox5 = new TYesNoPickerBox();
this.label3 = new System.Windows.Forms.Label();
this.SuspendLayout();
//
@ -301,9 +302,9 @@ namespace FizzyLauncher
this.label3.Margin = new System.Windows.Forms.Padding(0);
this.label3.Name = "label3";
this.label3.Padding = new System.Windows.Forms.Padding(0, 9, 0, 10);
this.label3.Size = new System.Drawing.Size(111, 34);
this.label3.Size = new System.Drawing.Size(112, 34);
this.label3.TabIndex = 195;
this.label3.Text = "Show toolbar menu";
this.label3.Text = "Show Toolbar Menu";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// OptionsForm

BIN
References/HtmlAgilityPack.dll Normal file
View File

Binary file not shown.

75
References/Ryz3core.deps.json Normal file
View File

@ -0,0 +1,75 @@
{
"runtimeTarget": {
"name": ".NETCoreApp,Version=v6.0/win-x64",
"signature": ""
},
"compilationOptions": {},
"targets": {
".NETCoreApp,Version=v6.0": {},
".NETCoreApp,Version=v6.0/win-x64": {
"Ryz3core/0.1.5.035": {
"dependencies": {
"HtmlAgilityPack": "1.11.46",
"System.Data.SQLite.Core": "1.0.117"
},
"runtime": {
"Ryz3core.dll": {}
}
},
"HtmlAgilityPack/1.11.46": {
"runtime": {
"lib/netstandard2.0/HtmlAgilityPack.dll": {
"assemblyVersion": "1.11.46.0",
"fileVersion": "1.11.46.0"
}
}
},
"Stub.System.Data.SQLite.Core.NetStandard/1.0.117": {
"runtime": {
"lib/netstandard2.1/System.Data.SQLite.dll": {
"assemblyVersion": "1.0.117.0",
"fileVersion": "1.0.117.0"
}
},
"native": {
"runtimes/win-x64/native/SQLite.Interop.dll": {
"fileVersion": "1.0.117.0"
}
}
},
"System.Data.SQLite.Core/1.0.117": {
"dependencies": {
"Stub.System.Data.SQLite.Core.NetStandard": "1.0.117"
}
}
}
},
"libraries": {
"Ryz3core/0.1.5.035": {
"type": "project",
"serviceable": false,
"sha512": ""
},
"HtmlAgilityPack/1.11.46": {
"type": "package",
"serviceable": true,
"sha512": "sha512-dLMn4EVfJBHWmWK4Uh0XGD76FPLHI0qr2Tm0s1m/xmgiHb1JUb9zB8AzO8HtrkBBlMN6JfCUBYddhqC0hZNR+g==",
"path": "htmlagilitypack/1.11.46",
"hashPath": "htmlagilitypack.1.11.46.nupkg.sha512"
},
"Stub.System.Data.SQLite.Core.NetStandard/1.0.117": {
"type": "package",
"serviceable": true,
"sha512": "sha512-x1zzPC/A4MmiKGDLoxLE6O5KLu7Kz7dyzhPQzlqYFTFcXmXAtM7hNNWpGw5yLEz833AnGbd/kxoitXArgR4YyA==",
"path": "stub.system.data.sqlite.core.netstandard/1.0.117",
"hashPath": "stub.system.data.sqlite.core.netstandard.1.0.117.nupkg.sha512"
},
"System.Data.SQLite.Core/1.0.117": {
"type": "package",
"serviceable": true,
"sha512": "sha512-lGfOhA3QQod9XhdWYqLgNgbgq5uZnVG6DtnhDAdPisbLpTTgZBNbeGnp+GWt8C+3EyaqBYTGJWXcxHlHKwo05A==",
"path": "system.data.sqlite.core/1.0.117",
"hashPath": "system.data.sqlite.core.1.0.117.nupkg.sha512"
}
}
}

BIN
References/Ryz3core.dll Normal file
View File

Binary file not shown.

BIN
References/Ryz3ui.dll Normal file
View File

Binary file not shown.

BIN
References/SQLite.Interop.dll Normal file
View File

Binary file not shown.

BIN
References/System.Data.SQLite.dll Normal file
View File

Binary file not shown.

38
UpdateIconsForm.cs
View File

@ -1,17 +1,17 @@
using BookmarkManager;
using bzit.bomg.Models;
using FizzyLauncher.Models;
using RyzStudio.IO;
using RyzStudio.Windows.Forms;
using RyzStudio.Windows.ThemedForms;
using System;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Net;
using System.Threading.Tasks;
using System.Windows.Forms;
using TProgressBar = RyzStudio.Windows.ThemedForms.TProgressBar;
using BookmarkManager;
using bzit.bomg.Models;
using FizzyLauncher.Models;
using RyzStudio;
using RyzStudio.IO;
using RyzStudio.Windows.Forms;
using RyzStudio.Windows.ThemedForms;
using RyzStudio.Windows.ThemedForms.PickerBox;
namespace FizzyLauncher
{
@ -63,7 +63,7 @@ namespace FizzyLauncher
this.label2 = new System.Windows.Forms.Label();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.pictureBox2 = new System.Windows.Forms.PictureBox();
this.pickerBox1 = new RyzStudio.Windows.ThemedForms.TYesNoPickerBox();
this.pickerBox1 = new RyzStudio.Windows.ThemedForms.PickerBox.TYesNoPickerBox();
this.button2 = new RyzStudio.Windows.ThemedForms.TButton();
this.progressBar1 = new RyzStudio.Windows.ThemedForms.TProgressBar();
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
@ -78,9 +78,9 @@ namespace FizzyLauncher
this.label1.Margin = new System.Windows.Forms.Padding(0);
this.label1.Name = "label1";
this.label1.Padding = new System.Windows.Forms.Padding(0, 9, 0, 10);
this.label1.Size = new System.Drawing.Size(154, 34);
this.label1.Size = new System.Drawing.Size(133, 34);
this.label1.TabIndex = 153;
this.label1.Text = "Find outstanding icons only";
this.label1.Text = "Find Missing Icons Only";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// button1
@ -98,6 +98,7 @@ namespace FizzyLauncher
this.button1.Padding = new System.Windows.Forms.Padding(4, 4, 3, 3);
this.button1.Size = new System.Drawing.Size(128, 32);
this.button1.TabIndex = 2;
this.button1.TabStop = false;
this.button1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.button1_MouseClick);
//
// tHorizontalSeparator1
@ -108,11 +109,10 @@ namespace FizzyLauncher
this.tHorizontalSeparator1.AutoScrollMinSize = new System.Drawing.Size(0, 0);
this.tHorizontalSeparator1.BackColor = System.Drawing.Color.Transparent;
this.tHorizontalSeparator1.Location = new System.Drawing.Point(10, 437);
this.tHorizontalSeparator1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 10);
this.tHorizontalSeparator1.Margin = new System.Windows.Forms.Padding(0, 10, 0, 10);
this.tHorizontalSeparator1.MaximumSize = new System.Drawing.Size(4920, 2);
this.tHorizontalSeparator1.MinimumSize = new System.Drawing.Size(0, 22);
this.tHorizontalSeparator1.Name = "tHorizontalSeparator1";
this.tHorizontalSeparator1.Padding = new System.Windows.Forms.Padding(0, 10, 0, 10);
this.tHorizontalSeparator1.Size = new System.Drawing.Size(364, 22);
this.tHorizontalSeparator1.TabIndex = 188;
this.tHorizontalSeparator1.TabStop = false;
@ -125,11 +125,10 @@ namespace FizzyLauncher
this.tHorizontalSeparator2.AutoScrollMinSize = new System.Drawing.Size(0, 0);
this.tHorizontalSeparator2.BackColor = System.Drawing.Color.Transparent;
this.tHorizontalSeparator2.Location = new System.Drawing.Point(10, 59);
this.tHorizontalSeparator2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 10);
this.tHorizontalSeparator2.Margin = new System.Windows.Forms.Padding(0, 10, 0, 10);
this.tHorizontalSeparator2.MaximumSize = new System.Drawing.Size(4920, 2);
this.tHorizontalSeparator2.MinimumSize = new System.Drawing.Size(0, 22);
this.tHorizontalSeparator2.Name = "tHorizontalSeparator2";
this.tHorizontalSeparator2.Padding = new System.Windows.Forms.Padding(0, 10, 0, 10);
this.tHorizontalSeparator2.Size = new System.Drawing.Size(364, 22);
this.tHorizontalSeparator2.TabIndex = 190;
this.tHorizontalSeparator2.TabStop = false;
@ -168,11 +167,13 @@ namespace FizzyLauncher
this.pickerBox1.BackColor = System.Drawing.Color.Transparent;
this.pickerBox1.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
this.pickerBox1.Location = new System.Drawing.Point(285, 21);
this.pickerBox1.Margin = new System.Windows.Forms.Padding(10, 4, 10, 4);
this.pickerBox1.Margin = new System.Windows.Forms.Padding(10, 10, 10, 0);
this.pickerBox1.Name = "pickerBox1";
this.pickerBox1.Padding = new System.Windows.Forms.Padding(4, 4, 3, 3);
this.pickerBox1.SelectedIndex = 1;
this.pickerBox1.Size = new System.Drawing.Size(84, 35);
this.pickerBox1.TabIndex = 0;
this.pickerBox1.TabStop = false;
this.pickerBox1.Value = true;
//
// button2
@ -190,6 +191,7 @@ namespace FizzyLauncher
this.button2.Padding = new System.Windows.Forms.Padding(4, 4, 3, 3);
this.button2.Size = new System.Drawing.Size(128, 32);
this.button2.TabIndex = 1;
this.button2.TabStop = false;
this.button2.MouseClick += new System.Windows.Forms.MouseEventHandler(this.button2_MouseClick);
//
// progressBar1
@ -246,7 +248,7 @@ namespace FizzyLauncher
{
base.IsBusy = value;
UIControl.SetValue(pictureBox2, (this.IsBusy ? UIcon.GetImage("loading_block") : null));
UIControl.SetValue(pictureBox2, (this.IsBusy ? UIResource1.loading_block : null));
UIControl.SetEnable(pickerBox1, !this.IsBusy);
button2.LabelText = (this.IsBusy ? "&Stop" : "&Run");

6
installer-64.iss
View File

@ -2,7 +2,7 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
#define MyAppName "Bookmark Manager"
#define MyAppVersion "0.4.4.026"
#define MyAppVersion "0.5.0.011"
#define MyAppPublisher "Hi, I'm Ray"
#define MyAppURL "https://www.hiimray.co.uk/software-bookmark-manager"
#define MyAppExeName "bookmarkmanager.exe"
@ -35,8 +35,8 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
[Files]
Source: "L:\gitlab-hiimray\bookmark-manager-r4\bin\Release\64\bookmarkmanager.exe"; DestDir: "{app}"; Flags: ignoreversion
Source: "L:\gitlab-hiimray\bookmark-manager-r4\bin\Release\64\e_sqlite3.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "L:\gitea-hiimray\bookmark-manager-r4\bin\Release\64\bookmarkmanager.exe"; DestDir: "{app}"; Flags: ignoreversion
Source: "L:\gitea-hiimray\bookmark-manager-r4\bin\Release\64\e_sqlite3.dll"; DestDir: "{app}"; Flags: ignoreversion
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
[Icons]

4
skye.sln
View File

@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.31410.357
# Visual Studio Version 17
VisualStudioVersion = 17.4.33205.214
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BookmarkManager", "BookmarkManager.csproj", "{4833FB27-0817-4720-A54B-180369B0C374}"
EndProject