diff --git a/Pilz.Updating.UpdateInstaller/Main.Designer.cs b/Pilz.Updating.UpdateInstaller/Main.Designer.cs
index add8411..eafd303 100644
--- a/Pilz.Updating.UpdateInstaller/Main.Designer.cs
+++ b/Pilz.Updating.UpdateInstaller/Main.Designer.cs
@@ -7,7 +7,7 @@ using Microsoft.VisualBasic.CompilerServices;
namespace Pilz.Updating.UpdateInstaller
{
[DesignerGenerated()]
- public partial class Main : DevComponents.DotNetBar.OfficeForm
+ public partial class Main : Telerik.WinControls.UI.RadForm
{
// Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
@@ -37,114 +37,108 @@ namespace Pilz.Updating.UpdateInstaller
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Main));
- this._ProgressBarX1 = new DevComponents.DotNetBar.Controls.ProgressBarX();
this._Panel1 = new System.Windows.Forms.Panel();
- this._LabelX_Header = new DevComponents.DotNetBar.LabelX();
- this._LabelX_Status = new DevComponents.DotNetBar.LabelX();
+ this.radWaitingBar1 = new Telerik.WinControls.UI.RadWaitingBar();
+ this.dotsLineWaitingBarIndicatorElement1 = new Telerik.WinControls.UI.DotsLineWaitingBarIndicatorElement();
+ this.radLabel_Status = new Telerik.WinControls.UI.RadLabel();
+ this.radLabel_Header = new Telerik.WinControls.UI.RadLabel();
this._Panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.radWaitingBar1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.radLabel_Status)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.radLabel_Header)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
this.SuspendLayout();
//
- // _ProgressBarX1
- //
- this._ProgressBarX1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- //
- //
- //
- this._ProgressBarX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this._ProgressBarX1.Location = new System.Drawing.Point(3, 94);
- this._ProgressBarX1.Name = "_ProgressBarX1";
- this._ProgressBarX1.ProgressType = DevComponents.DotNetBar.eProgressItemType.Marquee;
- this._ProgressBarX1.Size = new System.Drawing.Size(628, 16);
- this._ProgressBarX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
- this._ProgressBarX1.TabIndex = 0;
- //
// _Panel1
//
this._Panel1.BackColor = System.Drawing.Color.Transparent;
- this._Panel1.Controls.Add(this._LabelX_Header);
- this._Panel1.Controls.Add(this._LabelX_Status);
- this._Panel1.Controls.Add(this._ProgressBarX1);
+ this._Panel1.Controls.Add(this.radWaitingBar1);
+ this._Panel1.Controls.Add(this.radLabel_Status);
+ this._Panel1.Controls.Add(this.radLabel_Header);
this._Panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this._Panel1.Location = new System.Drawing.Point(0, 0);
this._Panel1.Name = "_Panel1";
- this._Panel1.Size = new System.Drawing.Size(634, 111);
+ this._Panel1.Size = new System.Drawing.Size(692, 106);
this._Panel1.TabIndex = 1;
//
- // _LabelX_Header
+ // radWaitingBar1
//
- this._LabelX_Header.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ this.radWaitingBar1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.radWaitingBar1.Location = new System.Drawing.Point(3, 85);
+ this.radWaitingBar1.Name = "radWaitingBar1";
+ this.radWaitingBar1.Size = new System.Drawing.Size(130, 18);
+ this.radWaitingBar1.TabIndex = 3;
+ this.radWaitingBar1.Text = "radWaitingBar1";
+ this.radWaitingBar1.WaitingIndicators.Add(this.dotsLineWaitingBarIndicatorElement1);
+ this.radWaitingBar1.WaitingSpeed = 80;
+ this.radWaitingBar1.WaitingStyle = Telerik.WinControls.Enumerations.WaitingBarStyles.DotsLine;
+ ((Telerik.WinControls.UI.RadWaitingBarElement)(radWaitingBar1.GetChildAt(0))).WaitingSpeed = 80;
+ ((Telerik.WinControls.UI.WaitingBarContentElement)(radWaitingBar1.GetChildAt(0).GetChildAt(0))).WaitingStyle = Telerik.WinControls.Enumerations.WaitingBarStyles.DotsLine;
+ ((Telerik.WinControls.UI.WaitingBarSeparatorElement)(radWaitingBar1.GetChildAt(0).GetChildAt(0).GetChildAt(0))).Dash = false;
+ //
+ // dotsLineWaitingBarIndicatorElement1
+ //
+ this.dotsLineWaitingBarIndicatorElement1.Name = "dotsLineWaitingBarIndicatorElement1";
+ //
+ // radLabel_Status
+ //
+ this.radLabel_Status.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
+ this.radLabel_Status.AutoSize = false;
+ this.radLabel_Status.Location = new System.Drawing.Point(139, 85);
+ this.radLabel_Status.Name = "radLabel_Status";
+ this.radLabel_Status.Size = new System.Drawing.Size(550, 18);
+ this.radLabel_Status.TabIndex = 2;
+ this.radLabel_Status.Text = "Idle ...";
//
+ // radLabel_Header
//
- //
- this._LabelX_Header.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this._LabelX_Header.Font = new System.Drawing.Font("Calibri", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this._LabelX_Header.Image = global::Pilz.Updating.UpdateInstaller.MyIcons.icons8_installing_updates_48px;
- this._LabelX_Header.Location = new System.Drawing.Point(3, 3);
- this._LabelX_Header.Name = "_LabelX_Header";
- this._LabelX_Header.Size = new System.Drawing.Size(628, 56);
- this._LabelX_Header.TabIndex = 3;
- this._LabelX_Header.Text = "SM64 ROM M" +
- "anager wird aktuallisierung ...
";
- //
- // _LabelX_Status
- //
- this._LabelX_Status.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ this.radLabel_Header.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
- //
- //
- //
- this._LabelX_Status.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this._LabelX_Status.Location = new System.Drawing.Point(3, 65);
- this._LabelX_Status.Name = "_LabelX_Status";
- this._LabelX_Status.Size = new System.Drawing.Size(628, 23);
- this._LabelX_Status.TabIndex = 2;
- this._LabelX_Status.Text = "Idle ...";
+ this.radLabel_Header.AutoSize = false;
+ this.radLabel_Header.Image = global::Pilz.Updating.UpdateInstaller.MyIcons.icons8_installing_updates_48px;
+ this.radLabel_Header.Location = new System.Drawing.Point(3, 3);
+ this.radLabel_Header.Name = "radLabel_Header";
+ this.radLabel_Header.Size = new System.Drawing.Size(686, 76);
+ this.radLabel_Header.TabIndex = 1;
+ this.radLabel_Header.Text = "SM64 ROM Manager wird aktu" +
+ "allisierung ...";
+ this.radLabel_Header.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
+ this.radLabel_Header.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
//
// Main
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleBaseSize = new System.Drawing.Size(7, 15);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(634, 111);
+ this.ClientSize = new System.Drawing.Size(692, 106);
this.Controls.Add(this._Panel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "Main";
+ //
+ //
+ //
+ this.RootElement.ApplyShapeToControl = true;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Installing";
this._Panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.radWaitingBar1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.radLabel_Status)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.radLabel_Header)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
this.ResumeLayout(false);
}
- private DevComponents.DotNetBar.Controls.ProgressBarX _ProgressBarX1;
-
- internal DevComponents.DotNetBar.Controls.ProgressBarX ProgressBarX1
- {
- [MethodImpl(MethodImplOptions.Synchronized)]
- get
- {
- return _ProgressBarX1;
- }
-
- [MethodImpl(MethodImplOptions.Synchronized)]
- set
- {
- if (_ProgressBarX1 != null)
- {
- }
-
- _ProgressBarX1 = value;
- if (_ProgressBarX1 != null)
- {
- }
- }
- }
-
private Panel _Panel1;
+ private Telerik.WinControls.UI.RadLabel radLabel_Status;
+ private Telerik.WinControls.UI.RadLabel radLabel_Header;
+ private Telerik.WinControls.UI.RadWaitingBar radWaitingBar1;
+ private Telerik.WinControls.UI.DotsLineWaitingBarIndicatorElement dotsLineWaitingBarIndicatorElement1;
internal Panel Panel1
{
@@ -167,53 +161,5 @@ namespace Pilz.Updating.UpdateInstaller
}
}
}
-
- private DevComponents.DotNetBar.LabelX _LabelX_Status;
-
- internal DevComponents.DotNetBar.LabelX LabelX_Status
- {
- [MethodImpl(MethodImplOptions.Synchronized)]
- get
- {
- return _LabelX_Status;
- }
-
- [MethodImpl(MethodImplOptions.Synchronized)]
- set
- {
- if (_LabelX_Status != null)
- {
- }
-
- _LabelX_Status = value;
- if (_LabelX_Status != null)
- {
- }
- }
- }
-
- private DevComponents.DotNetBar.LabelX _LabelX_Header;
-
- internal DevComponents.DotNetBar.LabelX LabelX_Header
- {
- [MethodImpl(MethodImplOptions.Synchronized)]
- get
- {
- return _LabelX_Header;
- }
-
- [MethodImpl(MethodImplOptions.Synchronized)]
- set
- {
- if (_LabelX_Header != null)
- {
- }
-
- _LabelX_Header = value;
- if (_LabelX_Header != null)
- {
- }
- }
- }
}
}
\ No newline at end of file
diff --git a/Pilz.Updating.UpdateInstaller/Main.cs b/Pilz.Updating.UpdateInstaller/Main.cs
index 07d8c50..febbaeb 100644
--- a/Pilz.Updating.UpdateInstaller/Main.cs
+++ b/Pilz.Updating.UpdateInstaller/Main.cs
@@ -4,7 +4,8 @@ using System.Linq;
using System.Runtime.CompilerServices;
using System.Threading.Tasks;
using System.Windows.Forms;
-using global::DevComponents.DotNetBar;
+using Telerik.WinControls;
+using Telerik.WinControls.Themes;
namespace Pilz.Updating.UpdateInstaller
{
@@ -32,9 +33,8 @@ namespace Pilz.Updating.UpdateInstaller
InitializeComponent();
// Init Style
- StyleManager.Style = eStyle.Office2016;
- StyleManager.MetroColorGeneratorParameters = new DevComponents.DotNetBar.Metro.ColorTables.MetroColorGeneratorParameters(Installer.Configuration.UpdateWindowCanvasColor, Installer.Configuration.UpdateWindowBaseColor);
- StyleManager.UpdateAmbientColors(this);
+ RadThemeComponentBase themeToUse = Installer.Configuration.UIDarkMode ? new FluentDarkTheme() : new FluentTheme();
+ ThemeResolutionService.ApplicationThemeName = themeToUse.ThemeName;
// Init Application Header Text
string header;
@@ -47,7 +47,8 @@ namespace Pilz.Updating.UpdateInstaller
header = My.Resources.UpdateInstallerGuiLangRes.String_UpdateIsRunning;
}
- LabelX_Header.Text = $"{header}
";
+ radLabel_Header.Text = $"{header}
";
+ radLabel_Header.Text = $"{header}";
}
if (Installer is null)
@@ -131,8 +132,8 @@ namespace Pilz.Updating.UpdateInstaller
break;
}
- LabelX_Status.Text = newStatusText;
- LabelX_Status.Image = newStatusImage;
+ radLabel_Status.Text = newStatusText;
+ radLabel_Status.Image = newStatusImage;
//if (newStatus == UpdateInstallerStatus.Done)
//{
diff --git a/Pilz.Updating.UpdateInstaller/Main.resx b/Pilz.Updating.UpdateInstaller/Main.resx
index 96f590b..d2235dd 100644
--- a/Pilz.Updating.UpdateInstaller/Main.resx
+++ b/Pilz.Updating.UpdateInstaller/Main.resx
@@ -1,64 +1,4 @@
-
-
-
+
diff --git a/Pilz.Updating.UpdateInstaller/Pilz.Updating.UpdateInstaller.csproj b/Pilz.Updating.UpdateInstaller/Pilz.Updating.UpdateInstaller.csproj
index cf92eb5..2fad043 100644
--- a/Pilz.Updating.UpdateInstaller/Pilz.Updating.UpdateInstaller.csproj
+++ b/Pilz.Updating.UpdateInstaller/Pilz.Updating.UpdateInstaller.csproj
@@ -4,7 +4,7 @@
Pilz.Updating.UpdateInstaller.My.MyApplication
Pilz.Updating.UpdateInstaller
WindowsForms
- net48
+ net6.0-windows
true
$(DefaultItemExcludes);$(ProjectDir)**\*.vb
latest
@@ -46,22 +46,13 @@
TRACE;RelMono
+
-
-
-
-
- ..\Shared Libs\DotNetBarNew\DevComponents.DotNetBar.Design.dll
- False
-
-
- ..\Shared Libs\DotNetBarNew\DevComponents.DotNetBar2.dll
-
-
-
-
+
+ 2022.2.510.0
+
@@ -78,9 +69,7 @@
-
- Form
-
+
Main.cs
Form
diff --git a/Pilz.Updating/Pilz.Updating.csproj b/Pilz.Updating/Pilz.Updating.csproj
index b8ac467..c99ce90 100644
--- a/Pilz.Updating/Pilz.Updating.csproj
+++ b/Pilz.Updating/Pilz.Updating.csproj
@@ -2,7 +2,7 @@
Pilz.Updating
Windows
- net48
+ net6.0-windows
$(DefaultItemExcludes);$(ProjectDir)**\*.vb
latest
Pilz.Updating
@@ -38,12 +38,10 @@
TRACE;RelMono
+
-
-
-
diff --git a/Pilz.Updating/UpdateInstaller/UpdateInstallerConfig.cs b/Pilz.Updating/UpdateInstaller/UpdateInstallerConfig.cs
index d3efa28..e450d59 100644
--- a/Pilz.Updating/UpdateInstaller/UpdateInstallerConfig.cs
+++ b/Pilz.Updating/UpdateInstaller/UpdateInstallerConfig.cs
@@ -14,8 +14,7 @@ namespace Pilz.Updating.UpdateInstaller
public string HostApplicationProcessPath { get; set; }
public bool ForceClosingHostApplication { get; set; }
public uint MillisecondsToWaitForHostApplicationToClose { get; set; }
- public Color UpdateWindowBaseColor { get; set; }
- public Color UpdateWindowCanvasColor { get; set; }
+ public bool UIDarkMode { get; set; }
public ApplicationVersion CurrentApplicationVersion { get; set; }
public ApplicationVersion NewApplicationVersion { get; set; }
diff --git a/Shared Libs/Pilz.Cryptography.dll b/Shared Libs/Pilz.Cryptography.dll
index 20d0e80..d9b6a3e 100644
Binary files a/Shared Libs/Pilz.Cryptography.dll and b/Shared Libs/Pilz.Cryptography.dll differ
diff --git a/Shared Libs/drsPwEnc.dll b/Shared Libs/drsPwEnc.dll
deleted file mode 100644
index 0dcf69d..0000000
Binary files a/Shared Libs/drsPwEnc.dll and /dev/null differ