diff --git a/.gitignore b/.gitignore index ce7ad09..5ac5f54 100644 --- a/.gitignore +++ b/.gitignore @@ -155,4 +155,4 @@ $RECYCLE.BIN/ # Mac desktop service store files .DS_Store -/.vs +.vs diff --git a/Global_Indexer/App.config b/Global_Indexer/App.config index 77bdf81..a993409 100644 --- a/Global_Indexer/App.config +++ b/Global_Indexer/App.config @@ -8,10 +8,10 @@ - Skin/Office 2019 Colorful + Skin/Office 2019 White - Fire Brick + Yale @@ -59,4 +59,4 @@ - + \ No newline at end of file diff --git a/Global_Indexer/ClassConfig.vb b/Global_Indexer/ClassConfig.vb index a2d7afc..c31180d 100644 --- a/Global_Indexer/ClassConfig.vb +++ b/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 OverrideLanguage As String = "" End Class diff --git a/Global_Indexer/ClassFileHandler.vb b/Global_Indexer/ClassFileHandler.vb index d071203..1711f9d 100644 --- a/Global_Indexer/ClassFileHandler.vb +++ b/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, "Global Indexer") + MsgBox("Verknüpfungen können nicht abgelegt werden!", MsgBoxStyle.Critical, "File Flow") Else - MsgBox("Shortcuts cannot be droppped!", MsgBoxStyle.Critical, "Global Indexer") + MsgBox("Shortcuts cannot be droppped!", MsgBoxStyle.Critical, "File Flow") End If Return False End If diff --git a/Global_Indexer/ClassInit.vb b/Global_Indexer/ClassInit.vb index 984a151..250790f 100644 --- a/Global_Indexer/ClassInit.vb +++ b/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) + CONFIG = New ConfigManager(Of ClassConfig)(LOGCONFIG, Application.UserAppDataPath, Application.CommonAppDataPath, Application.StartupPath) 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] ('{0}','GLOBIX',{1})", Environment.UserName, 1) + oSql = String.Format($"SELECT * FROM [dbo].[FNDD_CHECK_USER_MODULE] ('{Environment.UserName}','GLOBIX',{1},'{CONFIG.Config.OverrideLanguage}')") 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 Global Indexer!") + LOGGER.Info(" >> Die Anzahl der aktuell angemeldeten User (" & USERCOUNT_LOGGED_IN.ToString & ") überschreitet die Anzahl der Lizenzen (" & LICENSE_COUNT & ") für File Flow!") 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'" diff --git a/Global_Indexer/My Project/AssemblyInfo.vb b/Global_Indexer/My Project/AssemblyInfo.vb index 10c7224..8c14d1b 100644 --- a/Global_Indexer/My Project/AssemblyInfo.vb +++ b/Global_Indexer/My Project/AssemblyInfo.vb @@ -14,8 +14,8 @@ Imports System.Runtime.InteropServices - - + + @@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + \ No newline at end of file diff --git a/Global_Indexer/frmAdministration.en-US.resx b/Global_Indexer/frmAdministration.en-US.resx index d5dddf8..bf0cc19 100644 --- a/Global_Indexer/frmAdministration.en-US.resx +++ b/Global_Indexer/frmAdministration.en-US.resx @@ -1326,6 +1326,6 @@ The received values can be written to Indicies or used to rename a file. - Adminconsole Global Indexer + Adminconsole File Flow \ No newline at end of file diff --git a/Global_Indexer/frmAdministration.resx b/Global_Indexer/frmAdministration.resx index 36062db..af96d28 100644 --- a/Global_Indexer/frmAdministration.resx +++ b/Global_Indexer/frmAdministration.resx @@ -6737,7 +6737,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei 3, 4, 3, 4 - Global Indexer - Administration + File Flow - Administration viewAssignedGroups diff --git a/Global_Indexer/frmConfig_Basic.vb b/Global_Indexer/frmConfig_Basic.vb index d7412d2..91442ab 100644 --- a/Global_Indexer/frmConfig_Basic.vb +++ b/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 Global Indexer. this might result in unhandled exceptions!", MsgBoxStyle.Exclamation) - LOGGER.Info("User '" & Environment.UserName & "' not configured for Global Indexer! (DBNull - frmConfigBasic)") + MsgBox("Attention: Your Username '" & Environment.UserName & "' is not configured for File Flow. this might result in unhandled exceptions!", MsgBoxStyle.Exclamation) + LOGGER.Info("User '" & Environment.UserName & "' not configured for File Flow! (DBNull - frmConfigBasic)") End If diff --git a/Global_Indexer/frmStart.Designer.vb b/Global_Indexer/frmStart.Designer.vb index 205f9b3..2aad394 100644 --- a/Global_Indexer/frmStart.Designer.vb +++ b/Global_Indexer/frmStart.Designer.vb @@ -255,6 +255,7 @@ 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 diff --git a/Global_Indexer/frmStart.resx b/Global_Indexer/frmStart.resx index 154aae4..2e0e362 100644 --- a/Global_Indexer/frmStart.resx +++ b/Global_Indexer/frmStart.resx @@ -615,7 +615,7 @@ Transparent - Segoe UI, 11.25pt + Calibri, 11.25pt @@ -919,7 +919,7 @@ auszuwählen 296, 193 - 296, 193 + 294, 161 File Flow diff --git a/Global_Indexer/frmStart.vb b/Global_Indexer/frmStart.vb index 3b0a134..035949d 100644 --- a/Global_Indexer/frmStart.vb +++ b/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. Global Indexer 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. File Flow 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. 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." + 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." 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("Global Indexer wird nun geschlossen, weil keine neue Lizenzdaten eingegeben wurden!", MsgBoxStyle.Information) + MsgBox("File Flow wird nun geschlossen, weil keine neue Lizenzdaten eingegeben wurden!", MsgBoxStyle.Information) Else - MsgBox("Global Indexer will now be closed, cause no new license was updated!", MsgBoxStyle.Information) + MsgBox("File Flow will now be closed, cause no new license was updated!", MsgBoxStyle.Information) End If Me.Close()