Pilz.NET/Pilz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor flyoutbase and radflyoutbase

Browse Source 
- hopefully fix problems with child classes and tabindex problems
This commit is contained in:
Pilzinsel64
2025-01-14 07:50:47 +01:00
parent 0e2f393334
commit cb2831ce4a
6 changed files with 240 additions and 521 deletions
Download Patch File Download Diff File Expand all files Collapse all files

122
Pilz.UI/Dialogs/FlyoutBase.Designer.cs generated
View File

@@ -1,122 +0,0 @@
namespace Pilz.UI.Dialogs;
partial class FlyoutBase
{
/// <summary>
/// Erforderliche Designervariable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Verwendete Ressourcen bereinigen.
/// </summary>
/// <param name="disposing">True, wenn verwaltete Ressourcen gelöscht werden sollen; andernfalls False.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Vom Komponenten-Designer generierter Code
/// <summary>
/// Erforderliche Methode für die Designerunterstützung.
/// Der Inhalt der Methode darf nicht mit dem Code-Editor geändert werden.
/// </summary>
private void InitializeComponent()
{
tableLayoutPanel_TitlePanel = new System.Windows.Forms.TableLayoutPanel();
label_Title = new System.Windows.Forms.Label();
tableLayoutPanel_ActionPanel = new System.Windows.Forms.TableLayoutPanel();
button_Accept = new System.Windows.Forms.Button();
button_Cancel = new System.Windows.Forms.Button();
tableLayoutPanel_TitlePanel.SuspendLayout();
tableLayoutPanel_ActionPanel.SuspendLayout();
SuspendLayout();
//
// tableLayoutPanel_TitlePanel
//
tableLayoutPanel_TitlePanel.ColumnCount = 1;
tableLayoutPanel_TitlePanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
tableLayoutPanel_TitlePanel.Controls.Add(label_Title, 0, 0);
tableLayoutPanel_TitlePanel.Dock = System.Windows.Forms.DockStyle.Top;
tableLayoutPanel_TitlePanel.Location = new System.Drawing.Point(0, 0);
tableLayoutPanel_TitlePanel.Name = "tableLayoutPanel_TitlePanel";
tableLayoutPanel_TitlePanel.RowCount = 1;
tableLayoutPanel_TitlePanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
tableLayoutPanel_TitlePanel.Size = new System.Drawing.Size(300, 29);
tableLayoutPanel_TitlePanel.TabIndex = 2147483647;
//
// label_Title
//
label_Title.Dock = System.Windows.Forms.DockStyle.Fill;
label_Title.Location = new System.Drawing.Point(3, 0);
label_Title.Name = "label_Title";
label_Title.Size = new System.Drawing.Size(294, 29);
label_Title.TabIndex = 2147483646;
label_Title.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// tableLayoutPanel_ActionPanel
//
tableLayoutPanel_ActionPanel.AutoSize = true;
tableLayoutPanel_ActionPanel.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
tableLayoutPanel_ActionPanel.ColumnCount = 3;
tableLayoutPanel_ActionPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
tableLayoutPanel_ActionPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
tableLayoutPanel_ActionPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
tableLayoutPanel_ActionPanel.Controls.Add(button_Cancel, 2, 0);
tableLayoutPanel_ActionPanel.Controls.Add(button_Accept, 1, 0);
tableLayoutPanel_ActionPanel.Dock = System.Windows.Forms.DockStyle.Bottom;
tableLayoutPanel_ActionPanel.Location = new System.Drawing.Point(0, 121);
tableLayoutPanel_ActionPanel.Name = "tableLayoutPanel_ActionPanel";
tableLayoutPanel_ActionPanel.RowCount = 1;
tableLayoutPanel_ActionPanel.RowStyles.Add(new System.Windows.Forms.RowStyle());
tableLayoutPanel_ActionPanel.Size = new System.Drawing.Size(300, 29);
tableLayoutPanel_ActionPanel.TabIndex = 2147483645;
tableLayoutPanel_ActionPanel.Visible = false;
//
// button_Accept
//
button_Accept.Location = new System.Drawing.Point(141, 3);
button_Accept.Name = "button_Accept";
button_Accept.Size = new System.Drawing.Size(75, 23);
button_Accept.TabIndex = 2147483640;
button_Accept.Text = "Accept";
button_Accept.UseVisualStyleBackColor = true;
button_Accept.Click += Button_Accept_Click;
//
// button_Cancel
//
button_Cancel.Location = new System.Drawing.Point(222, 3);
button_Cancel.Name = "button_Cancel";
button_Cancel.Size = new System.Drawing.Size(75, 23);
button_Cancel.TabIndex = 2147483641;
button_Cancel.Text = "Cancel";
button_Cancel.UseVisualStyleBackColor = true;
button_Cancel.Click += Button_Cancel_Click;
//
// FlyoutBase
//
AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
Controls.Add(tableLayoutPanel_ActionPanel);
Controls.Add(tableLayoutPanel_TitlePanel);
Name = "FlyoutBase";
Size = new System.Drawing.Size(300, 150);
tableLayoutPanel_TitlePanel.ResumeLayout(false);
tableLayoutPanel_ActionPanel.ResumeLayout(false);
ResumeLayout(false);
PerformLayout();
}
#endregion
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel_TitlePanel;
private System.Windows.Forms.Label label_Title;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel_ActionPanel;
private System.Windows.Forms.Button button_Cancel;
private System.Windows.Forms.Button button_Accept;
}

