Labels laden wie sie sollen
This commit is contained in:
OlgunR
parent
5ac9b9b6fc
commit
80f49a1546
26
Global_Indexer/frmIndex.designer.vb
generated
26
Global_Indexer/frmIndex.designer.vb
generated
@ -31,6 +31,7 @@ Partial Class frmIndex
|
||||
Dim SerializableAppearanceObject4 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject()
|
||||
Me.SplitContainer1 = New System.Windows.Forms.SplitContainer()
|
||||
Me.pnlIndex = New System.Windows.Forms.Panel()
|
||||
Me.tlpIndex = New System.Windows.Forms.TableLayoutPanel()
|
||||
Me.ComboboxDoctype = New DevExpress.XtraEditors.SearchLookUpEdit()
|
||||
Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl()
|
||||
Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
|
||||
@ -50,6 +51,7 @@ Partial Class frmIndex
|
||||
Me.BarCheckItem_MultiIndexing = New DevExpress.XtraBars.BarCheckItem()
|
||||
Me.BarToggleSwitchItem_Preselection = New DevExpress.XtraBars.BarToggleSwitchItem()
|
||||
Me.BarButtonItem_OK = New DevExpress.XtraBars.BarButtonItem()
|
||||
Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem()
|
||||
Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
|
||||
Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
|
||||
Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
|
||||
@ -79,8 +81,6 @@ Partial Class frmIndex
|
||||
Me.PdfBarController2 = New DevExpress.XtraPdfViewer.Bars.PdfBarController(Me.components)
|
||||
Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
|
||||
Me.DxErrorProvider1 = New DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(Me.components)
|
||||
Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem()
|
||||
Me.tlpIndex = New System.Windows.Forms.TableLayoutPanel()
|
||||
CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
Me.SplitContainer1.Panel1.SuspendLayout()
|
||||
Me.SplitContainer1.Panel2.SuspendLayout()
|
||||
@ -124,6 +124,11 @@ Partial Class frmIndex
|
||||
Me.pnlIndex.Controls.Add(Me.tlpIndex)
|
||||
Me.pnlIndex.Name = "pnlIndex"
|
||||
'
|
||||
'tlpIndex
|
||||
'
|
||||
resources.ApplyResources(Me.tlpIndex, "tlpIndex")
|
||||
Me.tlpIndex.Name = "tlpIndex"
|
||||
'
|
||||
'ComboboxDoctype
|
||||
'
|
||||
Me.ComboboxDoctype.AllowDrop = True
|
||||
@ -289,6 +294,12 @@ Partial Class frmIndex
|
||||
Me.BarButtonItem_OK.Name = "BarButtonItem_OK"
|
||||
Me.BarButtonItem_OK.ShowItemShortcut = DevExpress.Utils.DefaultBoolean.[True]
|
||||
'
|
||||
'BarButtonItem3
|
||||
'
|
||||
resources.ApplyResources(Me.BarButtonItem3, "BarButtonItem3")
|
||||
Me.BarButtonItem3.Id = 31
|
||||
Me.BarButtonItem3.Name = "BarButtonItem3"
|
||||
'
|
||||
'RibbonPage1
|
||||
'
|
||||
Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup3, Me.RibbonPageGroup4, Me.RibbonPageGroup1})
|
||||
@ -473,17 +484,6 @@ Partial Class frmIndex
|
||||
'
|
||||
Me.DxErrorProvider1.ContainerControl = Me
|
||||
'
|
||||
'BarButtonItem3
|
||||
'
|
||||
resources.ApplyResources(Me.BarButtonItem3, "BarButtonItem3")
|
||||
Me.BarButtonItem3.Id = 31
|
||||
Me.BarButtonItem3.Name = "BarButtonItem3"
|
||||
'
|
||||
'tlpIndex
|
||||
'
|
||||
resources.ApplyResources(Me.tlpIndex, "tlpIndex")
|
||||
Me.tlpIndex.Name = "tlpIndex"
|
||||
'
|
||||
'frmIndex
|
||||
'
|
||||
Me.Appearance.Options.UseFont = True
|
||||
|
||||
@ -139,7 +139,7 @@
|
||||
<value>2</value>
|
||||
</data>
|
||||
<data name="tlpIndex.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
|
||||
<value>Fill</value>
|
||||
<value>Top</value>
|
||||
</data>
|
||||
<data name="tlpIndex.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>0, 0</value>
|
||||
@ -148,7 +148,7 @@
|
||||
<value>1</value>
|
||||
</data>
|
||||
<data name="tlpIndex.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>615, 479</value>
|
||||
<value>615, 0</value>
|
||||
</data>
|
||||
<data name="tlpIndex.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>0</value>
|
||||
@ -1068,6 +1068,12 @@
|
||||
<data name=">>BarButtonItem_OK.Type" xml:space="preserve">
|
||||
<value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name=">>BarButtonItem3.Name" xml:space="preserve">
|
||||
<value>BarButtonItem3</value>
|
||||
</data>
|
||||
<data name=">>BarButtonItem3.Type" xml:space="preserve">
|
||||
<value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name=">>RibbonPage1.Name" xml:space="preserve">
|
||||
<value>RibbonPage1</value>
|
||||
</data>
|
||||
@ -1230,12 +1236,6 @@
|
||||
<data name=">>DxErrorProvider1.Type" xml:space="preserve">
|
||||
<value>DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name=">>BarButtonItem3.Name" xml:space="preserve">
|
||||
<value>BarButtonItem3</value>
|
||||
</data>
|
||||
<data name=">>BarButtonItem3.Type" xml:space="preserve">
|
||||
<value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name=">>$this.Name" xml:space="preserve">
|
||||
<value>frmIndex</value>
|
||||
</data>
|
||||
|
||||
@ -12,6 +12,7 @@ Imports DigitalData.Modules.Base
|
||||
'Imports System.Security.Principal
|
||||
Imports DigitalData.Modules.Logging
|
||||
Imports DigitalData.Modules.Windream
|
||||
Imports GdPicture.Internal.MSOfficeBinary.translator.Spreadsheet.XlsFileFormat.Records
|
||||
Imports Limilabs.Mail
|
||||
'Imports DevExpress.DataAccess.Native.Json
|
||||
'Imports GdPicture.Internal.MSOfficeBinary.translator.Spreadsheet.XlsFileFormat.Records
|
||||
@ -168,23 +169,22 @@ Public Class frmIndex
|
||||
pnlIndex.Controls.Add(lbl)
|
||||
End Sub
|
||||
|
||||
Private Sub AddLabelAndControl(labelText As String,
|
||||
ctrl As Control,
|
||||
indexName As String)
|
||||
Private Sub AddLabelAndControl(labelText As String, ctrl As Control, indexName As String)
|
||||
|
||||
'--- Label vorbereiten ------------------------------------
|
||||
Dim lbl As New Label With {
|
||||
Dim lbl As New Windows.Forms.Label With {
|
||||
.Name = $"lbl_{indexName}",
|
||||
.Text = labelText,
|
||||
.AutoSize = True,
|
||||
.Anchor = AnchorStyles.Left,
|
||||
.Margin = New Padding(4, 4, 4, 4) 'äußerer Abstand
|
||||
.Margin = New Padding(4, 4, 4, 4)
|
||||
}
|
||||
|
||||
'--- Control vorbereiten ----------------------------------
|
||||
ctrl.Anchor = AnchorStyles.Left Or AnchorStyles.Right
|
||||
ctrl.Margin = New Padding(4, 4, 8, 4) 'äußerer Abstand rechts etwas größer
|
||||
ctrl.Width = 260 'falls AutoSize=False
|
||||
ctrl.Margin = New Padding(4, 4, 4, 4)
|
||||
ctrl.Width = 300 'falls AutoSize=False
|
||||
ctrl.Dock = DockStyle.Fill
|
||||
|
||||
'--- Zeile dynamisch anlegen ------------------------------
|
||||
tlpIndex.RowCount += 1
|
||||
@ -2123,9 +2123,9 @@ Public Class frmIndex
|
||||
Dim oDpiscale = oScreen.GetScreenScaling(Me)
|
||||
|
||||
Dim oRowTop As Integer = 20 * oDpiscale
|
||||
Dim oLabelLeft As Integer = 10
|
||||
Dim oControlLeft As Integer = 160
|
||||
Dim oControlWidth As Integer = 300
|
||||
Dim oLabelLeft As Integer = 20
|
||||
Dim oControlLeft As Integer = 250
|
||||
Dim oControlWidth As Integer = 420
|
||||
Dim oZeilenhoehe As Integer = 30 * oDpiscale
|
||||
|
||||
_Logger.Info("Loading Indicies for Screen Scaling Factor [{0}]", oDpiscale)
|
||||
@ -2160,15 +2160,20 @@ Public Class frmIndex
|
||||
|
||||
Dim ctrl As Control = Nothing
|
||||
|
||||
Dim lbl As Windows.Forms.Label = Nothing
|
||||
|
||||
' Label nur anzeigen, wenn nicht BOOLEAN
|
||||
If oDataType <> ClassConstants.INDEX_TYPE_BOOLEAN Then
|
||||
Dim lbl As New Label()
|
||||
lbl = New Windows.Forms.Label()
|
||||
lbl.Text = oRow.Item("COMMENT").ToString()
|
||||
lbl.Left = oLabelLeft
|
||||
lbl.Top = oRowTop
|
||||
lbl.Width = oControlLeft - oLabelLeft - 10
|
||||
lbl.Height = 20
|
||||
lbl.TextAlign = ContentAlignment.MiddleRight
|
||||
lbl.AutoSize = True
|
||||
lbl.MaximumSize = New Size(lbl.Width, 0) ' Max Breite, Höhe unbegrenzt
|
||||
lbl.Height = lbl.PreferredHeight
|
||||
lbl.TextAlign = ContentAlignment.MiddleLeft
|
||||
lbl.UseCompatibleTextRendering = True
|
||||
pnlIndex.Controls.Add(lbl)
|
||||
End If
|
||||
|
||||
@ -2207,7 +2212,17 @@ Public Class frmIndex
|
||||
pnlIndex.Controls.Add(ctrl)
|
||||
End If
|
||||
|
||||
oRowTop += oZeilenhoehe
|
||||
Dim zeilenhoeheAktuell As Integer
|
||||
|
||||
If oDataType <> ClassConstants.INDEX_TYPE_BOOLEAN Then
|
||||
' Verwende die Höhe vom Label oder Mindesthöhe
|
||||
zeilenhoeheAktuell = Math.Max(lbl.Height, 30 * oDpiscale)
|
||||
Else
|
||||
' Für Boolean Controls kannst du die Standardhöhe nehmen
|
||||
zeilenhoeheAktuell = 30 * oDpiscale
|
||||
End If
|
||||
|
||||
oRowTop += zeilenhoeheAktuell
|
||||
Next
|
||||
|
||||
' Panel- und Formhöhe anpassen, wenn nötig
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user