update gdpicture license sql, fix connection strings loading, clean up settings
This commit is contained in:
Jonathan Jenne
parent
b145bdf6b5
commit
9e7f2e2770
@ -1,9 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<configuration>
|
||||
<configSections>
|
||||
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<section name="DD_Clipboard_Watcher.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
|
||||
</sectionGroup>
|
||||
<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System">
|
||||
<section name="DevExpress.LookAndFeel.Design.AppSettings" type="System.Configuration.ClientSettingsSection" requirePermission="false" />
|
||||
</sectionGroup>
|
||||
@ -40,46 +37,11 @@
|
||||
</DevExpress.LookAndFeel.Design.AppSettings>
|
||||
</applicationSettings>
|
||||
<connectionStrings>
|
||||
<add name="DD_Clipboard_Watcher.My.MySettings.DD_ECMConnectionString" connectionString="Data Source=172.24.12.41\tests;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd" providerName="System.Data.SqlClient" />
|
||||
<add name="DD_Clipboard_Watcher.My.MySettings.DD_ECMConnectionString"
|
||||
connectionString="Data Source=172.24.12.41\tests;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd"
|
||||
providerName="System.Data.SqlClient" />
|
||||
</connectionStrings>
|
||||
<startup>
|
||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
|
||||
</startup>
|
||||
<userSettings>
|
||||
<DD_Clipboard_Watcher.My.MySettings>
|
||||
<setting name="WDSearch_maximized" serializeAs="String">
|
||||
<value>False</value>
|
||||
</setting>
|
||||
<setting name="frmResultSearchSplitterDistance" serializeAs="String">
|
||||
<value>555</value>
|
||||
</setting>
|
||||
<setting name="frmResultDocSize" serializeAs="String">
|
||||
<value>0, 0</value>
|
||||
</setting>
|
||||
<setting name="frmResultDocPosition" serializeAs="String">
|
||||
<value>0, 0</value>
|
||||
</setting>
|
||||
<setting name="frmViewerPosition" serializeAs="String">
|
||||
<value>0, 0</value>
|
||||
</setting>
|
||||
<setting name="frmViewerSize" serializeAs="String">
|
||||
<value>0, 0</value>
|
||||
</setting>
|
||||
<setting name="frmProfileMatchPosition" serializeAs="String">
|
||||
<value>0, 0</value>
|
||||
</setting>
|
||||
<setting name="frmProfileMatchSize" serializeAs="String">
|
||||
<value>0, 0</value>
|
||||
</setting>
|
||||
<setting name="LoadDocView" serializeAs="String">
|
||||
<value>False</value>
|
||||
</setting>
|
||||
<setting name="frmResultDataSize" serializeAs="String">
|
||||
<value>0, 0</value>
|
||||
</setting>
|
||||
<setting name="frmResultDataPosition" serializeAs="String">
|
||||
<value>0, 0</value>
|
||||
</setting>
|
||||
</DD_Clipboard_Watcher.My.MySettings>
|
||||
</userSettings>
|
||||
</configuration>
|
||||
@ -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
|
||||
|
||||
@ -54,18 +54,6 @@ Namespace My
|
||||
End Get
|
||||
End Property
|
||||
|
||||
<Global.System.Configuration.UserScopedSettingAttribute(), _
|
||||
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
|
||||
Global.System.Configuration.DefaultSettingValueAttribute("False")> _
|
||||
Public Property WDSearch_maximized() As Boolean
|
||||
Get
|
||||
Return CType(Me("WDSearch_maximized"),Boolean)
|
||||
End Get
|
||||
Set
|
||||
Me("WDSearch_maximized") = value
|
||||
End Set
|
||||
End Property
|
||||
|
||||
<Global.System.Configuration.ApplicationScopedSettingAttribute(), _
|
||||
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
|
||||
Global.System.Configuration.SpecialSettingAttribute(Global.System.Configuration.SpecialSetting.ConnectionString), _
|
||||
@ -76,126 +64,6 @@ Namespace My
|
||||
Return CType(Me("DD_ECMConnectionString"),String)
|
||||
End Get
|
||||
End Property
|
||||
|
||||
<Global.System.Configuration.UserScopedSettingAttribute(), _
|
||||
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
|
||||
Global.System.Configuration.DefaultSettingValueAttribute("555")> _
|
||||
Public Property frmResultSearchSplitterDistance() As Integer
|
||||
Get
|
||||
Return CType(Me("frmResultSearchSplitterDistance"),Integer)
|
||||
End Get
|
||||
Set
|
||||
Me("frmResultSearchSplitterDistance") = value
|
||||
End Set
|
||||
End Property
|
||||
|
||||
<Global.System.Configuration.UserScopedSettingAttribute(), _
|
||||
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
|
||||
Global.System.Configuration.DefaultSettingValueAttribute("0, 0")> _
|
||||
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
|
||||
|
||||
<Global.System.Configuration.UserScopedSettingAttribute(), _
|
||||
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
|
||||
Global.System.Configuration.DefaultSettingValueAttribute("0, 0")> _
|
||||
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
|
||||
|
||||
<Global.System.Configuration.UserScopedSettingAttribute(), _
|
||||
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
|
||||
Global.System.Configuration.DefaultSettingValueAttribute("0, 0")> _
|
||||
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
|
||||
|
||||
<Global.System.Configuration.UserScopedSettingAttribute(), _
|
||||
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
|
||||
Global.System.Configuration.DefaultSettingValueAttribute("0, 0")> _
|
||||
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
|
||||
|
||||
<Global.System.Configuration.UserScopedSettingAttribute(), _
|
||||
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
|
||||
Global.System.Configuration.DefaultSettingValueAttribute("0, 0")> _
|
||||
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
|
||||
|
||||
<Global.System.Configuration.UserScopedSettingAttribute(), _
|
||||
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
|
||||
Global.System.Configuration.DefaultSettingValueAttribute("0, 0")> _
|
||||
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
|
||||
|
||||
<Global.System.Configuration.UserScopedSettingAttribute(), _
|
||||
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
|
||||
Global.System.Configuration.DefaultSettingValueAttribute("False")> _
|
||||
Public Property LoadDocView() As Boolean
|
||||
Get
|
||||
Return CType(Me("LoadDocView"),Boolean)
|
||||
End Get
|
||||
Set
|
||||
Me("LoadDocView") = value
|
||||
End Set
|
||||
End Property
|
||||
|
||||
<Global.System.Configuration.UserScopedSettingAttribute(), _
|
||||
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
|
||||
Global.System.Configuration.DefaultSettingValueAttribute("0, 0")> _
|
||||
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
|
||||
|
||||
<Global.System.Configuration.UserScopedSettingAttribute(), _
|
||||
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
|
||||
Global.System.Configuration.DefaultSettingValueAttribute("0, 0")> _
|
||||
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
|
||||
|
||||
|
||||
@ -2,9 +2,6 @@
|
||||
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="My" GeneratedClassName="MySettings" UseMySettingsClassName="true">
|
||||
<Profiles />
|
||||
<Settings>
|
||||
<Setting Name="WDSearch_maximized" Type="System.Boolean" Scope="User">
|
||||
<Value Profile="(Default)">False</Value>
|
||||
</Setting>
|
||||
<Setting Name="DD_ECMConnectionString" Type="(Connection string)" Scope="Application">
|
||||
<DesignTimeValue Profile="(Default)"><?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></DesignTimeValue>
|
||||
<Value Profile="(Default)">Data Source=172.24.12.41\tests;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd</Value>
|
||||
</Setting>
|
||||
<Setting Name="frmResultSearchSplitterDistance" Type="System.Int32" Scope="User">
|
||||
<Value Profile="(Default)">555</Value>
|
||||
</Setting>
|
||||
<Setting Name="frmResultDocSize" Type="System.Drawing.Size" Scope="User">
|
||||
<Value Profile="(Default)">0, 0</Value>
|
||||
</Setting>
|
||||
<Setting Name="frmResultDocPosition" Type="System.Drawing.Point" Scope="User">
|
||||
<Value Profile="(Default)">0, 0</Value>
|
||||
</Setting>
|
||||
<Setting Name="frmViewerPosition" Type="System.Drawing.Point" Scope="User">
|
||||
<Value Profile="(Default)">0, 0</Value>
|
||||
</Setting>
|
||||
<Setting Name="frmViewerSize" Type="System.Drawing.Size" Scope="User">
|
||||
<Value Profile="(Default)">0, 0</Value>
|
||||
</Setting>
|
||||
<Setting Name="frmProfileMatchPosition" Type="System.Drawing.Point" Scope="User">
|
||||
<Value Profile="(Default)">0, 0</Value>
|
||||
</Setting>
|
||||
<Setting Name="frmProfileMatchSize" Type="System.Drawing.Size" Scope="User">
|
||||
<Value Profile="(Default)">0, 0</Value>
|
||||
</Setting>
|
||||
<Setting Name="LoadDocView" Type="System.Boolean" Scope="User">
|
||||
<Value Profile="(Default)">False</Value>
|
||||
</Setting>
|
||||
<Setting Name="frmResultDataSize" Type="System.Drawing.Size" Scope="User">
|
||||
<Value Profile="(Default)">0, 0</Value>
|
||||
</Setting>
|
||||
<Setting Name="frmResultDataPosition" Type="System.Drawing.Point" Scope="User">
|
||||
<Value Profile="(Default)">0, 0</Value>
|
||||
</Setting>
|
||||
</Settings>
|
||||
</SettingsFile>
|
||||
@ -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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user