diff --git a/app/DD_Clipboard_Searcher/App.config b/app/DD_Clipboard_Searcher/App.config
index 11a189f..8d12d79 100644
--- a/app/DD_Clipboard_Searcher/App.config
+++ b/app/DD_Clipboard_Searcher/App.config
@@ -17,6 +17,9 @@
+
+ 11.2024
+
@@ -87,7 +90,8 @@
-
+
diff --git a/app/DD_Clipboard_Searcher/ClassInit.vb b/app/DD_Clipboard_Searcher/ClassInit.vb
index bd9e6c7..65994e5 100644
--- a/app/DD_Clipboard_Searcher/ClassInit.vb
+++ b/app/DD_Clipboard_Searcher/ClassInit.vb
@@ -342,7 +342,12 @@ Public Class ClassInit
End If
WD_UNICODE = Database.GetScalarValue("SELECT WD_UNICODE FROM TBCW_CONFIGURATION WHERE GUID = 1")
- GDPICTURE_LICENSE = Database.GetScalarValue("SELECT LICENSE FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE'")
+ oSQL = $"SELECT COALESCE(MAX(LICENSE),'') FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE'
+ and VERSION = '{My.Settings.GDPICTURE_VERSION}' AND ACTIVE = 1"
+ GDPICTURE_LICENSE = Database.GetScalarValue(oSQL)
+ If GDPICTURE_LICENSE = String.Empty Then
+ Logger.Info($"ATTENTION: GDPICTURE VERSION is nothing. [{oSQL}]")
+ End If
oSQL = "SELECT LANG_CODE FROM TBDD_GUI_LANGUAGE WHERE ACTIVE = 1 ORDER BY LANG_CODE"
BASEDATA_DT_LANGUAGE = Database.GetDatatable(oSQL)
@@ -405,8 +410,8 @@ Public Class ClassInit
Dim oWhereClause = $"USER_ID = {USER_ID}"
'OR GROUP_ID IN (SELECT DISTINCT GUID FROM TBDD_GROUPS WHERE GUID IN (SELECT GROUP_ID FROM TBDD_GROUPS_USER WHERE USER_ID = {USER_ID}))"
- Dim ProfileSQL As String = $"SELECT DISTINCT PROFIL_ID, PROFIL_NAME,REGEX_EXPRESSION,COMMENT,PROC_NAME,PROFILE_TYPE FROM VWCW_USER_PROFILE WHERE {oWhereClause}"
- Dim oProcessSQL As String = $"SELECT DISTINCT T1.PROFIL_ID, T.PROC_NAME FROM TBCW_PROFILE_PROCESS T, VWCW_USER_PROFILE T1 WHERE T.PROFILE_ID = T1.PROFIL_ID AND ({oWhereClause})"
+ Dim ProfileSQL As String = $"SELECT DISTINCT PROFIL_ID [GUID], PROFIL_ID, PROFIL_NAME,REGEX_EXPRESSION,COMMENT,PROC_NAME,PROFILE_TYPE FROM VWCW_USER_PROFILE WHERE {oWhereClause}"
+ Dim oProcessSQL As String = $"SELECT DISTINCT T.GUID, T1.PROFIL_ID, T.PROC_NAME FROM TBCW_PROFILE_PROCESS T, VWCW_USER_PROFILE T1 WHERE T.PROFILE_ID = T1.PROFIL_ID AND ({oWhereClause})"
Dim oWindowSQL As String = $"SELECT DISTINCT T.* FROM VWCW_PROFILE_REL_WINDOW T, VWCW_USER_PROFILE T1 WHERE T.PROFILE_ID = T1.PROFIL_ID AND T1.USER_ID = {USER_ID}"
Dim oControlSQL As String = $"SELECT DISTINCT T.* FROM VWCW_PROFILE_REL_CONTROL T, VWCW_USER_PROFILE T1 WHERE T.PROFILE_ID = T1.PROFIL_ID AND T1.USER_ID = {USER_ID}"
diff --git a/app/DD_Clipboard_Searcher/My Project/Settings.Designer.vb b/app/DD_Clipboard_Searcher/My Project/Settings.Designer.vb
index be7bd55..b62c396 100644
--- a/app/DD_Clipboard_Searcher/My Project/Settings.Designer.vb
+++ b/app/DD_Clipboard_Searcher/My Project/Settings.Designer.vb
@@ -91,6 +91,15 @@ Namespace My
Return CType(Me("DD_ECMConnectionString"),String)
End Get
End Property
+
+ _
+ Public ReadOnly Property GDPICTURE_VERSION() As String
+ Get
+ Return CType(Me("GDPICTURE_VERSION"),String)
+ End Get
+ End Property
End Class
End Namespace
diff --git a/app/DD_Clipboard_Searcher/My Project/Settings.settings b/app/DD_Clipboard_Searcher/My Project/Settings.settings
index 48ee3af..1719b4e 100644
--- a/app/DD_Clipboard_Searcher/My Project/Settings.settings
+++ b/app/DD_Clipboard_Searcher/My Project/Settings.settings
@@ -19,5 +19,8 @@
</SerializableConnectionString>
Data Source=172.24.12.44\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd;Encrypt=False
+
+ 11.2024
+
\ No newline at end of file
diff --git a/app/DD_Clipboard_Searcher/easyFLOW.vbproj b/app/DD_Clipboard_Searcher/easyFLOW.vbproj
index c8f0354..60c64c0 100644
--- a/app/DD_Clipboard_Searcher/easyFLOW.vbproj
+++ b/app/DD_Clipboard_Searcher/easyFLOW.vbproj
@@ -101,7 +101,8 @@
P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\Controls\DigitalData.Controls.RegexEditor.dll
-
+
+ False
..\..\..\..\2_DLL Projekte\DDMonorepo\GUIs.ClipboardWatcher\bin\Debug\DigitalData.GUIs.ClipboardWatcher.dll
diff --git a/app/DD_Clipboard_Searcher/frmAdministration.vb b/app/DD_Clipboard_Searcher/frmAdministration.vb
index de2fd8f..16f53a0 100644
--- a/app/DD_Clipboard_Searcher/frmAdministration.vb
+++ b/app/DD_Clipboard_Searcher/frmAdministration.vb
@@ -423,7 +423,7 @@ Public Class frmAdministration
End If
If CtrlApplicationAssignment1.Process_DeleteAssignment() = False Then
- MsgBox("Error while deleting assignment of process!", MsgBoxStyle.Critical, "easyFLOW")
+ MsgBox("Error while deleting assignment of process!", MsgBoxStyle.Critical, AppTitle)
End If
Status_Changed("Prozesszuordnung gelöscht")
@@ -463,7 +463,7 @@ Public Class frmAdministration
End If
If CtrlApplicationAssignment1.Window_DeleteAssignment() = False Then
- MsgBox("Error while deleting assignment of window!", MsgBoxStyle.Critical, "easyFLOW")
+ MsgBox("Error while deleting assignment of window!", MsgBoxStyle.Critical, AppTitle)
End If
Status_Changed("Fensterzuordnung gelöscht")
diff --git a/app/DD_Clipboard_Searcher/frmMain.vb b/app/DD_Clipboard_Searcher/frmMain.vb
index d4eee6c..c448fd1 100644
--- a/app/DD_Clipboard_Searcher/frmMain.vb
+++ b/app/DD_Clipboard_Searcher/frmMain.vb
@@ -11,7 +11,7 @@ Imports DevExpress.XtraBars.ToastNotifications
Imports DigitalData.GUIs.Common
Public Class frmMain
- Private Const AppTitle = "easyFLOW"
+
Private WithEvents _Hotkey As New ClassHotkey(Me)
Private WithEvents _Watcher As ClasseasyFLOW = ClasseasyFLOW.Singleton
@@ -176,7 +176,7 @@ Public Class frmMain
Private Sub WatcherChanged_New(ByVal sender As Object, ByVal e As String) Handles _Watcher.Changed
If MONITORING_ACTIVE = False Then
- Logger.Info("easyFLOW is inactive!")
+ Logger.Info($"{AppTitle} is inactive!")
'NotifyIconMain.ShowBalloonTip(20000, "easyFLOW", "Clipboard-watcher is inactive.", ToolTipIcon.Info)
Exit Sub
End If
@@ -273,7 +273,7 @@ Public Class frmMain
Dim oMessageTitle As String
Dim oMessageText As String
- oMessageTitle = "easyFLOW"
+ oMessageTitle = AppTitle
oMessageText = String.Format(S.Es_wurden_keine_passenden_Profile_gefunden_für_die_Suche_nach___0___, CURRENT_CLIPBOARD_CONTENTS)
@@ -299,7 +299,7 @@ Public Class frmMain
Dim oMessageTitle As String
Dim oMessageText As String
- oMessageTitle = "easyFLOW"
+ oMessageTitle = AppTitle
oMessageText = String.Format(S.Es_wurden_weder_Dokumente_noch_Daten_gefunden_für_die_Suche_nach___0___, CURRENT_CLIPBOARD_CONTENTS)
If NOTIFY_MODE.ToUpper = "MSGBOX" Then
@@ -385,10 +385,10 @@ Public Class frmMain
Sub Change_Monitoring_State()
If MONITORING_ACTIVE = True Then
MONITORING_ACTIVE = False
- NotifyIconMain.ShowBalloonTip(30000, "easyFLOW", S.Clipboard_Watcher_wurde_deaktiviert_, ToolTipIcon.Info)
+ NotifyIconMain.ShowBalloonTip(30000, AppTitle, S.Clipboard_Watcher_wurde_deaktiviert_, ToolTipIcon.Info)
Else
MONITORING_ACTIVE = True
- NotifyIconMain.ShowBalloonTip(30000, "easyFLOW", S.Clipboard_Watcher_wurde_wieder_aktiviert_, ToolTipIcon.Info)
+ NotifyIconMain.ShowBalloonTip(30000, AppTitle, S.Clipboard_Watcher_wurde_wieder_aktiviert_, ToolTipIcon.Info)
End If
End Sub
Private Sub frmMain_Shown(sender As Object, e As EventArgs) Handles Me.Shown
diff --git a/app/DD_Clipboard_Searcher/modCurrent.vb b/app/DD_Clipboard_Searcher/modCurrent.vb
index 48aec30..11f23e6 100644
--- a/app/DD_Clipboard_Searcher/modCurrent.vb
+++ b/app/DD_Clipboard_Searcher/modCurrent.vb
@@ -10,7 +10,7 @@ Module modCurrent
Public Database As MSSQLServer
Public DatabaseAppServ As MSSQLServer
Public Automation As ClassAutomation
-
+ Public AppTitle = "easyFLOW"
Public Const LANGUAGE_GERMAN As String = "de-DE"
diff --git a/app/SetupVS19/Product.wxs b/app/SetupVS19/Product.wxs
index a9d0f16..7afb33b 100644
--- a/app/SetupVS19/Product.wxs
+++ b/app/SetupVS19/Product.wxs
@@ -107,6 +107,7 @@
+
@@ -164,13 +165,13 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/app/SetupVS19/SetupVS19.wixproj b/app/SetupVS19/SetupVS19.wixproj
index 5ecdbd3..9e3677a 100644
--- a/app/SetupVS19/SetupVS19.wixproj
+++ b/app/SetupVS19/SetupVS19.wixproj
@@ -45,7 +45,7 @@
-
+