AppStd/FileFlow
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Version .20, Grundkonfigurationen Checken, speichern der CONFIG.Variante Preview etc

Browse Source
This commit is contained in:
Digital Data - Marlon Schreiber 2019-08-15 13:44:32 +02:00
parent 2fa4aba3c7
commit a77786b706
15 changed files with 1145 additions and 1148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/Global_Indexer/DesignTimeBuild/.dtbcache
View File

Binary file not shown.

2
Global_Indexer/ClassConfig.vb
View File

@ -10,7 +10,7 @@ Public Class ClassConfig
' PDF Viewer Settings ' PDF Viewer Settings
Public Property UniversalViewerPath As String = "" Public Property UniversalViewerPath As String = ""
Public Property FilePreview As Boolean = False Public Property FilePreview As Boolean = True
' Misc Settings ' Misc Settings
Public Property DeleteOriginalFile As Boolean = False Public Property DeleteOriginalFile As Boolean = False

7
Global_Indexer/ClassFolderWatcher.vb
View File

@ -31,14 +31,12 @@ Public Class ClassFolderWatcher
If FolderWatcher_SCAN.EnableRaisingEvents = True Then If FolderWatcher_SCAN.EnableRaisingEvents = True Then
'Gestartet also Stoppen 'Gestartet also Stoppen
FolderWatcher_SCAN.EnableRaisingEvents = False FolderWatcher_SCAN.EnableRaisingEvents = False
FWSCAN_started = False
'FolderWatch neu instanzieren 'FolderWatch neu instanzieren
FolderWatcher_SCAN = New System.IO.FileSystemWatcher(CURRENT_SCAN_FOLDERWATCH, "*.*") FolderWatcher_SCAN = New System.IO.FileSystemWatcher(CURRENT_SCAN_FOLDERWATCH, "*.*")
ClassLogger.Add(" >> FolderWatchScan neu instanziert", False) ClassLogger.Add(" >> FolderWatchScan neu instanziert", False)
FolderWatcher_SCAN.IncludeSubdirectories = False FolderWatcher_SCAN.IncludeSubdirectories = False
FolderWatcher_SCAN.EnableRaisingEvents = True FolderWatcher_SCAN.EnableRaisingEvents = True
AddHandler FolderWatcher_SCAN.Created, AddressOf OnCreated AddHandler FolderWatcher_SCAN.Created, AddressOf OnCreated
FWSCAN_started = True
'SaveConfigValue("FWSCAN_started", "True") 'SaveConfigValue("FWSCAN_started", "True")
CONFIG.Config.FolderWatchScanStarted = True CONFIG.Config.FolderWatchScanStarted = True
CONFIG.Save() CONFIG.Save()
@ -127,8 +125,6 @@ Public Class ClassFolderWatcher
FolderWatcher_SCAN.IncludeSubdirectories = False FolderWatcher_SCAN.IncludeSubdirectories = False
FolderWatcher_SCAN.EnableRaisingEvents = True FolderWatcher_SCAN.EnableRaisingEvents = True
AddHandler FolderWatcher_SCAN.Created, AddressOf OnCreated AddHandler FolderWatcher_SCAN.Created, AddressOf OnCreated
FWSCAN_started = True
'SaveConfigValue("FWSCAN_started", "True")
CONFIG.Config.FolderWatchScanStarted = True CONFIG.Config.FolderWatchScanStarted = True
CONFIG.Save() CONFIG.Save()
Return 1 Return 1
@ -141,15 +137,12 @@ Public Class ClassFolderWatcher
FolderWatcher_SCAN.IncludeSubdirectories = False FolderWatcher_SCAN.IncludeSubdirectories = False
FolderWatcher_SCAN.EnableRaisingEvents = True FolderWatcher_SCAN.EnableRaisingEvents = True
AddHandler FolderWatcher_SCAN.Created, AddressOf OnCreated AddHandler FolderWatcher_SCAN.Created, AddressOf OnCreated
FWSCAN_started = True
'SaveConfigValue("FWSCAN_started", "True")
CONFIG.Config.FolderWatchScanStarted = True CONFIG.Config.FolderWatchScanStarted = True
CONFIG.Save() CONFIG.Save()
Return 1 Return 1
Else Else
'Gestartet also Stoppen 'Gestartet also Stoppen
FolderWatcher_SCAN.EnableRaisingEvents = False FolderWatcher_SCAN.EnableRaisingEvents = False
FWSCAN_started = False
ClassLogger.Add(" >> FolderWatch Scan gestoppt", False) ClassLogger.Add(" >> FolderWatch Scan gestoppt", False)
'SaveConfigValue("FWSCAN_started", "False") 'SaveConfigValue("FWSCAN_started", "False")
CONFIG.Config.FolderWatchScanStarted = False CONFIG.Config.FolderWatchScanStarted = False

17
Global_Indexer/ClassInit.vb
View File

