updating main dialogs to Telerik UI

This commit is contained in:
2022-06-12 15:47:14 +02:00
parent c7f0098c20
commit 0cacb0d980
26 changed files with 1462 additions and 3873 deletions

View File

@@ -11,4 +11,7 @@
</dependentAssembly>
</assemblyBinding>
</runtime>
<appSettings>
<add key="TelerikWinFormsThemeName" value="Fluent" />
</appSettings>
</configuration>

View File

@@ -44,22 +44,6 @@
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="ui.for.winforms.allcontrols.net60" Version="2022.2.510" />
</ItemGroup>
<ItemGroup>
<Reference Include="DevComponents.DotNetBar.Design">
<HintPath>..\Shared Libs\DotNetBarNew\DevComponents.DotNetBar.Design.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="DevComponents.DotNetBar.Layout">
<HintPath>..\Shared Libs\DotNetBarNew\DevComponents.DotNetBar.Layout.dll</HintPath>
</Reference>
<Reference Include="DevComponents.DotNetBar.Layout.Design">
<HintPath>..\Shared Libs\DotNetBarNew\DevComponents.DotNetBar.Layout.Design.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="DevComponents.DotNetBar2">
<HintPath>..\Shared Libs\DotNetBarNew\DevComponents.DotNetBar2.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Import Include="Microsoft.VisualBasic" />
<Import Include="SM64_ROM_Manager.Updating.GUIBase" />

View File

@@ -38,19 +38,19 @@ namespace Pilz.Updating.Client.GUI
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SimpleActionDialog));
this._Panel1 = new System.Windows.Forms.Panel();
this.radWaitingBar1 = new Telerik.WinControls.UI.RadWaitingBar();
this.radProgressBar1 = new Telerik.WinControls.UI.RadProgressBar();
this.waitingBarIndicatorElement1 = new Telerik.WinControls.UI.WaitingBarIndicatorElement();
this.waitingBarIndicatorElement2 = new Telerik.WinControls.UI.WaitingBarIndicatorElement();
this.waitingBarIndicatorElement1 = new Telerik.WinControls.UI.WaitingBarIndicatorElement();
this.radProgressBar1 = new Telerik.WinControls.UI.RadProgressBar();
this._Panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.radWaitingBar1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.radProgressBar1)).BeginInit();
this.radProgressBar1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
this.SuspendLayout();
//
// _Panel1
//
this._Panel1.BackColor = System.Drawing.Color.Transparent;
this._Panel1.Controls.Add(this.radWaitingBar1);
this._Panel1.Controls.Add(this.radProgressBar1);
resources.ApplyResources(this._Panel1, "_Panel1");
this._Panel1.Name = "_Panel1";
@@ -62,23 +62,25 @@ namespace Pilz.Updating.Client.GUI
this.radWaitingBar1.ShowText = true;
this.radWaitingBar1.WaitingIndicators.Add(this.waitingBarIndicatorElement2);
this.radWaitingBar1.WaitingIndicators.Add(this.waitingBarIndicatorElement1);
this.radWaitingBar1.WaitingIndicatorSize = new System.Drawing.Size(100, 14);
this.radWaitingBar1.WaitingSpeed = 100;
this.radWaitingBar1.WaitingStep = 2;
//
// radProgressBar1
// waitingBarIndicatorElement2
//
resources.ApplyResources(this.radProgressBar1, "radProgressBar1");
this.radProgressBar1.Name = "radProgressBar1";
this.waitingBarIndicatorElement2.Name = "waitingBarIndicatorElement2";
this.waitingBarIndicatorElement2.StretchHorizontally = false;
//
// waitingBarIndicatorElement1
//
this.waitingBarIndicatorElement1.Name = "waitingBarIndicatorElement1";
this.waitingBarIndicatorElement1.StretchHorizontally = false;
//
// waitingBarIndicatorElement2
// radProgressBar1
//
this.waitingBarIndicatorElement2.Name = "waitingBarIndicatorElement2";
this.waitingBarIndicatorElement2.StretchHorizontally = false;
resources.ApplyResources(this.radProgressBar1, "radProgressBar1");
this.radProgressBar1.Controls.Add(this.radWaitingBar1);
this.radProgressBar1.Name = "radProgressBar1";
//
// SimpleActionDialog
//
@@ -95,6 +97,7 @@ namespace Pilz.Updating.Client.GUI
this._Panel1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.radWaitingBar1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.radProgressBar1)).EndInit();
this.radProgressBar1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
this.ResumeLayout(false);

