AppStd/FileFlow
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Jonathan Jenne 2023-03-28 13:57:36 +02:00
commit 2fefe100ee
12 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -155,4 +155,4 @@ $RECYCLE.BIN/
# Mac desktop service store files
.DS_Store
/.vs
.vs

4
Global_Indexer/App.config
View File

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

1
Global_Indexer/ClassConfig.vb
View File

@ -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

4
Global_Indexer/ClassFileHandler.vb
View File

@ -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

6
Global_Indexer/ClassInit.vb
View File

@ -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'"

6
Global_Indexer/My Project/AssemblyInfo.vb
View File

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

2
Global_Indexer/frmAdministration.en-US.resx
View File

@ -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 Global Indexer</value>
<value>Adminconsole File Flow</value>
</data>
</root>

2
Global_Indexer/frmAdministration.resx
View File

@ -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>Global Indexer - Administration</value>
<value>File Flow - Administration</value>
</data>
<data name="&gt;&gt;viewAssignedGroups.Name" xml:space="preserve">
<value>viewAssignedGroups</value>

4
Global_Indexer/frmConfig_Basic.vb
View File

@ -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

1
Global_Indexer/frmStart.Designer.vb generated
View File

@ -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

4
Global_Indexer/frmStart.resx
View File

@ -615,7 +615,7 @@
<value>Transparent</value>
</data>
<data name="LabelControl1.Appearance.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 11.25pt</value>
<value>Calibri, 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>296, 193</value>
<value>294, 161</value>
</data>
<data name="$this.Text" xml:space="preserve">
<value>File Flow</value>

8
Global_Indexer/frmStart.vb
View File

@ -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()