Merge branch 'master' of http://dd-vmp07-com04:3000/AppStd/ProcessManager

app/DD_PM_WINDREAM/ClassConfig.vb

@@ -35,5 +35,6 @@ Public Class ClassConfig
 
     Public Property LastExportPath As String = ""
     Public Property ADDITIONAL_SEARCHES_LOAD_ONCLICK As Boolean = True
+    Public Property GridFontSizeDelta As Integer = 0
 
 End Class

app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb

@@ -8,12 +8,12 @@ Imports System.Runtime.InteropServices
 
 ' Die Werte der Assemblyattribute überprüfen
 
-<Assembly: AssemblyTitle("Flow Task")>
+<Assembly: AssemblyTitle("Task Flow")>
 <Assembly: AssemblyDescription("")> 
 <Assembly: AssemblyCompany("Digital Data")>
-<Assembly: AssemblyProduct("Flow Task")>
+<Assembly: AssemblyProduct("Task Flow")>
 <Assembly: AssemblyCopyright("Copyright © Digital Data 2022")>
-<Assembly: AssemblyTrademark("2352")>
+<Assembly: AssemblyTrademark("2353")>
 
 <Assembly: ComVisible(False)>
 
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.3.5.2")>
+<Assembly: AssemblyVersion("2.3.5.3")>
 <Assembly: AssemblyFileVersion("1.0.0.0")> 

app/DD_PM_WINDREAM/My Project/licenses.licx

@@ -1,10 +1,11 @@
-DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemProgressBar, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemProgressBar, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

app/DD_PM_WINDREAM/frmColumn_Detail.vb

@@ -170,6 +170,7 @@ Public Class frmColumn_Detail
                 If DatabaseFallback.ExecuteNonQueryECM(oUpdate) = True Then
                     tslblAenderungen.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
                     tslblAenderungen.Caption = "Changes saved - " & Now
+                    SQL_COMMANDTextBox.Text = oForm.SQLCommand
                 End If
 
             End If

app/DD_PM_WINDREAM/frmKonfig.Designer.vb

@@ -42,6 +42,7 @@ Partial Class frmKonfig
         Me.txtActualConnection = New System.Windows.Forms.TextBox()
         Me.txtServer = New System.Windows.Forms.TextBox()
         Me.TabPage3 = New System.Windows.Forms.TabPage()
+        Me.LabelControl1 = New DevExpress.XtraEditors.LabelControl()
         Me.Button4 = New System.Windows.Forms.Button()
         Me.Label7 = New System.Windows.Forms.Label()
         Me.txtIntervall = New System.Windows.Forms.TextBox()
@@ -63,6 +64,7 @@ Partial Class frmKonfig
         Me.TBPM_KONFIGURATIONTableAdapter = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_KONFIGURATIONTableAdapter()
         Me.TableAdapterManager = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager()
         Me.SaveFileDialog1 = New System.Windows.Forms.SaveFileDialog()
+        Me.ComboBoxEdit1 = New DevExpress.XtraEditors.ComboBoxEdit()
         Me.TabControl1.SuspendLayout()
         Me.TabPage2.SuspendLayout()
         Me.TabPage3.SuspendLayout()
