diff --git a/.gitignore b/.gitignore
index 2c70369..0836eb2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -132,7 +132,7 @@ publish/
packages/*
## TODO: If the tool you use requires repositories.config
## uncomment the next line
-#!packages/repositories.config
+!packages/repositories.config
# Enable "build/" folder in the NuGet Packages folder since
# NuGet packages use it for MSBuild targets.
diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs
index fdca2fd..be0b7fc 100644
--- a/Properties/Resources.Designer.cs
+++ b/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace Web_Page_Screensaver.Properties {
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
diff --git a/Properties/Settings.Designer.cs b/Properties/Settings.Designer.cs
index 3455aec..d57e71e 100644
--- a/Properties/Settings.Designer.cs
+++ b/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace Web_Page_Screensaver.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/ScreensaverForm.Designer.cs b/ScreensaverForm.Designer.cs
index bdec2a6..6d45391 100644
--- a/ScreensaverForm.Designer.cs
+++ b/ScreensaverForm.Designer.cs
@@ -28,60 +28,57 @@ protected override void Dispose(bool disposing)
///
private void InitializeComponent()
{
- this.webBrowser = new System.Windows.Forms.WebBrowser();
this.closeButton = new System.Windows.Forms.Button();
+ this.webView1 = new Microsoft.Toolkit.Forms.UI.Controls.WebView();
+ ((System.ComponentModel.ISupportInitialize)(this.webView1)).BeginInit();
this.SuspendLayout();
//
- // webBrowser
- //
- this.webBrowser.Dock = System.Windows.Forms.DockStyle.Fill;
- this.webBrowser.Location = new System.Drawing.Point(0, 0);
- this.webBrowser.Margin = new System.Windows.Forms.Padding(4);
- this.webBrowser.MinimumSize = new System.Drawing.Size(27, 25);
- this.webBrowser.Name = "webBrowser";
- this.webBrowser.ScriptErrorsSuppressed = true;
- this.webBrowser.Size = new System.Drawing.Size(379, 322);
- this.webBrowser.TabIndex = 0;
- //
// closeButton
//
this.closeButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.closeButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.closeButton.Location = new System.Drawing.Point(323, 15);
- this.closeButton.Margin = new System.Windows.Forms.Padding(4);
+ this.closeButton.Location = new System.Drawing.Point(242, 12);
this.closeButton.Name = "closeButton";
- this.closeButton.Size = new System.Drawing.Size(40, 28);
+ this.closeButton.Size = new System.Drawing.Size(30, 23);
this.closeButton.TabIndex = 1;
this.closeButton.Text = "X";
this.closeButton.UseVisualStyleBackColor = true;
this.closeButton.Visible = false;
this.closeButton.Click += new System.EventHandler(this.closeButton_Click);
//
+ // webView1
+ //
+ this.webView1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.webView1.Location = new System.Drawing.Point(0, 0);
+ this.webView1.MinimumSize = new System.Drawing.Size(20, 20);
+ this.webView1.Name = "webView1";
+ this.webView1.Size = new System.Drawing.Size(284, 262);
+ this.webView1.TabIndex = 2;
+ //
// ScreensaverForm
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.Black;
- this.ClientSize = new System.Drawing.Size(379, 322);
+ this.ClientSize = new System.Drawing.Size(284, 262);
this.Controls.Add(this.closeButton);
- this.Controls.Add(this.webBrowser);
+ this.Controls.Add(this.webView1);
this.ForeColor = System.Drawing.Color.White;
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
- this.Margin = new System.Windows.Forms.Padding(4);
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "ScreensaverForm";
this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
this.Text = "Form1";
this.Load += new System.EventHandler(this.ScreensaverForm_Load);
+ ((System.ComponentModel.ISupportInitialize)(this.webView1)).EndInit();
this.ResumeLayout(false);
}
#endregion
-
- private System.Windows.Forms.WebBrowser webBrowser;
private System.Windows.Forms.Button closeButton;
+ private Microsoft.Toolkit.Forms.UI.Controls.WebView webView1;
}
}
diff --git a/ScreensaverForm.cs b/ScreensaverForm.cs
index 4f63bed..710afe3 100644
--- a/ScreensaverForm.cs
+++ b/ScreensaverForm.cs
@@ -90,7 +90,7 @@ private void ScreensaverForm_Load(object sender, EventArgs e)
}
else
{
- webBrowser.Visible = false;
+ webView1.Visible = false;
}
}
@@ -101,15 +101,15 @@ private void BrowseTo(string url)
if (string.IsNullOrWhiteSpace(url))
{
- webBrowser.Visible = false;
+ webView1.Visible = false;
}
else
{
- webBrowser.Visible = true;
+ webView1.Visible = true;
try
{
Debug.WriteLine($"Navigating: {url}");
- webBrowser.Navigate(url);
+ webView1.Navigate(url);
}
catch
{
diff --git a/ScreensaverForm.resx b/ScreensaverForm.resx
new file mode 100644
index 0000000..29dcb1b
--- /dev/null
+++ b/ScreensaverForm.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/Web-Page-Screensaver.csproj b/Web-Page-Screensaver.csproj
index 7fdcffd..0da8e4a 100644
--- a/Web-Page-Screensaver.csproj
+++ b/Web-Page-Screensaver.csproj
@@ -10,7 +10,7 @@
Properties
Web_Page_Screensaver
Web-Page-Screensaver
- v4.0
+ v4.7.2
512
@@ -18,6 +18,21 @@
3.5
+ false
+ publish\
+ true
+ Disk
+ false
+ Foreground
+ 7
+ Days
+ false
+ false
+ true
+ 0
+ 1.0.0.%2a
+ false
+ true
true
@@ -46,6 +61,7 @@
AnyCPU
prompt
MinimumRecommendedRules.ruleset
+ false
true
@@ -55,14 +71,24 @@
AnyCPU
prompt
MinimumRecommendedRules.ruleset
+ false
+
+ packages\Microsoft.Toolkit.Forms.UI.Controls.WebView.5.0.1\lib\net462\Microsoft.Toolkit.Forms.UI.Controls.WebView.dll
+
+
+ ..\..\..\Documents\web-page-screensaver-master\web-page-screensaver-master\packages\Microsoft.Toolkit.Win32.UI.Controls.4.0.3\lib\net462\Microsoft.Toolkit.Win32.UI.Controls.dll
+
+
3.5
+
+
3.5
@@ -114,9 +140,13 @@
Resources.resx
True
+
+ ScreensaverForm.cs
+
Designer
+
SettingsSingleFileGenerator
Settings.Designer.cs
@@ -127,6 +157,13 @@
True
+
+
+ False
+ .NET Framework 3.5 SP1
+ false
+
+
if $(ConfigurationName) == Release move $(TargetPath) $(TargetDir)$(TargetName).scr
diff --git a/app.config b/app.config
index fcd0c93..05d8b24 100644
--- a/app.config
+++ b/app.config
@@ -1,3 +1,3 @@
-
-
-
+
+
+
diff --git a/packages.config b/packages.config
new file mode 100644
index 0000000..3018a8c
--- /dev/null
+++ b/packages.config
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file