@ -23,10 +23,9 @@ Public Class ClassInit
MyConnectionString = DecryptConnectionString(CONFIG.Config.ConnectionString) MyConnectionString = DecryptConnectionString(CONFIG.Config.ConnectionString)
LogErrorsOnly = CONFIG.Config.LogErrorsOnly LogErrorsOnly = CONFIG.Config.LogErrorsOnly
Preview = CONFIG.Config.FilePreview 'myPreviewActive = CONFIG.Config.FilePreview
UniversalViewer_Path = CONFIG.Config.UniversalViewerPath UniversalViewer_Path = CONFIG.Config.UniversalViewerPath
FW_started = CONFIG.Config.FolderWatchStarted FW_started = CONFIG.Config.FolderWatchStarted
FWSCAN_started = CONFIG.Config.FolderWatchScanStarted
CURR_DELETE_ORIGIN = CONFIG.Config.DeleteOriginalFile CURR_DELETE_ORIGIN = CONFIG.Config.DeleteOriginalFile
End Sub End Sub
@ -105,7 +104,7 @@ Public Class ClassInit
'SaveConfigValue("FW_started", "False") 'SaveConfigValue("FW_started", "False")
CONFIG.Config.FolderWatchStarted = False CONFIG.Config.FolderWatchStarted = False
CONFIG.Save() CONFIG.Save()
Exit Sub
End If End If
If Not IO.Directory.Exists(folderwatchPath) Then If Not IO.Directory.Exists(folderwatchPath) Then
@ -114,13 +113,13 @@ Public Class ClassInit
'SaveConfigValue("FW_started", "False") 'SaveConfigValue("FW_started", "False")
CONFIG.Config.FolderWatchStarted = False CONFIG.Config.FolderWatchStarted = False
CONFIG.Save() CONFIG.Save()
Exit Sub
End If End If
CURRENT_FOLDERWATCH = folderwatchPath CURRENT_FOLDERWATCH = folderwatchPath
FW_started = True FW_started = True
FW_ISSTARTED = True FWFunction_STARTED = True
ClassFolderWatcher.StartStop_FolderWatch() ClassFolderWatcher.StartStop_FolderWatch()
Catch ex As Exception Catch ex As Exception
MsgBox($"Init_Folderwatch: Unexpected error while starting FolderWatch: {ex.Message}", MsgBoxStyle.Critical) MsgBox($"Init_Folderwatch: Unexpected error while starting FolderWatch: {ex.Message}", MsgBoxStyle.Critical)
@ -136,8 +135,6 @@ Public Class ClassInit
If folderwatchScanPath = String.Empty Then If folderwatchScanPath = String.Empty Then
ClassLogger.Add("Init_Folderwatch: folderwatchScanPath is empty", True) ClassLogger.Add("Init_Folderwatch: folderwatchScanPath is empty", True)
FWSCAN_started = False
'SaveConfigValue("FW_started", "False")
CONFIG.Config.FolderWatchStarted = False CONFIG.Config.FolderWatchStarted = False
CONFIG.Save() CONFIG.Save()
Exit Sub Exit Sub
@ -145,8 +142,6 @@ Public Class ClassInit
If Not IO.Directory.Exists(folderwatchScanPath) Then If Not IO.Directory.Exists(folderwatchScanPath) Then
ClassLogger.Add("Init_Folderwatch: folderwatchScanPath does not exists or is invalid path", True) ClassLogger.Add("Init_Folderwatch: folderwatchScanPath does not exists or is invalid path", True)
FWSCAN_started = False
'SaveConfigValue("FW_started", "False")
CONFIG.Config.FolderWatchStarted = False CONFIG.Config.FolderWatchStarted = False
CONFIG.Save() CONFIG.Save()
Exit Sub Exit Sub
@ -154,8 +149,8 @@ Public Class ClassInit
CURRENT_SCAN_FOLDERWATCH = folderwatchScanPath CURRENT_SCAN_FOLDERWATCH = folderwatchScanPath
FWSCAN_started = True
FW_ISSTARTED = True FWFunction_STARTED = True
ClassFolderWatcher.StartStop_FolderWatchSCAN() ClassFolderWatcher.StartStop_FolderWatchSCAN()
Catch ex As Exception Catch ex As Exception
MsgBox($"Init_Folderwatch: Unexpected error while starting FolderWatchScan: {ex.Message}", MsgBoxStyle.Critical) MsgBox($"Init_Folderwatch: Unexpected error while starting FolderWatchScan: {ex.Message}", MsgBoxStyle.Critical)

2
Global_Indexer/ClassLayout.vb
View File

@ -57,7 +57,7 @@ Public Class ClassWindowLocation
form.Size = New Size(w, h) form.Size = New Size(w, h)
End If End If
End If End If
' form.Size = New Size(310, 190)
End If End If

2
Global_Indexer/ModuleCURRENT.vb
View File

@ -39,7 +39,7 @@ Module ModuleCURRENT
Public CURRENT_FOLDERWATCH As String = "" Public CURRENT_FOLDERWATCH As String = ""
Public CURRENT_SCAN_FOLDERWATCH As String = "" Public CURRENT_SCAN_FOLDERWATCH As String = ""
Public FW_ISSTARTED As Boolean = False Public FWFunction_STARTED As Boolean = False
Public CURR_DOKART_WD_DIRECT As Boolean = False Public CURR_DOKART_WD_DIRECT As Boolean = False
Public CURR_DOKART_OBJECTTYPE As String Public CURR_DOKART_OBJECTTYPE As String

4
Global_Indexer/ModuleMySettings.vb
View File

@ -10,10 +10,10 @@ Module ModuleMySettings
Public LogErrorsOnly As Boolean = True Public LogErrorsOnly As Boolean = True
Public GI_withWindream As Boolean = False Public GI_withWindream As Boolean = False
Public vWLaufwerk As String = "W" Public vWLaufwerk As String = "W"
Public Preview As Boolean = True 'Public myPreviewActive As Boolean = True
Public UniversalViewer_Path As String Public UniversalViewer_Path As String
Public FW_started As Boolean = False Public FW_started As Boolean = False
Public FWSCAN_started As Boolean = False 'Public FWSCAN_started As Boolean = False
'Public Function GetUserConfigPath() As String 'Public Function GetUserConfigPath() As String
' Return Path.Combine(Application.UserAppDataPath(), USER_CONFIG_FILE) ' Return Path.Combine(Application.UserAppDataPath(), USER_CONFIG_FILE)