@@ -72,6 +74,7 @@ Partial Class frmKonfig
         CType(Me.gvLogs, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.TBPM_KONFIGURATIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.ComboBoxEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         'OpenFileDialog1
@@ -193,6 +196,8 @@ Partial Class frmKonfig
         '
         'TabPage3
         '
+        Me.TabPage3.Controls.Add(Me.ComboBoxEdit1)
+        Me.TabPage3.Controls.Add(Me.LabelControl1)
         Me.TabPage3.Controls.Add(Me.Button4)
         Me.TabPage3.Controls.Add(Me.Label7)
         Me.TabPage3.Controls.Add(Me.txtIntervall)
@@ -207,6 +212,13 @@ Partial Class frmKonfig
         Me.TabPage3.Name = "TabPage3"
         Me.TabPage3.UseVisualStyleBackColor = True
         '
+        'LabelControl1
+        '
+        Me.LabelControl1.Appearance.Font = CType(resources.GetObject("LabelControl1.Appearance.Font"), System.Drawing.Font)
+        Me.LabelControl1.Appearance.Options.UseFont = True
+        resources.ApplyResources(Me.LabelControl1, "LabelControl1")
+        Me.LabelControl1.Name = "LabelControl1"
+        '
         'Button4
         '
         resources.ApplyResources(Me.Button4, "Button4")
@@ -339,6 +351,14 @@ Partial Class frmKonfig
         Me.TableAdapterManager.TBPM_TYPETableAdapter = Nothing
         Me.TableAdapterManager.UpdateOrder = DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete
         '
+        'ComboBoxEdit1
+        '
+        resources.ApplyResources(Me.ComboBoxEdit1, "ComboBoxEdit1")
+        Me.ComboBoxEdit1.Name = "ComboBoxEdit1"
+        Me.ComboBoxEdit1.Properties.Appearance.Font = CType(resources.GetObject("ComboBoxEdit1.Properties.Appearance.Font"), System.Drawing.Font)
+        Me.ComboBoxEdit1.Properties.Appearance.Options.UseFont = True
+        Me.ComboBoxEdit1.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("ComboBoxEdit1.Properties.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))})
+        '
         'frmKonfig
         '
         resources.ApplyResources(Me, "$this")
@@ -357,6 +377,7 @@ Partial Class frmKonfig
         CType(Me.gvLogs, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.TBPM_KONFIGURATIONBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.ComboBoxEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
 
     End Sub
@@ -399,4 +420,6 @@ Partial Class frmKonfig
     Friend WithEvents LogNachrichtenLeerenToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents SpeichereLogAlsToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents SaveFileDialog1 As SaveFileDialog
+    Friend WithEvents LabelControl1 As DevExpress.XtraEditors.LabelControl
+    Friend WithEvents ComboBoxEdit1 As DevExpress.XtraEditors.ComboBoxEdit
 End Class

app/DD_PM_WINDREAM/frmKonfig.resx

@@ -507,6 +507,61 @@
   <data name="&gt;&gt;TabPage2.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
+  <data name="ComboBoxEdit1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>8, 225</value>
+  </data>
+  <data name="ComboBoxEdit1.Properties.Appearance.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Tahoma, 9.75pt</value>
+  </data>
+  <assembly alias="DevExpress.Utils.v21.2" name="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="ComboBoxEdit1.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v21.2">
+    <value>Combo</value>
+  </data>
+  <data name="ComboBoxEdit1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>146, 22</value>
+  </data>
+  <data name="ComboBoxEdit1.TabIndex" type="System.Int32, mscorlib">
+    <value>49</value>
+  </data>
+  <data name="&gt;&gt;ComboBoxEdit1.Name" xml:space="preserve">
+    <value>ComboBoxEdit1</value>
+  </data>
+  <data name="&gt;&gt;ComboBoxEdit1.Type" xml:space="preserve">
+    <value>DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;ComboBoxEdit1.Parent" xml:space="preserve">
+    <value>TabPage3</value>
+  </data>
+  <data name="&gt;&gt;ComboBoxEdit1.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="LabelControl1.Appearance.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Tahoma, 9.75pt</value>
+  </data>
+  <data name="LabelControl1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>8, 203</value>
+  </data>
+  <data name="LabelControl1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>146, 16</value>
+  </data>
+  <data name="LabelControl1.TabIndex" type="System.Int32, mscorlib">
+    <value>48</value>
+  </data>
+  <data name="LabelControl1.Text" xml:space="preserve">
+    <value>Schriftgröße in Übersicht:</value>
+  </data>
+  <data name="&gt;&gt;LabelControl1.Name" xml:space="preserve">
+    <value>LabelControl1</value>
+  </data>
+  <data name="&gt;&gt;LabelControl1.Type" xml:space="preserve">
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;LabelControl1.Parent" xml:space="preserve">
+    <value>TabPage3</value>
+  </data>
+  <data name="&gt;&gt;LabelControl1.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
   <data name="Button4.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
   </data>
@@ -532,7 +587,7 @@
     <value>TabPage3</value>
   </data>
   <data name="&gt;&gt;Button4.ZOrder" xml:space="preserve">
-    <value>0</value>
+    <value>2</value>
   </data>
   <data name="Label7.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -559,7 +614,7 @@
     <value>TabPage3</value>
   </data>
   <data name="&gt;&gt;Label7.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>3</value>
   </data>
   <data name="txtIntervall.Location" type="System.Drawing.Point, System.Drawing">
     <value>8, 162</value>
@@ -583,7 +638,7 @@
     <value>TabPage3</value>
   </data>
   <data name="&gt;&gt;txtIntervall.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>4</value>
   </data>
   <data name="Label6.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -610,7 +665,7 @@
     <value>TabPage3</value>
   </data>
   <data name="&gt;&gt;Label6.ZOrder" xml:space="preserve">
-    <value>3</value>
+    <value>5</value>
   </data>
   <data name="btnopenlog.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
     <value>MiddleLeft</value>
@@ -637,7 +692,7 @@
     <value>TabPage3</value>
   </data>
   <data name="&gt;&gt;btnopenlog.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <value>6</value>
   </data>
   <data name="chkLogErrorsOnly.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -664,7 +719,7 @@
     <value>TabPage3</value>
   </data>
   <data name="&gt;&gt;chkLogErrorsOnly.ZOrder" xml:space="preserve">
-    <value>5</value>
+    <value>7</value>
   </data>
   <data name="Button3.Location" type="System.Drawing.Point, System.Drawing">
     <value>8, 64</value>
@@ -688,7 +743,7 @@
     <value>TabPage3</value>
   </data>
   <data name="&gt;&gt;Button3.ZOrder" xml:space="preserve">
-    <value>6</value>
+    <value>8</value>
   </data>
   <data name="LinkLabel1.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -715,7 +770,7 @@
     <value>TabPage3</value>
   </data>
   <data name="&gt;&gt;LinkLabel1.ZOrder" xml:space="preserve">
-    <value>7</value>
+    <value>9</value>
   </data>
   <data name="Button1.Location" type="System.Drawing.Point, System.Drawing">
     <value>438, 64</value>
@@ -739,7 +794,7 @@
     <value>TabPage3</value>
   </data>
   <data name="&gt;&gt;Button1.ZOrder" xml:space="preserve">
-    <value>8</value>
+    <value>10</value>
   </data>
   <data name="btnLogMail.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
     <value>MiddleLeft</value>
@@ -769,7 +824,7 @@
     <value>TabPage3</value>
   </data>
   <data name="&gt;&gt;btnLogMail.ZOrder" xml:space="preserve">
-    <value>9</value>
+    <value>11</value>
   </data>
   <data name="TabPage3.Location" type="System.Drawing.Point, System.Drawing">
     <value>4, 26</value>

app/DD_PM_WINDREAM/frmKonfig.vb

@@ -25,12 +25,35 @@ Public Class frmKonfig
             chkLogErrorsOnly.Checked = CBool(DEBUG)
             txtIntervall.Text = CONFIG.Config.ReminderTimer
 
+
+            Dim oFontSettings = New List(Of FontSetting) From {
+                New FontSetting With {.Title = "Kleiner", .Value = -2},
+                New FontSetting With {.Title = "Normal", .Value = 0},
+                New FontSetting With {.Title = "Größer", .Value = 2}
+            }
+
+            ComboBoxEdit1.Properties.Items.Clear()
+            ComboBoxEdit1.Properties.Items.AddRange(oFontSettings)
+            ComboBoxEdit1.SelectedItem = oFontSettings.
+                Where(Function(item) item.Value = CONFIG.Config.GridFontSizeDelta).
+                FirstOrDefault()
+
+
         Catch ex As Exception
             LOGGER.Error(ex)
             MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler bei Formload Grundkonfig:")
         End Try
     End Sub
 
+    Public Class FontSetting
+        Public Property Title As String
+        Public Property Value As Integer
+
+        Public Overrides Function ToString() As String
+            Return Title
+        End Function
+    End Class
+
 
     Private Sub cmbDatenbank_Click(sender As System.Object, e As System.EventArgs) Handles cmbDatenbank.Click
         Try
@@ -250,4 +273,12 @@ Public Class frmKonfig
             MsgBox("Error in Export: " & ex.Message)
         End Try
     End Sub
+
+    Private Sub ComboBoxEdit1_SelectedValueChanged(sender As Object, e As EventArgs) Handles ComboBoxEdit1.SelectedValueChanged
+        Try
+            CONFIG.Config.GridFontSizeDelta = DirectCast(ComboBoxEdit1.EditValue, FontSetting).Value
+            CONFIG.Save()
+        Catch ex As Exception
+        End Try
+    End Sub
 End Class

app/DD_PM_WINDREAM/frmMain.vb

@@ -11,6 +11,7 @@ Imports System.IO
 Imports DevExpress.XtraPrinting
 Imports DigitalData.Modules.EDMI.API.DatabaseWithFallback
 Imports DigitalData.Modules.EDMI.API.Constants
+Imports DigitalData.GUIs.Common
 Imports DevExpress.XtraGrid.Views.BandedGrid
 Imports DevExpress.XtraBars.Ribbon
 
@@ -36,6 +37,7 @@ Public Class frmMain
     Private FormShown As Boolean = False
     Private GridIsLoaded As Boolean = False
     Private OverviewOrDEtail As String = "OVERVIEW"
+    Private GridBuilder As GridBuilder
 
     Private allgFunk As New ClassAllgemeineFunktionen
     Private _Init As New ClassInit
@@ -138,6 +140,10 @@ Public Class frmMain
         FormOpenClose = True
         LOGGER.Debug("Initializing MainForm....")
 
+        GridBuilder = New GridBuilder(GridViewWFItems)
+        GridBuilder.WithFontSizeDelta(CONFIG.Config.GridFontSizeDelta)
+
+
         ' Create helper to save/load expanded GroupColumns at runtime
         RefreshHelper = New RefreshHelper(LOGCONFIG, GridViewWFItems, "GUID")
         Dim oVErsion = String.Format("{0}.{1}.{2}", My.Application.Info.Version.Major, My.Application.Info.Version.Minor, My.Application.Info.Version.Build)
@@ -923,6 +929,7 @@ Public Class frmMain
 
             RestoreLayout()
 
+
             GridViewWFItems.Columns.Item("PROFILE_ID").Visible = False
             GridViewWFItems.Columns.Item("GUID").Visible = False
             Try
@@ -1899,6 +1906,7 @@ Public Class frmMain
         Await Reset_GridLayout(False)
         Await Decide_Load(False, True)
         SaveGridLayout()
+        GridBuilder.WithFontSizeDelta(CONFIG.Config.GridFontSizeDelta)
         If GridControl_Docs.Visible = True And FormOpenClose = False Then RefreshHelper.LoadViewInfo()
         FRONTEND_ACTION = "NONE"
     End Sub
@@ -2252,6 +2260,7 @@ Public Class frmMain
             frmKonfig.ShowDialog()
 
             '  Load_Profil()
+            GridBuilder.WithFontSizeDelta(CONFIG.Config.GridFontSizeDelta)
             Check_Timer_Notification()
         Catch ex As Exception
             LOGGER.Error(ex)

app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb

@@ -157,6 +157,8 @@ Public Class frmSQL_DESIGNER
         Dim ds As DataSet = ExecuteWithConnection(cmbConnection.SelectedValue, query)
 
         If ds IsNot Nothing Then
+            GridView1.Columns.Clear()
+            GridView1.PopulateColumns(ds.Tables(0))
             GridControl1.DataSource = ds.Tables(0)
         End If