ZooFlow: Clean up, faster search
This commit is contained in:
Jonathan Jenne
@@ -44,6 +44,9 @@
|
||||
|
||||
Public Const WM_WINDOWPOSCHANGING As Integer = &H46
|
||||
|
||||
Public Const TEXT_MISSING_INPUT = "Bitte vervollständigen Sie die Eingaben!"
|
||||
Public Const TITLE_MISSING_INPUT = "Fehlende Eingaben"
|
||||
|
||||
Class DropType
|
||||
Public Const DROP_TYPE_FILESYSTEM = "|DROPFROMFSYSTEM|"
|
||||
Public Const DROP_TYPE_MESSAGE = "|OUTLOOK_MESSAGE|"
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
Imports DigitalData.Modules.ZooFlow
|
||||
|
||||
Public Class ClassEnvironment
|
||||
Public Shared Function GetEnvironment() As Environment
|
||||
Dim oEnvironment As New Environment() With {
|
||||
.DatabaseIDB = My.DatabaseIDB,
|
||||
.Database = My.DatabaseECM,
|
||||
.Modules = My.Application.Modules,
|
||||
.Service = My.Application.Service,
|
||||
.Settings = My.Application.Settings,
|
||||
.User = My.Application.User
|
||||
}
|
||||
Return oEnvironment
|
||||
End Function
|
||||
End Class
|
||||
@@ -1,4 +0,0 @@
|
||||
Public Class ClassStrings
|
||||
Public Const TEXT_MISSING_INPUT = "Bitte vervollständigen Sie die Eingaben!"
|
||||
Public Const TITLE_MISSING_INPUT = "Fehlende Eingaben"
|
||||
End Class
|
||||
@@ -259,6 +259,6 @@ Public Class ClassValidator
|
||||
End Function
|
||||
|
||||
Private Sub ShowValidationMessage()
|
||||
MsgBox(ClassStrings.TEXT_MISSING_INPUT, MsgBoxStyle.Exclamation, ClassStrings.TITLE_MISSING_INPUT)
|
||||
MsgBox(ClassConstants.TEXT_MISSING_INPUT, MsgBoxStyle.Exclamation, ClassConstants.TITLE_MISSING_INPUT)
|
||||
End Sub
|
||||
End Class
|
||||
@@ -64,7 +64,7 @@
|
||||
<StartupObject>DigitalData.GUIs.ZooFlow.My.MyApplication</StartupObject>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<ApplicationIcon>ZOO_FLOW_ sysicon_48.ico</ApplicationIcon>
|
||||
<ApplicationIcon>Zooflow.ico</ApplicationIcon>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Accessibility" />
|
||||
@@ -217,9 +217,8 @@
|
||||
<Compile Include="Administration\ClassSourceBundle.vb" />
|
||||
<Compile Include="ApplicationEvents.vb" />
|
||||
<Compile Include="ClassDragDrop.vb" />
|
||||
<Compile Include="ClassStrings.vb" />
|
||||
<Compile Include="ClipboardWatcher\ClassProfileLoader.vb" />
|
||||
<Compile Include="ClipboardWatcher\Watcher.vb" />
|
||||
<Compile Include="Modules\ClipboardWatcher\ClassProfileLoader.vb" />
|
||||
<Compile Include="Modules\ClipboardWatcher\Watcher.vb" />
|
||||
<Compile Include="ClassCommandlineArgs.vb" />
|
||||
<Compile Include="clsPatterns.vb" />
|
||||
<Compile Include="DBCW_Stammdaten.Designer.vb">
|
||||
@@ -256,44 +255,44 @@
|
||||
<Compile Include="frmTest.vb">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Globix\ClassExclusions.vb" />
|
||||
<Compile Include="Globix\ClassValidator.vb" />
|
||||
<Compile Include="Globix\frmGlobixNameconvention.Designer.vb">
|
||||
<Compile Include="Modules\Globix\ClassExclusions.vb" />
|
||||
<Compile Include="Modules\Globix\ClassValidator.vb" />
|
||||
<Compile Include="Modules\Globix\frmGlobixNameconvention.Designer.vb">
|
||||
<DependentUpon>frmGlobixNameconvention.vb</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Globix\frmGlobixNameconvention.vb">
|
||||
<Compile Include="Modules\Globix\frmGlobixNameconvention.vb">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Globix\Models\DocumentType.vb" />
|
||||
<Compile Include="Globix\Models\ManualIndex.vb" />
|
||||
<Compile Include="Globix\Models\WorkFile.vb" />
|
||||
<Compile Include="Modules\Globix\Models\DocumentType.vb" />
|
||||
<Compile Include="Modules\Globix\Models\ManualIndex.vb" />
|
||||
<Compile Include="Modules\Globix\Models\WorkFile.vb" />
|
||||
<Compile Include="frmWaitForm.Designer.vb">
|
||||
<DependentUpon>frmWaitForm.vb</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="frmWaitForm.vb">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Globix\ClassUserFiles.vb" />
|
||||
<Compile Include="Modules\Globix\ClassUserFiles.vb" />
|
||||
<Compile Include="modCurrent.vb" />
|
||||
<Compile Include="MyDataset.Designer.vb">
|
||||
<AutoGen>True</AutoGen>
|
||||
<DesignTime>True</DesignTime>
|
||||
<DependentUpon>MyDataset.xsd</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Globix\ClassFolderwatcher.vb" />
|
||||
<Compile Include="Globix\frmGlobixBasicConfig.Designer.vb">
|
||||
<Compile Include="Modules\Globix\ClassFolderwatcher.vb" />
|
||||
<Compile Include="Modules\Globix\frmGlobixBasicConfig.Designer.vb">
|
||||
<DependentUpon>frmGlobixBasicConfig.vb</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Globix\frmGlobixBasicConfig.vb">
|
||||
<Compile Include="Modules\Globix\frmGlobixBasicConfig.vb">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Globix\frmGlobixMissingInput.Designer.vb">
|
||||
<Compile Include="Modules\Globix\frmGlobixMissingInput.Designer.vb">
|
||||
<DependentUpon>frmGlobixMissingInput.vb</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Globix\frmGlobixMissingInput.vb">
|
||||
<Compile Include="Modules\Globix\frmGlobixMissingInput.vb">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Globix\GlobixDataset.Designer.vb">
|
||||
<Compile Include="Modules\Globix\GlobixDataset.Designer.vb">
|
||||
<AutoGen>True</AutoGen>
|
||||
<DesignTime>True</DesignTime>
|
||||
<DependentUpon>GlobixDataset.xsd</DependentUpon>
|
||||
@@ -309,10 +308,10 @@
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Search\ClassControlCreator.vb" />
|
||||
<Compile Include="Globix\ClassFilehandle.vb" />
|
||||
<Compile Include="Modules\Globix\ClassFilehandle.vb" />
|
||||
<Compile Include="ClassInit.vb" />
|
||||
<Compile Include="ClassWindowLayout.vb" />
|
||||
<Compile Include="ClipboardWatcher\State.vb" />
|
||||
<Compile Include="Modules\ClipboardWatcher\State.vb" />
|
||||
<Compile Include="DSIDB_Stammdaten.Designer.vb">
|
||||
<AutoGen>True</AutoGen>
|
||||
<DesignTime>True</DesignTime>
|
||||
@@ -332,16 +331,16 @@
|
||||
<Compile Include="frmFlowForm.vb">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Globix\frmGlobix_IndexFileList.Designer.vb">
|
||||
<Compile Include="Modules\Globix\frmGlobix_IndexFileList.Designer.vb">
|
||||
<DependentUpon>frmGlobix_IndexFileList.vb</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Globix\frmGlobix_IndexFileList.vb">
|
||||
<Compile Include="Modules\Globix\frmGlobix_IndexFileList.vb">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Globix\frmGlobix_Index.Designer.vb">
|
||||
<Compile Include="Modules\Globix\frmGlobix_Index.Designer.vb">
|
||||
<DependentUpon>frmGlobix_Index.vb</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Globix\frmGlobix_Index.vb">
|
||||
<Compile Include="Modules\Globix\frmGlobix_Index.vb">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Search\frmFlowSearch1.Designer.vb">
|
||||
@@ -368,7 +367,7 @@
|
||||
<Compile Include="Search\frmSearchStart.vb">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Globix\State.vb" />
|
||||
<Compile Include="Modules\Globix\State.vb" />
|
||||
<Compile Include="My Project\Resources.Designer.vb">
|
||||
<AutoGen>True</AutoGen>
|
||||
<DesignTime>True</DesignTime>
|
||||
@@ -378,15 +377,8 @@
|
||||
<Compile Include="Queries\ClassCommonQueries.vb" />
|
||||
<Compile Include="Config\ClassConfig.vb" />
|
||||
<Compile Include="ClassConstants.vb" />
|
||||
<Compile Include="ClassEnvironment.vb" />
|
||||
<Compile Include="ClassInitLoader.vb" />
|
||||
<Compile Include="Config\ClassUIConfig.vb" />
|
||||
<Compile Include="frmConfigDatabase.Designer.vb">
|
||||
<DependentUpon>frmConfigDatabase.vb</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="frmConfigDatabase.vb">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
<Compile Include="frmSettings.Designer.vb">
|
||||
<DependentUpon>frmSettings.vb</DependentUpon>
|
||||
</Compile>
|
||||
@@ -451,13 +443,13 @@
|
||||
<EmbeddedResource Include="frmTest.resx">
|
||||
<DependentUpon>frmTest.vb</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Globix\frmGlobixBasicConfig.resx">
|
||||
<EmbeddedResource Include="Modules\Globix\frmGlobixBasicConfig.resx">
|
||||
<DependentUpon>frmGlobixBasicConfig.vb</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Globix\frmGlobixMissingInput.resx">
|
||||
<EmbeddedResource Include="Modules\Globix\frmGlobixMissingInput.resx">
|
||||
<DependentUpon>frmGlobixMissingInput.vb</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Globix\frmGlobixNameconvention.resx">
|
||||
<EmbeddedResource Include="Modules\Globix\frmGlobixNameconvention.resx">
|
||||
<DependentUpon>frmGlobixNameconvention.vb</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="frmWaitForm.resx">
|
||||
@@ -469,16 +461,13 @@
|
||||
<EmbeddedResource Include="Administration\frmAdmin_Start.resx">
|
||||
<DependentUpon>frmAdmin_Start.vb</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="frmConfigDatabase.resx">
|
||||
<DependentUpon>frmConfigDatabase.vb</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="frmFlowForm.resx">
|
||||
<DependentUpon>frmFlowForm.vb</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Globix\frmGlobix_IndexFileList.resx">
|
||||
<EmbeddedResource Include="Modules\Globix\frmGlobix_IndexFileList.resx">
|
||||
<DependentUpon>frmGlobix_IndexFileList.vb</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Globix\frmGlobix_Index.resx">
|
||||
<EmbeddedResource Include="Modules\Globix\frmGlobix_Index.resx">
|
||||
<DependentUpon>frmGlobix_Index.vb</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Search\frmFlowSearch1.resx">
|
||||
@@ -551,15 +540,15 @@
|
||||
<None Include="DSIDB_Stammdaten.xss">
|
||||
<DependentUpon>DSIDB_Stammdaten.xsd</DependentUpon>
|
||||
</None>
|
||||
<None Include="Globix\GlobixDataset.xsc">
|
||||
<None Include="Modules\Globix\GlobixDataset.xsc">
|
||||
<DependentUpon>GlobixDataset.xsd</DependentUpon>
|
||||
</None>
|
||||
<None Include="Globix\GlobixDataset.xsd">
|
||||
<None Include="Modules\Globix\GlobixDataset.xsd">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSDataSetGenerator</Generator>
|
||||
<LastGenOutput>GlobixDataset.Designer.vb</LastGenOutput>
|
||||
</None>
|
||||
<None Include="Globix\GlobixDataset.xss">
|
||||
<None Include="Modules\Globix\GlobixDataset.xss">
|
||||
<DependentUpon>GlobixDataset.xsd</DependentUpon>
|
||||
</None>
|
||||
<None Include="My Project\Settings.settings">
|
||||
@@ -999,7 +988,7 @@
|
||||
<None Include="Resources\Compare_RefreshScriptPreview.png" />
|
||||
<None Include="Resources\refresh_16xMD.png" />
|
||||
<None Include="Resources\Close_16xLG.png" />
|
||||
<Content Include="ZOO_FLOW_ sysicon_48.ico" />
|
||||
<Content Include="Zooflow.ico" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
|
||||
|
Before Width: | Height: | Size: 107 KiB After Width: | Height: | Size: 107 KiB |
272
GUIs.ZooFlow/frmConfigDatabase.Designer.vb
generated
272
GUIs.ZooFlow/frmConfigDatabase.Designer.vb
generated
@@ -1,272 +0,0 @@
|
||||
<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
|
||||
Partial Class frmConfigDatabase
|
||||
Inherits DevExpress.XtraEditors.XtraForm
|
||||
|
||||
'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
|
||||
<System.Diagnostics.DebuggerNonUserCode()> _
|
||||
Protected Overrides Sub Dispose(ByVal disposing As Boolean)
|
||||
Try
|
||||
If disposing AndAlso components IsNot Nothing Then
|
||||
components.Dispose()
|
||||
End If
|
||||
Finally
|
||||
MyBase.Dispose(disposing)
|
||||
End Try
|
||||
End Sub
|
||||
|
||||
'Wird vom Windows Form-Designer benötigt.
|
||||
Private components As System.ComponentModel.IContainer
|
||||
|
||||
'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
|
||||
'Das Bearbeiten ist mit dem Windows Form-Designer möglich.
|
||||
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
|
||||
<System.Diagnostics.DebuggerStepThrough()> _
|
||||
Private Sub InitializeComponent()
|
||||
Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl()
|
||||
Me.btnTestConnection = New DevExpress.XtraEditors.SimpleButton()
|
||||
Me.LayoutControlGroup1 = New DevExpress.XtraLayout.LayoutControlGroup()
|
||||
Me.LayoutControlItem5 = New DevExpress.XtraLayout.LayoutControlItem()
|
||||
Me.EmptySpaceItem2 = New DevExpress.XtraLayout.EmptySpaceItem()
|
||||
Me.txtServerName = New DevExpress.XtraEditors.TextEdit()
|
||||
Me.txtUserName = New DevExpress.XtraEditors.TextEdit()
|
||||
Me.txtPassword = New DevExpress.XtraEditors.TextEdit()
|
||||
Me.cmbDatabase = New DevExpress.XtraEditors.ComboBoxEdit()
|
||||
Me.txtConnectionString = New DevExpress.XtraEditors.TextEdit()
|
||||
Me.chkWinAuth = New DevExpress.XtraEditors.CheckEdit()
|
||||
Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem()
|
||||
Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem()
|
||||
Me.LayoutControlItem4 = New DevExpress.XtraLayout.LayoutControlItem()
|
||||
Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem()
|
||||
Me.LayoutControlItem7 = New DevExpress.XtraLayout.LayoutControlItem()
|
||||
Me.LayoutControlItem6 = New DevExpress.XtraLayout.LayoutControlItem()
|
||||
CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
Me.LayoutControl1.SuspendLayout()
|
||||
CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.EmptySpaceItem2, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.txtServerName.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.txtUserName.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.txtPassword.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.cmbDatabase.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.txtConnectionString.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.chkWinAuth.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
Me.SuspendLayout()
|
||||
'
|
||||
'LayoutControl1
|
||||
'
|
||||
Me.LayoutControl1.Controls.Add(Me.txtServerName)
|
||||
Me.LayoutControl1.Controls.Add(Me.txtUserName)
|
||||
Me.LayoutControl1.Controls.Add(Me.txtPassword)
|
||||
Me.LayoutControl1.Controls.Add(Me.cmbDatabase)
|
||||
Me.LayoutControl1.Controls.Add(Me.btnTestConnection)
|
||||
Me.LayoutControl1.Controls.Add(Me.txtConnectionString)
|
||||
Me.LayoutControl1.Controls.Add(Me.chkWinAuth)
|
||||
Me.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Fill
|
||||
Me.LayoutControl1.Location = New System.Drawing.Point(0, 0)
|
||||
Me.LayoutControl1.Name = "LayoutControl1"
|
||||
Me.LayoutControl1.Root = Me.LayoutControlGroup1
|
||||
Me.LayoutControl1.Size = New System.Drawing.Size(602, 221)
|
||||
Me.LayoutControl1.TabIndex = 0
|
||||
Me.LayoutControl1.Text = "LayoutControl1"
|
||||
'
|
||||
'btnTestConnection
|
||||
'
|
||||
Me.btnTestConnection.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.actions_check4
|
||||
Me.btnTestConnection.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16)
|
||||
Me.btnTestConnection.Location = New System.Drawing.Point(303, 164)
|
||||
Me.btnTestConnection.Name = "btnTestConnection"
|
||||
Me.btnTestConnection.Size = New System.Drawing.Size(287, 22)
|
||||
Me.btnTestConnection.StyleController = Me.LayoutControl1
|
||||
Me.btnTestConnection.TabIndex = 8
|
||||
Me.btnTestConnection.Text = "Verbindung zur Datenbank herstellen"
|
||||
'
|
||||
'LayoutControlGroup1
|
||||
'
|
||||
Me.LayoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True]
|
||||
Me.LayoutControlGroup1.GroupBordersVisible = False
|
||||
Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.LayoutControlItem2, Me.LayoutControlItem4, Me.LayoutControlItem3, Me.LayoutControlItem7, Me.LayoutControlItem6, Me.LayoutControlItem5, Me.EmptySpaceItem2})
|
||||
Me.LayoutControlGroup1.Name = "LayoutControlGroup1"
|
||||
Me.LayoutControlGroup1.Size = New System.Drawing.Size(602, 221)
|
||||
Me.LayoutControlGroup1.TextVisible = False
|
||||
'
|
||||
'LayoutControlItem5
|
||||
'
|
||||
Me.LayoutControlItem5.Control = Me.btnTestConnection
|
||||
Me.LayoutControlItem5.Location = New System.Drawing.Point(291, 152)
|
||||
Me.LayoutControlItem5.Name = "LayoutControlItem5"
|
||||
Me.LayoutControlItem5.Size = New System.Drawing.Size(291, 49)
|
||||
Me.LayoutControlItem5.TextSize = New System.Drawing.Size(0, 0)
|
||||
Me.LayoutControlItem5.TextVisible = False
|
||||
'
|
||||
'EmptySpaceItem2
|
||||
'
|
||||
Me.EmptySpaceItem2.AllowHotTrack = False
|
||||
Me.EmptySpaceItem2.Location = New System.Drawing.Point(0, 152)
|
||||
Me.EmptySpaceItem2.Name = "EmptySpaceItem2"
|
||||
Me.EmptySpaceItem2.Size = New System.Drawing.Size(291, 49)
|
||||
Me.EmptySpaceItem2.TextSize = New System.Drawing.Size(0, 0)
|
||||
'
|
||||
'txtServerName
|
||||
'
|
||||
Me.txtServerName.Location = New System.Drawing.Point(169, 15)
|
||||
Me.txtServerName.Name = "txtServerName"
|
||||
Me.txtServerName.Size = New System.Drawing.Size(418, 20)
|
||||
Me.txtServerName.StyleController = Me.LayoutControl1
|
||||
Me.txtServerName.TabIndex = 4
|
||||
'
|
||||
'txtUserName
|
||||
'
|
||||
Me.txtUserName.Location = New System.Drawing.Point(169, 45)
|
||||
Me.txtUserName.Name = "txtUserName"
|
||||
Me.txtUserName.Size = New System.Drawing.Size(127, 20)
|
||||
Me.txtUserName.StyleController = Me.LayoutControl1
|
||||
Me.txtUserName.TabIndex = 5
|
||||
'
|
||||
'txtPassword
|
||||
'
|
||||
Me.txtPassword.Location = New System.Drawing.Point(460, 45)
|
||||
Me.txtPassword.Name = "txtPassword"
|
||||
Me.txtPassword.Size = New System.Drawing.Size(127, 20)
|
||||
Me.txtPassword.StyleController = Me.LayoutControl1
|
||||
Me.txtPassword.TabIndex = 6
|
||||
'
|
||||
'cmbDatabase
|
||||
'
|
||||
Me.cmbDatabase.Location = New System.Drawing.Point(169, 75)
|
||||
Me.cmbDatabase.Name = "cmbDatabase"
|
||||
Me.cmbDatabase.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
|
||||
Me.cmbDatabase.Size = New System.Drawing.Size(418, 20)
|
||||
Me.cmbDatabase.StyleController = Me.LayoutControl1
|
||||
Me.cmbDatabase.TabIndex = 7
|
||||
'
|
||||
'txtConnectionString
|
||||
'
|
||||
Me.txtConnectionString.Location = New System.Drawing.Point(169, 137)
|
||||
Me.txtConnectionString.Name = "txtConnectionString"
|
||||
Me.txtConnectionString.Properties.ReadOnly = True
|
||||
Me.txtConnectionString.Size = New System.Drawing.Size(418, 20)
|
||||
Me.txtConnectionString.StyleController = Me.LayoutControl1
|
||||
Me.txtConnectionString.TabIndex = 9
|
||||
'
|
||||
'chkWinAuth
|
||||
'
|
||||
Me.chkWinAuth.Location = New System.Drawing.Point(17, 107)
|
||||
Me.chkWinAuth.Name = "chkWinAuth"
|
||||
Me.chkWinAuth.Properties.Caption = "Windows Authentifizierung"
|
||||
Me.chkWinAuth.Size = New System.Drawing.Size(568, 18)
|
||||
Me.chkWinAuth.StyleController = Me.LayoutControl1
|
||||
Me.chkWinAuth.TabIndex = 10
|
||||
'
|
||||
'LayoutControlItem1
|
||||
'
|
||||
Me.LayoutControlItem1.Control = Me.txtServerName
|
||||
Me.LayoutControlItem1.Location = New System.Drawing.Point(0, 0)
|
||||
Me.LayoutControlItem1.Name = "LayoutControlItem1"
|
||||
Me.LayoutControlItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
|
||||
Me.LayoutControlItem1.Size = New System.Drawing.Size(582, 30)
|
||||
Me.LayoutControlItem1.Text = "Server Name:"
|
||||
Me.LayoutControlItem1.TextSize = New System.Drawing.Size(142, 13)
|
||||
'
|
||||
'LayoutControlItem2
|
||||
'
|
||||
Me.LayoutControlItem2.Control = Me.txtUserName
|
||||
Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 30)
|
||||
Me.LayoutControlItem2.Name = "LayoutControlItem2"
|
||||
Me.LayoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
|
||||
Me.LayoutControlItem2.Size = New System.Drawing.Size(291, 30)
|
||||
Me.LayoutControlItem2.Text = "Benutzername:"
|
||||
Me.LayoutControlItem2.TextSize = New System.Drawing.Size(142, 13)
|
||||
'
|
||||
'LayoutControlItem4
|
||||
'
|
||||
Me.LayoutControlItem4.Control = Me.cmbDatabase
|
||||
Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 60)
|
||||
Me.LayoutControlItem4.Name = "LayoutControlItem4"
|
||||
Me.LayoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
|
||||
Me.LayoutControlItem4.Size = New System.Drawing.Size(582, 30)
|
||||
Me.LayoutControlItem4.Text = "Datenbank:"
|
||||
Me.LayoutControlItem4.TextSize = New System.Drawing.Size(142, 13)
|
||||
'
|
||||
'LayoutControlItem3
|
||||
'
|
||||
Me.LayoutControlItem3.Control = Me.txtPassword
|
||||
Me.LayoutControlItem3.Location = New System.Drawing.Point(291, 30)
|
||||
Me.LayoutControlItem3.Name = "LayoutControlItem3"
|
||||
Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
|
||||
Me.LayoutControlItem3.Size = New System.Drawing.Size(291, 30)
|
||||
Me.LayoutControlItem3.Text = "Passwort:"
|
||||
Me.LayoutControlItem3.TextSize = New System.Drawing.Size(142, 13)
|
||||
'
|
||||
'LayoutControlItem7
|
||||
'
|
||||
Me.LayoutControlItem7.Control = Me.chkWinAuth
|
||||
Me.LayoutControlItem7.Location = New System.Drawing.Point(0, 90)
|
||||
Me.LayoutControlItem7.Name = "LayoutControlItem7"
|
||||
Me.LayoutControlItem7.Size = New System.Drawing.Size(582, 32)
|
||||
Me.LayoutControlItem7.Spacing = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
|
||||
Me.LayoutControlItem7.TextSize = New System.Drawing.Size(0, 0)
|
||||
Me.LayoutControlItem7.TextVisible = False
|
||||
'
|
||||
'LayoutControlItem6
|
||||
'
|
||||
Me.LayoutControlItem6.Control = Me.txtConnectionString
|
||||
Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 122)
|
||||
Me.LayoutControlItem6.Name = "LayoutControlItem6"
|
||||
Me.LayoutControlItem6.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
|
||||
Me.LayoutControlItem6.Size = New System.Drawing.Size(582, 30)
|
||||
Me.LayoutControlItem6.Text = "Aktueller Connectionstring:"
|
||||
Me.LayoutControlItem6.TextSize = New System.Drawing.Size(142, 13)
|
||||
'
|
||||
'frmConfigDatabase
|
||||
'
|
||||
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
|
||||
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
|
||||
Me.ClientSize = New System.Drawing.Size(602, 221)
|
||||
Me.Controls.Add(Me.LayoutControl1)
|
||||
Me.Name = "frmConfigDatabase"
|
||||
Me.Text = "Datenbank Verbindung"
|
||||
CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
Me.LayoutControl1.ResumeLayout(False)
|
||||
CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
CType(Me.EmptySpaceItem2, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
CType(Me.txtServerName.Properties, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
CType(Me.txtUserName.Properties, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
CType(Me.txtPassword.Properties, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
CType(Me.cmbDatabase.Properties, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
CType(Me.txtConnectionString.Properties, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
CType(Me.chkWinAuth.Properties, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
Me.ResumeLayout(False)
|
||||
|
||||
End Sub
|
||||
|
||||
Friend WithEvents LayoutControl1 As DevExpress.XtraLayout.LayoutControl
|
||||
Friend WithEvents LayoutControlGroup1 As DevExpress.XtraLayout.LayoutControlGroup
|
||||
Friend WithEvents txtServerName As DevExpress.XtraEditors.TextEdit
|
||||
Friend WithEvents txtUserName As DevExpress.XtraEditors.TextEdit
|
||||
Friend WithEvents txtPassword As DevExpress.XtraEditors.TextEdit
|
||||
Friend WithEvents cmbDatabase As DevExpress.XtraEditors.ComboBoxEdit
|
||||
Friend WithEvents btnTestConnection As DevExpress.XtraEditors.SimpleButton
|
||||
Friend WithEvents txtConnectionString As DevExpress.XtraEditors.TextEdit
|
||||
Friend WithEvents chkWinAuth As DevExpress.XtraEditors.CheckEdit
|
||||
Friend WithEvents LayoutControlItem1 As DevExpress.XtraLayout.LayoutControlItem
|
||||
Friend WithEvents LayoutControlItem2 As DevExpress.XtraLayout.LayoutControlItem
|
||||
Friend WithEvents LayoutControlItem4 As DevExpress.XtraLayout.LayoutControlItem
|
||||
Friend WithEvents LayoutControlItem3 As DevExpress.XtraLayout.LayoutControlItem
|
||||
Friend WithEvents LayoutControlItem7 As DevExpress.XtraLayout.LayoutControlItem
|
||||
Friend WithEvents LayoutControlItem6 As DevExpress.XtraLayout.LayoutControlItem
|
||||
Friend WithEvents LayoutControlItem5 As DevExpress.XtraLayout.LayoutControlItem
|
||||
Friend WithEvents EmptySpaceItem2 As DevExpress.XtraLayout.EmptySpaceItem
|
||||
End Class
|
||||
@@ -1,120 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<root>
|
||||
<!--
|
||||
Microsoft ResX Schema
|
||||
|
||||
Version 2.0
|
||||
|
||||
The primary goals of this format is to allow a simple XML format
|
||||
that is mostly human readable. The generation and parsing of the
|
||||
various data types are done through the TypeConverter classes
|
||||
associated with the data types.
|
||||
|
||||
Example:
|
||||
|
||||
... ado.net/XML headers & schema ...
|
||||
<resheader name="resmimetype">text/microsoft-resx</resheader>
|
||||
<resheader name="version">2.0</resheader>
|
||||
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
|
||||
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
|
||||
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
|
||||
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
|
||||
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
|
||||
<value>[base64 mime encoded serialized .NET Framework object]</value>
|
||||
</data>
|
||||
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
|
||||
<comment>This is a comment</comment>
|
||||
</data>
|
||||
|
||||
There are any number of "resheader" rows that contain simple
|
||||
name/value pairs.
|
||||
|
||||
Each data row contains a name, and value. The row also contains a
|
||||
type or mimetype. Type corresponds to a .NET class that support
|
||||
text/value conversion through the TypeConverter architecture.
|
||||
Classes that don't support this are serialized and stored with the
|
||||
mimetype set.
|
||||
|
||||
The mimetype is used for serialized objects, and tells the
|
||||
ResXResourceReader how to depersist the object. This is currently not
|
||||
extensible. For a given mimetype the value must be set accordingly:
|
||||
|
||||
Note - application/x-microsoft.net.object.binary.base64 is the format
|
||||
that the ResXResourceWriter will generate, however the reader can
|
||||
read any of the formats listed below.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.binary.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.soap.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.bytearray.base64
|
||||
value : The object must be serialized into a byte array
|
||||
: using a System.ComponentModel.TypeConverter
|
||||
: and then encoded with base64 encoding.
|
||||
-->
|
||||
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
||||
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||
<xsd:element name="root" msdata:IsDataSet="true">
|
||||
<xsd:complexType>
|
||||
<xsd:choice maxOccurs="unbounded">
|
||||
<xsd:element name="metadata">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" use="required" type="xsd:string" />
|
||||
<xsd:attribute name="type" type="xsd:string" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="assembly">
|
||||
<xsd:complexType>
|
||||
<xsd:attribute name="alias" type="xsd:string" />
|
||||
<xsd:attribute name="name" type="xsd:string" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="data">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
||||
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="resheader">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:choice>
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:schema>
|
||||
<resheader name="resmimetype">
|
||||
<value>text/microsoft-resx</value>
|
||||
</resheader>
|
||||
<resheader name="version">
|
||||
<value>2.0</value>
|
||||
</resheader>
|
||||
<resheader name="reader">
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<resheader name="writer">
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
</root>
|
||||
@@ -1,118 +0,0 @@
|
||||
Imports DigitalData.Modules.Database
|
||||
Imports DigitalData.Modules.Encryption
|
||||
Imports DigitalData.Modules.Filesystem
|
||||
Imports DigitalData.Modules.Logging
|
||||
|
||||
Public Class frmConfigDatabase
|
||||
Private Const STRING_CONNECTION_SUCCESSFUL = "Die Verbindung wurde erfolgreich aufgebaut!" & vbNewLine & "Möchten Sie diese Verbindung nun in der Anwendung speichern?"
|
||||
|
||||
Private Logger As Logger = My.LogConfig.GetLogger()
|
||||
|
||||
Private Sub frmConfigDatabase_Load(sender As Object, e As EventArgs) Handles MyBase.Load
|
||||
Dim oConnectionString = My.SystemConfig.ConnectionString
|
||||
|
||||
If Not oConnectionString = String.Empty Then
|
||||
Dim oBuilder = My.SystemConfig.GetConnectionStringBuilder(oConnectionString)
|
||||
|
||||
If oBuilder Is Nothing Then
|
||||
MsgBox("Connection String ist ungültig!", MsgBoxStyle.Critical)
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
If oConnectionString.Contains("Trusted") Then
|
||||
chkWinAuth.Checked = True
|
||||
txtConnectionString.Text = oConnectionString
|
||||
Else
|
||||
chkWinAuth.Checked = False
|
||||
txtConnectionString.Text = oConnectionString.Replace(oBuilder.Password, "XXXXXX")
|
||||
txtUserName.Text = oBuilder.UserID
|
||||
End If
|
||||
|
||||
txtServerName.Text = oBuilder.DataSource
|
||||
cmbDatabase.Text = oBuilder.InitialCatalog
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Private Sub chkWinAuth_CheckedChanged(sender As Object, e As EventArgs) Handles chkWinAuth.CheckedChanged
|
||||
txtPassword.Enabled = Not chkWinAuth.Checked
|
||||
txtUserName.Enabled = Not chkWinAuth.Checked
|
||||
End Sub
|
||||
|
||||
Private Sub cmbDatabase_Click(sender As Object, e As EventArgs) Handles cmbDatabase.Click
|
||||
Cursor = Cursors.WaitCursor
|
||||
|
||||
Dim oConnectionString As String = GetConnectionString(False)
|
||||
Dim oDatabase As New MSSQLServer(My.LogConfig, oConnectionString)
|
||||
|
||||
If oDatabase.DBInitialized = False Then
|
||||
MsgBox("Verbindung fehlgeschlagen!", MsgBoxStyle.Critical, Text)
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
Try
|
||||
Using oConnection = New SqlClient.SqlConnection(oConnectionString)
|
||||
oConnection.Open()
|
||||
Using oCommand As New SqlClient.SqlCommand("sp_databases", oConnection)
|
||||
Using oReader As SqlClient.SqlDataReader = oCommand.ExecuteReader
|
||||
If oReader.HasRows Then
|
||||
cmbDatabase.Properties.Items.Clear()
|
||||
|
||||
Do While oReader.Read
|
||||
cmbDatabase.Properties.Items.Add(oReader("Database_Name"))
|
||||
Loop
|
||||
cmbDatabase.ShowPopup()
|
||||
Else
|
||||
MsgBox("The standard-databases could not be retrieved. The default database will be set!" & vbNewLine & "Check rights in sql-server for user: " & Me.txtUserName.Text, MsgBoxStyle.Exclamation)
|
||||
End If
|
||||
End Using
|
||||
End Using
|
||||
End Using
|
||||
|
||||
Catch ex As Exception
|
||||
Logger.Error(ex)
|
||||
End Try
|
||||
|
||||
Cursor = Cursors.Default
|
||||
End Sub
|
||||
|
||||
Private Function GetConnectionString(WithDatabase As Boolean) As String
|
||||
Dim oConnectionString As String
|
||||
|
||||
If chkWinAuth.Checked Then
|
||||
oConnectionString = $"Data Source={txtServerName.Text};Trusted_Connection=True;"
|
||||
Else
|
||||
oConnectionString = $"Server={txtServerName.Text};User Id={txtUserName.Text};Password={txtPassword.Text};"
|
||||
End If
|
||||
|
||||
If WithDatabase Then
|
||||
oConnectionString &= $"Database={cmbDatabase.Text};"
|
||||
End If
|
||||
|
||||
Return oConnectionString
|
||||
End Function
|
||||
|
||||
Private Sub btnTestConnection_Click(sender As Object, e As EventArgs) Handles btnTestConnection.Click
|
||||
Try
|
||||
Dim oConnectionString = GetConnectionString(True)
|
||||
|
||||
Using oConnection As New SqlClient.SqlConnection(oConnectionString)
|
||||
oConnection.Open()
|
||||
oConnection.Close()
|
||||
End Using
|
||||
|
||||
Dim oResult = MessageBox.Show(STRING_CONNECTION_SUCCESSFUL, Text, MessageBoxButtons.YesNo, MessageBoxIcon.Question)
|
||||
|
||||
If oResult = DialogResult.Yes Then
|
||||
Dim oCrypt As New EncryptionLegacy()
|
||||
Dim oEncryptedPassword = oCrypt.EncryptData(txtPassword.Text)
|
||||
Dim oEncryptedConnectionString = $"Server={txtServerName.Text};Database={cmbDatabase.Text};User Id={txtUserName.Text};Password={oEncryptedPassword};"
|
||||
|
||||
My.SystemConfig.ConnectionString = oEncryptedConnectionString
|
||||
My.SystemConfigManager.Save()
|
||||
End If
|
||||
Catch ex As Exception
|
||||
Logger.Error(ex)
|
||||
MsgBox("Error while connecting to Database", MsgBoxStyle.Critical, Text)
|
||||
End Try
|
||||
End Sub
|
||||
End Class
|
||||
@@ -163,7 +163,7 @@ Public Class frmFlowForm
|
||||
Private ClassWindow As Window
|
||||
Private ProfileFilter As ProfileFilter
|
||||
Private ProfileLoader As ClassProfileLoader
|
||||
Private _Environment As Environment
|
||||
Private Property _Environment As Environment
|
||||
|
||||
' Runtime Flags
|
||||
Private ApplicationLoading As Boolean = True
|
||||
@@ -187,7 +187,6 @@ Public Class frmFlowForm
|
||||
Init = New ClassInit(My.LogConfig, Me)
|
||||
AddHandler Init.Completed, AddressOf Init_Completed
|
||||
Init.InitializeApplication()
|
||||
_Environment = My.Application.GetEnvironment
|
||||
|
||||
' === Register Sidebar ===
|
||||
RegisterBar(ABEdge.ABE_RIGHT)
|
||||
@@ -204,6 +203,8 @@ Public Class frmFlowForm
|
||||
ApplicationLoading = False
|
||||
SplashScreenManager.CloseForm(False)
|
||||
|
||||
_Environment = My.Application.GetEnvironment()
|
||||
|
||||
' === Initialize Error Handler ===
|
||||
Logger = My.LogConfig.GetLogger()
|
||||
ErrorHandler = New BaseErrorHandler(My.LogConfig, Logger, Me)
|
||||
@@ -911,40 +912,40 @@ Public Class frmFlowForm
|
||||
|
||||
oState.CurrentClipboardContents = ClipboardContents
|
||||
|
||||
If oState.MonitoringActive = False Then
|
||||
Dim oMessage As String = "Clipboard Watcher is not active!"
|
||||
Logger.Warn(oMessage)
|
||||
'If oState.MonitoringActive = False Then
|
||||
' Dim oMessage As String = "Clipboard Watcher is not active!"
|
||||
' Logger.Warn(oMessage)
|
||||
|
||||
Exit Sub
|
||||
End If
|
||||
' Exit Sub
|
||||
'End If
|
||||
|
||||
If oState.UserProfiles Is Nothing Then
|
||||
Dim oMessage As String = "User Profiles are empty!"
|
||||
Logger.Warn(oMessage)
|
||||
'If oState.UserProfiles Is Nothing Then
|
||||
' Dim oMessage As String = "User Profiles are empty!"
|
||||
' Logger.Warn(oMessage)
|
||||
|
||||
Exit Sub
|
||||
End If
|
||||
' Exit Sub
|
||||
'End If
|
||||
|
||||
If oState.ProfileProcesses Is Nothing OrElse oState.ProfileProcesses.Rows.Count = 0 Then
|
||||
Dim oMessage As String = "Profile Processes are empty!"
|
||||
Logger.Warn(oMessage)
|
||||
'If oState.ProfileProcesses Is Nothing OrElse oState.ProfileProcesses.Rows.Count = 0 Then
|
||||
' Dim oMessage As String = "Profile Processes are empty!"
|
||||
' Logger.Warn(oMessage)
|
||||
|
||||
Exit Sub
|
||||
End If
|
||||
' Exit Sub
|
||||
'End If
|
||||
|
||||
If oState.ProfileWindows Is Nothing OrElse oState.ProfileWindows.Rows.Count = 0 Then
|
||||
Dim oMessage As String = "Profile Windows are empty!"
|
||||
Logger.Warn(oMessage)
|
||||
'If oState.ProfileWindows Is Nothing OrElse oState.ProfileWindows.Rows.Count = 0 Then
|
||||
' Dim oMessage As String = "Profile Windows are empty!"
|
||||
' Logger.Warn(oMessage)
|
||||
|
||||
Exit Sub
|
||||
End If
|
||||
' Exit Sub
|
||||
'End If
|
||||
|
||||
If oState.ProfileControls Is Nothing OrElse oState.ProfileControls.Rows.Count = 0 Then
|
||||
Dim oMessage As String = "Profile Processes are empty!"
|
||||
Logger.Warn(oMessage)
|
||||
'If oState.ProfileControls Is Nothing OrElse oState.ProfileControls.Rows.Count = 0 Then
|
||||
' Dim oMessage As String = "Profile Processes are empty!"
|
||||
' Logger.Warn(oMessage)
|
||||
|
||||
Exit Sub
|
||||
End If
|
||||
' Exit Sub
|
||||
'End If
|
||||
|
||||
Dim oWindowInfo = ClassWindow.GetWindowInfo()
|
||||
|
||||
@@ -961,7 +962,7 @@ Public Class frmFlowForm
|
||||
|
||||
Try
|
||||
Dim oProfiles = ProfileFilter.Profiles
|
||||
Dim oEnvironment = ClassEnvironment.GetEnvironment()
|
||||
Dim oEnvironment = My.Application.GetEnvironment()
|
||||
|
||||
' Filter by Clipboard Contents
|
||||
oProfiles = ProfileFilter.FilterProfilesByClipboardRegex(oProfiles, ClipboardContents)
|
||||
@@ -995,13 +996,11 @@ Public Class frmFlowForm
|
||||
End Try
|
||||
End Sub
|
||||
|
||||
Private Sub HotkeyClass_HotKeyPressed(HotKeyID As String)
|
||||
Private Async Sub HotkeyClass_HotKeyPressed(HotKeyID As String)
|
||||
Dim oState = My.Application.ClipboardWatcher
|
||||
|
||||
Select Case HotKeyID
|
||||
Case HOTKEY_TRIGGER_WATCHER
|
||||
'Animator.Highlight(Cursor.Position)
|
||||
|
||||
If oState.CurrentClipboardContents = String.Empty Then
|
||||
Logger.Info("Current Clipboard Contents is empty. Exiting.")
|
||||
Exit Sub
|
||||
@@ -1021,10 +1020,21 @@ Public Class frmFlowForm
|
||||
ElseIf oState.CurrentProfilesWithResults.Count = 0 Then
|
||||
NotifyIcon.ShowBalloonTip(NOTIFICATION_DELAY, "ClipboardWatcher", "Es wurden weder Dokumente noch Daten gefunden!", ToolTipIcon.Warning)
|
||||
|
||||
ElseIf oState.CurrentProfilesWithResults.Count = 1 Then
|
||||
Dim oProfile = oState.CurrentProfilesWithResults.First()
|
||||
Dim oProfileSearches As New ProfileSearches(My.LogConfig, My.Application.GetEnvironment(), oState.CurrentClipboardContents)
|
||||
Dim oFormTitle = GetResultWindowString(oState.CurrentClipboardContents)
|
||||
|
||||
' For now we assume these are document results instead of data results
|
||||
Dim oForm = Await oProfileSearches.GetDocResultForm(oProfile, oFormTitle, Modules.ZooFlow.Constants.OperationMode.ZooFlow)
|
||||
AddHandler oForm.NeedsRefresh, AddressOf ProfileResultForm_NeedsRefresh
|
||||
oForm.Show()
|
||||
|
||||
Else
|
||||
|
||||
Dim oProfiles = oState.CurrentProfilesWithResults
|
||||
Dim oEnvironment = My.Application.GetEnvironment()
|
||||
Dim oParams As New DigitalData.Modules.ZooFlow.ClipboardWatcherParams With {
|
||||
Dim oParams As New ClipboardWatcherParams With {
|
||||
.ClipboardContents = oState.CurrentClipboardContents,
|
||||
.MatchingProfiles = oProfiles,
|
||||
.MatchTreeView = oState.MatchTreeView,
|
||||
@@ -1050,6 +1060,26 @@ Public Class frmFlowForm
|
||||
End Select
|
||||
End Sub
|
||||
|
||||
Private Async Sub ProfileResultForm_NeedsRefresh(sender As Object, e As Integer)
|
||||
Dim oThisForm As IResultForm = sender
|
||||
Dim oState = My.Application.ClipboardWatcher
|
||||
Dim oProfileSearch As New ProfileSearches(My.LogConfig, _Environment, oState.CurrentClipboardContents)
|
||||
|
||||
If TypeOf sender Is frmDocumentResultList Then
|
||||
Dim oProfileId = e
|
||||
Dim oSearches = Await oProfileSearch.LoadDocumentSearchesAsync(oProfileId)
|
||||
Dim oResults = oSearches.Select(Function(search)
|
||||
Return New DocumentResultList.DocumentResult() With {
|
||||
.Title = search.TabCaption,
|
||||
.Datatable = search.DataTable
|
||||
}
|
||||
End Function).ToList()
|
||||
|
||||
'RaiseEvent ResultsRefreshed(Me, Nothing)
|
||||
oThisForm.RefreshResults(oResults)
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Private Sub PictureBoxPM1_Click(sender As Object, e As EventArgs) Handles PictureBoxPM1.Click
|
||||
ToastNotificationsManager1.ShowNotification(ToastNotificationsManager1.Notifications(1))
|
||||
End Sub
|
||||
|
||||
@@ -3,7 +3,6 @@ Imports DigitalData.Modules.Logging
|
||||
Imports DigitalData.Modules.Config
|
||||
|
||||
Module modCurrent
|
||||
Public Property LOGGER As Logger
|
||||
Public Property CURR_MISSING_PATTERN_NAME = "Email To"
|
||||
Public Property CURR_MISSING_SEARCH_STRING = String.Empty
|
||||
Public Property CURR_MISSING_MANUAL_VALUE = String.Empty
|
||||
|
||||
Reference in New Issue
Block a user