126
Pilz.UI/Dialogs/FlyoutBase.cs
View File

@@ -1,35 +1,66 @@
namespace Pilz.UI.Dialogs;
using System.ComponentModel;
using System.Diagnostics.CodeAnalysis;
namespace Pilz.UI.Dialogs;
public partial class FlyoutBase : UserControl
{
private TableLayoutPanel tableLayoutPanel_TitlePanel;
private Label label_Title;
private TableLayoutPanel tableLayoutPanel_ActionPanel;
private Button button_Cancel;
private Button button_Accept;
public DialogResult Result { get; protected set; }
public bool RegisterDialogAccept { get; set; } = true;
public bool RegisterDialogCancel { get; set; } = false;
[DefaultValue(true)]
protected bool ActionPanelVisible
{
get => tableLayoutPanel_ActionPanel.Visible;
set => tableLayoutPanel_ActionPanel.Visible = value;
}
[DefaultValue(true)]
protected bool CancelButtonVisible
{
get => button_Cancel.Visible;
set => button_Cancel.Visible = value;
}
[DefaultValue(true)]
protected bool CancelButtonEnable
{
get => button_Cancel.Enabled;
set => button_Cancel.Enabled = value;
}
[DefaultValue(true)]
protected bool ConfirmButtonEnable
{
get => button_Accept.Enabled;
set => button_Accept.Enabled = value;
}
[Localizable(true)]
[DefaultValue("Okay")]
public string ConfirmButtonText
{
get => button_Accept.Text;
set => button_Accept.Text = value;
}
[Localizable(true)]
[DefaultValue("Cancel")]
public string CancelButtonText
{
get => button_Cancel.Text;
set => button_Cancel.Text = value;
}
[Localizable(true)]
[DefaultValue("")]
public string Title
{
get => label_Title.Text;
@@ -44,11 +75,92 @@ public partial class FlyoutBase : UserControl
{
InitializeComponent();
ParentChanged += FlyoutBase_ParentChanged;
}
// Change TabIndex to a very high value
// -> prevent conflicts with controls based on this class
button_Cancel.TabIndex = int.MaxValue - 1;
button_Cancel.TabIndex = int.MaxValue;
[MemberNotNull(nameof(tableLayoutPanel_TitlePanel))]
[MemberNotNull(nameof(label_Title))]
[MemberNotNull(nameof(tableLayoutPanel_ActionPanel))]
[MemberNotNull(nameof(button_Cancel))]
[MemberNotNull(nameof(button_Accept))]
private void InitializeComponent()
{
SuspendLayout();
// button_Accept
button_Accept = new Button
{
Name = "button_Accept",
Size = new Size(75, 23),
TabIndex = int.MaxValue - 1,
Text = "Accept",
UseVisualStyleBackColor = true
};
button_Accept.Click += Button_Accept_Click;
// button_Cancel
button_Cancel = new Button
{
Name = "button_Cancel",
Size = new Size(75, 23),
TabIndex = int.MaxValue,
Text = "Cancel",
UseVisualStyleBackColor = true
};
button_Cancel.Click += Button_Cancel_Click;
// label_Title
label_Title = new Label
{
Name = "label_Title",
Dock = DockStyle.Fill,
TextAlign = ContentAlignment.MiddleLeft
};
// tableLayoutPanel_TitlePanel
tableLayoutPanel_TitlePanel = new TableLayoutPanel
{
Name = "tableLayoutPanel_TitlePanel",
Dock = DockStyle.Top,
Size = new Size(ClientSize.Width, 29),
Visible = false,
ColumnCount = 1,
RowCount = 1
};
tableLayoutPanel_TitlePanel.SuspendLayout();
tableLayoutPanel_TitlePanel.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 50F));
tableLayoutPanel_TitlePanel.RowStyles.Add(new RowStyle(SizeType.Percent, 50F));
tableLayoutPanel_TitlePanel.Controls.Add(label_Title, 0, 0);
// tableLayoutPanel_ActionPanel
tableLayoutPanel_ActionPanel = new TableLayoutPanel
{
Name = "tableLayoutPanel_ActionPanel",
AutoSize = true,
AutoSizeMode = AutoSizeMode.GrowAndShrink,
Dock = DockStyle.Bottom,
Size = new Size(ClientSize.Width, 29),
ColumnCount = 3,
RowCount = 1
};
tableLayoutPanel_ActionPanel.SuspendLayout();
tableLayoutPanel_ActionPanel.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 100F));
tableLayoutPanel_ActionPanel.ColumnStyles.Add(new ColumnStyle());
tableLayoutPanel_ActionPanel.ColumnStyles.Add(new ColumnStyle());
tableLayoutPanel_ActionPanel.RowStyles.Add(new RowStyle());
tableLayoutPanel_ActionPanel.Controls.Add(button_Cancel, 2, 0);
tableLayoutPanel_ActionPanel.Controls.Add(button_Accept, 1, 0);
// FlyoutBase
AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleMode = AutoScaleMode.Font;
Controls.Add(tableLayoutPanel_ActionPanel);
Controls.Add(tableLayoutPanel_TitlePanel);
Size = new Size(300, 150);
tableLayoutPanel_TitlePanel.ResumeLayout(false);
tableLayoutPanel_ActionPanel.ResumeLayout(false);
ResumeLayout(false);
PerformLayout();
}
private void FlyoutBase_ParentChanged(object? sender, EventArgs e)
@@ -81,13 +193,13 @@ public partial class FlyoutBase : UserControl
tableLayoutPanel_TitlePanel.Visible = !string.IsNullOrWhiteSpace(label_Title.Text);
}
protected virtual void Button_Accept_Click(object sender, System.EventArgs e)
protected virtual void Button_Accept_Click(object? sender, EventArgs e)
{
if (ValidateOK())
Close(DialogResult.OK);
}
protected virtual void Button_Cancel_Click(object sender, System.EventArgs e)
protected virtual void Button_Cancel_Click(object? sender, EventArgs e)
{
Close(DialogResult.Cancel);
}

120
Pilz.UI/Dialogs/FlyoutBase.resx
View File

@@ -1,120 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>