From a8c1424fbb9fd59de0caacaf6dd226915deb837e Mon Sep 17 00:00:00 2001
From: maforget <11904426+maforget@users.noreply.github.com>
Date: Sat, 27 Jan 2024 17:43:57 -0500
Subject: [PATCH] Cleanup, fixed some warnings
---
ComicRack.Plugins/ComicRack.Plugins.csproj | 8 ++
.../Controls/HtmlComicPageControl.Designer.cs | 63 +++++++++
.../Controls/HtmlComicPageControl.cs | 41 +-----
.../Controls/HtmlComicPageControl.resx | 120 ++++++++++++++++++
ComicRack/Views/ComicBrowserView.Designer.cs | 1 +
.../Views/ComicListFilesBrowser.Designer.cs | 8 +-
6 files changed, 199 insertions(+), 42 deletions(-)
create mode 100644 ComicRack.Plugins/Controls/HtmlComicPageControl.Designer.cs
create mode 100644 ComicRack.Plugins/Controls/HtmlComicPageControl.resx
diff --git a/ComicRack.Plugins/ComicRack.Plugins.csproj b/ComicRack.Plugins/ComicRack.Plugins.csproj
index 9c25825..d9a740e 100644
--- a/ComicRack.Plugins/ComicRack.Plugins.csproj
+++ b/ComicRack.Plugins/ComicRack.Plugins.csproj
@@ -52,6 +52,9 @@
UserControl
+
+ HtmlComicPageControl.cs
+
UserControl
@@ -83,6 +86,11 @@
4.7.0
+
+
+ HtmlComicPageControl.cs
+
+
diff --git a/ComicRack.Plugins/Controls/HtmlComicPageControl.Designer.cs b/ComicRack.Plugins/Controls/HtmlComicPageControl.Designer.cs
new file mode 100644
index 0000000..91dcfc4
--- /dev/null
+++ b/ComicRack.Plugins/Controls/HtmlComicPageControl.Designer.cs
@@ -0,0 +1,63 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Windows.Forms;
+using cYo.Projects.ComicRack.Engine;
+using cYo.Projects.ComicRack.Engine.Controls;
+
+namespace cYo.Projects.ComicRack.Plugins.Controls
+{
+ public partial class HtmlComicPageControl : ComicPageControl
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing)
+ {
+ if (SaveConfigFunction != null && originalConfig != ScriptConfig)
+ {
+ SaveConfigFunction(ScriptConfig);
+ }
+ if (components != null)
+ {
+ components.Dispose();
+ }
+ }
+ base.Dispose(disposing);
+ }
+
+ private void InitializeComponent()
+ {
+ this.webBrowser = new System.Windows.Forms.WebBrowser();
+ this.SuspendLayout();
+ //
+ // webBrowser
+ //
+ this.webBrowser.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.webBrowser.Location = new System.Drawing.Point(0, 0);
+ this.webBrowser.MinimumSize = new System.Drawing.Size(20, 20);
+ this.webBrowser.Name = "webBrowser";
+ this.webBrowser.Size = new System.Drawing.Size(540, 402);
+ this.webBrowser.TabIndex = 1;
+ this.webBrowser.WebBrowserShortcutsEnabled = false;
+ //
+ // HtmlComicPageControl
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.Controls.Add(this.webBrowser);
+ this.Name = "HtmlComicPageControl";
+ this.Size = new System.Drawing.Size(540, 402);
+ this.ResumeLayout(false);
+
+ }
+
+ private WebBrowser webBrowser;
+ }
+}
diff --git a/ComicRack.Plugins/Controls/HtmlComicPageControl.cs b/ComicRack.Plugins/Controls/HtmlComicPageControl.cs
index 66e448e..bfda888 100644
--- a/ComicRack.Plugins/Controls/HtmlComicPageControl.cs
+++ b/ComicRack.Plugins/Controls/HtmlComicPageControl.cs
@@ -10,7 +10,7 @@
namespace cYo.Projects.ComicRack.Plugins.Controls
{
- public class HtmlComicPageControl : ComicPageControl
+ public partial class HtmlComicPageControl : ComicPageControl
{
[ComVisible(true)]
public class ScriptProvider
@@ -32,10 +32,6 @@ public string Config
private string originalConfig;
- private IContainer components;
-
- private WebBrowser webBrowser;
-
public Func InfoFunction
{
get;
@@ -84,22 +80,6 @@ public HtmlComicPageControl()
InitializeComponent();
}
- protected override void Dispose(bool disposing)
- {
- if (disposing)
- {
- if (SaveConfigFunction != null && originalConfig != ScriptConfig)
- {
- SaveConfigFunction(ScriptConfig);
- }
- if (components != null)
- {
- components.Dispose();
- }
- }
- base.Dispose(disposing);
- }
-
protected override void OnShowInfo(IEnumerable books)
{
base.OnShowInfo(books);
@@ -132,24 +112,5 @@ protected override void OnShowInfo(IEnumerable books)
lastResult = null;
}
}
-
- private void InitializeComponent()
- {
- webBrowser = new System.Windows.Forms.WebBrowser();
- SuspendLayout();
- webBrowser.Dock = System.Windows.Forms.DockStyle.Fill;
- webBrowser.Location = new System.Drawing.Point(0, 0);
- webBrowser.MinimumSize = new System.Drawing.Size(20, 20);
- webBrowser.Name = "webBrowser";
- webBrowser.Size = new System.Drawing.Size(540, 402);
- webBrowser.TabIndex = 1;
- webBrowser.WebBrowserShortcutsEnabled = false;
- base.AutoScaleDimensions = new System.Drawing.SizeF(6f, 13f);
- base.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- base.Controls.Add(webBrowser);
- base.Name = "HtmlInfoControl";
- base.Size = new System.Drawing.Size(540, 402);
- ResumeLayout(false);
- }
}
}
diff --git a/ComicRack.Plugins/Controls/HtmlComicPageControl.resx b/ComicRack.Plugins/Controls/HtmlComicPageControl.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/ComicRack.Plugins/Controls/HtmlComicPageControl.resx
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/ComicRack/Views/ComicBrowserView.Designer.cs b/ComicRack/Views/ComicBrowserView.Designer.cs
index 4730bae..875ccc1 100644
--- a/ComicRack/Views/ComicBrowserView.Designer.cs
+++ b/ComicRack/Views/ComicBrowserView.Designer.cs
@@ -13,6 +13,7 @@ public partial class ComicBrowserView : SubView
private void InitializeComponent()
{
+ this.components = new System.ComponentModel.Container();
this.comicBrowser = new cYo.Projects.ComicRack.Viewer.Views.ComicBrowserControl();
this.SuspendLayout();
//
diff --git a/ComicRack/Views/ComicListFilesBrowser.Designer.cs b/ComicRack/Views/ComicListFilesBrowser.Designer.cs
index 6a95135..a3cb605 100644
--- a/ComicRack/Views/ComicListFilesBrowser.Designer.cs
+++ b/ComicRack/Views/ComicListFilesBrowser.Designer.cs
@@ -8,9 +8,12 @@ namespace cYo.Projects.ComicRack.Viewer.Views
public partial class ComicListFilesBrowser : ComicListBrowser
{
- private IContainer components;
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
- protected override void Dispose(bool disposing)
+ protected override void Dispose(bool disposing)
{
if (disposing)
{
@@ -25,6 +28,7 @@ protected override void Dispose(bool disposing)
private void InitializeComponent()
{
+ this.components = new System.ComponentModel.Container();
this.SuspendLayout();
//
// ComicListFilesBrowser