MergeCommit

Global_Indexer/App.config

@@ -8,10 +8,10 @@
   <applicationSettings>
     <DevExpress.LookAndFeel.Design.AppSettings>
       <setting name="DefaultAppSkin" serializeAs="String">
-        <value>Skin/Office 2019 White</value>
+        <value>Skin/Office 2016 Colorful</value>
       </setting>
       <setting name="DefaultPalette" serializeAs="String">
-        <value>Yale</value>
+        <value></value>
       </setting>
       <setting name="TouchUI" serializeAs="String">
         <value></value>

Global_Indexer/ClassConfig.vb

@@ -19,4 +19,5 @@ Public Class ClassConfig
     ' Misc Settings
     Public Property LogDEBUG As Boolean = True
     Public Property WindreamSearchMaximized As Boolean = False
+    Public Property MyFormsDesign As String = ""
 End Class

Global_Indexer/ClassFileHandler.vb

@@ -57,6 +57,7 @@ Public Class ClassFileHandler
 
     Public Function Decide_FileHandle(pFilepath As String, pHandletype As String) As Boolean
         Try
+            Logger.Info($"Decide_FileHandle - pFilepath: {pFilepath} - pHandletype: {pHandletype}")
             ''TODO: Before doing anything, clean the filename
             'Dim oFilename = IO.Path.GetFileName(pFilepath)
             'Dim oCleanFileName = Utils.RemoveInvalidCharacters(oFilename)

Global_Indexer/ClassInit.vb

@@ -227,8 +227,7 @@ Public Class ClassInit
                 oHandleType = "|FW_SIMPLEINDEXER|"
             End If
             'Die Datei übergeben
-            LOGGER.Info(">> OnCreated-File:" & e.FullPath)
+            LOGGER.Info(">> Adding file from Hotfolder (OnCreated):" & e.FullPath)
-
             If ClassIndexFunctions.CheckDuplicateFiles(Form, e.FullPath, "FolderWatch/Scan") Then
                 FILE_HANDLER.Decide_FileHandle(e.FullPath, oHandleType)
             End If

Global_Indexer/ModuleRuntime.vb

@@ -29,4 +29,5 @@ Module ModuleRuntime
 
     Public Property DATABASE_ECM As MSSQLServer
     Public Property DATABASE_IDB As MSSQLServer
+    Public Property DebugDisplay As Boolean = False
 End Module

Global_Indexer/My Project/AssemblyInfo.vb

@@ -14,8 +14,8 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyDescription("")>
 <Assembly: AssemblyCompany("Digital Data")>
 <Assembly: AssemblyProduct("File Flow")>
-<Assembly: AssemblyCopyright("Copyright © 2023")>
+<Assembly: AssemblyCopyright("Copyright © 2024")>
-<Assembly: AssemblyTrademark("2.6.8.1")>
+<Assembly: AssemblyTrademark("2.6.7.1")>
 
 <Assembly: ComVisible(False)> 
 
@@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.6.8.1")>
+<Assembly: AssemblyVersion("2.6.7.2")>
 <Assembly: AssemblyFileVersion("1.0.0.0")>
 
 <Assembly: NeutralResourcesLanguageAttribute("")> 

Global_Indexer/frmConfig_Basic.designer.vb

@@ -22,8 +22,8 @@ Partial Class frmConfig_Basic
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
+        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmConfig_Basic))
-        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.TabControl1 = New System.Windows.Forms.TabControl()
         Me.TabPage1 = New System.Windows.Forms.TabPage()
         Me.chkbxUserAut = New System.Windows.Forms.CheckBox()
@@ -63,6 +63,9 @@ Partial Class frmConfig_Basic
         Me.btnstartstop2 = New System.Windows.Forms.Button()
         Me.btnstartstop1 = New System.Windows.Forms.Button()
         Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog()
+        Me.Button5 = New System.Windows.Forms.Button()
+        Me.cmbDesign = New System.Windows.Forms.ComboBox()
+        Me.Label10 = New System.Windows.Forms.Label()
         Me.TabControl1.SuspendLayout()
         Me.TabPage1.SuspendLayout()
         Me.TabPage2.SuspendLayout()
@@ -169,6 +172,9 @@ Partial Class frmConfig_Basic
         '
         'TabPage2
         '
