Compare commits
3 Commits
c6c1ce4e70
...
a92b685727
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a92b685727 | ||
|
|
beb91f6603 | ||
|
|
57e3984c26 |
@@ -29,7 +29,7 @@ Public Class frmNIHauptseite
|
|||||||
Private _fulltext As clsNIFulltext
|
Private _fulltext As clsNIFulltext
|
||||||
|
|
||||||
Private manuallyRun As Boolean = False
|
Private manuallyRun As Boolean = False
|
||||||
Private manually_cancel As Boolean = True
|
Private manually_cancel As Boolean = False
|
||||||
'#### Variablen für das Profil
|
'#### Variablen für das Profil
|
||||||
Private myNIDatatable As DataTable
|
Private myNIDatatable As DataTable
|
||||||
Private myNIArrayIndexe() As String = Nothing ' zum Speichern der Indexe
|
Private myNIArrayIndexe() As String = Nothing ' zum Speichern der Indexe
|
||||||
@@ -794,6 +794,7 @@ Public Class frmNIHauptseite
|
|||||||
Me.ProgressBar1.Value = 0
|
Me.ProgressBar1.Value = 0
|
||||||
|
|
||||||
Me.Refresh()
|
Me.Refresh()
|
||||||
|
manually_cancel = False
|
||||||
Me.startProfileDurchlauf()
|
Me.startProfileDurchlauf()
|
||||||
Else
|
Else
|
||||||
_Logger.Warn("Attention: ClassNIProfile.Profile IsNothing")
|
_Logger.Warn("Attention: ClassNIProfile.Profile IsNothing")
|
||||||
|
|||||||
34
ToolCollection/frmStart.Designer.vb
generated
34
ToolCollection/frmStart.Designer.vb
generated
@@ -1,9 +1,9 @@
|
|||||||
<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
|
<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
|
||||||
Partial Class frmStart
|
Partial Class frmStart
|
||||||
Inherits System.Windows.Forms.Form
|
Inherits System.Windows.Forms.Form
|
||||||
|
|
||||||
'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
|
'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
|
||||||
<System.Diagnostics.DebuggerNonUserCode()> _
|
<System.Diagnostics.DebuggerNonUserCode()>
|
||||||
Protected Overrides Sub Dispose(ByVal disposing As Boolean)
|
Protected Overrides Sub Dispose(ByVal disposing As Boolean)
|
||||||
Try
|
Try
|
||||||
If disposing AndAlso components IsNot Nothing Then
|
If disposing AndAlso components IsNot Nothing Then
|
||||||
@@ -20,7 +20,7 @@ Partial Class frmStart
|
|||||||
'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
|
'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
|
||||||
'Das Bearbeiten ist mit dem Windows Form-Designer möglich.
|
'Das Bearbeiten ist mit dem Windows Form-Designer möglich.
|
||||||
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
|
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
|
||||||
<System.Diagnostics.DebuggerStepThrough()> _
|
<System.Diagnostics.DebuggerStepThrough()>
|
||||||
Private Sub InitializeComponent()
|
Private Sub InitializeComponent()
|
||||||
Me.components = New System.ComponentModel.Container()
|
Me.components = New System.ComponentModel.Container()
|
||||||
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmStart))
|
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmStart))
|
||||||
@@ -29,6 +29,7 @@ Partial Class frmStart
|
|||||||
Me.ToolStripStatusLabel2 = New System.Windows.Forms.ToolStripStatusLabel()
|
Me.ToolStripStatusLabel2 = New System.Windows.Forms.ToolStripStatusLabel()
|
||||||
Me.tslblVersion = New System.Windows.Forms.ToolStripStatusLabel()
|
Me.tslblVersion = New System.Windows.Forms.ToolStripStatusLabel()
|
||||||
Me.ToolStripStatusLabel_LogDeleteTime = New System.Windows.Forms.ToolStripStatusLabel()
|
Me.ToolStripStatusLabel_LogDeleteTime = New System.Windows.Forms.ToolStripStatusLabel()
|
||||||
|
Me.ToolStripStatusLabel_ConnectionString = New System.Windows.Forms.ToolStripStatusLabel()
|
||||||
Me.menHauptmenü = New System.Windows.Forms.MenuStrip()
|
Me.menHauptmenü = New System.Windows.Forms.MenuStrip()
|
||||||
Me.DateiToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
|
Me.DateiToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
|
||||||
Me.ÜbersichtToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
|
Me.ÜbersichtToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
|
||||||
@@ -63,7 +64,6 @@ Partial Class frmStart
|
|||||||
Me.TimerNIRestart = New System.Windows.Forms.Timer(Me.components)
|
Me.TimerNIRestart = New System.Windows.Forms.Timer(Me.components)
|
||||||
Me.TimerErrorLog = New System.Windows.Forms.Timer(Me.components)
|
Me.TimerErrorLog = New System.Windows.Forms.Timer(Me.components)
|
||||||
Me.TimerDeleteLogfiles = New System.Windows.Forms.Timer(Me.components)
|
Me.TimerDeleteLogfiles = New System.Windows.Forms.Timer(Me.components)
|
||||||
Me.ToolStripStatusLabel_ConnectionString = New System.Windows.Forms.ToolStripStatusLabel()
|
|
||||||
Me.StatusStrip1.SuspendLayout()
|
Me.StatusStrip1.SuspendLayout()
|
||||||
Me.menHauptmenü.SuspendLayout()
|
Me.menHauptmenü.SuspendLayout()
|
||||||
Me.Panel1.SuspendLayout()
|
Me.Panel1.SuspendLayout()
|
||||||
@@ -128,6 +128,15 @@ Partial Class frmStart
|
|||||||
Me.ToolStripStatusLabel_LogDeleteTime.Size = New System.Drawing.Size(270, 20)
|
Me.ToolStripStatusLabel_LogDeleteTime.Size = New System.Drawing.Size(270, 20)
|
||||||
Me.ToolStripStatusLabel_LogDeleteTime.Text = "Zeitpunkt der automatischen Löschung von Logs"
|
Me.ToolStripStatusLabel_LogDeleteTime.Text = "Zeitpunkt der automatischen Löschung von Logs"
|
||||||
'
|
'
|
||||||
|
'ToolStripStatusLabel_ConnectionString
|
||||||
|
'
|
||||||
|
Me.ToolStripStatusLabel_ConnectionString.BorderSides = CType((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Top) _
|
||||||
|
Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Right) _
|
||||||
|
Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom), System.Windows.Forms.ToolStripStatusLabelBorderSides)
|
||||||
|
Me.ToolStripStatusLabel_ConnectionString.Name = "ToolStripStatusLabel_ConnectionString"
|
||||||
|
Me.ToolStripStatusLabel_ConnectionString.Size = New System.Drawing.Size(129, 20)
|
||||||
|
Me.ToolStripStatusLabel_ConnectionString.Text = "Datenbankverbindung"
|
||||||
|
'
|
||||||
'menHauptmenü
|
'menHauptmenü
|
||||||
'
|
'
|
||||||
Me.menHauptmenü.BackColor = System.Drawing.SystemColors.Control
|
Me.menHauptmenü.BackColor = System.Drawing.SystemColors.Control
|
||||||
@@ -150,20 +159,20 @@ Partial Class frmStart
|
|||||||
'
|
'
|
||||||
Me.ÜbersichtToolStripMenuItem.Image = Global.ToolCollection.My.Resources.Resources.Auslesen1
|
Me.ÜbersichtToolStripMenuItem.Image = Global.ToolCollection.My.Resources.Resources.Auslesen1
|
||||||
Me.ÜbersichtToolStripMenuItem.Name = "ÜbersichtToolStripMenuItem"
|
Me.ÜbersichtToolStripMenuItem.Name = "ÜbersichtToolStripMenuItem"
|
||||||
Me.ÜbersichtToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
|
Me.ÜbersichtToolStripMenuItem.Size = New System.Drawing.Size(149, 22)
|
||||||
Me.ÜbersichtToolStripMenuItem.Text = "Übersicht"
|
Me.ÜbersichtToolStripMenuItem.Text = "Übersicht"
|
||||||
'
|
'
|
||||||
'BeendenToolStripMenuItem
|
'BeendenToolStripMenuItem
|
||||||
'
|
'
|
||||||
Me.BeendenToolStripMenuItem.Name = "BeendenToolStripMenuItem"
|
Me.BeendenToolStripMenuItem.Name = "BeendenToolStripMenuItem"
|
||||||
Me.BeendenToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
|
Me.BeendenToolStripMenuItem.Size = New System.Drawing.Size(149, 22)
|
||||||
Me.BeendenToolStripMenuItem.Text = "Beenden"
|
Me.BeendenToolStripMenuItem.Text = "Beenden"
|
||||||
'
|
'
|
||||||
'ZeigeLogFileToolStripMenuItem
|
'ZeigeLogFileToolStripMenuItem
|
||||||
'
|
'
|
||||||
Me.ZeigeLogFileToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ÖffneLogverzeichnisToolStripMenuItem})
|
Me.ZeigeLogFileToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ÖffneLogverzeichnisToolStripMenuItem})
|
||||||
Me.ZeigeLogFileToolStripMenuItem.Name = "ZeigeLogFileToolStripMenuItem"
|
Me.ZeigeLogFileToolStripMenuItem.Name = "ZeigeLogFileToolStripMenuItem"
|
||||||
Me.ZeigeLogFileToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
|
Me.ZeigeLogFileToolStripMenuItem.Size = New System.Drawing.Size(149, 22)
|
||||||
Me.ZeigeLogFileToolStripMenuItem.Text = "Zeige Log-File"
|
Me.ZeigeLogFileToolStripMenuItem.Text = "Zeige Log-File"
|
||||||
'
|
'
|
||||||
'ÖffneLogverzeichnisToolStripMenuItem
|
'ÖffneLogverzeichnisToolStripMenuItem
|
||||||
@@ -425,7 +434,6 @@ Partial Class frmStart
|
|||||||
Me.niToolcollection.BalloonTipIcon = System.Windows.Forms.ToolTipIcon.Info
|
Me.niToolcollection.BalloonTipIcon = System.Windows.Forms.ToolTipIcon.Info
|
||||||
Me.niToolcollection.ContextMenuStrip = Me.ContextMenuStrip1
|
Me.niToolcollection.ContextMenuStrip = Me.ContextMenuStrip1
|
||||||
Me.niToolcollection.Icon = CType(resources.GetObject("niToolcollection.Icon"), System.Drawing.Icon)
|
Me.niToolcollection.Icon = CType(resources.GetObject("niToolcollection.Icon"), System.Drawing.Icon)
|
||||||
Me.niToolcollection.Text = $"ToolCollection - {My.Settings.vInstanceName}"
|
|
||||||
'
|
'
|
||||||
'ContextMenuStrip1
|
'ContextMenuStrip1
|
||||||
'
|
'
|
||||||
@@ -452,15 +460,6 @@ Partial Class frmStart
|
|||||||
'
|
'
|
||||||
Me.TimerDeleteLogfiles.Interval = 1000
|
Me.TimerDeleteLogfiles.Interval = 1000
|
||||||
'
|
'
|
||||||
'ToolStripStatusLabel_ConnectionString
|
|
||||||
'
|
|
||||||
Me.ToolStripStatusLabel_ConnectionString.BorderSides = CType((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Top) _
|
|
||||||
Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Right) _
|
|
||||||
Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom), System.Windows.Forms.ToolStripStatusLabelBorderSides)
|
|
||||||
Me.ToolStripStatusLabel_ConnectionString.Name = "ToolStripStatusLabel_ConnectionString"
|
|
||||||
Me.ToolStripStatusLabel_ConnectionString.Size = New System.Drawing.Size(129, 20)
|
|
||||||
Me.ToolStripStatusLabel_ConnectionString.Text = "Datenbankverbindung"
|
|
||||||
'
|
|
||||||
'frmStart
|
'frmStart
|
||||||
'
|
'
|
||||||
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
|
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
|
||||||
@@ -474,7 +473,6 @@ Partial Class frmStart
|
|||||||
Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
|
Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
|
||||||
Me.IsMdiContainer = True
|
Me.IsMdiContainer = True
|
||||||
Me.Name = "frmStart"
|
Me.Name = "frmStart"
|
||||||
Me.Text = $"ToolCollection - {My.Settings.vInstanceName}"
|
|
||||||
Me.StatusStrip1.ResumeLayout(False)
|
Me.StatusStrip1.ResumeLayout(False)
|
||||||
Me.StatusStrip1.PerformLayout()
|
Me.StatusStrip1.PerformLayout()
|
||||||
Me.menHauptmenü.ResumeLayout(False)
|
Me.menHauptmenü.ResumeLayout(False)
|
||||||
|
|||||||
@@ -159,7 +159,7 @@
|
|||||||
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
|
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
|
||||||
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
|
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
|
||||||
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAO
|
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAO
|
||||||
FAAAAk1TRnQBSQFMAgEBCQEAAWABAwFgAQMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
|
FAAAAk1TRnQBSQFMAgEBCQEAAXABAwFwAQMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
|
||||||
AwABQAMAATADAAEBAQABCAYAAQwYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
|
AwABQAMAATADAAEBAQABCAYAAQwYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
|
||||||
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
|
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
|
||||||
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
|
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
|
||||||
|
|||||||
@@ -131,11 +131,25 @@ Public Class frmStart
|
|||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
Private Sub CaptionForm()
|
Private Sub CaptionForm()
|
||||||
|
Dim caption As String
|
||||||
|
|
||||||
If String.IsNullOrWhiteSpace(My.Settings.vInstanceName) Then
|
If String.IsNullOrWhiteSpace(My.Settings.vInstanceName) Then
|
||||||
Me.Text = Application.CompanyName & " - " & Application.ProductName
|
caption = Application.CompanyName & " - " & Application.ProductName
|
||||||
Else
|
Else
|
||||||
Me.Text = Application.CompanyName & " - " & Application.ProductName & " - " & My.Settings.vInstanceName
|
caption = Application.CompanyName & " - " & Application.ProductName & " - " & My.Settings.vInstanceName
|
||||||
End If
|
End If
|
||||||
|
|
||||||
|
' Fenster-Titel setzen
|
||||||
|
Me.Text = caption
|
||||||
|
|
||||||
|
Dim trayText As String = caption
|
||||||
|
|
||||||
|
If trayText.Length > 63 Then
|
||||||
|
trayText = trayText.Substring(0, 60) & "..."
|
||||||
|
End If
|
||||||
|
|
||||||
|
' Systray-Tooltip setzen
|
||||||
|
niToolcollection.Text = trayText
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
Private Sub FMStart_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load
|
Private Sub FMStart_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load
|
||||||
|
|||||||
Reference in New Issue
Block a user