3.7.2 Optimierungen und Button Knoten hinzufügen
This commit is contained in:
@@ -11,8 +11,6 @@ Imports Microsoft.Office.Core
|
||||
|
||||
Public Class frmMain
|
||||
Dim strIPAddress As String
|
||||
|
||||
Public Shared TIMER_SCAN As New System.Windows.Forms.Timer
|
||||
Public TIMER_INACTIVITY As ClassInactivity
|
||||
|
||||
Public Sub OpenRibbon()
|
||||
@@ -23,47 +21,6 @@ Public Class frmMain
|
||||
ribbonMain.Minimized = True
|
||||
End Sub
|
||||
|
||||
Private Shared Sub Scan_TickHandler(sender As Object, e As EventArgs)
|
||||
Try
|
||||
If ClassFolderWatcher.NEW_FILES = False Then Exit Sub
|
||||
ClassFolderWatcher.Check_Scan_Files()
|
||||
Dim open As Boolean = False
|
||||
If Not IsNothing(CURRENT_SCAN_TABLE) Then
|
||||
If CURRENT_SCAN_TABLE.Rows.Count > 0 Then
|
||||
For Each form In My.Application.OpenForms
|
||||
If (form.name = frmScanFiles.Name) Then
|
||||
'form is loaded so can do work
|
||||
'if you need to check wether it is actually visible
|
||||
If form.Visible Then
|
||||
open = True
|
||||
'do work when visible
|
||||
If My.Settings.User_InBoxScan_NotinFront = False Then
|
||||
frmScanFiles.BringToFront()
|
||||
End If
|
||||
Else
|
||||
|
||||
End If
|
||||
End If
|
||||
Next
|
||||
If open = False Then
|
||||
Dim frm As New frmScanFiles
|
||||
frm = frmScanFiles.Instance()
|
||||
frm.Show()
|
||||
End If
|
||||
End If
|
||||
If CURRENT_SCAN_TABLE.Rows.Count = 0 And open = True Then
|
||||
frmScanFiles.Close()
|
||||
End If
|
||||
ClassFolderWatcher.NEW_FILES = False
|
||||
End If
|
||||
Catch ex As Exception
|
||||
MsgBox("Unexpected Error in Scan_TickHandler:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
|
||||
TIMER_SCAN.Enabled = False
|
||||
End Try
|
||||
End Sub
|
||||
|
||||
|
||||
|
||||
Private Sub frmMain_Load(sender As Object, e As EventArgs) Handles Me.Load
|
||||
' Referenz zu frmMain speichern
|
||||
MAIN_FORM = Me
|
||||
@@ -102,7 +59,7 @@ Public Class frmMain
|
||||
LabelLanguage.Caption = "Language: " & USER_LANGUAGE
|
||||
Load_Connection_Dep_Data()
|
||||
|
||||
Display_ConString
|
||||
Display_ConString()
|
||||
|
||||
'Wenn Argumente übergeben wurden, wird Formular geladen und zu record gesprungen
|
||||
ClassJumpRecord.ParseArgs()
|
||||
@@ -164,31 +121,6 @@ Public Class frmMain
|
||||
' End Try
|
||||
|
||||
'End Sub
|
||||
Public Sub RUN_TIMER()
|
||||
Try
|
||||
If TIMER_SCAN.Enabled = False And CURRENT_SCAN_FOLDERWATCH <> "" And FWSCAN_started = True Then
|
||||
If System.IO.Directory.Exists(CURRENT_SCAN_FOLDERWATCH) = False Then
|
||||
LOGGER.Warn("SCAN PATH '" & CURRENT_SCAN_FOLDERWATCH & "'not accessable!")
|
||||
Exit Sub
|
||||
End If
|
||||
TIMER_SCAN.Interval = 30000
|
||||
TIMER_SCAN.Enabled = True
|
||||
AddHandler TIMER_SCAN.Tick, AddressOf Scan_TickHandler
|
||||
Else
|
||||
If TIMER_SCAN.Enabled = True And CURRENT_SCAN_FOLDERWATCH <> "" And FWSCAN_started = True Then
|
||||
TIMER_SCAN.Enabled = False
|
||||
|
||||
itemScanInbox.Visibility = BarItemVisibility.Always
|
||||
RUN_TIMER()
|
||||
Else
|
||||
TIMER_SCAN.Enabled = False
|
||||
End If
|
||||
End If
|
||||
Catch ex As Exception
|
||||
MsgBox("Unexpected Error in RUN_TIMER:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
|
||||
End Try
|
||||
|
||||
End Sub
|
||||
Sub Load_Connection_Dep_Data()
|
||||
SetBackground()
|
||||
If ERROR_INIT = "NONE" Then
|
||||
@@ -571,8 +503,6 @@ Public Class frmMain
|
||||
TimerTasks.Start()
|
||||
'Refresh_TaskReminder()
|
||||
End If
|
||||
|
||||
RUN_TIMER()
|
||||
Timer5mins.Start()
|
||||
|
||||
If Sett_ConstructorStart <> 0 Then
|
||||
@@ -746,9 +676,6 @@ Public Class frmMain
|
||||
TimerTasks.Enabled = False
|
||||
TimerTasks.Stop()
|
||||
End If
|
||||
'Proxy_Server_Controls()
|
||||
RUN_TIMER()
|
||||
|
||||
End Sub
|
||||
Private Sub BarButtonItem3_ItemClick(sender As Object, e As ItemClickEventArgs) Handles BarButtonItem3.ItemClick
|
||||
Cursor = Cursors.WaitCursor
|
||||
|
||||
Reference in New Issue
Block a user