merge

ZooFlow/Administration/IDB/frmAdmin_IDBObjectStore.vb

@@ -8,7 +8,7 @@ Public Class frmAdmin_IDBObjectStore
 
     Public Property HasChanges As Boolean Implements IAdminForm.HasChanges
 
-    Private FormHelper As FormHelper
+    Private ReadOnly FormHelper As FormHelper
 
     Public Property IsInsert As Boolean Implements IAdminForm.IsInsert
     Dim oStorePath As String = String.Empty

ZooFlow/App.config

@@ -21,10 +21,10 @@
     </DigitalData.GUIs.ZooFlow.Settings>
     <DevExpress.LookAndFeel.Design.AppSettings>
       <setting name="DefaultAppSkin" serializeAs="String">
-        <value>Skin/Office 2019 Colorful</value>
+        <value></value>
       </setting>
       <setting name="DefaultPalette" serializeAs="String">
-        <value>Custom/Digital Data Palette</value>
+        <value>Custom/Digital Data</value>
       </setting>
       <setting name="TouchUI" serializeAs="String">
         <value></value>
@@ -36,7 +36,7 @@
         <value></value>
       </setting>
       <setting name="DirectX" serializeAs="String">
-        <value></value>
+        <value>True</value>
       </setting>
       <setting name="RegisterUserSkins" serializeAs="String">
         <value></value>
@@ -81,6 +81,30 @@
                 <SvgColor Name="Gray" Value="169,168,168" />
                 <SvgColor Name="White" Value="255,255,255" />
               </SvgPalette>
+              <SvgPalette Name="Digital Data 2">
+                <SvgColor Name="Paint" Value="248,248,248" />
+                <SvgColor Name="Paint High" Value="255,255,255" />
+                <SvgColor Name="Paint Shadow" Value="255,214,49" />
+                <SvgColor Name="Paint Deep Shadow" Value="230,230,230" />
+                <SvgColor Name="Brush" Value="72,70,68" />
+                <SvgColor Name="Brush High" Value="72,70,68" />
+                <SvgColor Name="Brush Light" Value="119,119,119" />
+                <SvgColor Name="Brush Major" Value="171,171,171" />
+                <SvgColor Name="Brush Minor" Value="210,210,210" />
+                <SvgColor Name="Accent Paint" Value="165,36,49" />
+                <SvgColor Name="Accent Paint Dark" Value="165,36,49" />
+                <SvgColor Name="Accent Paint Light" Value="250,220,221" />
+                <SvgColor Name="Accent Paint Lighter" Value="251,233,234" />
+                <SvgColor Name="Accent Brush" Value="255,255,255" />
+                <SvgColor Name="Accent Brush Light" Value="218,175,176" />
+                <SvgColor Name="Red" Value="237,61,59" />
+                <SvgColor Name="Green" Value="48,144,72" />
+                <SvgColor Name="Blue" Value="30,139,205" />
+                <SvgColor Name="Yellow" Value="251,152,59" />
+                <SvgColor Name="Black" Value="87,87,85" />
+                <SvgColor Name="Gray" Value="169,168,168" />
+                <SvgColor Name="White" Value="255,255,255" />
+              </SvgPalette>
             </Skin>
             <Skin Name="Basic">
               <SvgPalette Name="Digital Data">
@@ -107,6 +131,30 @@
                 <SvgColor Name="Gray" Value="191,191,194" />
                 <SvgColor Name="White" Value="255,255,255" />
               </SvgPalette>
