diff --git a/Dokumentation/App.config b/Dokumentation/App.config index 5534e28..5f70bbd 100644 --- a/Dokumentation/App.config +++ b/Dokumentation/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/Dokumentation/Classes/Class1.vb b/Dokumentation/Classes/Class1.vb index a7ff4e8..ce231a7 100644 --- a/Dokumentation/Classes/Class1.vb +++ b/Dokumentation/Classes/Class1.vb @@ -21,6 +21,8 @@ Public Class Class1 Public Shared DebugText As String = "" Public Shared GroupUsers As List(Of cBenutzer) + Public Shared HostList As New List(Of String) + Public Shared Sub EnableDoubleBuffered(ByVal dgv As DataGridView) Dim dgvType As Type = dgv.[GetType]() diff --git a/Dokumentation/Dokumentation.vbproj b/Dokumentation/Dokumentation.vbproj index 59a9567..a5e18a4 100644 --- a/Dokumentation/Dokumentation.vbproj +++ b/Dokumentation/Dokumentation.vbproj @@ -11,7 +11,7 @@ Dokumentation 512 WindowsForms - v4.6.1 + v4.7 true true false @@ -32,6 +32,7 @@ false true true + AnyCPU diff --git a/Dokumentation/Main.vb b/Dokumentation/Main.vb index 898dbc1..da17306 100644 --- a/Dokumentation/Main.vb +++ b/Dokumentation/Main.vb @@ -425,6 +425,13 @@ Public Class Main End If ''--------------------------------------------------------------------------------------------------------/Ende// Abfrage DHCP Clients + + Class1.HostList.Clear() + + For Each dr As DataRow In ds.Tables(0).Rows + Class1.HostList.Add(dr.Item("IPAdresse").ToString) + Next + dgvfill(ds, "Netzwerk") Dim endtimedgvfill As Date = Date.Now LblDebugInfo.Text &= "dgvfill: " & ((endtimedgvfill - starttime).Milliseconds) & vbCrLf @@ -1215,9 +1222,9 @@ Public Class Main End Sub Private Sub btnTest3_Click(sender As Object, e As EventArgs) Handles btnTest3.Click - Dim test As String = "" - For Each User As cBenutzer In Class1.GroupUsers - test &= User.suchname & vbCrLf + Dim test As String + For Each st As String In Class1.HostList + test &= st & vbCrLf Next MsgBox(test) End Sub diff --git a/Dokumentation/My Project/Resources.Designer.vb b/Dokumentation/My Project/Resources.Designer.vb index a6aefa1..6147e1d 100644 --- a/Dokumentation/My Project/Resources.Designer.vb +++ b/Dokumentation/My Project/Resources.Designer.vb @@ -22,7 +22,7 @@ Namespace My.Resources ''' ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. ''' - _ diff --git a/Dokumentation/My Project/Settings.Designer.vb b/Dokumentation/My Project/Settings.Designer.vb index 4de32f9..5743702 100644 --- a/Dokumentation/My Project/Settings.Designer.vb +++ b/Dokumentation/My Project/Settings.Designer.vb @@ -1,10 +1,10 @@ '------------------------------------------------------------------------------ ' -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 ' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. ' '------------------------------------------------------------------------------ @@ -13,42 +13,42 @@ Option Explicit On Namespace My - - _ + + _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase - - Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings), MySettings) - -#Region "My.Settings Auto-Save Functionality" + + Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings) + +#Region "Automatische My.Settings-Speicherfunktion" #If _MyType = "WindowsForms" Then - Private Shared addedHandler As Boolean + Private Shared addedHandler As Boolean - Private Shared addedHandlerLockObject As New Object + Private Shared addedHandlerLockObject As New Object - _ - Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs) - If My.Application.SaveMySettingsOnExit Then - My.Settings.Save() - End If - End Sub + _ + Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs) + If My.Application.SaveMySettingsOnExit Then + My.Settings.Save() + End If + End Sub #End If #End Region - + Public Shared ReadOnly Property [Default]() As MySettings Get - + #If _MyType = "WindowsForms" Then - If Not addedHandler Then - SyncLock addedHandlerLockObject - If Not addedHandler Then - AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings - addedHandler = True - End If - End SyncLock - End If + If Not addedHandler Then + SyncLock addedHandlerLockObject + If Not addedHandler Then + AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings + addedHandler = True + End If + End SyncLock + End If #End If Return defaultInstance End Get @@ -57,13 +57,13 @@ Namespace My End Namespace Namespace My - - _ + + _ Friend Module MySettingsProperty - - _ + + _ Friend ReadOnly Property Settings() As Global.Dokumentation.My.MySettings Get Return Global.Dokumentation.My.MySettings.Default diff --git a/Dokumentation/frmHostBearbeiten.Designer.vb b/Dokumentation/frmHostBearbeiten.Designer.vb index 18accd3..b80557a 100644 --- a/Dokumentation/frmHostBearbeiten.Designer.vb +++ b/Dokumentation/frmHostBearbeiten.Designer.vb @@ -70,24 +70,22 @@ Partial Class frmHostBearbeiten Me.CmdDelete = New System.Windows.Forms.Button() Me.TxtBenutzername = New System.Windows.Forms.TextBox() Me.Panel1 = New System.Windows.Forms.Panel() + Me.cmdSMB = New System.Windows.Forms.Button() Me.ChkShowSlaves = New System.Windows.Forms.CheckBox() Me.lblSuchfilter = New System.Windows.Forms.Label() Me.PanFirewall = New System.Windows.Forms.Panel() Me.PanSlaves = New System.Windows.Forms.Panel() - Me.PictureBox1 = New System.Windows.Forms.PictureBox() Me.PanNavTop = New System.Windows.Forms.Panel() - Me.cmdSMB = New System.Windows.Forms.Button() Me.ContextMenuStrip2.SuspendLayout() Me.ContextMenuStrip1.SuspendLayout() Me.Panel1.SuspendLayout() - CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() Me.PanNavTop.SuspendLayout() Me.SuspendLayout() ' 'chkFirewall ' Me.chkFirewall.AutoSize = True - Me.chkFirewall.Location = New System.Drawing.Point(509, 420) + Me.chkFirewall.Location = New System.Drawing.Point(521, 39) Me.chkFirewall.Name = "chkFirewall" Me.chkFirewall.Size = New System.Drawing.Size(123, 17) Me.chkFirewall.TabIndex = 136 @@ -507,7 +505,6 @@ Partial Class frmHostBearbeiten ' Me.Panel1.Controls.Add(Me.cmdSMB) Me.Panel1.Controls.Add(Me.ChkShowSlaves) - Me.Panel1.Controls.Add(Me.chkFirewall) Me.Panel1.Controls.Add(Me.TxtBenutzername) Me.Panel1.Controls.Add(Me.CmdHostLink) Me.Panel1.Controls.Add(Me.CmdDelete) @@ -548,13 +545,25 @@ Partial Class frmHostBearbeiten Me.Panel1.Controls.Add(Me.Label4) Me.Panel1.Location = New System.Drawing.Point(12, 62) Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(643, 449) + Me.Panel1.Size = New System.Drawing.Size(643, 415) Me.Panel1.TabIndex = 137 ' + 'cmdSMB + ' + Me.cmdSMB.BackColor = System.Drawing.SystemColors.ControlLightLight + Me.cmdSMB.FlatAppearance.BorderColor = System.Drawing.Color.DimGray + Me.cmdSMB.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.cmdSMB.Location = New System.Drawing.Point(434, 349) + Me.cmdSMB.Name = "cmdSMB" + Me.cmdSMB.Size = New System.Drawing.Size(96, 23) + Me.cmdSMB.TabIndex = 138 + Me.cmdSMB.Text = "SMB" + Me.cmdSMB.UseVisualStyleBackColor = False + ' 'ChkShowSlaves ' Me.ChkShowSlaves.AutoSize = True - Me.ChkShowSlaves.Location = New System.Drawing.Point(387, 420) + Me.ChkShowSlaves.Location = New System.Drawing.Point(6, 349) Me.ChkShowSlaves.Name = "ChkShowSlaves" Me.ChkShowSlaves.Size = New System.Drawing.Size(104, 17) Me.ChkShowSlaves.TabIndex = 137 @@ -593,15 +602,6 @@ Partial Class frmHostBearbeiten Me.PanSlaves.TabIndex = 139 Me.PanSlaves.Visible = False ' - 'PictureBox1 - ' - Me.PictureBox1.InitialImage = Global.Dokumentation.My.Resources.Resources.pdf512 - Me.PictureBox1.Location = New System.Drawing.Point(507, 626) - Me.PictureBox1.Name = "PictureBox1" - Me.PictureBox1.Size = New System.Drawing.Size(100, 50) - Me.PictureBox1.TabIndex = 140 - Me.PictureBox1.TabStop = False - ' 'PanNavTop ' Me.PanNavTop.Controls.Add(Me.lblSuchfilter) @@ -612,18 +612,6 @@ Partial Class frmHostBearbeiten Me.PanNavTop.Size = New System.Drawing.Size(309, 32) Me.PanNavTop.TabIndex = 141 ' - 'cmdSMB - ' - Me.cmdSMB.BackColor = System.Drawing.SystemColors.ControlLightLight - Me.cmdSMB.FlatAppearance.BorderColor = System.Drawing.Color.DimGray - Me.cmdSMB.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.cmdSMB.Location = New System.Drawing.Point(434, 349) - Me.cmdSMB.Name = "cmdSMB" - Me.cmdSMB.Size = New System.Drawing.Size(96, 23) - Me.cmdSMB.TabIndex = 138 - Me.cmdSMB.Text = "SMB" - Me.cmdSMB.UseVisualStyleBackColor = False - ' 'frmHostBearbeiten ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -631,9 +619,9 @@ Partial Class frmHostBearbeiten Me.AutoSize = True Me.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.BackColor = System.Drawing.SystemColors.GradientInactiveCaption - Me.ClientSize = New System.Drawing.Size(1608, 815) + Me.ClientSize = New System.Drawing.Size(1608, 534) + Me.Controls.Add(Me.chkFirewall) Me.Controls.Add(Me.PanNavTop) - Me.Controls.Add(Me.PictureBox1) Me.Controls.Add(Me.PanSlaves) Me.Controls.Add(Me.PanFirewall) Me.Controls.Add(Me.Panel1) @@ -645,10 +633,10 @@ Partial Class frmHostBearbeiten Me.ContextMenuStrip1.ResumeLayout(False) Me.Panel1.ResumeLayout(False) Me.Panel1.PerformLayout() - CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit() Me.PanNavTop.ResumeLayout(False) Me.PanNavTop.PerformLayout() Me.ResumeLayout(False) + Me.PerformLayout() End Sub @@ -702,7 +690,6 @@ Partial Class frmHostBearbeiten Friend WithEvents ContextMenuStrip2 As ContextMenuStrip Friend WithEvents GeheZuToolStripMenuItem As ToolStripMenuItem Friend WithEvents lblSuchfilter As Label - Friend WithEvents PictureBox1 As PictureBox Friend WithEvents PanNavTop As Panel Friend WithEvents cmdSMB As Button End Class