View File

@@ -1,5 +1,4 @@
using global::DevComponents.DotNetBar;
using global::Pilz.Updating.Client.GUI.My.Resources;
using global::Pilz.Updating.Client.GUI.My.Resources;
namespace Pilz.Updating.Client.GUI
{
@@ -8,7 +7,6 @@ namespace Pilz.Updating.Client.GUI
public SimpleActionDialog()
{
InitializeComponent();
StyleManager.UpdateAmbientColors(this);
SetCurrentState(UpdateStatus.Waiting);
}

View File

@@ -58,12 +58,15 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="radProgressBar1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
<data name="radWaitingBar1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="radWaitingBar1.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 3</value>
<value>0, 0</value>
</data>
<data name="radWaitingBar1.Size" type="System.Drawing.Size, System.Drawing">
<value>444, 24</value>
@@ -79,14 +82,11 @@
<value>Telerik.WinControls.UI.RadWaitingBar, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e</value>
</data>
<data name="&gt;&gt;radWaitingBar1.Parent" xml:space="preserve">
<value>_Panel1</value>
<value>radProgressBar1</value>
</data>
<data name="&gt;&gt;radWaitingBar1.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="radProgressBar1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
<data name="radProgressBar1.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 3</value>
</data>
@@ -109,7 +109,7 @@
<value>_Panel1</value>
</data>
<data name="&gt;&gt;radProgressBar1.ZOrder" xml:space="preserve">
<value>1</value>
<value>0</value>
</data>
<data name="_Panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
@@ -698,18 +698,18 @@
<data name="$this.Text" xml:space="preserve">
<value>Updates</value>
</data>
<data name="&gt;&gt;waitingBarIndicatorElement1.Name" xml:space="preserve">
<value>waitingBarIndicatorElement1</value>
</data>
<data name="&gt;&gt;waitingBarIndicatorElement1.Type" xml:space="preserve">
<value>Telerik.WinControls.UI.WaitingBarIndicatorElement, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e</value>
</data>
<data name="&gt;&gt;waitingBarIndicatorElement2.Name" xml:space="preserve">
<value>waitingBarIndicatorElement2</value>
</data>
<data name="&gt;&gt;waitingBarIndicatorElement2.Type" xml:space="preserve">
<value>Telerik.WinControls.UI.WaitingBarIndicatorElement, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e</value>
</data>
<data name="&gt;&gt;waitingBarIndicatorElement1.Name" xml:space="preserve">
<value>waitingBarIndicatorElement1</value>
</data>
<data name="&gt;&gt;waitingBarIndicatorElement1.Type" xml:space="preserve">
<value>Telerik.WinControls.UI.WaitingBarIndicatorElement, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>SimpleActionDialog</value>
</data>

View File

@@ -3,10 +3,10 @@ using System.Drawing;
using global::System.Reflection;
using System.Runtime.CompilerServices;
using System.Windows.Forms;
using global::DevComponents.DotNetBar;
using Microsoft.VisualBasic.CompilerServices;
using global::Pilz.Updating.Client.GUI.My.Resources;
using System;
using Telerik.WinControls;
namespace Pilz.Updating.Client.GUI
{
@@ -145,7 +145,7 @@ namespace Pilz.Updating.Client.GUI
EndUpdating();
if (!UseHiddenSearch)
{
MessageBoxEx.Show(UpdatingClientGuiLangRes.MsgBox_NoUpdatesFound, UpdatingClientGuiLangRes.MsgBox_NoUpdatesFound_Titel, MessageBoxButtons.OK, MessageBoxIcon.Information);
RadMessageBox.Show(UpdatingClientGuiLangRes.MsgBox_NoUpdatesFound, UpdatingClientGuiLangRes.MsgBox_NoUpdatesFound_Titel, MessageBoxButtons.OK, RadMessageIcon.Info);
}
}
}

View File

@@ -2,7 +2,6 @@
using System.Drawing;
using System.Runtime.CompilerServices;
using System.Windows.Forms;
using global::DevComponents.DotNetBar;
using Microsoft.VisualBasic.CompilerServices;
namespace Pilz.Updating.Client.GUI

View File

@@ -1,6 +1,5 @@
using System.Drawing;
using System.Windows.Forms;
using global::DevComponents.DotNetBar;
using Pilz.Updating.GUIBase;
using Telerik.WinControls;
using Telerik.WinControls.UI;