+              <SvgPalette Name="Digital Data 2">
+                <SvgColor Name="Paint" Value="240,240,240" />
+                <SvgColor Name="Paint High" Value="255,255,255" />
+                <SvgColor Name="Paint Shadow" Value="255,214,49" />
+                <SvgColor Name="Paint Deep Shadow" Value="210,210,210" />
+                <SvgColor Name="Brush" Value="40,40,40" />
+                <SvgColor Name="Brush High" Value="40,40,40" />
+                <SvgColor Name="Brush Light" Value="120,120,120" />
+                <SvgColor Name="Brush Major" Value="160,160,160" />
+                <SvgColor Name="Brush Minor" Value="200,200,200" />
+                <SvgColor Name="Accent Paint" Value="165,36,49" />
+                <SvgColor Name="Accent Paint Dark" Value="133,28,38" />
+                <SvgColor Name="Accent Paint Light" Value="255,236,161" />
+                <SvgColor Name="Accent Paint Lighter" Value="255,244,203" />
+                <SvgColor Name="Accent Brush" Value="255,255,255" />
+                <SvgColor Name="Accent Brush Light" Value="255,236,161" />
+                <SvgColor Name="Red" Value="208,49,68" />
+                <SvgColor Name="Green" Value="56,152,83" />
+                <SvgColor Name="Blue" Value="78,138,200" />
+                <SvgColor Name="Yellow" Value="241,151,63" />
+                <SvgColor Name="Black" Value="108,109,117" />
+                <SvgColor Name="Gray" Value="191,191,194" />
+                <SvgColor Name="White" Value="255,255,255" />
+              </SvgPalette>
             </Skin>
           </CustomPaletteCollection>
         </value>

ZooFlow/ClassInit.vb

@@ -35,9 +35,8 @@ Public Class ClassInit
         _Loader = New ClassInitLoader(LogConfig)
 
         ' === Init Schritte definieren
-        _Loader.AddStep("Initializing Base", AddressOf InitializeBase, True)
+        _Loader.AddStep("Initializing Service", AddressOf InitializeService, True)
-        _Loader.AddStep("Initializing EDMI Service", AddressOf InitializeService, True)
+        _Loader.AddStep("Initializing Database", AddressOf InitializeDatabase, True)
-        _Loader.AddStep("Initializing Database", AddressOf InitializeDatabaseWithFallback, True)
         _Loader.AddStep("Initializing User", AddressOf InitializeUser, True)
         _Loader.AddStep("Initializing BasicCatalogues", AddressOf InitializeBasicsfromDB, True)
         _Loader.AddStep("Initializing Language", AddressOf InitializeLanguage, False)
@@ -83,60 +82,6 @@ Public Class ClassInit
 
 
 #Region "=== Init Steps ==="
-    Private Sub InitializeBase(MyApplication As My.MyApplication)
-    End Sub
-
-    Private Sub InitializeDatabase(MyApplication As My.MyApplication)
-        'Dim oConnectionString = MSSQLServer.DecryptConnectionString(My.SystemConfig.ConnectionString)
-        'My.DatabaseECM = New MSSQLServer(My.LogConfig, oConnectionString)
-
-        'If My.DatabaseECM.DBInitialized = False Then
-        '    Logger.Warn("Could not initialize DD_ECM-Database!")
-        '    Throw New InitException("Could not initialize ECM-Database!")
-
-        'Else
-        '    Dim oSQl = "SELECT * FROM TBDD_CONNECTION WHERE BEZEICHNUNG = 'IDB' AND AKTIV = 1"
-        '    Dim oDatatable As DataTable = My.DatabaseECM.GetDatatable(oSQl)
-
-        '    If IsNothing(oDatatable) OrElse oDatatable.Rows.Count = 0 Then
-
-        '        Dim oForm As New frmSQLConfig(My.LogConfig) With {.FormTitle = "IDB Datenbank"}
-        '        Dim oResult = oForm.ShowDialog()
-
-        '        If oResult = DialogResult.OK Then
-        '            Dim oConnectionStringSaved = SaveConnectionString(oForm.ConnectionString)
-
-        '            If oConnectionStringSaved = False Then
-        '                Throw New InitException("Fehler beim Laden der IDB Verbindungsdaten!")
-        '            End If
-
-        '            oDatatable = My.Database.GetDatatableECM(oSQl)
-        '        End If
-
-        '    End If
-
-        '    If oDatatable.Rows.Count > 1 Then
-        '        Logger.Warn("Multiple IDB connection entries in TBDD_CONNECTION found!")
-        '        Throw New InitException("Fehler beim Laden der IDB Verbindungsdaten!")
-        '    End If
-
-        '    Dim oDataRow As DataRow = oDatatable.Rows.Item(0)
-        '    Dim oConString = My.DatabaseECM.GetConnectionString(
-        '        oDataRow.Item("SERVER").ToString,
-        '        oDataRow.Item("DATENBANK").ToString,
-        '        oDataRow.Item("USERNAME").ToString,
-        '        oDataRow.Item("PASSWORD").ToString
-        '    )
-
-        '    Dim oDecryptedConnectionString = MSSQLServer.DecryptConnectionString(oConString)
-        '    My.DatabaseIDB = New MSSQLServer(My.LogConfig, oDecryptedConnectionString)
-        'End If
-
-        'If My.DatabaseIDB.DBInitialized = False Then
-        '    Logger.Warn("Could not initialize IDB-Database!")
-        '    Throw New InitException("Could not initialize IDB-Database!")
-        'End If
-    End Sub
     Private Sub InitializeService(MyApplication As My.MyApplication)
         Try
             If My.SystemConfig.AppServerConfig = String.Empty Then