4
Global_Indexer/My Project/AssemblyInfo.vb
View File

@ -14,7 +14,7 @@ Imports System.Runtime.InteropServices
<Assembly: AssemblyDescription("")> <Assembly: AssemblyDescription("")>
<Assembly: AssemblyCompany("Digital Data")> <Assembly: AssemblyCompany("Digital Data")>
<Assembly: AssemblyProduct("Global Indexer")> <Assembly: AssemblyProduct("Global Indexer")>
<Assembly: AssemblyCopyright("Copyright © 2017")> <Assembly: AssemblyCopyright("Copyright © 2019")>
<Assembly: AssemblyTrademark("")> <Assembly: AssemblyTrademark("")>
<Assembly: ComVisible(False)> <Assembly: ComVisible(False)>
@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.9.9.19")> <Assembly: AssemblyVersion("1.9.9.20")>
<Assembly: AssemblyFileVersion("1.0.0.0")> <Assembly: AssemblyFileVersion("1.0.0.0")>
<Assembly: NeutralResourcesLanguageAttribute("")> <Assembly: NeutralResourcesLanguageAttribute("")>

57
Global_Indexer/frmConfig_Basic.designer.vb generated
View File

@ -43,7 +43,7 @@ Partial Class frmConfig_Basic
Me.Button3 = New System.Windows.Forms.Button() Me.Button3 = New System.Windows.Forms.Button()
Me.cmbLanguage = New System.Windows.Forms.ComboBox() Me.cmbLanguage = New System.Windows.Forms.ComboBox()
Me.Label9 = New System.Windows.Forms.Label() Me.Label9 = New System.Windows.Forms.Label()
Me.CheckBox3 = New System.Windows.Forms.CheckBox() Me.CheckBoxPreviewDocs = New System.Windows.Forms.CheckBox()
Me.CheckBox2 = New System.Windows.Forms.CheckBox() Me.CheckBox2 = New System.Windows.Forms.CheckBox()
Me.chkLogErrorsOnly = New System.Windows.Forms.CheckBox() Me.chkLogErrorsOnly = New System.Windows.Forms.CheckBox()
Me.btnaddUniversalViewer = New System.Windows.Forms.Button() Me.btnaddUniversalViewer = New System.Windows.Forms.Button()
@ -76,16 +76,15 @@ Partial Class frmConfig_Basic
' '
'TabControl1 'TabControl1
' '
resources.ApplyResources(Me.TabControl1, "TabControl1")
Me.TabControl1.Controls.Add(Me.TabPage1) Me.TabControl1.Controls.Add(Me.TabPage1)
Me.TabControl1.Controls.Add(Me.TabPage2) Me.TabControl1.Controls.Add(Me.TabPage2)
Me.TabControl1.Controls.Add(Me.TabPage3) Me.TabControl1.Controls.Add(Me.TabPage3)
resources.ApplyResources(Me.TabControl1, "TabControl1")
Me.TabControl1.Name = "TabControl1" Me.TabControl1.Name = "TabControl1"
Me.TabControl1.SelectedIndex = 0 Me.TabControl1.SelectedIndex = 0
' '
'TabPage1 'TabPage1
' '
resources.ApplyResources(Me.TabPage1, "TabPage1")
Me.TabPage1.Controls.Add(Me.chkbxUserAut) Me.TabPage1.Controls.Add(Me.chkbxUserAut)
Me.TabPage1.Controls.Add(Me.Label5) Me.TabPage1.Controls.Add(Me.Label5)
Me.TabPage1.Controls.Add(Me.cmbDatenbank) Me.TabPage1.Controls.Add(Me.cmbDatenbank)
@ -98,6 +97,7 @@ Partial Class frmConfig_Basic
Me.TabPage1.Controls.Add(Me.txtUser) Me.TabPage1.Controls.Add(Me.txtUser)
Me.TabPage1.Controls.Add(Me.txtPasswort) Me.TabPage1.Controls.Add(Me.txtPasswort)
Me.TabPage1.Controls.Add(Me.BtnConnect) Me.TabPage1.Controls.Add(Me.BtnConnect)
resources.ApplyResources(Me.TabPage1, "TabPage1")
Me.TabPage1.Name = "TabPage1" Me.TabPage1.Name = "TabPage1"
Me.TabPage1.UseVisualStyleBackColor = True Me.TabPage1.UseVisualStyleBackColor = True
' '
@ -114,8 +114,8 @@ Partial Class frmConfig_Basic
' '
'cmbDatenbank 'cmbDatenbank
' '
resources.ApplyResources(Me.cmbDatenbank, "cmbDatenbank")
Me.cmbDatenbank.FormattingEnabled = True Me.cmbDatenbank.FormattingEnabled = True
resources.ApplyResources(Me.cmbDatenbank, "cmbDatenbank")
Me.cmbDatenbank.Name = "cmbDatenbank" Me.cmbDatenbank.Name = "cmbDatenbank"
' '
'Label4 'Label4
@ -147,38 +147,37 @@ Partial Class frmConfig_Basic
' '
'txtServer 'txtServer
' '
resources.ApplyResources(Me.txtServer, "txtServer")
Me.txtServer.ForeColor = System.Drawing.SystemColors.WindowText Me.txtServer.ForeColor = System.Drawing.SystemColors.WindowText
resources.ApplyResources(Me.txtServer, "txtServer")
Me.txtServer.Name = "txtServer" Me.txtServer.Name = "txtServer"
' '
'txtUser 'txtUser
' '
resources.ApplyResources(Me.txtUser, "txtUser")
Me.txtUser.ForeColor = System.Drawing.SystemColors.WindowText Me.txtUser.ForeColor = System.Drawing.SystemColors.WindowText
resources.ApplyResources(Me.txtUser, "txtUser")
Me.txtUser.Name = "txtUser" Me.txtUser.Name = "txtUser"
' '
'txtPasswort 'txtPasswort
' '
resources.ApplyResources(Me.txtPasswort, "txtPasswort")
Me.txtPasswort.ForeColor = System.Drawing.SystemColors.WindowText Me.txtPasswort.ForeColor = System.Drawing.SystemColors.WindowText
resources.ApplyResources(Me.txtPasswort, "txtPasswort")
Me.txtPasswort.Name = "txtPasswort" Me.txtPasswort.Name = "txtPasswort"
Me.txtPasswort.UseSystemPasswordChar = True Me.txtPasswort.UseSystemPasswordChar = True
' '
'BtnConnect 'BtnConnect
' '
resources.ApplyResources(Me.BtnConnect, "BtnConnect")
Me.BtnConnect.Image = Global.Global_Indexer.My.Resources.Resources.database_go Me.BtnConnect.Image = Global.Global_Indexer.My.Resources.Resources.database_go
resources.ApplyResources(Me.BtnConnect, "BtnConnect")
Me.BtnConnect.Name = "BtnConnect" Me.BtnConnect.Name = "BtnConnect"
Me.BtnConnect.UseVisualStyleBackColor = True Me.BtnConnect.UseVisualStyleBackColor = True
' '
'TabPage2 'TabPage2
' '
resources.ApplyResources(Me.TabPage2, "TabPage2")
Me.TabPage2.Controls.Add(Me.LinkLabel1) Me.TabPage2.Controls.Add(Me.LinkLabel1)
Me.TabPage2.Controls.Add(Me.Button3) Me.TabPage2.Controls.Add(Me.Button3)
Me.TabPage2.Controls.Add(Me.cmbLanguage) Me.TabPage2.Controls.Add(Me.cmbLanguage)
Me.TabPage2.Controls.Add(Me.Label9) Me.TabPage2.Controls.Add(Me.Label9)
Me.TabPage2.Controls.Add(Me.CheckBox3) Me.TabPage2.Controls.Add(Me.CheckBoxPreviewDocs)
Me.TabPage2.Controls.Add(Me.CheckBox2) Me.TabPage2.Controls.Add(Me.CheckBox2)
Me.TabPage2.Controls.Add(Me.chkLogErrorsOnly) Me.TabPage2.Controls.Add(Me.chkLogErrorsOnly)
Me.TabPage2.Controls.Add(Me.btnaddUniversalViewer) Me.TabPage2.Controls.Add(Me.btnaddUniversalViewer)
@ -187,6 +186,7 @@ Partial Class frmConfig_Basic
Me.TabPage2.Controls.Add(Me.btnLogMail) Me.TabPage2.Controls.Add(Me.btnLogMail)
Me.TabPage2.Controls.Add(Me.btnApplicationFolder) Me.TabPage2.Controls.Add(Me.btnApplicationFolder)
Me.TabPage2.Controls.Add(Me.btnopenlog) Me.TabPage2.Controls.Add(Me.btnopenlog)
resources.ApplyResources(Me.TabPage2, "TabPage2")
Me.TabPage2.Name = "TabPage2" Me.TabPage2.Name = "TabPage2"
Me.TabPage2.UseVisualStyleBackColor = True Me.TabPage2.UseVisualStyleBackColor = True
' '
@ -204,9 +204,9 @@ Partial Class frmConfig_Basic
' '
'cmbLanguage 'cmbLanguage
' '
resources.ApplyResources(Me.cmbLanguage, "cmbLanguage")
Me.cmbLanguage.FormattingEnabled = True Me.cmbLanguage.FormattingEnabled = True
Me.cmbLanguage.Items.AddRange(New Object() {resources.GetString("cmbLanguage.Items"), resources.GetString("cmbLanguage.Items1")}) Me.cmbLanguage.Items.AddRange(New Object() {resources.GetString("cmbLanguage.Items"), resources.GetString("cmbLanguage.Items1")})
resources.ApplyResources(Me.cmbLanguage, "cmbLanguage")
Me.cmbLanguage.Name = "cmbLanguage" Me.cmbLanguage.Name = "cmbLanguage"
' '
'Label9 'Label9
@ -214,13 +214,13 @@ Partial Class frmConfig_Basic
resources.ApplyResources(Me.Label9, "Label9") resources.ApplyResources(Me.Label9, "Label9")
Me.Label9.Name = "Label9" Me.Label9.Name = "Label9"
' '
'CheckBox3 'CheckBoxPreviewDocs
' '
resources.ApplyResources(Me.CheckBox3, "CheckBox3") resources.ApplyResources(Me.CheckBoxPreviewDocs, "CheckBoxPreviewDocs")
Me.CheckBox3.Checked = Global.Global_Indexer.My.MySettings.Default.DoNot_Show_Documents Me.CheckBoxPreviewDocs.Checked = Global.Global_Indexer.My.MySettings.Default.DoNot_Show_Documents
Me.CheckBox3.DataBindings.Add(New System.Windows.Forms.Binding("Checked", Global.Global_Indexer.My.MySettings.Default, "DoNot_Show_Documents", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) Me.CheckBoxPreviewDocs.DataBindings.Add(New System.Windows.Forms.Binding("Checked", Global.Global_Indexer.My.MySettings.Default, "DoNot_Show_Documents", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged))
Me.CheckBox3.Name = "CheckBox3" Me.CheckBoxPreviewDocs.Name = "CheckBoxPreviewDocs"
Me.CheckBox3.UseVisualStyleBackColor = True Me.CheckBoxPreviewDocs.UseVisualStyleBackColor = True
' '
'CheckBox2 'CheckBox2
' '
@ -255,28 +255,27 @@ Partial Class frmConfig_Basic
' '
'btnLogMail 'btnLogMail
' '
resources.ApplyResources(Me.btnLogMail, "btnLogMail")
Me.btnLogMail.Image = Global.Global_Indexer.My.Resources.Resources.email Me.btnLogMail.Image = Global.Global_Indexer.My.Resources.Resources.email
resources.ApplyResources(Me.btnLogMail, "btnLogMail")
Me.btnLogMail.Name = "btnLogMail" Me.btnLogMail.Name = "btnLogMail"
Me.btnLogMail.UseVisualStyleBackColor = True Me.btnLogMail.UseVisualStyleBackColor = True
' '
'btnApplicationFolder 'btnApplicationFolder
' '
resources.ApplyResources(Me.btnApplicationFolder, "btnApplicationFolder")
Me.btnApplicationFolder.Image = Global.Global_Indexer.My.Resources.Resources.folder_go Me.btnApplicationFolder.Image = Global.Global_Indexer.My.Resources.Resources.folder_go
resources.ApplyResources(Me.btnApplicationFolder, "btnApplicationFolder")
Me.btnApplicationFolder.Name = "btnApplicationFolder" Me.btnApplicationFolder.Name = "btnApplicationFolder"
Me.btnApplicationFolder.UseVisualStyleBackColor = True Me.btnApplicationFolder.UseVisualStyleBackColor = True
' '
'btnopenlog 'btnopenlog
' '
resources.ApplyResources(Me.btnopenlog, "btnopenlog")
Me.btnopenlog.Image = Global.Global_Indexer.My.Resources.Resources.folder_go Me.btnopenlog.Image = Global.Global_Indexer.My.Resources.Resources.folder_go
resources.ApplyResources(Me.btnopenlog, "btnopenlog")
Me.btnopenlog.Name = "btnopenlog" Me.btnopenlog.Name = "btnopenlog"
Me.btnopenlog.UseVisualStyleBackColor = True Me.btnopenlog.UseVisualStyleBackColor = True
' '
'TabPage3 'TabPage3
' '
resources.ApplyResources(Me.TabPage3, "TabPage3")
Me.TabPage3.Controls.Add(Me.Label8) Me.TabPage3.Controls.Add(Me.Label8)
Me.TabPage3.Controls.Add(Me.DataGridView1) Me.TabPage3.Controls.Add(Me.DataGridView1)
Me.TabPage3.Controls.Add(Me.Button2) Me.TabPage3.Controls.Add(Me.Button2)
@ -290,6 +289,7 @@ Partial Class frmConfig_Basic
Me.TabPage3.Controls.Add(Me.btnSaveExclusionFiles) Me.TabPage3.Controls.Add(Me.btnSaveExclusionFiles)
Me.TabPage3.Controls.Add(Me.btnstartstop2) Me.TabPage3.Controls.Add(Me.btnstartstop2)
Me.TabPage3.Controls.Add(Me.btnstartstop1) Me.TabPage3.Controls.Add(Me.btnstartstop1)
resources.ApplyResources(Me.TabPage3, "TabPage3")
Me.TabPage3.Name = "TabPage3" Me.TabPage3.Name = "TabPage3"
Me.TabPage3.UseVisualStyleBackColor = True Me.TabPage3.UseVisualStyleBackColor = True
' '
@ -300,9 +300,9 @@ Partial Class frmConfig_Basic
' '
'DataGridView1 'DataGridView1
' '
resources.ApplyResources(Me.DataGridView1, "DataGridView1")
DataGridViewCellStyle1.BackColor = System.Drawing.Color.Aqua DataGridViewCellStyle1.BackColor = System.Drawing.Color.Aqua
Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
resources.ApplyResources(Me.DataGridView1, "DataGridView1")
Me.DataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.DataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.DataGridView1.Name = "DataGridView1" Me.DataGridView1.Name = "DataGridView1"
' '
@ -314,8 +314,8 @@ Partial Class frmConfig_Basic
' '
'txtScanFolderWatch 'txtScanFolderWatch
' '
resources.ApplyResources(Me.txtScanFolderWatch, "txtScanFolderWatch")
Me.txtScanFolderWatch.BackColor = System.Drawing.Color.LemonChiffon Me.txtScanFolderWatch.BackColor = System.Drawing.Color.LemonChiffon
resources.ApplyResources(Me.txtScanFolderWatch, "txtScanFolderWatch")
Me.txtScanFolderWatch.Name = "txtScanFolderWatch" Me.txtScanFolderWatch.Name = "txtScanFolderWatch"
' '
'Label7 'Label7
@ -343,8 +343,8 @@ Partial Class frmConfig_Basic
' '
'txtFolderWatch 'txtFolderWatch
' '
resources.ApplyResources(Me.txtFolderWatch, "txtFolderWatch")
Me.txtFolderWatch.BackColor = System.Drawing.Color.Khaki Me.txtFolderWatch.BackColor = System.Drawing.Color.Khaki
resources.ApplyResources(Me.txtFolderWatch, "txtFolderWatch")
Me.txtFolderWatch.Name = "txtFolderWatch" Me.txtFolderWatch.Name = "txtFolderWatch"
' '
'Label6 'Label6
@ -354,29 +354,28 @@ Partial Class frmConfig_Basic
' '
'btnSaveExclusionFiles 'btnSaveExclusionFiles
' '
resources.ApplyResources(Me.btnSaveExclusionFiles, "btnSaveExclusionFiles")
Me.btnSaveExclusionFiles.Image = Global.Global_Indexer.My.Resources.Resources.save_16xLG Me.btnSaveExclusionFiles.Image = Global.Global_Indexer.My.Resources.Resources.save_16xLG
resources.ApplyResources(Me.btnSaveExclusionFiles, "btnSaveExclusionFiles")
Me.btnSaveExclusionFiles.Name = "btnSaveExclusionFiles" Me.btnSaveExclusionFiles.Name = "btnSaveExclusionFiles"
Me.btnSaveExclusionFiles.UseVisualStyleBackColor = True Me.btnSaveExclusionFiles.UseVisualStyleBackColor = True
' '
'btnstartstop2 'btnstartstop2
' '
resources.ApplyResources(Me.btnstartstop2, "btnstartstop2")
Me.btnstartstop2.Image = Global.Global_Indexer.My.Resources.Resources.bell_go Me.btnstartstop2.Image = Global.Global_Indexer.My.Resources.Resources.bell_go
resources.ApplyResources(Me.btnstartstop2, "btnstartstop2")
Me.btnstartstop2.Name = "btnstartstop2" Me.btnstartstop2.Name = "btnstartstop2"
Me.btnstartstop2.UseVisualStyleBackColor = True Me.btnstartstop2.UseVisualStyleBackColor = True
' '
'btnstartstop1 'btnstartstop1
' '
resources.ApplyResources(Me.btnstartstop1, "btnstartstop1")
Me.btnstartstop1.Image = Global.Global_Indexer.My.Resources.Resources.bell_go Me.btnstartstop1.Image = Global.Global_Indexer.My.Resources.Resources.bell_go
resources.ApplyResources(Me.btnstartstop1, "btnstartstop1")
Me.btnstartstop1.Name = "btnstartstop1" Me.btnstartstop1.Name = "btnstartstop1"
Me.btnstartstop1.UseVisualStyleBackColor = True Me.btnstartstop1.UseVisualStyleBackColor = True
' '
'OpenFileDialog1 'OpenFileDialog1
' '
Me.OpenFileDialog1.FileName = "OpenFileDialog1" Me.OpenFileDialog1.FileName = "OpenFileDialog1"
resources.ApplyResources(Me.OpenFileDialog1, "OpenFileDialog1")
' '
'frmConfig_Basic 'frmConfig_Basic
' '
@ -431,7 +430,7 @@ Partial Class frmConfig_Basic
Friend WithEvents txtScanFolderWatch As System.Windows.Forms.TextBox Friend WithEvents txtScanFolderWatch As System.Windows.Forms.TextBox
Friend WithEvents Label7 As System.Windows.Forms.Label Friend WithEvents Label7 As System.Windows.Forms.Label
Friend WithEvents btnstartstop2 As System.Windows.Forms.Button Friend WithEvents btnstartstop2 As System.Windows.Forms.Button
Friend WithEvents CheckBox3 As System.Windows.Forms.CheckBox Friend WithEvents CheckBoxPreviewDocs As System.Windows.Forms.CheckBox
Friend WithEvents DataGridView1 As System.Windows.Forms.DataGridView Friend WithEvents DataGridView1 As System.Windows.Forms.DataGridView
Friend WithEvents btnSaveExclusionFiles As System.Windows.Forms.Button Friend WithEvents btnSaveExclusionFiles As System.Windows.Forms.Button
Friend WithEvents Label8 As System.Windows.Forms.Label Friend WithEvents Label8 As System.Windows.Forms.Label

2112
Global_Indexer/frmConfig_Basic.resx
View File

File diff suppressed because it is too large Load Diff

10
Global_Indexer/frmConfig_Basic.vb
View File

@ -277,10 +277,8 @@ Public Class frmConfig_Basic
ClassDatabase.Execute_non_Query("DELETE FROM TBGI_FOLDERWATCH_USER WHERE USER_ID = " & USER_ID & " AND FOLDER_TYPE = '" & FOLDER_TYPE & "'", True) ClassDatabase.Execute_non_Query("DELETE FROM TBGI_FOLDERWATCH_USER WHERE USER_ID = " & USER_ID & " AND FOLDER_TYPE = '" & FOLDER_TYPE & "'", True)
If FOLDER_TYPE = "SCAN" Then If FOLDER_TYPE = "SCAN" Then
CURRENT_SCAN_FOLDERWATCH = "" CURRENT_SCAN_FOLDERWATCH = ""
'SaveConfigValue("FWSCAN_started", "False")
CONFIG.Config.FolderWatchScanStarted = False CONFIG.Config.FolderWatchScanStarted = False
CONFIG.Save() CONFIG.Save()
FWSCAN_started = False
Else Else
FW_started = False FW_started = False
'SaveConfigValue("FW_started", "False") 'SaveConfigValue("FW_started", "False")
@ -328,7 +326,7 @@ Public Class frmConfig_Basic
If FW_started = True And FOLDER_TYPE = "DEFAULT" Then If FW_started = True And FOLDER_TYPE = "DEFAULT" Then
ClassFolderWatcher.Restart_FolderWatch() ClassFolderWatcher.Restart_FolderWatch()
End If End If
If FWSCAN_started = True And FOLDER_TYPE = "SCAN" Then If CONFIG.Config.FolderWatchScanStarted = True And FOLDER_TYPE = "SCAN" Then
ClassFolderWatcher.Restart_FolderWatchSCAN() ClassFolderWatcher.Restart_FolderWatchSCAN()
End If End If
Catch ex As Exception Catch ex As Exception
@ -461,6 +459,7 @@ Public Class frmConfig_Basic
End Sub End Sub
Private Sub CheckBox2_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox2.CheckedChanged Private Sub CheckBox2_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox2.CheckedChanged
My.Settings.Save() My.Settings.Save()
End Sub End Sub
@ -480,8 +479,9 @@ Public Class frmConfig_Basic
End If End If
End Sub End Sub
Private Sub CheckBox3_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox3.CheckedChanged Private Sub CheckBox3_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBoxPreviewDocs.CheckedChanged
My.Settings.Save() CONFIG.Config.FilePreview = CheckBoxPreviewDocs.Checked
CONFIG.Save()
End Sub End Sub
Private Sub txtScanFolderWatch_TextChanged(sender As Object, e As EventArgs) Handles txtScanFolderWatch.TextChanged Private Sub txtScanFolderWatch_TextChanged(sender As Object, e As EventArgs) Handles txtScanFolderWatch.TextChanged

4
Global_Indexer/frmIndex.vb
View File

@ -1997,10 +1997,12 @@ Public Class frmIndex
End If End If
txtIndexfilepath.Text = CURRENT_WORKFILE txtIndexfilepath.Text = CURRENT_WORKFILE
ClassWindowLocation.LoadFormLocationSize(Me) ClassWindowLocation.LoadFormLocationSize(Me)
If Preview = True Then If CONFIG.Config.FilePreview = True Then
SplitContainer1.Panel2Collapsed = False
PreviewFile() PreviewFile()
Me.tslblVorschau.Visible = True Me.tslblVorschau.Visible = True
Else Else
SplitContainer1.Panel2Collapsed = True
Me.tslblVorschau.Visible = False Me.tslblVorschau.Visible = False
End If End If
Load_String() Load_String()

1
Global_Indexer/frmStart.Designer.vb generated
View File

@ -239,7 +239,6 @@ Partial Class frmStart
Me.Controls.Add(Me.LabelControl1) Me.Controls.Add(Me.LabelControl1)
Me.Controls.Add(Me.StatusStrip1) Me.Controls.Add(Me.StatusStrip1)
Me.Controls.Add(Me.MenuStrip1) Me.Controls.Add(Me.MenuStrip1)
Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog
Me.MaximizeBox = False Me.MaximizeBox = False
Me.Name = "frmStart" Me.Name = "frmStart"
Me.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide Me.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide

45
Global_Indexer/frmStart.resx
View File

@ -121,17 +121,11 @@
<value>17, 17</value> <value>17, 17</value>
</metadata> </metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="KonfigurationToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>108, 20</value>
</data>
<data name="KonfigurationToolStripMenuItem.Text" xml:space="preserve">
<value>Konfiguration</value>
</data>
<data name="MenuStrip1.Location" type="System.Drawing.Point, System.Drawing"> <data name="MenuStrip1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value> <value>0, 0</value>
</data> </data>
<data name="MenuStrip1.Size" type="System.Drawing.Size, System.Drawing"> <data name="MenuStrip1.Size" type="System.Drawing.Size, System.Drawing">
<value>337, 24</value> <value>294, 24</value>
</data> </data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="MenuStrip1.TabIndex" type="System.Int32, mscorlib"> <data name="MenuStrip1.TabIndex" type="System.Int32, mscorlib">
@ -152,6 +146,12 @@
<data name="&gt;&gt;MenuStrip1.ZOrder" xml:space="preserve"> <data name="&gt;&gt;MenuStrip1.ZOrder" xml:space="preserve">
<value>3</value> <value>3</value>
</data> </data>
<data name="KonfigurationToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>108, 20</value>
</data>
<data name="KonfigurationToolStripMenuItem.Text" xml:space="preserve">
<value>Konfiguration</value>
</data>
<data name="AdministrationToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> <data name="AdministrationToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>220, 22</value> <value>220, 22</value>
</data> </data>
@ -200,20 +200,11 @@
<metadata name="StatusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="StatusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>132, 17</value> <value>132, 17</value>
</metadata> </metadata>
<data name="tslblFW.Size" type="System.Drawing.Size, System.Drawing">
<value>133, 17</value>
</data>
<data name="tslblFW.Text" xml:space="preserve">
<value>FolderWatch ist aktiv</value>
</data>
<data name="tslblFW.Visible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="StatusStrip1.Location" type="System.Drawing.Point, System.Drawing"> <data name="StatusStrip1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 151</value> <value>0, 128</value>
</data> </data>
<data name="StatusStrip1.Size" type="System.Drawing.Size, System.Drawing"> <data name="StatusStrip1.Size" type="System.Drawing.Size, System.Drawing">
<value>337, 22</value> <value>294, 22</value>
</data> </data>
<data name="StatusStrip1.TabIndex" type="System.Int32, mscorlib"> <data name="StatusStrip1.TabIndex" type="System.Int32, mscorlib">
<value>6</value> <value>6</value>
@ -233,6 +224,15 @@
<data name="&gt;&gt;StatusStrip1.ZOrder" xml:space="preserve"> <data name="&gt;&gt;StatusStrip1.ZOrder" xml:space="preserve">
<value>2</value> <value>2</value>
</data> </data>
<data name="tslblFW.Size" type="System.Drawing.Size, System.Drawing">
<value>133, 17</value>
</data>
<data name="tslblFW.Text" xml:space="preserve">
<value>FolderWatch ist aktiv</value>
</data>
<data name="tslblFW.Visible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<metadata name="TimerFolderWatch.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="TimerFolderWatch.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1072, 17</value> <value>1072, 17</value>
</metadata> </metadata>
@ -539,7 +539,7 @@
<value>Tahoma, 12pt</value> <value>Tahoma, 12pt</value>
</data> </data>
<data name="LabelControl1.Location" type="System.Drawing.Point, System.Drawing"> <data name="LabelControl1.Location" type="System.Drawing.Point, System.Drawing">
<value>34, 42</value> <value>13, 37</value>
</data> </data>
<data name="LabelControl1.Size" type="System.Drawing.Size, System.Drawing"> <data name="LabelControl1.Size" type="System.Drawing.Size, System.Drawing">
<value>269, 38</value> <value>269, 38</value>
@ -601,7 +601,7 @@ auf dieses Fenster oder...</value>
<value>NoControl</value> <value>NoControl</value>
</data> </data>
<data name="btnChoosefiles.Location" type="System.Drawing.Point, System.Drawing"> <data name="btnChoosefiles.Location" type="System.Drawing.Point, System.Drawing">
<value>30, 88</value> <value>13, 81</value>
</data> </data>
<data name="btnChoosefiles.Size" type="System.Drawing.Size, System.Drawing"> <data name="btnChoosefiles.Size" type="System.Drawing.Size, System.Drawing">
<value>269, 37</value> <value>269, 37</value>
@ -634,7 +634,7 @@ auf dieses Fenster oder...</value>
<value>6, 13</value> <value>6, 13</value>
</data> </data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing"> <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>337, 173</value> <value>294, 150</value>
</data> </data>
<data name="$this.Font" type="System.Drawing.Font, System.Drawing"> <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 8.25pt</value> <value>Segoe UI, 8.25pt</value>
@ -1531,9 +1531,6 @@ auf dieses Fenster oder...</value>
/////////////wA///////////////////8f//////////////////// /////////////wA///////////////////8f////////////////////
</value> </value>
</data> </data>
<data name="$this.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="$this.Text" xml:space="preserve"> <data name="$this.Text" xml:space="preserve">
<value>Global Indexer</value> <value>Global Indexer</value>
</data> </data>

22
Global_Indexer/frmStart.vb
View File

@ -405,18 +405,19 @@ Public Class frmStart
End If End If
If CURRENT_SCAN_FOLDERWATCH = String.Empty Then If CURRENT_SCAN_FOLDERWATCH = String.Empty Then
FWSCAN_started = False CONFIG.Config.FolderWatchScanStarted = False
CONFIG.Save()
End If End If
If CURRENT_FOLDERWATCH <> "" Or CURRENT_SCAN_FOLDERWATCH <> "" Then If CURRENT_FOLDERWATCH <> "" Or CURRENT_SCAN_FOLDERWATCH <> "" Then
If FW_ISSTARTED = True Then If FWFunction_STARTED = True Then
tslblFW.Visible = True tslblFW.Visible = True
Else Else
tslblFW.Visible = False tslblFW.Visible = False
End If End If
Try Try
If FWSCAN_started = True Then If CONFIG.Config.FolderWatchScanStarted = True Then
If LogErrorsOnly = False Then ClassLogger.Add(">> FWSCAN started - Checking file:" & CURRENT_SCAN_FOLDERWATCH, False) If LogErrorsOnly = False Then ClassLogger.Add(">> FWSCAN started - Checking file:" & CURRENT_SCAN_FOLDERWATCH, False)
Dim fileEntries As String() = Directory.GetFiles(CURRENT_SCAN_FOLDERWATCH) Dim fileEntries As String() = Directory.GetFiles(CURRENT_SCAN_FOLDERWATCH)
' Process the list of files found in the directory. ' Process the list of files found in the directory.
@ -626,7 +627,7 @@ Public Class frmStart
End If End If
Else Else
Try Try
If FW_started = True Or FWSCAN_started = True Then If FW_started = True Or CONFIG.Config.FolderWatchScanStarted = True Then
'Prüfen ob alle Files abgearbeitet wurden 'Prüfen ob alle Files abgearbeitet wurden
Dim sql = "SELECT * FROM TBGI_FILES_USER WHERE WORKED = 0 AND HANDLE_TYPE like '%|FW%' AND UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')" Dim sql = "SELECT * FROM TBGI_FILES_USER WHERE WORKED = 0 AND HANDLE_TYPE like '%|FW%' AND UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')"
DTACTUAL_FILES = ClassDatabase.Return_Datatable(sql, True) DTACTUAL_FILES = ClassDatabase.Return_Datatable(sql, True)
@ -667,7 +668,12 @@ Public Class frmStart
tslblFW.Visible = False tslblFW.Visible = False
End If End If
Catch ex As Exception Catch ex As Exception
If ex.Message.Contains("Sammlung wurde geändert") Or ex.Message.Contains("Enumeration") Then
Else
MsgBox("Error in Work FolderWatch-File:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) MsgBox("Error in Work FolderWatch-File:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
End If
End Try End Try
End If End If
@ -707,12 +713,18 @@ Public Class frmStart
Me.TopMost = True Me.TopMost = True
End If End If
loaded = True loaded = True
Opacity = 0.65 Opacity = 0.6
ClassHelper.Refresh_RegexTable() ClassHelper.Refresh_RegexTable()
Start_Folderwatch() Start_Folderwatch()
ClassWindowLocation.LoadFormLocationSize(Me) ClassWindowLocation.LoadFormLocationSize(Me)
Try
Me.LabelControl1.Location = New Point(13, 37)
Catch ex As Exception
Me.btnChoosefiles.Location = New Point(269, 37)
End Try
End Sub End Sub
Private Sub HistoryIndexierteDateienToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles HistoryIndexierteDateienToolStripMenuItem.Click Private Sub HistoryIndexierteDateienToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles HistoryIndexierteDateienToolStripMenuItem.Click
frmHistory.ShowDialog() frmHistory.ShowDialog()