MS 2.4.7.0 Anpassung Resultprüfung mit Modules Clipboardwatcher, Namen easyFLOW
This commit is contained in:
Developer01
parent
f33c903fa9
commit
81b0e44d45
@ -17,6 +17,9 @@
|
||||
<setting name="GHOSTUSER" serializeAs="String">
|
||||
<value />
|
||||
</setting>
|
||||
<setting name="GDPICTURE_VERSION" serializeAs="String">
|
||||
<value>11.2024</value>
|
||||
</setting>
|
||||
</easyFLOW.My.MySettings>
|
||||
<DevExpress.LookAndFeel.Design.AppSettings>
|
||||
<setting name="DefaultAppSkin" serializeAs="String">
|
||||
@ -87,7 +90,8 @@
|
||||
</DevExpress.LookAndFeel.Design.AppSettings>
|
||||
</applicationSettings>
|
||||
<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>
|
||||
<startup>
|
||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
|
||||
|
||||
@ -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}"
|
||||
|
||||
|
||||
@ -91,6 +91,15 @@ Namespace My
|
||||
Return CType(Me("DD_ECMConnectionString"),String)
|
||||
End Get
|
||||
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 Namespace
|
||||
|
||||
|
||||
@ -19,5 +19,8 @@
|
||||
</SerializableConnectionString></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>
|
||||
</Setting>
|
||||
<Setting Name="GDPICTURE_VERSION" Type="System.String" Scope="Application">
|
||||
<Value Profile="(Default)">11.2024</Value>
|
||||
</Setting>
|
||||
</Settings>
|
||||
</SettingsFile>
|
||||
@ -101,7 +101,8 @@
|
||||
<Reference Include="DigitalData.Controls.RegexEditor">
|
||||
<HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\Controls\DigitalData.Controls.RegexEditor.dll</HintPath>
|
||||
</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>
|
||||
</Reference>
|
||||
<Reference Include="DigitalData.GUIs.Common">
|
||||
|
||||
@ -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")
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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"
|
||||
|
||||
|
||||
|
||||
@ -107,6 +107,7 @@
|
||||
<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="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 Id="NLog" Guid="{08903680-6b02-4ff0-b700-93209381fe1a}">
|
||||
@ -164,13 +165,13 @@
|
||||
</Component>
|
||||
|
||||
<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.filters" Name="GdPicture.NET.14.filters.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\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.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.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.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.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" Name="GdPicture.NET.14.dll" KeyPath="yes" />
|
||||
<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" />
|
||||
<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" />
|
||||
<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" />
|
||||
</Component>
|
||||
|
||||
<Component Id="RegistryKeys" Guid="{72D6927F-8297-4D51-BF4A-813064089A4A}">
|
||||
|
||||
@ -45,7 +45,7 @@
|
||||
</Target>
|
||||
<Target Name="BeforeBuild">
|
||||
<!-- 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" />
|
||||
</GetAssemblyIdentity>
|
||||
<!-- Store the assembly version number in ProductVersion preprocessor variable -->
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user