+        Me.TabPage2.Controls.Add(Me.Label10)
+        Me.TabPage2.Controls.Add(Me.Button5)
+        Me.TabPage2.Controls.Add(Me.cmbDesign)
         Me.TabPage2.Controls.Add(Me.LinkLabel1)
         Me.TabPage2.Controls.Add(Me.Button3)
         Me.TabPage2.Controls.Add(Me.cmbLanguage)
@@ -266,8 +272,8 @@ Partial Class frmConfig_Basic
         '
         'DataGridView1
         '
-        DataGridViewCellStyle1.BackColor = System.Drawing.Color.Aqua
+        DataGridViewCellStyle3.BackColor = System.Drawing.Color.Aqua
-        Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
+        Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3
         resources.ApplyResources(Me.DataGridView1, "DataGridView1")
         Me.DataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.DataGridView1.Name = "DataGridView1"
@@ -343,6 +349,24 @@ Partial Class frmConfig_Basic
         '
         Me.OpenFileDialog1.FileName = "OpenFileDialog1"
         '
+        'Button5
+        '
+        resources.ApplyResources(Me.Button5, "Button5")
+        Me.Button5.Name = "Button5"
+        Me.Button5.UseVisualStyleBackColor = True
+        '
+        'cmbDesign
+        '
+        resources.ApplyResources(Me.cmbDesign, "cmbDesign")
+        Me.cmbDesign.FormattingEnabled = True
+        Me.cmbDesign.Items.AddRange(New Object() {resources.GetString("cmbDesign.Items"), resources.GetString("cmbDesign.Items1"), resources.GetString("cmbDesign.Items2"), resources.GetString("cmbDesign.Items3"), resources.GetString("cmbDesign.Items4"), resources.GetString("cmbDesign.Items5"), resources.GetString("cmbDesign.Items6")})
+        Me.cmbDesign.Name = "cmbDesign"
+        '
+        'Label10
+        '
+        resources.ApplyResources(Me.Label10, "Label10")
+        Me.Label10.Name = "Label10"
+        '
         'frmConfig_Basic
         '
         resources.ApplyResources(Me, "$this")
@@ -401,4 +425,7 @@ Partial Class frmConfig_Basic
     Friend WithEvents Label9 As System.Windows.Forms.Label
     Friend WithEvents Button3 As System.Windows.Forms.Button
     Friend WithEvents LinkLabel1 As System.Windows.Forms.LinkLabel
+    Friend WithEvents Label10 As Label
+    Friend WithEvents Button5 As Button
+    Friend WithEvents cmbDesign As ComboBox
 End Class

Global_Indexer/frmConfig_Basic.vb

@@ -2,6 +2,7 @@
 Imports System.Threading
 Imports System.Globalization
 Imports DigitalData.Modules.Database
+Imports DevExpress.LookAndFeel
 
 Public Class frmConfig_Basic
     Dim formloaded = False
@@ -149,6 +150,8 @@ Public Class frmConfig_Basic
                 Else
                     cmbLanguage.SelectedIndex = 1
                 End If
+                cmbDesign.Text = CONFIG.Config.MyFormsDesign
+
                 'chkdelete_origin.Checked = CURR_DELETE_ORIGIN
             Case 2
                 If ERROR_STATE = "NO DB-CONNECTION" Then
@@ -521,4 +524,17 @@ Public Class frmConfig_Basic
         ' Navigate to a URL.
         Process.Start("https://digitaldata.works/support")
     End Sub
+
+    Private Sub Label10_Click(sender As Object, e As EventArgs) Handles Label10.Click
+
+    End Sub
+
+    Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click
+        If cmbDesign.SelectedIndex <> -1 Then
+            UserLookAndFeel.Default.SetSkinStyle(cmbDesign.Text)
+            CONFIG.Config.MyFormsDesign = cmbDesign.Text
+            CONFIG.Save()
+
+        End If
+    End Sub
 End Class

Global_Indexer/frmStart.resx

@@ -543,10 +543,10 @@
     <value>Bottom</value>
   </data>
   <data name="barDockControlBottom.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 136</value>
+    <value>0, 135</value>
   </data>
   <data name="barDockControlBottom.Size" type="System.Drawing.Size, System.Drawing">
-    <value>294, 25</value>
+    <value>294, 26</value>
   </data>
   <data name="&gt;&gt;barDockControlBottom.Name" xml:space="preserve">
     <value>barDockControlBottom</value>
