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

MS 2.4.7.0 Anpassung Resultprüfung mit Modules Clipboardwatcher, Namen easyFLOW

Browse Source
This commit is contained in:
Developer01 2025-01-28 15:26:09 +01:00
parent f33c903fa9
commit 81b0e44d45
10 changed files with 45 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/DD_Clipboard_Searcher/App.config
View File

@ -17,6 +17,9 @@
<setting name="GHOSTUSER" serializeAs="String"> <setting name="GHOSTUSER" serializeAs="String">
<value /> <value />
</setting> </setting>
<setting name="GDPICTURE_VERSION" serializeAs="String">
<value>11.2024</value>
</setting>
</easyFLOW.My.MySettings> </easyFLOW.My.MySettings>
<DevExpress.LookAndFeel.Design.AppSettings> <DevExpress.LookAndFeel.Design.AppSettings>
<setting name="DefaultAppSkin" serializeAs="String"> <setting name="DefaultAppSkin" serializeAs="String">
@ -87,7 +90,8 @@
</DevExpress.LookAndFeel.Design.AppSettings> </DevExpress.LookAndFeel.Design.AppSettings>
</applicationSettings> </applicationSettings>
<connectionStrings> <connectionStrings>
<add name="easyFLOW.My.MySettings.DD_ECMConnectionString" connectionString="Data Source=172.24.12.44\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd;Encrypt=False" providerName="System.Data.SqlClient" /> <add name="easyFLOW.My.MySettings.DD_ECMConnectionString" connectionString="Data Source=172.24.12.44\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd;Encrypt=False"
providerName="System.Data.SqlClient" />
</connectionStrings> </connectionStrings>
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" /> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />

11
app/DD_Clipboard_Searcher/ClassInit.vb
View File

@ -342,7 +342,12 @@ Public Class ClassInit
End If End If
WD_UNICODE = Database.GetScalarValue("SELECT WD_UNICODE FROM TBCW_CONFIGURATION WHERE GUID = 1") 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" oSQL = "SELECT LANG_CODE FROM TBDD_GUI_LANGUAGE WHERE ACTIVE = 1 ORDER BY LANG_CODE"
BASEDATA_DT_LANGUAGE = Database.GetDatatable(oSQL) BASEDATA_DT_LANGUAGE = Database.GetDatatable(oSQL)
@ -405,8 +410,8 @@ Public Class ClassInit
Dim oWhereClause = $"USER_ID = {USER_ID}" 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}))" '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 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 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 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 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}" 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}"

9
app/DD_Clipboard_Searcher/My Project/Settings.Designer.vb generated
View File

@ -91,6 +91,15 @@ Namespace My
Return CType(Me("DD_ECMConnectionString"),String) Return CType(Me("DD_ECMConnectionString"),String)
End Get End Get
End Property End Property
<Global.System.Configuration.ApplicationScopedSettingAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Configuration.DefaultSettingValueAttribute("11.2024")> _
Public ReadOnly Property GDPICTURE_VERSION() As String
Get
Return CType(Me("GDPICTURE_VERSION"),String)
End Get
End Property
End Class End Class
End Namespace End Namespace

3
app/DD_Clipboard_Searcher/My Project/Settings.settings
View File

@ -19,5 +19,8 @@
&lt;/SerializableConnectionString&gt;</DesignTimeValue> &lt;/SerializableConnectionString&gt;</DesignTimeValue>
<Value Profile="(Default)">Data Source=172.24.12.44\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd;Encrypt=False</Value> <Value Profile="(Default)">Data Source=172.24.12.44\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd;Encrypt=False</Value>
</Setting> </Setting>
<Setting Name="GDPICTURE_VERSION" Type="System.String" Scope="Application">
<Value Profile="(Default)">11.2024</Value>
</Setting>
</Settings> </Settings>
</SettingsFile> </SettingsFile>

3
app/DD_Clipboard_Searcher/easyFLOW.vbproj
View File

