diff --git a/Pilz.UI.Telerik/Dialogs/RadFlyoutBase.Designer.cs b/Pilz.UI.Telerik/Dialogs/RadFlyoutBase.Designer.cs index 93650cc..cb64b81 100644 --- a/Pilz.UI.Telerik/Dialogs/RadFlyoutBase.Designer.cs +++ b/Pilz.UI.Telerik/Dialogs/RadFlyoutBase.Designer.cs @@ -31,10 +31,14 @@ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RadFlyoutBase)); radButton_Cancel = new global::Telerik.WinControls.UI.RadButton(); radButton_Confirm = new global::Telerik.WinControls.UI.RadButton(); - tableLayoutPanel_ActionButtons = new TableLayoutPanel(); + tableLayoutPanel_ActionPanel = new TableLayoutPanel(); + tableLayoutPanel_TitlePanel = new TableLayoutPanel(); + radLabel_Title = new global::Telerik.WinControls.UI.RadLabel(); ((System.ComponentModel.ISupportInitialize)radButton_Cancel).BeginInit(); ((System.ComponentModel.ISupportInitialize)radButton_Confirm).BeginInit(); - tableLayoutPanel_ActionButtons.SuspendLayout(); + tableLayoutPanel_ActionPanel.SuspendLayout(); + tableLayoutPanel_TitlePanel.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)radLabel_Title).BeginInit(); SuspendLayout(); // // radButton_Cancel @@ -49,22 +53,36 @@ radButton_Confirm.Name = "radButton_Confirm"; radButton_Confirm.Click += RadButton_Confirm_Click; // - // tableLayoutPanel_ActionButtons + // tableLayoutPanel_ActionPanel // - resources.ApplyResources(tableLayoutPanel_ActionButtons, "tableLayoutPanel_ActionButtons"); - tableLayoutPanel_ActionButtons.Controls.Add(radButton_Confirm, 1, 0); - tableLayoutPanel_ActionButtons.Controls.Add(radButton_Cancel, 2, 0); - tableLayoutPanel_ActionButtons.Name = "tableLayoutPanel_ActionButtons"; + resources.ApplyResources(tableLayoutPanel_ActionPanel, "tableLayoutPanel_ActionPanel"); + tableLayoutPanel_ActionPanel.Controls.Add(radButton_Confirm, 1, 0); + tableLayoutPanel_ActionPanel.Controls.Add(radButton_Cancel, 2, 0); + tableLayoutPanel_ActionPanel.Name = "tableLayoutPanel_ActionPanel"; // - // FlyoutDialogBase + // tableLayoutPanel_TitlePanel + // + resources.ApplyResources(tableLayoutPanel_TitlePanel, "tableLayoutPanel_TitlePanel"); + tableLayoutPanel_TitlePanel.Controls.Add(radLabel_Title, 0, 0); + tableLayoutPanel_TitlePanel.Name = "tableLayoutPanel_TitlePanel"; + // + // radLabel_Title + // + resources.ApplyResources(radLabel_Title, "radLabel_Title"); + radLabel_Title.Name = "radLabel_Title"; + // + // RadFlyoutBase // resources.ApplyResources(this, "$this"); AutoScaleMode = AutoScaleMode.Font; - Controls.Add(tableLayoutPanel_ActionButtons); - Name = "FlyoutDialogBase"; + Controls.Add(tableLayoutPanel_TitlePanel); + Controls.Add(tableLayoutPanel_ActionPanel); + Name = "RadFlyoutBase"; ((System.ComponentModel.ISupportInitialize)radButton_Cancel).EndInit(); ((System.ComponentModel.ISupportInitialize)radButton_Confirm).EndInit(); - tableLayoutPanel_ActionButtons.ResumeLayout(false); + tableLayoutPanel_ActionPanel.ResumeLayout(false); + tableLayoutPanel_TitlePanel.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)radLabel_Title).EndInit(); ResumeLayout(false); } @@ -72,6 +90,8 @@ private global::Telerik.WinControls.UI.RadButton radButton_Cancel; private global::Telerik.WinControls.UI.RadButton radButton_Confirm; - private TableLayoutPanel tableLayoutPanel_ActionButtons; + private TableLayoutPanel tableLayoutPanel_ActionPanel; + private TableLayoutPanel tableLayoutPanel_TitlePanel; + private global::Telerik.WinControls.UI.RadLabel radLabel_Title; } } diff --git a/Pilz.UI.Telerik/Dialogs/RadFlyoutBase.cs b/Pilz.UI.Telerik/Dialogs/RadFlyoutBase.cs index 731c0e1..caf201a 100644 --- a/Pilz.UI.Telerik/Dialogs/RadFlyoutBase.cs +++ b/Pilz.UI.Telerik/Dialogs/RadFlyoutBase.cs @@ -13,8 +13,8 @@ public partial class RadFlyoutBase : UserControl protected bool ActionPanelVisible { - get => tableLayoutPanel_ActionButtons.Visible; - set => tableLayoutPanel_ActionButtons.Visible = value; + get => tableLayoutPanel_ActionPanel.Visible; + set => tableLayoutPanel_ActionPanel.Visible = value; } protected bool CancelButtonVisible @@ -35,6 +35,18 @@ public partial class RadFlyoutBase : UserControl set => radButton_Confirm.Enabled = value; } + public string Title + { + get => radLabel_Title.Text; + set => radLabel_Title.Text = value; + } + + public RadSvgImage TitleIcon + { + get => radLabel_Title.Icon; + set => radLabel_Title.Icon = value; + } + protected RadFlyoutBase() { InitializeComponent(); diff --git a/Pilz.UI.Telerik/Dialogs/RadFlyoutBase.resx b/Pilz.UI.Telerik/Dialogs/RadFlyoutBase.resx index 02e83a6..a1f49e9 100644 --- a/Pilz.UI.Telerik/Dialogs/RadFlyoutBase.resx +++ b/Pilz.UI.Telerik/Dialogs/RadFlyoutBase.resx @@ -151,7 +151,7 @@ Telerik.WinControls.UI.RadButton, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e - tableLayoutPanel_ActionButtons + tableLayoutPanel_ActionPanel 1 @@ -187,43 +187,106 @@ Telerik.WinControls.UI.RadButton, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e - tableLayoutPanel_ActionButtons + tableLayoutPanel_ActionPanel 0 - + 3 - + Bottom - + 0, 120 - + 1 - + 300, 30 - + 2 - - tableLayoutPanel_ActionButtons + + tableLayoutPanel_ActionPanel - + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - + + 1 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="radButton_Confirm" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="radButton_Cancel" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /></Controls><Columns Styles="Percent,100,AutoSize,0,AutoSize,0" /><Rows Styles="Absolute,30" /></TableLayoutSettings> + + + 1 + + + False + + + Fill + + + 3, 3 + + + 294, 24 + + 0 - - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="radButton_Confirm" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="radButton_Cancel" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /></Controls><Columns Styles="Percent,100,AutoSize,0,AutoSize,0" /><Rows Styles="Absolute,30" /></TableLayoutSettings> + + ImageBeforeText + + + radLabel_Title + + + Telerik.WinControls.UI.RadLabel, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e + + + tableLayoutPanel_TitlePanel + + + 0 + + + Top + + + 0, 0 + + + 1 + + + 300, 30 + + + 3 + + + tableLayoutPanel_TitlePanel + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="radLabel_Title" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,50" /><Rows Styles="Percent,50" /></TableLayoutSettings> True @@ -235,7 +298,7 @@ 300, 150 - FlyoutDialogBase + RadFlyoutBase System.Windows.Forms.UserControl, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089