Merge branch 'master' of http://dd-vmp07-com04:3000/SchreiberM/GlobalIndexer

.gitignore

@@ -154,5 +154,5 @@ $RECYCLE.BIN/
 
 # Mac desktop service store files
 .DS_Store
-/.vs/Global_Indexer/v15/Server/sqlite3
+
-/.vs/Global_Indexer/v16/Server/sqlite3
+/.vs

.vs/ProjectSettings.json

@@ -1,3 +0,0 @@
-{
-  "CurrentProjectSetting": null
-}

.vs/VSWorkspaceState.json

@@ -1,7 +0,0 @@
-{
-  "ExpandedNodes": [
-    ""
-  ],
-  "SelectedNode": "\\Global_Indexer.sln",
-  "PreviewInSolutionExplorer": false
-}

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 2019 Colorful</value>
       </setting>
       <setting name="DefaultPalette" serializeAs="String">
-        <value>Yale</value>
+        <value>Fire Brick</value>
       </setting>
       <setting name="TouchUI" serializeAs="String">
         <value></value>
@@ -59,4 +59,4 @@
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+</configuration>

Global_Indexer/ClassConfig.vb

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

Global_Indexer/ClassFileHandler.vb

@@ -130,9 +130,9 @@ Public Class ClassFileHandler
 
             If oTempFilePath.ToUpper.EndsWith(".LNK") Then
                 If USER_LANGUAGE = "de-DE" Then
-                    MsgBox("Verknüpfungen können nicht abgelegt werden!", MsgBoxStyle.Critical, "File Flow")
+                    MsgBox("Verknüpfungen können nicht abgelegt werden!", MsgBoxStyle.Critical, "Global Indexer")
                 Else
-                    MsgBox("Shortcuts cannot be droppped!", MsgBoxStyle.Critical, "File Flow")
+                    MsgBox("Shortcuts cannot be droppped!", MsgBoxStyle.Critical, "Global Indexer")
                 End If
                 Return False
             End If

Global_Indexer/ClassInit.vb

@@ -23,7 +23,7 @@ Public Class ClassInit
     End Sub
 
     Public Sub InitConfig()
-        CONFIG = New ConfigManager(Of ClassConfig)(LOGCONFIG, Application.UserAppDataPath, Application.CommonAppDataPath, Application.StartupPath)
+        CONFIG = New ConfigManager(Of ClassConfig)(LOGCONFIG, Application.UserAppDataPath, Application.CommonAppDataPath)
         LOGCONFIG.Debug = Not CONFIG.Config.LogDEBUG
         LOGGER.Info("Debug log set to: [{0}]", LOGCONFIG.Debug)
 
@@ -237,7 +237,7 @@ Public Class ClassInit
         Try
             Dim oSql As String
 
-            oSql = String.Format($"SELECT * FROM [dbo].[FNDD_CHECK_USER_MODULE] ('{Environment.UserName}','GLOBIX',{1},'{CONFIG.Config.OverrideLanguage}')")
+            oSql = String.Format("SELECT * FROM [dbo].[FNDD_CHECK_USER_MODULE] ('{0}','GLOBIX',{1})", Environment.UserName, 1)
             Dim DT_CHECKUSER_MODULE As DataTable = DATABASE_ECM.GetDatatable(oSql)
             If DT_CHECKUSER_MODULE.Rows.Count = 0 Then
                 LOGGER.Info("DT_CHECKUSER_MODULE.Rows.Count = 0")
