MS Use without WM

This commit is contained in:
2021-01-13 10:31:01 +01:00
parent 34368ce760
commit 03a6d14214
69 changed files with 206 additions and 79 deletions

View File

@@ -29,6 +29,9 @@
<setting name="MyTestHTML" serializeAs="String">
<value />
</setting>
<setting name="DEBUG" serializeAs="String">
<value>False</value>
</setting>
</CONFIG_APP.My.MySettings>
</userSettings>
<applicationSettings>
@@ -45,6 +48,9 @@
<setting name="FB_PW" serializeAs="String">
<value>dd</value>
</setting>
<setting name="USE_WM" serializeAs="String">
<value>False</value>
</setting>
</CONFIG_APP.My.MySettings>
</applicationSettings>
</configuration>

View File

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.2.0.0")>
<Assembly: AssemblyVersion("2.3.0.0")>
<Assembly: AssemblyFileVersion("1.0.0.0")>

View File

@@ -149,6 +149,27 @@ Namespace My
Me("MyTestHTML") = value
End Set
End Property
<Global.System.Configuration.ApplicationScopedSettingAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Configuration.DefaultSettingValueAttribute("False")> _
Public ReadOnly Property USE_WM() As Boolean
Get
Return CType(Me("USE_WM"),Boolean)
End Get
End Property
<Global.System.Configuration.UserScopedSettingAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Configuration.DefaultSettingValueAttribute("False")> _
Public Property DEBUG() As Boolean
Get
Return CType(Me("DEBUG"),Boolean)
End Get
Set
Me("DEBUG") = value
End Set
End Property
End Class
End Namespace

View File

@@ -34,5 +34,11 @@
<Setting Name="MyTestHTML" Type="System.String" Scope="User">
<Value Profile="(Default)" />
</Setting>
<Setting Name="USE_WM" Type="System.Boolean" Scope="Application">
<Value Profile="(Default)">False</Value>
</Setting>
<Setting Name="DEBUG" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
</Settings>
</SettingsFile>

View File

@@ -29,6 +29,9 @@
<setting name="MyTestHTML" serializeAs="String">
<value />
</setting>
<setting name="DEBUG" serializeAs="String">
<value>False</value>
</setting>
</CONFIG_APP.My.MySettings>
</userSettings>
<applicationSettings>
@@ -45,6 +48,9 @@
<setting name="FB_PW" serializeAs="String">
<value>dd</value>
</setting>
<setting name="USE_WM" serializeAs="String">
<value>False</value>
</setting>
</CONFIG_APP.My.MySettings>
</applicationSettings>
</configuration>

View File

@@ -16,13 +16,8 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.3.0.0" newVersion="6.3.0.0" />
<bindingRedirect oldVersion="0.0.0.0-7.5.0.0" newVersion="7.5.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<system.data>
<DbProviderFactories>
<remove invariant="FirebirdSql.Data.FirebirdClient" />
<add name="FirebirdClient Data Provider" invariant="FirebirdSql.Data.FirebirdClient" description=".NET Framework Data Provider for Firebird" type="FirebirdSql.Data.FirebirdClient.FirebirdClientFactory, FirebirdSql.Data.FirebirdClient" />
</DbProviderFactories>
</system.data></configuration>
</configuration>

View File

