diff --git a/Global_Indexer/frmIndex.designer.vb b/Global_Indexer/frmIndex.designer.vb
index a704252..346075f 100644
--- a/Global_Indexer/frmIndex.designer.vb
+++ b/Global_Indexer/frmIndex.designer.vb
@@ -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
diff --git a/Global_Indexer/frmIndex.resx b/Global_Indexer/frmIndex.resx
index 6fe9c09..620db59 100644
--- a/Global_Indexer/frmIndex.resx
+++ b/Global_Indexer/frmIndex.resx
@@ -139,7 +139,7 @@
2
- Fill
+ Top
0, 0
@@ -148,7 +148,7 @@
1
- 615, 479
+ 615, 0
0
@@ -1068,6 +1068,12 @@
DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+
+ BarButtonItem3
+
+
+ DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+
RibbonPage1
@@ -1230,12 +1236,6 @@
DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-
- BarButtonItem3
-
-
- DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-
frmIndex
diff --git a/Global_Indexer/frmIndex.vb b/Global_Indexer/frmIndex.vb
index 010017a..03f6df3 100644
--- a/Global_Indexer/frmIndex.vb
+++ b/Global_Indexer/frmIndex.vb
@@ -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