diff --git a/Global_Indexer/ClassFileHandler.vb b/Global_Indexer/ClassFileHandler.vb index 9cff488..8913bc2 100644 --- a/Global_Indexer/ClassFileHandler.vb +++ b/Global_Indexer/ClassFileHandler.vb @@ -131,9 +131,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, "fileFLOW") Else - MsgBox("Shortcuts cannot be droppped!", MsgBoxStyle.Critical, "File Flow") + MsgBox("Shortcuts cannot be droppped!", MsgBoxStyle.Critical, "fileFLOW") End If Return False End If diff --git a/Global_Indexer/ClassInit.vb b/Global_Indexer/ClassInit.vb index 25e3f47..eb13ded 100644 --- a/Global_Indexer/ClassInit.vb +++ b/Global_Indexer/ClassInit.vb @@ -302,7 +302,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 fileFLOW!") 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/Global_Indexer.vbproj b/Global_Indexer/Global_Indexer.vbproj index 47f52cf..fdf9a67 100644 --- a/Global_Indexer/Global_Indexer.vbproj +++ b/Global_Indexer/Global_Indexer.vbproj @@ -502,9 +502,11 @@ frmLicense.vb + Designer frmLicense.vb + Designer frmLookupGrid.vb diff --git a/Global_Indexer/My Project/AssemblyInfo.vb b/Global_Indexer/My Project/AssemblyInfo.vb index 937958a..42ba56f 100644 --- a/Global_Indexer/My Project/AssemblyInfo.vb +++ b/Global_Indexer/My Project/AssemblyInfo.vb @@ -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 bf0cc19..65f2b89 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 File Flow + Adminconsole fileFLOW \ No newline at end of file diff --git a/Global_Indexer/frmAdministration.resx b/Global_Indexer/frmAdministration.resx index 08c40bd..f9da5be 100644 --- a/Global_Indexer/frmAdministration.resx +++ b/Global_Indexer/frmAdministration.resx @@ -8117,7 +8117,7 @@ der Datei 3, 4, 3, 4 - File Flow - Administration + fileFLOW - Administration viewAssignedGroups diff --git a/Global_Indexer/frmConfig_Basic.resx b/Global_Indexer/frmConfig_Basic.resx index 6c88bab..c61ba13 100644 --- a/Global_Indexer/frmConfig_Basic.resx +++ b/Global_Indexer/frmConfig_Basic.resx @@ -1338,7 +1338,7 @@ ausgenommen werden sollen: 3 - Ordner 'GlobalIndexer' in Eigenen Dateien erzeugen + Ordner 'fileFLOW' in Eigenen Dateien erzeugen btnFW_OwnFiles @@ -1362,7 +1362,7 @@ ausgenommen werden sollen: 2 - Ordner 'GlobalIndexer' auf Desktop erzeugen + Ordner 'fileFLOW' auf Desktop erzeugen btnFW_Desktop diff --git a/Global_Indexer/frmConfig_Basic.vb b/Global_Indexer/frmConfig_Basic.vb index c906744..e055498 100644 --- a/Global_Indexer/frmConfig_Basic.vb +++ b/Global_Indexer/frmConfig_Basic.vb @@ -76,8 +76,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) - LOGGER.Info("User '" & Environment.UserName & "' not configured for File Flow! (DBNull - frmConfigBasic)") + MsgBox("Attention: Your Username '" & Environment.UserName & "' is not configured for fileFLOW. this might result in unhandled exceptions!", MsgBoxStyle.Exclamation) + LOGGER.Info("User '" & Environment.UserName & "' not configured for fileFLOW! (DBNull - frmConfigBasic)") End If @@ -234,7 +234,7 @@ Public Class frmConfig_Basic End Sub Private Sub btnFW_Desktop_Click(sender As Object, e As EventArgs) Handles btnFW_Desktop.Click - CURRENT_FOLDERWATCH = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Desktop), "GlobalIndexer") + CURRENT_FOLDERWATCH = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Desktop), "fileFLOW") CheckFolder(CURRENT_FOLDERWATCH, "DEFAULT") End Sub Sub CheckFolder(mypath As String, FOLDER_TYPE As String) @@ -303,7 +303,7 @@ Public Class frmConfig_Basic End Sub Private Sub btnFW_OwnFiles_Click(sender As Object, e As EventArgs) Handles btnFW_OwnFiles.Click - CURRENT_FOLDERWATCH = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "GlobalIndexer") + CURRENT_FOLDERWATCH = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "fileFLOW") CheckFolder(CURRENT_FOLDERWATCH, "DEFAULT") End Sub diff --git a/Global_Indexer/frmLicense.en-US.resx b/Global_Indexer/frmLicense.en-US.resx index 92f214b..0026c3b 100644 --- a/Global_Indexer/frmLicense.en-US.resx +++ b/Global_Indexer/frmLicense.en-US.resx @@ -189,7 +189,7 @@ 143, 16 - GlobalIndexer Licenses: + fileFLOW Licenses: NoControl diff --git a/Global_Indexer/frmLicense.resx b/Global_Indexer/frmLicense.resx index 0d1993e..6c44e36 100644 --- a/Global_Indexer/frmLicense.resx +++ b/Global_Indexer/frmLicense.resx @@ -163,7 +163,7 @@ 9 - Anzahl GlobalIndexer Lizenzen: + Anzahl fileFLOW Lizenzen: True diff --git a/Global_Indexer/frmStart.resx b/Global_Indexer/frmStart.resx index b046b7b..6d63041 100644 --- a/Global_Indexer/frmStart.resx +++ b/Global_Indexer/frmStart.resx @@ -236,48 +236,6 @@ 625, 56 - - FolderWatch aktiv - - - Konfiguration - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAhdEVYdFRpdGxlAEFwcGx5O09LO0NoZWNrO0JhcnM7 - UmliYm9uO2RjyGgAAADESURBVDhPpZPRDYQgEEQtxUL4tiwT/88qLMZ2TK4Abt9GzMCtmMt9vAjLzAQW - HFJKLZOxGrtxnDCmxlql18lovIy3kW9gDQ3aKoDCZkSmCLQeUgJIjYQ98HgA5+ptW1lkjGcigOao6I4l - 54xeaysFOqzFCDcHATsFrkmLuk2fi3lu1o6vgFNYQnpm8IDqCGJ4MoMfoW3iXIwPZvAmRtfoIXybunJd - I0QPqWeG6yHBaPz1lEsIqb1XyRoaN4MGFH74ndPwASbJh+jVDWBmAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAhdEVYdFRpdGxlAEFwcGx5O09LO0NoZWNrO0JhcnM7 - UmliYm9uO2RjyGgAAAGcSURBVFhHxZcxcsIwEEU5AVWO4z4dZ8gBcgZm6LhNWsrcIh0dV6B19nm0Hln5 - sleG4OINRvq7+7FXktn1fb8pcvCVjBdd1y2xNw7G2bgYV+Oe4Jox5tCgVTlGWgy8GZ/Gt9EHQUsMsSpn - 2MC78WWoIhGIJcef3BEDH8aPoRK3QA5yTfIvGSDgZqiEayDXxMScAW7ZM355CTnHx1EzQNM88syXIPfQ - mDUDdK4KXMNJjAE1pAHWbstSm+OUcqo5auyVATYQFdDKUDzlVPNwcE1ugF1MiVsYi6ecSgNn1+RitlIl - jjIpnnIqHVxck4vZz5UYag3lqOLHQpNzdV0ewKGixDY9zNdMtBaHu2vzoFkDSVOaWFMcpIHqI3BN0rmJ - tcVBPoJqE7om0z5SHGQTzi3Do+sUzBf6JeQyXNqIpAnGC10EuRFFtuKJCb4X8xGqWzFEDqPBBJ/FeJTq - YQTR43ht8cXjGDZ9IXE2fSVzCHjGnSDHpDhEDAC37JFXNGLH254TNQA0DZ3b8raElpih4RQtBpz//Wu2 - FXLwdfS7XxGwk2isBZLIAAAAAElFTkSuQmCC - - - - Administration - - - User Basis Einstellungen - - - Historie - Bereits indexierte Dateien - - - Info - Statusleiste @@ -370,7 +328,7 @@ True - 90 + 230 294, 161 @@ -686,7 +644,7 @@ auszuwählen 294, 161 - File Flow + fileFLOW TimerFolderWatch @@ -814,4 +772,46 @@ auszuwählen DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + Konfiguration + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAhdEVYdFRpdGxlAEFwcGx5O09LO0NoZWNrO0JhcnM7 + UmliYm9uO2RjyGgAAADESURBVDhPpZPRDYQgEEQtxUL4tiwT/88qLMZ2TK4Abt9GzMCtmMt9vAjLzAQW + HFJKLZOxGrtxnDCmxlql18lovIy3kW9gDQ3aKoDCZkSmCLQeUgJIjYQ98HgA5+ptW1lkjGcigOao6I4l + 54xeaysFOqzFCDcHATsFrkmLuk2fi3lu1o6vgFNYQnpm8IDqCGJ4MoMfoW3iXIwPZvAmRtfoIXybunJd + I0QPqWeG6yHBaPz1lEsIqb1XyRoaN4MGFH74ndPwASbJh+jVDWBmAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAhdEVYdFRpdGxlAEFwcGx5O09LO0NoZWNrO0JhcnM7 + UmliYm9uO2RjyGgAAAGcSURBVFhHxZcxcsIwEEU5AVWO4z4dZ8gBcgZm6LhNWsrcIh0dV6B19nm0Hln5 + sleG4OINRvq7+7FXktn1fb8pcvCVjBdd1y2xNw7G2bgYV+Oe4Jox5tCgVTlGWgy8GZ/Gt9EHQUsMsSpn + 2MC78WWoIhGIJcef3BEDH8aPoRK3QA5yTfIvGSDgZqiEayDXxMScAW7ZM355CTnHx1EzQNM88syXIPfQ + mDUDdK4KXMNJjAE1pAHWbstSm+OUcqo5auyVATYQFdDKUDzlVPNwcE1ugF1MiVsYi6ecSgNn1+RitlIl + jjIpnnIqHVxck4vZz5UYag3lqOLHQpNzdV0ewKGixDY9zNdMtBaHu2vzoFkDSVOaWFMcpIHqI3BN0rmJ + tcVBPoJqE7om0z5SHGQTzi3Do+sUzBf6JeQyXNqIpAnGC10EuRFFtuKJCb4X8xGqWzFEDqPBBJ/FeJTq + YQTR43ht8cXjGDZ9IXE2fSVzCHjGnSDHpDhEDAC37JFXNGLH254TNQA0DZ3b8raElpih4RQtBpz//Wu2 + FXLwdfS7XxGwk2isBZLIAAAAAElFTkSuQmCC + + + + Administration + + + User Basis Einstellungen + + + Historie - Bereits indexierte Dateien + + + Info + + + FolderWatch aktiv + \ No newline at end of file diff --git a/SetupVS19/Config.wxi b/SetupVS19/Config.wxi index c1c5b7c..c2a4737 100644 --- a/SetupVS19/Config.wxi +++ b/SetupVS19/Config.wxi @@ -2,7 +2,7 @@ - + diff --git a/SetupVS19/Product.wxs b/SetupVS19/Product.wxs index b3fd38b..8138908 100644 --- a/SetupVS19/Product.wxs +++ b/SetupVS19/Product.wxs @@ -18,7 +18,7 @@ - +