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

release/0.6.0 #2

Merged
Ray merged 7 commits from release/0.6.0 into master 2024-07-20 21:52:48 +00:00
Conversation 0 Commits 7 Files Changed 46 +24 -49
8 changed files with 24 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 847accc213 - Show all commits

7
BookmarkManager.csproj
View File

@ -7,17 +7,18 @@
<NoWin32Manifest>true</NoWin32Manifest> <NoWin32Manifest>true</NoWin32Manifest>
<ApplicationIcon>favicon.ico</ApplicationIcon> <ApplicationIcon>favicon.ico</ApplicationIcon>
<SignAssembly>false</SignAssembly> <SignAssembly>false</SignAssembly>
<AssemblyName>bookmarkmanager</AssemblyName> <AssemblyName>bukkubuddy</AssemblyName>
<Authors>Ray Lam</Authors> <Authors>Ray Lam</Authors>
<Company>Hi, I'm Ray</Company> <Company>Hi, I'm Ray</Company>
<Product>Bookmark Manager</Product> <Product>BukkuBuddy</Product>
<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.0.716</Version> <Version>0.6.0.716</Version>
<PackageId>bookmarkmanager</PackageId> <PackageId>bukkubuddy</PackageId>
<RunAnalyzersDuringLiveAnalysis>True</RunAnalyzersDuringLiveAnalysis> <RunAnalyzersDuringLiveAnalysis>True</RunAnalyzersDuringLiveAnalysis>
<SupportedOSPlatformVersion>8.0</SupportedOSPlatformVersion> <SupportedOSPlatformVersion>8.0</SupportedOSPlatformVersion>
<Description>BukkuBuddy Bookmark Manager</Description>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

1
EditBookmarkForm.cs
View File

@ -42,6 +42,7 @@ namespace FizzyLauncher
this.OkButton = button1; this.OkButton = button1;
_webProvider = new WebProvider(); _webProvider = new WebProvider();
_webProvider.IgnoreSSL = true;
result = model; result = model;

2
Models/AppOptions.cs
View File

@ -12,7 +12,7 @@ namespace FizzyLauncher.Models
public string RunCommand { get; set; } = "{0}"; public string RunCommand { get; set; } = "{0}";
public bool IgnoreSSL { get; set; } = false; //public bool IgnoreSSL { get; set; } = false;
public Point StartPosition { get; set; } = Point.Empty; public Point StartPosition { get; set; } = Point.Empty;

41
OptionsForm.cs
View File

@ -22,8 +22,6 @@ namespace FizzyLauncher
private Label label1; private Label label1;
private ThYesNoPickerBox yesNoPickerBox2; private ThYesNoPickerBox yesNoPickerBox2;
private Label label3; private Label label3;
private ThYesNoPickerBox yesNoPickerBox3;
private Label label4;
private RyzStudio.Windows.ThemedForms.ButtonTextBox.ThClearableTextBox textBox1; private RyzStudio.Windows.ThemedForms.ButtonTextBox.ThClearableTextBox textBox1;
private AppOptions _appSession = null; private AppOptions _appSession = null;
@ -44,7 +42,6 @@ namespace FizzyLauncher
yesNoPickerBox2.Value = _appSession.AlwaysOnTop; yesNoPickerBox2.Value = _appSession.AlwaysOnTop;
textBox1.Text = _appSession.RunCommand ?? string.Empty; textBox1.Text = _appSession.RunCommand ?? string.Empty;
yesNoPickerBox3.Value = _appSession.IgnoreSSL;
} }
} }
@ -62,8 +59,6 @@ namespace FizzyLauncher
label1 = new Label(); label1 = new Label();
panel3 = new TTogglePanel(); panel3 = new TTogglePanel();
textBox1 = new RyzStudio.Windows.ThemedForms.ButtonTextBox.ThClearableTextBox(); textBox1 = new RyzStudio.Windows.ThemedForms.ButtonTextBox.ThClearableTextBox();
yesNoPickerBox3 = new ThYesNoPickerBox();
label4 = new Label();
label3 = new Label(); label3 = new Label();
flowLayoutPanel1.SuspendLayout(); flowLayoutPanel1.SuspendLayout();
panel1.SuspendLayout(); panel1.SuspendLayout();
@ -246,8 +241,6 @@ namespace FizzyLauncher
panel3.AutoScrollMargin = new System.Drawing.Size(0, 0); panel3.AutoScrollMargin = new System.Drawing.Size(0, 0);
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(yesNoPickerBox3);
panel3.Controls.Add(label4);
panel3.Controls.Add(label3); panel3.Controls.Add(label3);
panel3.ExpandedHeight = 100; panel3.ExpandedHeight = 100;
panel3.ForeColor = System.Drawing.Color.FromArgb(99, 105, 119); panel3.ForeColor = System.Drawing.Color.FromArgb(99, 105, 119);
@ -257,7 +250,7 @@ namespace FizzyLauncher
panel3.Name = "panel3"; panel3.Name = "panel3";
panel3.PaddingBottom = 2; panel3.PaddingBottom = 2;
panel3.PaddingLeft = 4; panel3.PaddingLeft = 4;
panel3.Size = new System.Drawing.Size(401, 121); 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;
@ -282,37 +275,6 @@ namespace FizzyLauncher
textBox1.TabStop = false; textBox1.TabStop = false;
textBox1.UseSystemPasswordChar = false; textBox1.UseSystemPasswordChar = false;
// //
// yesNoPickerBox3
//
yesNoPickerBox3.AcceptButton = null;
yesNoPickerBox3.Anchor = AnchorStyles.Top | AnchorStyles.Right;
yesNoPickerBox3.BackColor = System.Drawing.Color.Transparent;
yesNoPickerBox3.EnableReactiveVisual = true;
yesNoPickerBox3.Font = new System.Drawing.Font("Segoe UI", 9F);
yesNoPickerBox3.Location = new System.Drawing.Point(307, 66);
yesNoPickerBox3.Margin = new Padding(10, 10, 10, 0);
yesNoPickerBox3.Name = "yesNoPickerBox3";
yesNoPickerBox3.Padding = new Padding(4, 4, 3, 3);
yesNoPickerBox3.SelectedIndex = 1;
yesNoPickerBox3.Size = new System.Drawing.Size(84, 34);
yesNoPickerBox3.TabIndex = 202;
yesNoPickerBox3.TabStop = false;
yesNoPickerBox3.Value = true;
//
// label4
//
label4.AutoSize = true;
label4.BackColor = System.Drawing.Color.Transparent;
label4.ForeColor = System.Drawing.SystemColors.ControlText;
label4.Location = new System.Drawing.Point(1, 66);
label4.Margin = new Padding(0);
label4.Name = "label4";
label4.Padding = new Padding(0, 8, 0, 0);
label4.Size = new System.Drawing.Size(95, 23);
label4.TabIndex = 201;
label4.Text = "Ignore SSL Errors";
label4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// label3 // label3
// //
label3.AutoSize = true; label3.AutoSize = true;
@ -379,7 +341,6 @@ namespace FizzyLauncher
_appSession.AlwaysOnTop = yesNoPickerBox2.Value; _appSession.AlwaysOnTop = yesNoPickerBox2.Value;
_appSession.RunCommand = textBox1.Text ?? string.Empty; _appSession.RunCommand = textBox1.Text ?? string.Empty;
_appSession.IgnoreSSL = yesNoPickerBox3.Value;
return _appSession; return _appSession;
} }