@@ -1021,7 +1021,7 @@ Partial Class frmMain
Me.tsbtnRunLocalMail.Image = Global.CONFIG_APP.My.Resources.Resources.email_go
Me.tsbtnRunLocalMail.ImageTransparentColor = System.Drawing.Color.Magenta
Me.tsbtnRunLocalMail.Name = "tsbtnRunLocalMail"
Me.tsbtnRunLocalMail.Size = New System.Drawing.Size(134, 22)
Me.tsbtnRunLocalMail.Size = New System.Drawing.Size(133, 22)
Me.tsbtnRunLocalMail.Text = "Test with local email"
'
'tsbtnRunProfiles
@@ -1665,7 +1665,7 @@ Partial Class frmMain
Me.BindingNavigator2.MovePreviousItem = Me.ToolStripButton5
Me.BindingNavigator2.Name = "BindingNavigator2"
Me.BindingNavigator2.PositionItem = Me.ToolStripTextBox1
Me.BindingNavigator2.Size = New System.Drawing.Size(1177, 25)
Me.BindingNavigator2.Size = New System.Drawing.Size(964, 25)
Me.BindingNavigator2.TabIndex = 32
Me.BindingNavigator2.Text = "BindingNavigator2"
'
@@ -1780,7 +1780,7 @@ Partial Class frmMain
Me.GridControl1.Location = New System.Drawing.Point(0, 0)
Me.GridControl1.MainView = Me.GridView1
Me.GridControl1.Name = "GridControl1"
Me.GridControl1.Size = New System.Drawing.Size(241, 311)
Me.GridControl1.Size = New System.Drawing.Size(241, 328)
Me.GridControl1.TabIndex = 0
Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1})
'
@@ -2274,7 +2274,7 @@ Partial Class frmMain
'ToolStripLabel3
'
Me.ToolStripLabel3.Name = "ToolStripLabel3"
Me.ToolStripLabel3.Size = New System.Drawing.Size(160, 22)
Me.ToolStripLabel3.Size = New System.Drawing.Size(161, 22)
Me.ToolStripLabel3.Text = "von {0} Indexierungsschritten"
Me.ToolStripLabel3.ToolTipText = "Die Gesamtanzahl der Elemente."
'
@@ -2574,12 +2574,14 @@ Partial Class frmMain
'
'LOG_ERRORS_ONLYCheckBox
'
Me.LOG_ERRORS_ONLYCheckBox.Checked = Global.CONFIG_APP.My.MySettings.Default.DEBUG
Me.LOG_ERRORS_ONLYCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBEMLP_CONFIGBindingSource, "LOG_ERRORS_ONLY", True))
Me.LOG_ERRORS_ONLYCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("Checked", Global.CONFIG_APP.My.MySettings.Default, "DEBUG", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged))
Me.LOG_ERRORS_ONLYCheckBox.Location = New System.Drawing.Point(138, 22)
Me.LOG_ERRORS_ONLYCheckBox.Name = "LOG_ERRORS_ONLYCheckBox"
Me.LOG_ERRORS_ONLYCheckBox.Size = New System.Drawing.Size(104, 23)
Me.LOG_ERRORS_ONLYCheckBox.TabIndex = 64
Me.LOG_ERRORS_ONLYCheckBox.Text = "Log Errors Only"
Me.LOG_ERRORS_ONLYCheckBox.Text = "DEBUG (Log)"
Me.LOG_ERRORS_ONLYCheckBox.UseVisualStyleBackColor = True
'
'GroupBox1

View File

@@ -309,12 +309,33 @@
AAAASUVORK5CYII=
</value>
</data>
<metadata name="BindingNavigator1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1209, 17</value>
</metadata>
<metadata name="TBEMLP_CONFIGBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>467, 134</value>
</metadata>
<metadata name="TBEMLP_CONFIGBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>467, 134</value>
</metadata>
<metadata name="BindingNavigator5.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1297, 95</value>
</metadata>
<metadata name="BindingNavigator6.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1079, 134</value>
</metadata>
<metadata name="TBEMLP_POLL_PROFILESBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>514, 17</value>
</metadata>
<metadata name="MyDataset.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>404, 17</value>
</metadata>
<metadata name="MyDataset.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>404, 17</value>
</metadata>
<metadata name="TBDD_EMAIL_ACCOUNTBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>777, 95</value>
</metadata>
<metadata name="TBDD_EMAIL_ACCOUNTBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>777, 95</value>
</metadata>
@@ -385,6 +406,18 @@
8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg==
</value>
</data>
<metadata name="BindingNavigator2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 56</value>
</metadata>
<metadata name="BindingNavigator3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1175, 56</value>
</metadata>
<metadata name="BindingNavigator4.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 95</value>
</metadata>
<metadata name="TBEMLP_POLL_PROCESSBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>171, 56</value>
</metadata>
<metadata name="TBEMLP_POLL_PROCESSBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>171, 56</value>
</metadata>
@@ -458,6 +491,9 @@
<metadata name="TBEMLP_POLL_STEPSBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>691, 56</value>
</metadata>
<metadata name="TBEMLP_POLL_STEPSBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>691, 56</value>
</metadata>
<metadata name="BindingNavigator3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1175, 56</value>
</metadata>
@@ -528,6 +564,9 @@
<metadata name="TBEMLP_POLL_INDEXING_STEPSBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>171, 95</value>
</metadata>
<metadata name="TBEMLP_POLL_INDEXING_STEPSBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>171, 95</value>
</metadata>
<metadata name="BindingNavigator4.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 95</value>
</metadata>
@@ -595,9 +634,6 @@
8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg==
</value>
</data>
<metadata name="TBEMLP_CONFIGBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>467, 134</value>
</metadata>
<metadata name="TBEMLP_HISTORYBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 134</value>
</metadata>

View File