@@ -298,7 +298,7 @@ Public Class ClassInit
 
                 If LICENSE_COUNT < USERCOUNT_LOGGED_IN And LICENSE_EXPIRED = False Then
                     MsgBox("Die Anzahl der aktuell angemeldeten User (" & USERCOUNT_LOGGED_IN.ToString & ") überschreitet die Anzahl der aktuellen Lizenzen!" & vbNewLine & "Anzahl der Lizenzen: " & LICENSE_COUNT.ToString & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:")
-                    LOGGER.Info(" >> Die Anzahl der aktuell angemeldeten User (" & USERCOUNT_LOGGED_IN.ToString & ") überschreitet die Anzahl der Lizenzen (" & LICENSE_COUNT & ") für File Flow!")
+                    LOGGER.Info(" >> Die Anzahl der aktuell angemeldeten User (" & USERCOUNT_LOGGED_IN.ToString & ") überschreitet die Anzahl der Lizenzen (" & LICENSE_COUNT & ") für Global Indexer!")
                     If USER_IS_ADMIN = False Then
                         'Anmeldung wieder herausnehmen
                         oSql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_ID & " AND MODULE= 'Global-Indexer'"

Global_Indexer/My Project/AssemblyInfo.vb

@@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.6.5.0")>
+<Assembly: AssemblyVersion("2.6.3.0")>
 <Assembly: AssemblyFileVersion("1.0.0.0")>
 
 <Assembly: NeutralResourcesLanguageAttribute("")> 

Global_Indexer/frmAdministration.en-US.resx

@@ -1326,6 +1326,6 @@ The received values can be written to Indicies or used to rename a file.</value>
 </value>
   </data>
   <data name="$this.Text" xml:space="preserve">
-    <value>Adminconsole File Flow</value>
+    <value>Adminconsole Global Indexer</value>
   </data>
 </root>

Global_Indexer/frmAdministration.resx

@@ -6737,7 +6737,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei
     <value>3, 4, 3, 4</value>
   </data>
   <data name="$this.Text" xml:space="preserve">
-    <value>File Flow - Administration</value>
+    <value>Global Indexer - Administration</value>
   </data>
   <data name="&gt;&gt;viewAssignedGroups.Name" xml:space="preserve">
     <value>viewAssignedGroups</value>

Global_Indexer/frmConfig_Basic.vb

@@ -75,8 +75,8 @@ Public Class frmConfig_Basic
 
                 USER_ID = DATABASE_ECM.GetScalarValue(sql)
                 If IsDBNull(USER_ID) Then
-                    MsgBox("Attention: Your Username '" & Environment.UserName & "' is not configured for File Flow. this might result in unhandled exceptions!", MsgBoxStyle.Exclamation)
+                    MsgBox("Attention: Your Username '" & Environment.UserName & "' is not configured for Global Indexer. this might result in unhandled exceptions!", MsgBoxStyle.Exclamation)
-                    LOGGER.Info("User '" & Environment.UserName & "' not configured for File Flow! (DBNull - frmConfigBasic)")
+                    LOGGER.Info("User '" & Environment.UserName & "' not configured for Global Indexer! (DBNull - frmConfigBasic)")
                 End If
 
 

Global_Indexer/frmStart.Designer.vb

@@ -255,7 +255,6 @@ Partial Class frmStart
         Me.Controls.Add(Me.barDockControlRight)
         Me.Controls.Add(Me.barDockControlBottom)
         Me.Controls.Add(Me.barDockControlTop)
-        Me.FormBorderEffect = DevExpress.XtraEditors.FormBorderEffect.Glow
         Me.IconOptions.Icon = CType(resources.GetObject("frmStart.IconOptions.Icon"), System.Drawing.Icon)
         Me.IconOptions.Image = Global.Global_Indexer.My.Resources.Resources.file
         Me.KeyPreview = True

Global_Indexer/frmStart.resx

@@ -615,7 +615,7 @@
     <value>Transparent</value>
   </data>
   <data name="LabelControl1.Appearance.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Calibri, 11.25pt</value>
+    <value>Segoe UI, 11.25pt</value>
   </data>
   <assembly alias="DevExpress.XtraEditors.v21.2" name="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
   <data name="LabelControl1.AutoSizeMode" type="DevExpress.XtraEditors.LabelAutoSizeMode, DevExpress.XtraEditors.v21.2">
@@ -919,7 +919,7 @@ auszuwählen
     <value>296, 193</value>
   </data>
   <data name="$this.MinimumSize" type="System.Drawing.Size, System.Drawing">
-    <value>294, 161</value>
+    <value>296, 193</value>
   </data>
   <data name="$this.Text" xml:space="preserve">
     <value>File Flow</value>

Global_Indexer/frmStart.vb

@@ -480,11 +480,11 @@ Public Class frmStart
             TimerFolderWatch.Enabled = False
 
             Dim title = "Critical Error"
-            Dim message = $"Database could not be reached. File Flow will NOT work without a database!{vbCrLf}{vbCrLf}Please check your connection.{vbCrLf}The Application will exit now."
+            Dim message = $"Database could not be reached. Global Indexer will NOT work without a database!{vbCrLf}{vbCrLf}Please check your connection.{vbCrLf}The Application will exit now."
 
             If USER_LANGUAGE = "de-DE" Then
                 title = "Kritischer Fehler"
-                message = $"Die Datenbank konnte nicht erreicht werden. File Flow funktioniert NICHT ohne Datenbankverbindung{vbCrLf}{vbCrLf}Bitte überprüfen Sie Ihre Netzwerkverbindung oder benachrichtigen Sie Ihren Administrator.{vbCrLf}Die Anwendung wird nun geschlossen."
+                message = $"Die Datenbank konnte nicht erreicht werden. Global Indexer funktioniert NICHT ohne Datenbankverbindung{vbCrLf}{vbCrLf}Bitte überprüfen Sie Ihre Netzwerkverbindung oder benachrichtigen Sie Ihren Administrator.{vbCrLf}Die Anwendung wird nun geschlossen."
             End If
 
             Dim result = MsgBox(message, MsgBoxStyle.Critical, title)
@@ -573,9 +573,9 @@ Public Class frmStart
     Private Sub TimerClose3Minutes_Tick(sender As Object, e As EventArgs) Handles TimerClose3Minutes.Tick
         If LICENSE_EXPIRED = True Or LICENSE_COUNT < USERCOUNT_LOGGED_IN Then
             If USER_LANGUAGE = "de-DE" Then
-                MsgBox("File Flow wird nun geschlossen, weil keine neue Lizenzdaten eingegeben wurden!", MsgBoxStyle.Information)
+                MsgBox("Global Indexer wird nun geschlossen, weil keine neue Lizenzdaten eingegeben wurden!", MsgBoxStyle.Information)
             Else
-                MsgBox("File Flow will now be closed, cause no new license was updated!", MsgBoxStyle.Information)
+                MsgBox("Global Indexer will now be closed, cause no new license was updated!", MsgBoxStyle.Information)
             End If
 
             Me.Close()