AppStd/Monorepo
8
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Common/frmDialog: fix cancel button

Browse Source
This commit is contained in:
Jonathan Jenne 2022-09-14 14:25:50 +02:00
parent 57bb377b3a
commit ca3fdd3ef0
3 changed files with 68 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
GUIs.Common/frmDialog.Designer.vb generated
View File

@ -26,12 +26,12 @@ Partial Class frmDialog
Me.btnPositive = New DevExpress.XtraEditors.SimpleButton()
Me.btnNegative = New DevExpress.XtraEditors.SimpleButton()
Me.pnlContent = New DevExpress.XtraEditors.PanelControl()
Me.txtContent = New DevExpress.XtraEditors.LabelControl()
Me.SvgImageBox1 = New DevExpress.XtraEditors.SvgImageBox()
Me.pnlHeader = New DevExpress.XtraEditors.PanelControl()
Me.txtTitle = New DevExpress.XtraEditors.LabelControl()
Me.pnlFooter = New DevExpress.XtraEditors.PanelControl()
Me.SvgImageCollection1 = New DevExpress.Utils.SvgImageCollection(Me.components)
Me.txtContent = New DevExpress.XtraEditors.MemoEdit()
CType(Me.pnlContent, System.ComponentModel.ISupportInitialize).BeginInit()
Me.pnlContent.SuspendLayout()
CType(Me.SvgImageBox1, System.ComponentModel.ISupportInitialize).BeginInit()
@ -40,6 +40,7 @@ Partial Class frmDialog
CType(Me.pnlFooter, System.ComponentModel.ISupportInitialize).BeginInit()
Me.pnlFooter.SuspendLayout()
CType(Me.SvgImageCollection1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.txtContent.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout()
'
'btnPositive
@ -47,10 +48,10 @@ Partial Class frmDialog
Me.btnPositive.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.btnPositive.DialogResult = System.Windows.Forms.DialogResult.OK
Me.btnPositive.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.actions_checkcircled
Me.btnPositive.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16)
Me.btnPositive.ImageOptions.SvgImageSize = New System.Drawing.Size(20, 20)
Me.btnPositive.Location = New System.Drawing.Point(386, 6)
Me.btnPositive.Name = "btnPositive"
Me.btnPositive.Size = New System.Drawing.Size(100, 23)
Me.btnPositive.Size = New System.Drawing.Size(100, 38)
Me.btnPositive.TabIndex = 0
Me.btnPositive.Text = "OK"
'
@ -59,37 +60,25 @@ Partial Class frmDialog
Me.btnNegative.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.btnNegative.DialogResult = System.Windows.Forms.DialogResult.Cancel
Me.btnNegative.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.cancel
Me.btnNegative.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16)
Me.btnNegative.ImageOptions.SvgImageSize = New System.Drawing.Size(20, 20)
Me.btnNegative.Location = New System.Drawing.Point(280, 6)
Me.btnNegative.Name = "btnNegative"
Me.btnNegative.Size = New System.Drawing.Size(100, 23)
Me.btnNegative.Size = New System.Drawing.Size(100, 37)
Me.btnNegative.TabIndex = 1
Me.btnNegative.Text = "Abbrechen"
'
'pnlContent
'
Me.pnlContent.Appearance.BackColor = System.Drawing.Color.Transparent
Me.pnlContent.Appearance.Options.UseBackColor = True
Me.pnlContent.Controls.Add(Me.txtContent)
Me.pnlContent.Controls.Add(Me.SvgImageBox1)
Me.pnlContent.Dock = System.Windows.Forms.DockStyle.Fill
Me.pnlContent.Location = New System.Drawing.Point(0, 40)
Me.pnlContent.Name = "pnlContent"
Me.pnlContent.Size = New System.Drawing.Size(498, 131)
Me.pnlContent.Size = New System.Drawing.Size(498, 143)
Me.pnlContent.TabIndex = 3
'
'txtContent
'
Me.txtContent.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.txtContent.Appearance.Options.UseFont = True
Me.txtContent.Appearance.Options.UseTextOptions = True
Me.txtContent.Appearance.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Top
Me.txtContent.Appearance.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap
Me.txtContent.AutoSizeMode = DevExpress.XtraEditors.LabelAutoSizeMode.None
Me.txtContent.Location = New System.Drawing.Point(71, 6)
Me.txtContent.Name = "txtContent"
Me.txtContent.Size = New System.Drawing.Size(415, 119)
Me.txtContent.TabIndex = 3
Me.txtContent.Text = "LabelControl1"
'
'SvgImageBox1
'
Me.SvgImageBox1.BackColor = System.Drawing.Color.Transparent
@ -133,9 +122,9 @@ Partial Class frmDialog
Me.pnlFooter.Controls.Add(Me.btnPositive)
Me.pnlFooter.Controls.Add(Me.btnNegative)
Me.pnlFooter.Dock = System.Windows.Forms.DockStyle.Bottom
Me.pnlFooter.Location = New System.Drawing.Point(0, 171)
Me.pnlFooter.Location = New System.Drawing.Point(0, 183)
Me.pnlFooter.Name = "pnlFooter"
Me.pnlFooter.Size = New System.Drawing.Size(498, 39)
Me.pnlFooter.Size = New System.Drawing.Size(498, 56)
Me.pnlFooter.TabIndex = 5
'
'SvgImageCollection1
@ -146,11 +135,31 @@ Partial Class frmDialog
Me.SvgImageCollection1.Add("info", "image://svgimages/outlook inspired/about.svg")
Me.SvgImageCollection1.Add("question", "image://svgimages/icon builder/actions_question.svg")
'
'txtContent
'
Me.txtContent.Location = New System.Drawing.Point(71, 11)
Me.txtContent.Name = "txtContent"
Me.txtContent.Properties.Appearance.BackColor = System.Drawing.Color.Transparent
Me.txtContent.Properties.Appearance.Options.UseBackColor = True
Me.txtContent.Properties.AppearanceDisabled.BackColor = System.Drawing.Color.Transparent
Me.txtContent.Properties.AppearanceDisabled.Options.UseBackColor = True
Me.txtContent.Properties.AppearanceFocused.BackColor = System.Drawing.Color.Transparent
Me.txtContent.Properties.AppearanceFocused.Options.UseBackColor = True
Me.txtContent.Properties.AppearanceReadOnly.BackColor = System.Drawing.SystemColors.Control
Me.txtContent.Properties.AppearanceReadOnly.Options.UseBackColor = True
Me.txtContent.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder
Me.txtContent.Properties.ReadOnly = True
Me.txtContent.Properties.ScrollBars = System.Windows.Forms.ScrollBars.None
Me.txtContent.Properties.UseReadOnlyAppearance = False
Me.txtContent.Size = New System.Drawing.Size(415, 114)
Me.txtContent.TabIndex = 0
Me.txtContent.TabStop = False
'
'frmDialog
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.ClientSize = New System.Drawing.Size(498, 210)
Me.ClientSize = New System.Drawing.Size(498, 239)
Me.Controls.Add(Me.pnlContent)
Me.Controls.Add(Me.pnlFooter)
Me.Controls.Add(Me.pnlHeader)
@ -171,6 +180,7 @@ Partial Class frmDialog
CType(Me.pnlFooter, System.ComponentModel.ISupportInitialize).EndInit()
Me.pnlFooter.ResumeLayout(False)
CType(Me.SvgImageCollection1, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.txtContent.Properties, System.ComponentModel.ISupportInitialize).EndInit()
Me.ResumeLayout(False)
End Sub
@ -182,5 +192,5 @@ Partial Class frmDialog
Friend WithEvents SvgImageBox1 As DevExpress.XtraEditors.SvgImageBox
Friend WithEvents SvgImageCollection1 As DevExpress.Utils.SvgImageCollection
Friend WithEvents txtTitle As DevExpress.XtraEditors.LabelControl
Friend WithEvents txtContent As DevExpress.XtraEditors.LabelControl
Friend WithEvents txtContent As DevExpress.XtraEditors.MemoEdit
End Class

27
GUIs.Common/frmDialog.resx
View File

@ -117,7 +117,34 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="btnPositive.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="btnNegative.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="pnlContent.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="txtContent.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="SvgImageBox1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="pnlHeader.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="txtTitle.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="pnlFooter.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="SvgImageCollection1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
</root>

8
GUIs.Common/frmDialog.vb
View File

@ -22,7 +22,7 @@ Public Class frmDialog
Question
End Enum
Public Sub New(pMessageText As String, pTitle As String, pDialogType As DialogType)
Public Sub New(pMessageText As String, pTitle As String, pDialogType As DialogType, Optional pCancel As Boolean = False)
' Dieser Aufruf ist für den Designer erforderlich.
InitializeComponent()
@ -31,6 +31,12 @@ Public Class frmDialog
txtContent.Text = pMessageText
txtTitle.Text = pTitle
If pCancel Then
CancelButtonVisible()
Else
CancelButtonInvisible()
End If
Select Case pDialogType
Case DialogType.Success
pnlContent.BackColor = Color.LightGreen