From 9e7f2e2770e8300515abb691d871f265946d20b5 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 29 Oct 2019 16:16:27 +0100 Subject: [PATCH] update gdpicture license sql, fix connection strings loading, clean up settings --- app/DD_Clipboard_Searcher/App.config | 44 +----- app/DD_Clipboard_Searcher/ClassInit.vb | 2 +- .../My Project/Settings.Designer.vb | 132 ------------------ .../My Project/Settings.settings | 33 ----- .../ctrlApplicationAssignment.vb | 8 +- 5 files changed, 11 insertions(+), 208 deletions(-) diff --git a/app/DD_Clipboard_Searcher/App.config b/app/DD_Clipboard_Searcher/App.config index 65c9781..7f96e4b 100644 --- a/app/DD_Clipboard_Searcher/App.config +++ b/app/DD_Clipboard_Searcher/App.config @@ -1,9 +1,6 @@ - -
-
@@ -40,46 +37,11 @@ - + - - - - False - - - 555 - - - 0, 0 - - - 0, 0 - - - 0, 0 - - - 0, 0 - - - 0, 0 - - - 0, 0 - - - False - - - 0, 0 - - - 0, 0 - - - \ No newline at end of file diff --git a/app/DD_Clipboard_Searcher/ClassInit.vb b/app/DD_Clipboard_Searcher/ClassInit.vb index 10eb59a..f558a4b 100644 --- a/app/DD_Clipboard_Searcher/ClassInit.vb +++ b/app/DD_Clipboard_Searcher/ClassInit.vb @@ -188,7 +188,7 @@ Public Class ClassInit End If WD_UNICODE = Database.GetScalarValue("SELECT WD_UNICODE FROM TBCW_CONFIGURATION WHERE GUID = 1") - GDPICTURE_LICENSE = Database.GetScalarValue("SELECT GDPICTURE_LICENSE FROM TBCW_CONFIGURATION WHERE GUID = 1") + GDPICTURE_LICENSE = Database.GetScalarValue("SELECT LICENSE FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE'") Logger.Debug(" >> Count Users logged in: " & USERCOUNT_LOGGED_IN.ToString, False) If LICENSE_COUNT < USERCOUNT_LOGGED_IN And LICENSE_EXPIRED = False Then diff --git a/app/DD_Clipboard_Searcher/My Project/Settings.Designer.vb b/app/DD_Clipboard_Searcher/My Project/Settings.Designer.vb index 063b1e9..5f2b0ea 100644 --- a/app/DD_Clipboard_Searcher/My Project/Settings.Designer.vb +++ b/app/DD_Clipboard_Searcher/My Project/Settings.Designer.vb @@ -54,18 +54,6 @@ Namespace My End Get End Property - _ - Public Property WDSearch_maximized() As Boolean - Get - Return CType(Me("WDSearch_maximized"),Boolean) - End Get - Set - Me("WDSearch_maximized") = value - End Set - End Property - _ - Public Property frmResultSearchSplitterDistance() As Integer - Get - Return CType(Me("frmResultSearchSplitterDistance"),Integer) - End Get - Set - Me("frmResultSearchSplitterDistance") = value - End Set - End Property - - _ - Public Property frmResultDocSize() As Global.System.Drawing.Size - Get - Return CType(Me("frmResultDocSize"),Global.System.Drawing.Size) - End Get - Set - Me("frmResultDocSize") = value - End Set - End Property - - _ - Public Property frmResultDocPosition() As Global.System.Drawing.Point - Get - Return CType(Me("frmResultDocPosition"),Global.System.Drawing.Point) - End Get - Set - Me("frmResultDocPosition") = value - End Set - End Property - - _ - Public Property frmViewerPosition() As Global.System.Drawing.Point - Get - Return CType(Me("frmViewerPosition"),Global.System.Drawing.Point) - End Get - Set - Me("frmViewerPosition") = value - End Set - End Property - - _ - Public Property frmViewerSize() As Global.System.Drawing.Size - Get - Return CType(Me("frmViewerSize"),Global.System.Drawing.Size) - End Get - Set - Me("frmViewerSize") = value - End Set - End Property - - _ - Public Property frmProfileMatchPosition() As Global.System.Drawing.Point - Get - Return CType(Me("frmProfileMatchPosition"),Global.System.Drawing.Point) - End Get - Set - Me("frmProfileMatchPosition") = value - End Set - End Property - - _ - Public Property frmProfileMatchSize() As Global.System.Drawing.Size - Get - Return CType(Me("frmProfileMatchSize"),Global.System.Drawing.Size) - End Get - Set - Me("frmProfileMatchSize") = value - End Set - End Property - - _ - Public Property LoadDocView() As Boolean - Get - Return CType(Me("LoadDocView"),Boolean) - End Get - Set - Me("LoadDocView") = value - End Set - End Property - - _ - Public Property frmResultDataSize() As Global.System.Drawing.Size - Get - Return CType(Me("frmResultDataSize"),Global.System.Drawing.Size) - End Get - Set - Me("frmResultDataSize") = value - End Set - End Property - - _ - Public Property frmResultDataPosition() As Global.System.Drawing.Point - Get - Return CType(Me("frmResultDataPosition"),Global.System.Drawing.Point) - End Get - Set - Me("frmResultDataPosition") = value - End Set - 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 cf59b31..8ca5281 100644 --- a/app/DD_Clipboard_Searcher/My Project/Settings.settings +++ b/app/DD_Clipboard_Searcher/My Project/Settings.settings @@ -2,9 +2,6 @@ - - False - <?xml version="1.0" encoding="utf-16"?> <SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> @@ -13,35 +10,5 @@ </SerializableConnectionString> Data Source=172.24.12.41\tests;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd - - 555 - - - 0, 0 - - - 0, 0 - - - 0, 0 - - - 0, 0 - - - 0, 0 - - - 0, 0 - - - False - - - 0, 0 - - - 0, 0 - \ No newline at end of file diff --git a/app/DD_Clipboard_Searcher/ctrlApplicationAssignment.vb b/app/DD_Clipboard_Searcher/ctrlApplicationAssignment.vb index 6741397..3b478e5 100644 --- a/app/DD_Clipboard_Searcher/ctrlApplicationAssignment.vb +++ b/app/DD_Clipboard_Searcher/ctrlApplicationAssignment.vb @@ -12,11 +12,17 @@ Public Class ctrlApplicationAssignment Public Property SelectedWindowId As Integer = 0 Public Property SelectedControlId As Integer = 0 - Private Sub ctrlApplicationAssignment_Load(sender As Object, e As EventArgs) Handles Me.Load + Public Sub New() + ' Dieser Aufruf ist für den Designer erforderlich. + InitializeComponent() + + ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. TBCW_PROFILE_PROCESSTableAdapter.Connection.ConnectionString = MyConnectionString TBCW_PROF_REL_WINDOWTableAdapter.Connection.ConnectionString = MyConnectionString TBCW_PROF_REL_CONTROLTableAdapter.Connection.ConnectionString = MyConnectionString + End Sub + Private Sub ctrlApplicationAssignment_Load(sender As Object, e As EventArgs) Handles Me.Load AddHandler RepositoryItemRegexEdit.ButtonClick, AddressOf RepositoryItemRegexEdit_Click AddHandler RepositoryItemButtonEdit1.ButtonClick, AddressOf RepositoryItemRegexEdit_Click End Sub