@@ -35,11 +35,14 @@ Public Class frmMain
Try
MyLogger = New LogConfig(LogConfig.PathType.CustomPath, Path.Combine(My.Application.Info.DirectoryPath, "Log"), Nothing, My.Application.Info.CompanyName, My.Application.Info.ProductName)
Logger = MyLogger.GetLogger()
MyLogger.Debug = True
MyLogger.Debug = My.Settings.DEBUG
InitDatabase()
ToolStripProgressBar1.Visible = False
Logger.Debug($"AppConfig is located at: [{AppDomain.CurrentDomain.SetupInformation.ConfigurationFile}]")
_windream = New clsWindream_allgemein(MyLogger)
If My.Settings.USE_WM Then
_windream = New clsWindream_allgemein(MyLogger)
End If
_email = New clsEmail(MyLogger)
_emailIMAP = New clsEmailIMAP(MyLogger, _SQLServerConString)
Catch ex As Exception
@@ -53,7 +56,10 @@ Public Class frmMain
Check_Steps()
Active_Color()
End If
ObjektTypenEintragen()
If My.Settings.USE_WM Then
ObjektTypenEintragen()
End If
_Encryption = New clsEncryption("!35452didalog=", MyLogger)
End Sub
Private Function Set_ConnectionStrings()
@@ -277,7 +283,7 @@ Public Class frmMain
Private Sub BackgroundWorker1_DoWork(sender As Object, e As System.ComponentModel.DoWorkEventArgs) Handles BackgroundWorker1.DoWork
If _RunwithLocalemail = False Then
MyLogger.Debug = True
Dim _work As New clsWorker(MyLogger, _SQLServerConString, GUIDTextBox.Text, My.Settings.FB_DATASOURCE, My.Settings.FB_DATABASE, My.Settings.FB_USER, My.Settings.FB_PW)
Dim _work As New clsWorker(MyLogger, _SQLServerConString, GUIDTextBox.Text, My.Settings.FB_DATASOURCE, My.Settings.FB_DATABASE, My.Settings.FB_USER, My.Settings.FB_PW, My.Settings.USE_WM)
_work.Start_WorkingProfiles()
Else
@@ -408,7 +414,10 @@ Public Class frmMain
End Sub
Private Sub WM_OBJEKTTYPEComboBox_SelectedIndexChanged(sender As Object, e As EventArgs) Handles WM_OBJEKTTYPEComboBox.SelectedIndexChanged
Load_Indexdata()
If My.Settings.USE_WM Then
Load_Indexdata()
End If
End Sub
Sub Load_Indexdata()
Try
@@ -538,7 +547,10 @@ Public Class frmMain
Select Case XtraTabControl1.SelectedTabPageIndex
Case 0
Check_Steps()
Load_Indexdata()
If My.Settings.USE_WM Then
Load_Indexdata()
End If
Case 1
Check_IndexingSteps()
Case 2
@@ -547,7 +559,10 @@ Public Class frmMain
End Sub
Private Sub frmMain_Shown(sender As Object, e As EventArgs) Handles Me.Shown
Load_Indexdata()
If My.Settings.USE_WM Then
Load_Indexdata()
End If
End Sub
Private Sub TabControl1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles TabControl1.SelectedIndexChanged
@@ -610,6 +625,8 @@ Public Class frmMain
Private Sub LOG_ERRORS_ONLYCheckBox_CheckedChanged(sender As Object, e As EventArgs) Handles LOG_ERRORS_ONLYCheckBox.CheckedChanged
If _LoadInProgress = True Then Exit Sub
MyLogger.Debug = LOG_ERRORS_ONLYCheckBox.Checked
My.Settings.Save()
Dim upd = $"UPDATE TBEMLP_CONFIG SET CHANGED_WHO = '{Environment.UserName}',LOG_ERRORS_ONLY = '{LOG_ERRORS_ONLYCheckBox.Checked}' WHERE GUID = 1"
_database.Execute_non_Query(upd)
Load_Config()

View File

@@ -0,0 +1 @@
089985a82f862c462782eef3bd09083ddec4bb21

View File

@@ -1,3 +1,5 @@
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\DevExpress.Pdf.v18.1.Core.dll
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\obj\Debug\CONFIG_APP.Resources.resources
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\CONFIG_APP.exe.config
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\CONFIG_APP.exe
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\CONFIG_APP.pdb
@@ -17,7 +19,6 @@ E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\NLog.d
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\S22.Imap.dll
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\Interop.WINDREAMLib.dll
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\DigitalData.Modules.Database.dll
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\DevExpress.Pdf.v18.1.Core.dll
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\DevExpress.Sparkline.v18.1.Core.dll
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\DevExpress.XtraBars.v18.1.dll
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\DevExpress.RichEdit.v18.1.Core.dll
@@ -51,7 +52,6 @@ E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\DevExp
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\DevExpress.XtraBars.v18.1.xml
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\DevExpress.RichEdit.v18.1.Core.xml
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\DevExpress.XtraTreeList.v18.1.xml
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\FirebirdSql.Data.FirebirdClient.pdb
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\DevExpress.Office.v18.1.Core.xml
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\de\DevExpress.Data.v18.1.resources.dll
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\es\DevExpress.Data.v18.1.resources.dll
@@ -107,7 +107,6 @@ E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\ja\Dev
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\ru\DevExpress.Office.v18.1.Core.resources.dll
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\obj\Debug\CONFIG_APP.vbprojAssemblyReference.cache
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\obj\Debug\CONFIG_APP.frmMain.resources
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\obj\Debug\CONFIG_APP.Resources.resources
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\obj\Debug\CONFIG_APP.vbproj.GenerateResource.cache
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\obj\Debug\CONFIG_APP.exe.licenses
E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\obj\Debug\CONFIG_APP.vbproj.CopyComplete