@@ -567,7 +567,7 @@
     <value>0, 0</value>
   </data>
   <data name="barDockControlLeft.Size" type="System.Drawing.Size, System.Drawing">
-    <value>0, 136</value>
+    <value>0, 135</value>
   </data>
   <data name="&gt;&gt;barDockControlLeft.Name" xml:space="preserve">
     <value>barDockControlLeft</value>
@@ -588,7 +588,7 @@
     <value>294, 0</value>
   </data>
   <data name="barDockControlRight.Size" type="System.Drawing.Size, System.Drawing">
-    <value>0, 136</value>
+    <value>0, 135</value>
   </data>
   <data name="&gt;&gt;barDockControlRight.Name" xml:space="preserve">
     <value>barDockControlRight</value>
@@ -634,7 +634,7 @@
     <value>25, 20, 20, 20</value>
   </data>
   <data name="LabelControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>294, 136</value>
+    <value>294, 135</value>
   </data>
   <data name="LabelControl1.TabIndex" type="System.Int32, mscorlib">
     <value>8</value>

Global_Indexer/frmStart.vb

@@ -5,6 +5,7 @@ Imports DigitalData.Modules.Windows
 Imports DigitalData.Modules.License
 Imports DigitalData.Modules.Base
 Imports DigitalData.GUIs.Common
+Imports DevExpress.LookAndFeel
 
 Public Class frmStart
     Public LicenseManager As LicenseManagerLegacy
@@ -91,6 +92,10 @@ Public Class frmStart
             End If
             DATABASE_ECM.ExecuteNonQuery("DELETE FROM TBGI_FILES_USER WHERE UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')")
 
+            If CONFIG.Config.MyFormsDesign <> "" Then
+                UserLookAndFeel.Default.SetSkinStyle(CONFIG.Config.MyFormsDesign)
+            End If
+
             TopMost = True
 
         Catch ex As Exception
@@ -502,13 +507,19 @@ Public Class frmStart
 
                 If FW_started = True Or CONFIG.Config.FolderWatchScanStarted = True Then
                     'Prüfen ob alle Files abgearbeitet wurden
-                    Dim sql = "SELECT * FROM TBGI_FILES_USER WHERE WORKED = 0 AND HANDLE_TYPE like '%|FW%' AND UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')"
+                    Dim oSql = $"SELECT * FROM TBGI_FILES_USER WHERE WORKED = 0 AND HANDLE_TYPE like '%|FW%' AND USER@WORK = '{Environment.UserName}'"
-                    DTACTUAL_FILES = DATABASE_ECM.GetDatatable(sql)
+                    DTACTUAL_FILES = DATABASE_ECM.GetDatatable(oSql)
 
                     If DTACTUAL_FILES.Rows.Count > 0 Then
                         ABORT_INDEXING = False
-                        ' Dim fil As String
                         Me.TimerFolderWatch.Stop()
+                        If LOGCONFIG.Debug And DebugDisplay = False Then
+                            Clipboard.Clear()
+                            Clipboard.SetText(oSql, TextDataFormat.Text)
+                            DebugDisplay = True
+                            MsgBox("DEBUG - Check TBGI_FILES_USER if necessary. Command copied to Clipboard")
+                        End If
+
                         For Each row As DataRow In DTACTUAL_FILES.Rows
                             Dim FILEGUID = row.Item("GUID")
                             If ABORT_INDEXING = True Then
@@ -527,7 +538,7 @@ Public Class frmStart
 
                                     Open_IndexDialog()
                                 Else
-                                    LOGGER.Info(">> File not existing - Row will be deleted!")
+                                    LOGGER.Info($">> File [{FileForWork}] not existing - row from TBGI_FILES_USER will be deleted!")
                                     Dim del = String.Format("DELETE FROM TBGI_FILES_USER WHERE GUID = {0}", FILEGUID)
                                     DATABASE_ECM.ExecuteNonQuery(del)
                                 End If
@@ -672,4 +683,8 @@ Public Class frmStart
     Private Sub LabelControl1_DragLeave(sender As Object, e As EventArgs) Handles LabelControl1.DragLeave
         'PictureEdit1.Visible = False
     End Sub
+
+    Private Sub frmStart_GiveFeedback(sender As Object, e As GiveFeedbackEventArgs) Handles Me.GiveFeedback
+
+    End Sub
 End Class