@@ -172,7 +117,8 @@ Public Class ClassInit
             Throw New InitException("Error in InitializeService", ex)
         End Try
     End Sub
-    Private Sub InitializeDatabaseWithFallback(MyApplication As My.MyApplication)
+
+    Private Sub InitializeDatabase(MyApplication As My.MyApplication)
         Try
             Logger.Debug("Loading client config..")
             Dim oClientConfig = My.Application.Service.Client.ClientConfig
@@ -192,6 +138,7 @@ Public Class ClassInit
             Throw New InitException("Error in InitializeDatabaseWithFallback!", ex)
         End Try
     End Sub
+
     Private Sub InitializeUser(MyApplication As My.MyApplication)
         Try
             Dim oSql As String = My.Queries.Common.FNDD_MODULE_INIT(Environment.UserName)
@@ -348,28 +295,6 @@ Public Class ClassInit
 
 #End Region
 
-    Private Function SetupDatabase() As Boolean
-        'If My.SystemConfig.ConnectionString = String.Empty Then
-        '    Dim oConnectionString = My.SystemConfig.ConnectionString
-        '    Dim oForm As New frmSQLConfig(My.LogConfig) With {
-        '        .ConnectionString = oConnectionString,
-        '        .FormTitle = "ECM Datenbank"
-        '    }
-        '    Dim oResult = oForm.ShowDialog()
-
-        '    If oResult = DialogResult.OK Then
-        '        My.SystemConfig.ConnectionString = oForm.ConnectionString
-        '        My.SystemConfigManager.Save()
-
-        '        Return True
-        '    Else
-        '        Return False
-        '    End If
-        'End If
-
-        Return True
-    End Function
-
     Private Function SaveConnectionString(pConnectionString As String) As Boolean
         Try
             Dim oBuilder As New SqlConnectionStringBuilder(pConnectionString)

ZooFlow/MailLicense.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<License>
+  <Id>4dc5ef40-f1a9-468b-994c-b7ed600ad878</Id>
+  <ProductName>Mail.dll</ProductName>
+  <SubscriptionUntil>2022-07-29</SubscriptionUntil>
+  <RegisteredTo>Digital Data GmbH</RegisteredTo>
+  <LicenseType>single developer</LicenseType>
+  <BuyerName>Digital Data GmbH</BuyerName>
+  <Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
+    <SignedInfo>
+      <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" />
+      <SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" />
+      <Reference URI="">
+        <Transforms>
+          <Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" />
+        </Transforms>
+        <DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
+        <DigestValue>75MRtl4ipYelIZYlpT8O7QDX9Zc=</DigestValue>
+      </Reference>
+    </SignedInfo>
+    <SignatureValue>Raxfkz6DfQVs/sMvH+F2nH0eHXD8FoUFSdP3t7AgBUdpABJQx86srlyuMSEhXPlc1THCqPouEVob4RsWnd9OXvTiPPSOUSK9zuNG6uz93KLAhpSD5PraAgBCF4jwZArlAp7aCNfZpHqQ3w6TRHS+CfravUU0AHHG3MZ1ZcRkGuo=</SignatureValue>
+  </Signature>
+</License>