@ -101,7 +101,8 @@
<Reference Include="DigitalData.Controls.RegexEditor"> <Reference Include="DigitalData.Controls.RegexEditor">
<HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\Controls\DigitalData.Controls.RegexEditor.dll</HintPath> <HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\Controls\DigitalData.Controls.RegexEditor.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.GUIs.ClipboardWatcher"> <Reference Include="DigitalData.GUIs.ClipboardWatcher, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\2_DLL Projekte\DDMonorepo\GUIs.ClipboardWatcher\bin\Debug\DigitalData.GUIs.ClipboardWatcher.dll</HintPath> <HintPath>..\..\..\..\2_DLL Projekte\DDMonorepo\GUIs.ClipboardWatcher\bin\Debug\DigitalData.GUIs.ClipboardWatcher.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.GUIs.Common"> <Reference Include="DigitalData.GUIs.Common">

4
app/DD_Clipboard_Searcher/frmAdministration.vb
View File

@ -423,7 +423,7 @@ Public Class frmAdministration
End If End If
If CtrlApplicationAssignment1.Process_DeleteAssignment() = False Then 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 End If
Status_Changed("Prozesszuordnung gelöscht") Status_Changed("Prozesszuordnung gelöscht")
@ -463,7 +463,7 @@ Public Class frmAdministration
End If End If
If CtrlApplicationAssignment1.Window_DeleteAssignment() = False Then 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 End If
Status_Changed("Fensterzuordnung gelöscht") Status_Changed("Fensterzuordnung gelöscht")

12
app/DD_Clipboard_Searcher/frmMain.vb
View File

@ -11,7 +11,7 @@ Imports DevExpress.XtraBars.ToastNotifications
Imports DigitalData.GUIs.Common Imports DigitalData.GUIs.Common
Public Class frmMain Public Class frmMain
Private Const AppTitle = "easyFLOW"
Private WithEvents _Hotkey As New ClassHotkey(Me) Private WithEvents _Hotkey As New ClassHotkey(Me)
Private WithEvents _Watcher As ClasseasyFLOW = ClasseasyFLOW.Singleton 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 Private Sub WatcherChanged_New(ByVal sender As Object, ByVal e As String) Handles _Watcher.Changed
If MONITORING_ACTIVE = False Then 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) 'NotifyIconMain.ShowBalloonTip(20000, "easyFLOW", "Clipboard-watcher is inactive.", ToolTipIcon.Info)
Exit Sub Exit Sub
End If End If
@ -273,7 +273,7 @@ Public Class frmMain
Dim oMessageTitle As String Dim oMessageTitle As String
Dim oMessageText 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) 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 oMessageTitle As String
Dim oMessageText 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) 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 If NOTIFY_MODE.ToUpper = "MSGBOX" Then
@ -385,10 +385,10 @@ Public Class frmMain
Sub Change_Monitoring_State() Sub Change_Monitoring_State()
If MONITORING_ACTIVE = True Then If MONITORING_ACTIVE = True Then
MONITORING_ACTIVE = False 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 Else
MONITORING_ACTIVE = True 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 If
End Sub End Sub
Private Sub frmMain_Shown(sender As Object, e As EventArgs) Handles Me.Shown Private Sub frmMain_Shown(sender As Object, e As EventArgs) Handles Me.Shown

2
app/DD_Clipboard_Searcher/modCurrent.vb
View File

@ -10,7 +10,7 @@ Module modCurrent
Public Database As MSSQLServer Public Database As MSSQLServer
Public DatabaseAppServ As MSSQLServer Public DatabaseAppServ As MSSQLServer
Public Automation As ClassAutomation Public Automation As ClassAutomation
Public AppTitle = "easyFLOW"
Public Const LANGUAGE_GERMAN As String = "de-DE" Public Const LANGUAGE_GERMAN As String = "de-DE"

15
app/SetupVS19/Product.wxs
View File