11
Services/WebProvider.cs
View File

@ -18,6 +18,17 @@ namespace BookmarkManager.Services
_webClientProvider.Timeout = 4; _webClientProvider.Timeout = 4;
} }
public bool IgnoreSSL
{
get => _webClientProvider.IgnoreSSL;
set
{
_webClientProvider.IgnoreSSL = value;
}
}
public async Task<HtmlAgilityPack.HtmlDocument> RetrieveHtmlDocument(string url) public async Task<HtmlAgilityPack.HtmlDocument> RetrieveHtmlDocument(string url)
{ {
var sourceCode = await this.RetrieveSourceCode(url); var sourceCode = await this.RetrieveSourceCode(url);

1
UpdateIconsForm.cs
View File

@ -41,6 +41,7 @@ namespace FizzyLauncher
this.OkButton = button1; this.OkButton = button1;
_webProvider = new WebProvider(); _webProvider = new WebProvider();
_webProvider.IgnoreSSL = true;
_treeView = treeView; _treeView = treeView;
} }

8
build-installer.iss
View File

@ -1,15 +1,15 @@
; Script generated by the Inno Setup Script Wizard. ; Script generated by the Inno Setup Script Wizard.
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
#define MyAppName "Bookmark Manager" #define MyAppName "BukkuBuddy Bookmark Manager"
#define MyAppVersion "0.6.0.716" #define MyAppVersion "0.6.0.716"
#define MyAppPublisher "Hi, I'm Ray" #define MyAppPublisher "Hi, I'm Ray"
#define MyAppURL "https://www.hiimray.co.uk/software-bookmark-manager" #define MyAppURL "https://www.hiimray.co.uk/software-bookmark-manager"
#define MyAppExeName "bookmarkmanager.exe" #define MyAppExeName "bukkubuddy.exe"
#define AppSourcePath "L:\gitea-hiimray\bookmark-manager-r4\bin" #define AppSourcePath "L:\gitea-hiimray\bookmark-manager-r4\bin"
#define AppReleasePath "L:\gitea-hiimray\bookmark-manager-r4\bin" #define AppReleasePath "L:\gitea-hiimray\bookmark-manager-r4\bin"
#define AppReleaseName "bookmark-manager" #define AppReleaseName "bukkubuddy-installer"
[Setup] [Setup]
; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications. ; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.
@ -39,7 +39,7 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
[Files] [Files]
Source: "{#AppSourcePath}\bookmarkmanager.exe"; DestDir: "{app}"; Flags: ignoreversion Source: "{#AppSourcePath}\bukkubuddy.exe"; DestDir: "{app}"; Flags: ignoreversion
; NOTE: Don't use "Flags: ignoreversion" on any shared system files ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
[Icons] [Icons]

2
build.bat
View File

@ -8,7 +8,7 @@ dotnet publish skye.sln -r win-x64 -c Release /p:PublishSingleFile=true /p:SelfC
"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"
"C:\B\Portable Files\7-Zip (Portable)\23.01\App\7-Zip64\7z.exe" a -t7z "bin\bookmarkmanager.7z" ".\bin\bookmarkmanager.exe" -mx9 "C:\B\Portable Files\7-Zip (Portable)\23.01\App\7-Zip64\7z.exe" a -t7z "bin\bukkubuddy.7z" ".\bin\bukkubuddy.exe" -mx9
RMDIR /s /q "bin\debug" RMDIR /s /q "bin\debug"
RMDIR /s /q "bin\release" RMDIR /s /q "bin\release"