@ -107,6 +107,7 @@
<File Id="DDZooFlow" Name="DigitalData.Modules.ZooFlow.dll" KeyPath="no" Checksum="yes"/> <File Id="DDZooFlow" Name="DigitalData.Modules.ZooFlow.dll" KeyPath="no" Checksum="yes"/>
<File Id="DDEDMIAPI" Name="DigitalData.Modules.EDMI.API.dll" KeyPath="no" Checksum="yes"/> <File Id="DDEDMIAPI" Name="DigitalData.Modules.EDMI.API.dll" KeyPath="no" Checksum="yes"/>
<File Id="DDLookup" Name="DigitalData.Controls.LookupGrid.dll" KeyPath="no" Checksum="yes"/> <File Id="DDLookup" Name="DigitalData.Controls.LookupGrid.dll" KeyPath="no" Checksum="yes"/>
<File Id="InteropServices.RuntimeInformation" Name="System.Runtime.InteropServices.RuntimeInformation.dll" Source="System.Runtime.InteropServices.RuntimeInformation.dll" KeyPath="no" />
</Component> </Component>
<Component Id="NLog" Guid="{08903680-6b02-4ff0-b700-93209381fe1a}"> <Component Id="NLog" Guid="{08903680-6b02-4ff0-b700-93209381fe1a}">
@ -164,13 +165,13 @@
</Component> </Component>
<Component Id="GDPictureLibs" Guid="9ea5ab43-58ff-4813-9a8b-f854784f0275"> <Component Id="GDPictureLibs" Guid="9ea5ab43-58ff-4813-9a8b-f854784f0275">
<File Id="GdPicture.NET.14" Name="GdPicture.NET.14.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll" KeyPath="yes" /> <File Id="GdPicture.NET.14" Name="GdPicture.NET.14.dll" KeyPath="yes" />
<File Id="GdPicture.NET.14.filters" Name="GdPicture.NET.14.filters.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET.14.filters.dll" /> <File Id="GdPicture.NET.14.filters" Name="GdPicture.NET.14.filters.dll" />
<File Id="GdPicture.NET.14.filters64" Name="GdPicture.NET.14.filters.64.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET.14.filters.64.dll" /> <File Id="GdPicture.NET.14.filters64" Name="GdPicture.NET.14.filters.64.dll" />
<File Id="GdPicture.NET.14.image" Name="GdPicture.NET.14.image.gdimgplug.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET.14.image.gdimgplug.dll" /> <File Id="GdPicture.NET.14.image" Name="GdPicture.NET.14.image.gdimgplug.dll" />
<File Id="GdPicture.NET.14.image64" Name="GdPicture.NET.14.image.gdimgplug.64.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET.14.image.gdimgplug.64.dll" /> <File Id="GdPicture.NET.14.image64" Name="GdPicture.NET.14.image.gdimgplug.64.dll" />
<File Id="GdPicture.NET.14.Imaging" Name="GdPicture.NET.14.Imaging.Rendering.Skia.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET.14.Imaging.Rendering.Skia.dll" /> <File Id="GdPicture.NET.14.Imaging" Name="GdPicture.NET.14.Imaging.Rendering.Skia.dll"/>
<File Id="GdPicture.NET.14.Imaging64" Name="GdPicture.NET.14.Imaging.Rendering.Skia.64.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET.14.Imaging.Rendering.Skia.64.dll" /> <File Id="GdPicture.NET.14.Imaging64" Name="GdPicture.NET.14.Imaging.Rendering.Skia.64.dll" />
</Component> </Component>
<Component Id="RegistryKeys" Guid="{72D6927F-8297-4D51-BF4A-813064089A4A}"> <Component Id="RegistryKeys" Guid="{72D6927F-8297-4D51-BF4A-813064089A4A}">

2
app/SetupVS19/SetupVS19.wixproj
View File

@ -45,7 +45,7 @@
</Target> </Target>
<Target Name="BeforeBuild"> <Target Name="BeforeBuild">
<!-- Get the programs assembly version from the .exe file --> <!-- Get the programs assembly version from the .exe file -->
<GetAssemblyIdentity AssemblyFiles="..\DD_Clipboard_Searcher\bin\$(Configuration)\DD_Clipboard_Watcher.exe"> <GetAssemblyIdentity AssemblyFiles="..\DD_Clipboard_Searcher\bin\$(Configuration)\easyFLOW.exe">
<Output TaskParameter="Assemblies" ItemName="AsmInfo" /> <Output TaskParameter="Assemblies" ItemName="AsmInfo" />
</GetAssemblyIdentity> </GetAssemblyIdentity>
<!-- Store the assembly version number in ProductVersion preprocessor variable --> <!-- Store the assembly version number in ProductVersion preprocessor variable -->