From 82e83c6a70ee3b323a84ad4013836ffcf04aad4b Mon Sep 17 00:00:00 2001 From: ms Date: Tue, 22 Sep 2020 09:43:22 +0200 Subject: [PATCH] Dumdidummdummda --- Dokumentation/Classes/Class1.vb | 2 + Dokumentation/Classes/cDomUser.vb | 4 + Dokumentation/Classes/cINI.vb | 123 ++++++++++++++++++ Dokumentation/Dokumentation.vbproj | 2 + Dokumentation/Main.Designer.vb | 123 +++++++++++------- Dokumentation/Main.resx | 5 +- Dokumentation/Main.vb | 78 ++++++++--- .../My Project/Resources.Designer.vb | 12 +- Dokumentation/My Project/Resources.resx | 37 +++--- .../external-content.duckduckgo.com.png | Bin 0 -> 947 bytes Dokumentation/uscntr_DomUser.Designer.vb | 52 +++++++- Dokumentation/uscntr_DomUser.vb | 21 +++ Dokumentation/uscntr_DomUserList.Designer.vb | 52 ++++---- Dokumentation/uscntr_DomUserList.vb | 14 +- Dokumentation/uscntr_TSSitzungen.Designer.vb | 2 +- Dokumentation/uscntr_TSSitzungen.vb | 30 +++-- 16 files changed, 432 insertions(+), 125 deletions(-) create mode 100644 Dokumentation/Classes/cINI.vb create mode 100644 Dokumentation/Resources/external-content.duckduckgo.com.png diff --git a/Dokumentation/Classes/Class1.vb b/Dokumentation/Classes/Class1.vb index b940b9a..c1b410e 100644 --- a/Dokumentation/Classes/Class1.vb +++ b/Dokumentation/Classes/Class1.vb @@ -31,6 +31,8 @@ Public Class Class1 Public Shared HostList As New List(Of String) Public Shared TerminalServerList As New List(Of String) + Public Shared ini As New cINI + Public Shared Sub EnableDoubleBuffered(ByRef dgv As DataGridView) Dim dgvType As Type = dgv.[GetType]() diff --git a/Dokumentation/Classes/cDomUser.vb b/Dokumentation/Classes/cDomUser.vb index 49a3c73..7706f05 100644 --- a/Dokumentation/Classes/cDomUser.vb +++ b/Dokumentation/Classes/cDomUser.vb @@ -14,6 +14,8 @@ Public Class cDomUser Property du_Dom As String = "" Property du_sAMAc As String = "" Property du_Info As String = "" + Property du_autologoff As Boolean = False + Property du_autologofftime As DateTime Property mit_username As String = "" Property mit_pwd As String = "" '----------------------------------------- @@ -41,6 +43,8 @@ Public Class cDomUser list.Add(New SQLVariable("du_Dom", du_Dom)) list.Add(New SQLVariable("du_sAMAc", du_sAMAc)) list.Add(New SQLVariable("du_Info", du_Info)) + list.Add(New SQLVariable("du_autologoff", du_autologoff)) + list.Add(New SQLVariable("du_autologofftime", du_autologofftime)) list.Add(New SQLVariable("mit_username", mit_username)) list.Add(New SQLVariable("mit_pwd", mit_pwd)) Return list diff --git a/Dokumentation/Classes/cINI.vb b/Dokumentation/Classes/cINI.vb new file mode 100644 index 0000000..6989bea --- /dev/null +++ b/Dokumentation/Classes/cINI.vb @@ -0,0 +1,123 @@ +Imports System.Reflection +Imports System.IO + +Public Class cINI + + Public sAppPath As String = Application.StartupPath + + Dim cINIPropertys = New List(Of MemberInfo) + Dim INIfile As String = sAppPath & "\config.ini" + Property prop_TSSitzungenAnzeigen As Boolean = True + Property prop_Kompansicht As Boolean = True + Property prop_FreiHostsAnzeigen As Boolean = False + Property prop_DHCPClientsAnzeigen As Boolean = False + Property prop_ToolsPanelAnzeizgen As Boolean = False + + Property prop_Pano As Boolean = False + + + Public Function LoadParameters() + If Not File.Exists(Application.StartupPath & "\config.ini") Then + File.Create(Application.StartupPath & "\config.ini") + Exit Function + End If + + + Dim test As String = "" + Dim cINIPropertysNames = New List(Of String) + Dim t As Type = GetType(cINI) + + For Each member As MemberInfo In t.GetMembers + If member.Name.ToString Like "prop_*" Then + cINIPropertys.Add(member) + cINIPropertysNames.Add(member.Name) + 'MsgBox(member.Name) + End If + Next + + Try + Dim lines = IO.File.ReadAllLines(sAppPath & "\config.ini") + If lines.Count <= 1 Then Me.save() + Try + Dim colCount = lines.First.Split(";"c).Length + Catch + ' + Me.save(True) + End Try + + ' Dim cINIPropertys = New List(Of MemberInfo) + + + + + For Each meh In cINIPropertys + test &= meh.Name.ToString & vbCrLf + Next + + ' MsgBox(test) + + For Each member As MemberInfo In cINIPropertys + For Each line In lines + Dim objFields = From field In line.Split(";"c) + + Select Case objFields(0).ToString + Case member.Name + ' MsgBox(objFields(0).ToString) + 'MsgBox(objFields(1).ToString) + SetPropertyValueByName(Me, member.Name, objFields(1)) + ' _ConType = objFields(1).ToString + ' Return True + ' Exit Function + End Select + Next + Next + ' MsgBox(prop_TSSitzungenAnzeigen) + Return False + Catch ex As Exception + MsgBox("Fehler beim Lesen config.ini: " & vbCrLf & ex.Message) + End Try + + + + End Function + + Public Shared Function SetPropertyValueByName(obj As [Object], name As String, value As [Object]) As Boolean + Dim prop = obj.[GetType]().GetProperty(name, BindingFlags.[Public] Or BindingFlags.Instance) + If prop Is Nothing OrElse Not prop.CanWrite Then + Return False + End If + Try + prop.SetValue(obj, value, Nothing) + Catch + Dim b As Boolean = False + If value = "True" Or value = "1" Then + b = True + Else + b = False + End If + prop.SetValue(obj, b, Nothing) + End Try + + Return True + End Function + + Public Shared Function GETPropertyValueByName(obj As [Object], name As String) + Dim prop = obj.[GetType]().GetProperty(name, BindingFlags.[Public] Or BindingFlags.Instance) + Return prop.GetValue(obj) + End Function + + Function save(Optional ByVal echostring As Boolean = False) + Dim savestring As String = "" + For Each member As MemberInfo In cINIPropertys + savestring &= member.Name & ";" & GETPropertyValueByName(Me, member.Name) & ";" & vbCrLf + Next + If echostring = True Then + MsgBox(savestring) + Exit Function + End If + Dim objWriter As New System.IO.StreamWriter(INIfile) + objWriter.Write(savestring) + objWriter.Close() + + End Function +End Class diff --git a/Dokumentation/Dokumentation.vbproj b/Dokumentation/Dokumentation.vbproj index f0f0660..0b9959f 100644 --- a/Dokumentation/Dokumentation.vbproj +++ b/Dokumentation/Dokumentation.vbproj @@ -219,6 +219,7 @@ + @@ -579,6 +580,7 @@ + diff --git a/Dokumentation/Main.Designer.vb b/Dokumentation/Main.Designer.vb index 3db256a..6320dda 100644 --- a/Dokumentation/Main.Designer.vb +++ b/Dokumentation/Main.Designer.vb @@ -24,7 +24,7 @@ Partial Class Main Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(Main)) - Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.Panel2 = New System.Windows.Forms.Panel() Me.Panel4 = New System.Windows.Forms.Panel() Me.Button1 = New System.Windows.Forms.Button() @@ -60,6 +60,8 @@ Partial Class Main Me.ToolStripMenuItemINFO = New System.Windows.Forms.ToolStripMenuItem() Me.btnBenutzerverwaltung = New System.Windows.Forms.Button() Me.Panel3 = New System.Windows.Forms.Panel() + Me.chkPano = New System.Windows.Forms.CheckBox() + Me.btnTSSitzungen = New System.Windows.Forms.Button() Me.Label20 = New System.Windows.Forms.Label() Me.picAVISOMessenger = New System.Windows.Forms.PictureBox() Me.chkTSSitzungen = New System.Windows.Forms.CheckBox() @@ -134,7 +136,7 @@ Partial Class Main Me.Panel2.Dock = System.Windows.Forms.DockStyle.Top Me.Panel2.Location = New System.Drawing.Point(0, 0) Me.Panel2.Name = "Panel2" - Me.Panel2.Size = New System.Drawing.Size(1614, 130) + Me.Panel2.Size = New System.Drawing.Size(1697, 130) Me.Panel2.TabIndex = 1 ' 'Panel4 @@ -154,7 +156,7 @@ Partial Class Main Me.Panel4.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel4.Location = New System.Drawing.Point(272, 24) Me.Panel4.Name = "Panel4" - Me.Panel4.Size = New System.Drawing.Size(1342, 106) + Me.Panel4.Size = New System.Drawing.Size(1425, 106) Me.Panel4.TabIndex = 14 ' 'Button1 @@ -186,7 +188,7 @@ Partial Class Main ' Me.LblVersion.Anchor = System.Windows.Forms.AnchorStyles.Right Me.LblVersion.AutoSize = True - Me.LblVersion.Location = New System.Drawing.Point(995, 81) + Me.LblVersion.Location = New System.Drawing.Point(1078, 81) Me.LblVersion.Name = "LblVersion" Me.LblVersion.Size = New System.Drawing.Size(42, 13) Me.LblVersion.TabIndex = 17 @@ -207,7 +209,7 @@ Partial Class Main Me.CmdSucheReset.BackColor = System.Drawing.SystemColors.ControlLightLight Me.CmdSucheReset.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) Me.CmdSucheReset.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.CmdSucheReset.Location = New System.Drawing.Point(846, 71) + Me.CmdSucheReset.Location = New System.Drawing.Point(929, 71) Me.CmdSucheReset.Name = "CmdSucheReset" Me.CmdSucheReset.Size = New System.Drawing.Size(121, 23) Me.CmdSucheReset.TabIndex = 15 @@ -218,7 +220,7 @@ Partial Class Main ' Me.TxtSuche.Anchor = System.Windows.Forms.AnchorStyles.Right Me.TxtSuche.BackColor = System.Drawing.SystemColors.ControlLightLight - Me.TxtSuche.Location = New System.Drawing.Point(660, 23) + Me.TxtSuche.Location = New System.Drawing.Point(743, 23) Me.TxtSuche.Name = "TxtSuche" Me.TxtSuche.Size = New System.Drawing.Size(138, 20) Me.TxtSuche.TabIndex = 3 @@ -228,7 +230,7 @@ Partial Class Main Me.Label1.Anchor = System.Windows.Forms.AnchorStyles.Right Me.Label1.AutoSize = True Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label1.Location = New System.Drawing.Point(613, 26) + Me.Label1.Location = New System.Drawing.Point(696, 26) Me.Label1.Name = "Label1" Me.Label1.Size = New System.Drawing.Size(47, 13) Me.Label1.TabIndex = 4 @@ -239,7 +241,7 @@ Partial Class Main Me.PanType.Anchor = System.Windows.Forms.AnchorStyles.Right Me.PanType.Controls.Add(Me.LstType) Me.PanType.Controls.Add(Me.Label2) - Me.PanType.Location = New System.Drawing.Point(804, 5) + Me.PanType.Location = New System.Drawing.Point(887, 5) Me.PanType.Name = "PanType" Me.PanType.Size = New System.Drawing.Size(183, 41) Me.PanType.TabIndex = 12 @@ -267,7 +269,7 @@ Partial Class Main ' Me.PictureBox1.Anchor = System.Windows.Forms.AnchorStyles.Right Me.PictureBox1.Image = CType(resources.GetObject("PictureBox1.Image"), System.Drawing.Image) - Me.PictureBox1.Location = New System.Drawing.Point(998, 2) + Me.PictureBox1.Location = New System.Drawing.Point(1081, 2) Me.PictureBox1.Name = "PictureBox1" Me.PictureBox1.Size = New System.Drawing.Size(333, 67) Me.PictureBox1.TabIndex = 1 @@ -279,7 +281,7 @@ Partial Class Main Me.PanSuche.Controls.Add(Me.RadGlobal) Me.PanSuche.Controls.Add(Me.RadNurNetzwerk) Me.PanSuche.Controls.Add(Me.RadStandort) - Me.PanSuche.Location = New System.Drawing.Point(660, 49) + Me.PanSuche.Location = New System.Drawing.Point(743, 49) Me.PanSuche.Name = "PanSuche" Me.PanSuche.Size = New System.Drawing.Size(314, 31) Me.PanSuche.TabIndex = 11 @@ -351,7 +353,7 @@ Partial Class Main Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem1, Me.ToolStripMenuItem2, Me.ToolStripMenuItemINFO}) Me.MenuStrip1.Location = New System.Drawing.Point(0, 0) Me.MenuStrip1.Name = "MenuStrip1" - Me.MenuStrip1.Size = New System.Drawing.Size(1614, 24) + Me.MenuStrip1.Size = New System.Drawing.Size(1697, 24) Me.MenuStrip1.TabIndex = 2 Me.MenuStrip1.Text = "MenuStrip1" ' @@ -359,60 +361,60 @@ Partial Class Main ' Me.ToolStripMenuItem1.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.NetzwerkeToolStripMenuItem, Me.AnsichtDruckenToolStripMenuItem, Me.ExportToolStripMenuItem, Me.ImportToolStripMenuItem, Me.BenutzerToolStripMenuItem, Me.AllesSichernCSVToolStripMenuItem, Me.ToolStripSeparator1, Me.UpdateToolStripMenuItem, Me.ExitToolStripMenuItem}) Me.ToolStripMenuItem1.Name = "ToolStripMenuItem1" - Me.ToolStripMenuItem1.Size = New System.Drawing.Size(49, 20) + Me.ToolStripMenuItem1.Size = New System.Drawing.Size(50, 20) Me.ToolStripMenuItem1.Text = "Extras" ' 'NetzwerkeToolStripMenuItem ' Me.NetzwerkeToolStripMenuItem.Name = "NetzwerkeToolStripMenuItem" - Me.NetzwerkeToolStripMenuItem.Size = New System.Drawing.Size(177, 22) + Me.NetzwerkeToolStripMenuItem.Size = New System.Drawing.Size(176, 22) Me.NetzwerkeToolStripMenuItem.Text = "Tabellen bearbeiten" ' 'AnsichtDruckenToolStripMenuItem ' Me.AnsichtDruckenToolStripMenuItem.Name = "AnsichtDruckenToolStripMenuItem" - Me.AnsichtDruckenToolStripMenuItem.Size = New System.Drawing.Size(177, 22) + Me.AnsichtDruckenToolStripMenuItem.Size = New System.Drawing.Size(176, 22) Me.AnsichtDruckenToolStripMenuItem.Text = "Drucken" ' 'ExportToolStripMenuItem ' Me.ExportToolStripMenuItem.Name = "ExportToolStripMenuItem" - Me.ExportToolStripMenuItem.Size = New System.Drawing.Size(177, 22) + Me.ExportToolStripMenuItem.Size = New System.Drawing.Size(176, 22) Me.ExportToolStripMenuItem.Text = "Export" ' 'ImportToolStripMenuItem ' Me.ImportToolStripMenuItem.Name = "ImportToolStripMenuItem" - Me.ImportToolStripMenuItem.Size = New System.Drawing.Size(177, 22) + Me.ImportToolStripMenuItem.Size = New System.Drawing.Size(176, 22) Me.ImportToolStripMenuItem.Text = "Import" ' 'BenutzerToolStripMenuItem ' Me.BenutzerToolStripMenuItem.Name = "BenutzerToolStripMenuItem" - Me.BenutzerToolStripMenuItem.Size = New System.Drawing.Size(177, 22) + Me.BenutzerToolStripMenuItem.Size = New System.Drawing.Size(176, 22) Me.BenutzerToolStripMenuItem.Text = "Benutzer" ' 'AllesSichernCSVToolStripMenuItem ' Me.AllesSichernCSVToolStripMenuItem.Name = "AllesSichernCSVToolStripMenuItem" - Me.AllesSichernCSVToolStripMenuItem.Size = New System.Drawing.Size(177, 22) + Me.AllesSichernCSVToolStripMenuItem.Size = New System.Drawing.Size(176, 22) Me.AllesSichernCSVToolStripMenuItem.Text = "Alles Sichern (CSV)" ' 'ToolStripSeparator1 ' Me.ToolStripSeparator1.Name = "ToolStripSeparator1" - Me.ToolStripSeparator1.Size = New System.Drawing.Size(174, 6) + Me.ToolStripSeparator1.Size = New System.Drawing.Size(173, 6) ' 'UpdateToolStripMenuItem ' Me.UpdateToolStripMenuItem.Name = "UpdateToolStripMenuItem" - Me.UpdateToolStripMenuItem.Size = New System.Drawing.Size(177, 22) + Me.UpdateToolStripMenuItem.Size = New System.Drawing.Size(176, 22) Me.UpdateToolStripMenuItem.Text = "Update" ' 'ExitToolStripMenuItem ' Me.ExitToolStripMenuItem.Name = "ExitToolStripMenuItem" - Me.ExitToolStripMenuItem.Size = New System.Drawing.Size(177, 22) + Me.ExitToolStripMenuItem.Size = New System.Drawing.Size(176, 22) Me.ExitToolStripMenuItem.Text = "Exit" ' 'ToolStripMenuItem2 @@ -434,7 +436,7 @@ Partial Class Main Me.btnBenutzerverwaltung.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnBenutzerverwaltung.Image = Global.Dokumentation.My.Resources.Resources.Admin20 Me.btnBenutzerverwaltung.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnBenutzerverwaltung.Location = New System.Drawing.Point(25, 695) + Me.btnBenutzerverwaltung.Location = New System.Drawing.Point(25, 685) Me.btnBenutzerverwaltung.Name = "btnBenutzerverwaltung" Me.btnBenutzerverwaltung.Size = New System.Drawing.Size(151, 28) Me.btnBenutzerverwaltung.TabIndex = 20 @@ -444,6 +446,8 @@ Partial Class Main 'Panel3 ' Me.Panel3.BackColor = System.Drawing.SystemColors.GradientInactiveCaption + Me.Panel3.Controls.Add(Me.chkPano) + Me.Panel3.Controls.Add(Me.btnTSSitzungen) Me.Panel3.Controls.Add(Me.Label20) Me.Panel3.Controls.Add(Me.picAVISOMessenger) Me.Panel3.Controls.Add(Me.btnBenutzerverwaltung) @@ -465,16 +469,41 @@ Partial Class Main Me.Panel3.Dock = System.Windows.Forms.DockStyle.Left Me.Panel3.Location = New System.Drawing.Point(0, 130) Me.Panel3.Name = "Panel3" - Me.Panel3.Size = New System.Drawing.Size(200, 921) + Me.Panel3.Size = New System.Drawing.Size(200, 863) Me.Panel3.TabIndex = 2 ' + 'chkPano + ' + Me.chkPano.AutoSize = True + Me.chkPano.Location = New System.Drawing.Point(25, 826) + Me.chkPano.Name = "chkPano" + Me.chkPano.Size = New System.Drawing.Size(51, 17) + Me.chkPano.TabIndex = 44 + Me.chkPano.Text = "Pano" + Me.chkPano.UseVisualStyleBackColor = True + Me.chkPano.Visible = False + ' + 'btnTSSitzungen + ' + Me.btnTSSitzungen.BackColor = System.Drawing.SystemColors.ControlLightLight + Me.btnTSSitzungen.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) + Me.btnTSSitzungen.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnTSSitzungen.Image = Global.Dokumentation.My.Resources.Resources.external_content_duckduckgo_com + Me.btnTSSitzungen.ImageAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnTSSitzungen.Location = New System.Drawing.Point(25, 719) + Me.btnTSSitzungen.Name = "btnTSSitzungen" + Me.btnTSSitzungen.Size = New System.Drawing.Size(151, 28) + Me.btnTSSitzungen.TabIndex = 43 + Me.btnTSSitzungen.Text = "TS Sitzungen" + Me.btnTSSitzungen.UseVisualStyleBackColor = False + ' 'Label20 ' Me.Label20.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.Label20.BackColor = System.Drawing.Color.Red Me.Label20.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label20.ForeColor = System.Drawing.Color.White - Me.Label20.Location = New System.Drawing.Point(148, 862) + Me.Label20.Location = New System.Drawing.Point(148, 804) Me.Label20.Name = "Label20" Me.Label20.Size = New System.Drawing.Size(28, 19) Me.Label20.TabIndex = 42 @@ -488,7 +517,7 @@ Partial Class Main Me.picAVISOMessenger.BackgroundImage = Global.Dokumentation.My.Resources.Resources.aviso_messenger Me.picAVISOMessenger.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom Me.picAVISOMessenger.Cursor = System.Windows.Forms.Cursors.Hand - Me.picAVISOMessenger.Location = New System.Drawing.Point(107, 821) + Me.picAVISOMessenger.Location = New System.Drawing.Point(135, 805) Me.picAVISOMessenger.Name = "picAVISOMessenger" Me.picAVISOMessenger.Size = New System.Drawing.Size(59, 55) Me.picAVISOMessenger.TabIndex = 41 @@ -497,7 +526,7 @@ Partial Class Main 'chkTSSitzungen ' Me.chkTSSitzungen.AutoSize = True - Me.chkTSSitzungen.Location = New System.Drawing.Point(25, 744) + Me.chkTSSitzungen.Location = New System.Drawing.Point(25, 757) Me.chkTSSitzungen.Name = "chkTSSitzungen" Me.chkTSSitzungen.Size = New System.Drawing.Size(157, 17) Me.chkTSSitzungen.TabIndex = 19 @@ -638,7 +667,7 @@ Partial Class Main 'ChkTools ' Me.ChkTools.AutoSize = True - Me.ChkTools.Location = New System.Drawing.Point(25, 790) + Me.ChkTools.Location = New System.Drawing.Point(25, 803) Me.ChkTools.Name = "ChkTools" Me.ChkTools.Size = New System.Drawing.Size(107, 17) Me.ChkTools.TabIndex = 10 @@ -662,7 +691,7 @@ Partial Class Main 'ChKZugangsdaten ' Me.ChKZugangsdaten.AutoSize = True - Me.ChKZugangsdaten.Location = New System.Drawing.Point(25, 767) + Me.ChKZugangsdaten.Location = New System.Drawing.Point(25, 780) Me.ChKZugangsdaten.Name = "ChKZugangsdaten" Me.ChKZugangsdaten.Size = New System.Drawing.Size(141, 17) Me.ChKZugangsdaten.TabIndex = 4 @@ -690,7 +719,7 @@ Partial Class Main 'CMdTest2 ' Me.CMdTest2.Dock = System.Windows.Forms.DockStyle.Right - Me.CMdTest2.Location = New System.Drawing.Point(974, 0) + Me.CMdTest2.Location = New System.Drawing.Point(988, 0) Me.CMdTest2.Name = "CMdTest2" Me.CMdTest2.Size = New System.Drawing.Size(75, 100) Me.CMdTest2.TabIndex = 3 @@ -700,7 +729,7 @@ Partial Class Main 'CmdTest ' Me.CmdTest.Dock = System.Windows.Forms.DockStyle.Right - Me.CmdTest.Location = New System.Drawing.Point(899, 0) + Me.CmdTest.Location = New System.Drawing.Point(913, 0) Me.CmdTest.Name = "CmdTest" Me.CmdTest.Size = New System.Drawing.Size(75, 100) Me.CmdTest.TabIndex = 2 @@ -725,14 +754,14 @@ Partial Class Main Me.DgVMain.AllowUserToDeleteRows = False Me.DgVMain.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill Me.DgVMain.BorderStyle = System.Windows.Forms.BorderStyle.None - DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.DgVMain.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1 + DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.DgVMain.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle2 Me.DgVMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.DgVMain.ContextMenuStrip = Me.DGVMainContext Me.DgVMain.Dock = System.Windows.Forms.DockStyle.Fill @@ -743,7 +772,7 @@ Partial Class Main Me.DgVMain.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.[Single] Me.DgVMain.RowHeadersVisible = False Me.DgVMain.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.DgVMain.Size = New System.Drawing.Size(1049, 821) + Me.DgVMain.Size = New System.Drawing.Size(1063, 763) Me.DgVMain.TabIndex = 3 ' 'DGVMainContext @@ -846,9 +875,9 @@ Partial Class Main Me.PanTools.Controls.Add(Me.CmdTest) Me.PanTools.Controls.Add(Me.CMdTest2) Me.PanTools.Dock = System.Windows.Forms.DockStyle.Bottom - Me.PanTools.Location = New System.Drawing.Point(200, 951) + Me.PanTools.Location = New System.Drawing.Point(200, 893) Me.PanTools.Name = "PanTools" - Me.PanTools.Size = New System.Drawing.Size(1049, 100) + Me.PanTools.Size = New System.Drawing.Size(1063, 100) Me.PanTools.TabIndex = 4 Me.PanTools.Visible = False ' @@ -867,7 +896,7 @@ Partial Class Main 'btnTest3 ' Me.btnTest3.Dock = System.Windows.Forms.DockStyle.Right - Me.btnTest3.Location = New System.Drawing.Point(824, 0) + Me.btnTest3.Location = New System.Drawing.Point(838, 0) Me.btnTest3.Name = "btnTest3" Me.btnTest3.Size = New System.Drawing.Size(75, 100) Me.btnTest3.TabIndex = 13 @@ -918,9 +947,9 @@ Partial Class Main 'panTSSitzungen ' Me.panTSSitzungen.Dock = System.Windows.Forms.DockStyle.Right - Me.panTSSitzungen.Location = New System.Drawing.Point(1249, 130) + Me.panTSSitzungen.Location = New System.Drawing.Point(1263, 130) Me.panTSSitzungen.Name = "panTSSitzungen" - Me.panTSSitzungen.Size = New System.Drawing.Size(365, 921) + Me.panTSSitzungen.Size = New System.Drawing.Size(434, 863) Me.panTSSitzungen.TabIndex = 5 Me.panTSSitzungen.Visible = False ' @@ -933,7 +962,7 @@ Partial Class Main ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(1614, 1051) + Me.ClientSize = New System.Drawing.Size(1697, 993) Me.Controls.Add(Me.DgVMain) Me.Controls.Add(Me.PanTools) Me.Controls.Add(Me.panTSSitzungen) @@ -980,7 +1009,6 @@ Partial Class Main Friend WithEvents LblUhrzeit As Label Friend WithEvents LblNetzwerkinfo As Label Friend WithEvents CmdNetzwerkbearbeiten As Button - Friend WithEvents PictureBox1 As PictureBox Friend WithEvents MenuStrip1 As MenuStrip Friend WithEvents ToolStripMenuItem1 As ToolStripMenuItem Friend WithEvents NetzwerkeToolStripMenuItem As ToolStripMenuItem @@ -1054,4 +1082,7 @@ Partial Class Main Friend WithEvents Timer_Refresh As Timer Friend WithEvents Timer1 As Timer Friend WithEvents Button1 As Button + Public WithEvents PictureBox1 As PictureBox + Friend WithEvents btnTSSitzungen As Button + Friend WithEvents chkPano As CheckBox End Class diff --git a/Dokumentation/Main.resx b/Dokumentation/Main.resx index be7a457..ecd1a6a 100644 --- a/Dokumentation/Main.resx +++ b/Dokumentation/Main.resx @@ -117,6 +117,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + @@ -299,7 +302,7 @@ 1067, 17 - 59 + 48 diff --git a/Dokumentation/Main.vb b/Dokumentation/Main.vb index 8e1b6f8..26fe6b5 100644 --- a/Dokumentation/Main.vb +++ b/Dokumentation/Main.vb @@ -1,4 +1,5 @@ Imports System.Data.SqlClient +Imports System.IO Imports System.DirectoryServices.AccountManagement Public Class Main @@ -32,19 +33,19 @@ Public Class Main Public printds As DataSet = Nothing - Private Declare Function GetActiveWindow Lib "user32" Alias "GetActiveWindow" () As IntPtr + Public Shared Event ResetButtonPressed() + Private Declare Function GetActiveWindow Lib "user32" Alias "GetActiveWindow" () As IntPtr Private Sub Form1_Load(sender As Object, e As EventArgs) Handles MyBase.Load LblUhrzeit.Text = "Willkommen " & Class1.LoggedOnUser.Name + Class1.ini.LoadParameters() + SetAnsichtLautIni() Class1.EnableDoubleBuffered(DgVMain) Me.KeyPreview = True - 'MsgBox(sAppPath) - - 'If Class1.DBConString = "Server=DEVELOPER\DEVSQL;Initial Catalog=Doku;User ID=sa;Password=BmWr501956;Connection Timeout=5;" Then If Class1.DebugMode = True Then LblDEBUGMODE.Visible = True LblDEBUGMODE.ForeColor = Color.Red @@ -61,7 +62,6 @@ Public Class Main CheckUpdate("Programmstart") LstStandortLoad() LblUhrzeit.Text = "" - 'ImportToolStripMenuItem.Enabled = False With DgVMain .RowsDefaultCellStyle.BackColor = Color.White 'Color.Bisque .AlternatingRowsDefaultCellStyle.BackColor = ColorTranslator.FromHtml("#d7e4f2") @@ -70,8 +70,8 @@ Public Class Main TypeFilter() - ChkTools.Checked = Class1.DebugMode - chkTSSitzungen.Checked = True + 'ChkTools.Checked = Class1.DebugMode + ' chkTSSitzungen.Checked = True End Sub @@ -278,6 +278,7 @@ Public Class Main Dim netzwerkname As String = SenderStandort & "_" & SenderNetzwerk LblNetzwerkinfo.Text = "" Try + 'con.StatisticsEnabled = True con.Open() cmd.CommandText = "SELECT * FROM Tbl_Netzwerke WHERE Netzwerkname='" & netzwerkname & "'" reader = cmd.ExecuteReader() @@ -642,7 +643,7 @@ Public Class Main End Function Private Sub CmdTest_Click(sender As Object, e As EventArgs) Handles CmdTest.Click - CheckUpdate("DingDong") + End Sub Private Sub CMdTest2_Click(sender As Object, e As EventArgs) Handles CMdTest2.Click Dim testuser As New cDomUser @@ -663,7 +664,7 @@ Public Class Main End Sub Private Sub btnTest3_Click(sender As Object, e As EventArgs) Handles btnTest3.Click - + Class1.ini.save() End Sub Public Function GetDHCPClients(Netzwerk As String, DHCPServer As String, Fill As Boolean, ByRef ds As DataSet) @@ -770,17 +771,17 @@ Public Class Main Private Sub TxtSuche_TextChanged(sender As Object, e As EventArgs) Handles TxtSuche.TextChanged, RadNurNetzwerk.CheckedChanged, RadGlobal.CheckedChanged, RadStandort.CheckedChanged, LstType.SelectedIndexChanged ', TxtSuche.MouseClick If TxtSuche.TextLength < 1 And LstType.SelectedItem = "" Then Suchbegriff = "%%" - ChkFreieHosts.Checked = False + ' ChkFreieHosts.Checked = False dgvload_filter(Suchbegriff) ElseIf TxtSuche.TextLength < 1 And Not LstType.SelectedItem = "" Then - ChkDHCPClients.Checked = False - ChkFreieHosts.Checked = False + 'ChkDHCPClients.Checked = False + 'ChkFreieHosts.Checked = False dgvload_filter(Suchbegriff) Else Suchbegriff = "%" & Class1.hochkomma(TxtSuche.Text) & "%" - ChkDHCPClients.Checked = False - ChkFreieHosts.Checked = False + 'ChkDHCPClients.Checked = False + 'ChkFreieHosts.Checked = False dgvload_filter(Suchbegriff) End If @@ -898,6 +899,7 @@ Public Class Main End Sub Private Sub ChkTools_CheckedChanged(sender As Object, e As EventArgs) Handles ChkTools.CheckedChanged + If ChkTools.Checked Then PanTools.Visible = True Else @@ -1046,7 +1048,8 @@ Public Class Main End Sub Private Sub ChkKompAnsicht_CheckedChanged(sender As Object, e As EventArgs) Handles ChkKompAnsicht.CheckedChanged, ChkFreieHosts.CheckedChanged, ChkDHCPClients.CheckedChanged - 'dgvload(Tabelle) + + If ChkFreieHosts.Checked Then TxtSuche.Text = "" LstType.SelectedItem = "" @@ -1235,6 +1238,7 @@ Public Class Main End Sub Private Sub chkTSSitzungen_CheckedChanged(sender As Object, e As EventArgs) Handles chkTSSitzungen.CheckedChanged + If chkTSSitzungen.Checked Then panTSSitzungen.Controls.Clear() Dim dingsi As New uscntr_TSSitzungen @@ -1362,7 +1366,15 @@ Public Class Main DS.OPEN_SINGLE() End Sub - Private Sub PictureBox1_Click_1(sender As Object, e As EventArgs) Handles PictureBox1.Click + Public Sub PictureBox1_Click_1(sender As Object, e As EventArgs) Handles PictureBox1.Click + TxtSuche.Text = "" + RadNurNetzwerk.PerformClick() + CmdSucheReset.PerformClick() + Try + RaiseEvent ResetButtonPressed() + Catch ex As Exception + MsgBox(ex.Message) + End Try LstStandortLoad() 'dgvload_filter End Sub @@ -1492,8 +1504,42 @@ Public Class Main End Sub + Function SetAnsichtLautIni() + If File.Exists(Application.StartupPath & "\config.ini") Then + chkTSSitzungen.Checked = Class1.ini.prop_TSSitzungenAnzeigen + ChkKompAnsicht.Checked = Class1.ini.prop_Kompansicht + ChkFreieHosts.Checked = Class1.ini.prop_FreiHostsAnzeigen + ChkDHCPClients.Checked = Class1.ini.prop_DHCPClientsAnzeigen + ChkTools.Checked = Class1.ini.prop_ToolsPanelAnzeizgen + chkPano.Checked = Class1.ini.prop_Pano + Else + ' File.Create(Application.StartupPath & "\config.ini") + End If + End Function + + Private Sub btnTSSitzungen_Click(sender As Object, e As EventArgs) Handles btnTSSitzungen.Click + Dim TSSitzungen As New frmLeer + TSSitzungen.PanMain.Controls.Clear() + Dim dingsi As New uscntr_TSSitzungen + TSSitzungen.AutoSize = AutoSizeMode.GrowAndShrink + TSSitzungen.Size = New Size(434, 863) + dingsi.Dock = Dock.Fill + TSSitzungen.PanMain.Controls.Add(dingsi) + TSSitzungen.Show() + End Sub + Private Sub Main_Closed(sender As Object, e As EventArgs) Handles Me.Closed + + Class1.ini.prop_Kompansicht = ChkKompAnsicht.Checked + Class1.ini.prop_FreiHostsAnzeigen = ChkFreieHosts.Checked + Class1.ini.prop_DHCPClientsAnzeigen = ChkDHCPClients.Checked + Class1.ini.prop_ToolsPanelAnzeizgen = ChkTools.Checked + Class1.ini.prop_TSSitzungenAnzeigen = chkTSSitzungen.Checked + Class1.ini.prop_Pano = chkPano.Checked + + Class1.ini.save() + End Sub End Class '1208 diff --git a/Dokumentation/My Project/Resources.Designer.vb b/Dokumentation/My Project/Resources.Designer.vb index e9a5192..b0b6529 100644 --- a/Dokumentation/My Project/Resources.Designer.vb +++ b/Dokumentation/My Project/Resources.Designer.vb @@ -120,6 +120,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property external_content_duckduckgo_com() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("external-content.duckduckgo.com", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -269,7 +279,7 @@ Namespace My.Resources End Property ''' - ''' Sucht eine lokalisierte Zeichenfolge, die 0.0.1.60 ähnelt. + ''' Sucht eine lokalisierte Zeichenfolge, die 0.0.1.64 ähnelt. ''' Friend ReadOnly Property Version() As String Get diff --git a/Dokumentation/My Project/Resources.resx b/Dokumentation/My Project/Resources.resx index 42618f2..bc09d0b 100644 --- a/Dokumentation/My Project/Resources.resx +++ b/Dokumentation/My Project/Resources.resx @@ -124,17 +124,17 @@ ..\Resources\Hakerl20.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\msg.exe;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\Resources\del.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Bearbeiten20.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\mail20.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + - 0.0.1.60 + 0.0.1.64 ..\Resources\Link.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -145,20 +145,20 @@ ..\Resources\Netzwerk20.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\excel20.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Admin.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Link.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Admin20.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\aviso_messenger.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Dokumentation - - ..\Resources\Link20.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\excel20.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Print20x20.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -166,22 +166,25 @@ ..\Resources\Update.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Link20.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Print.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\pdf512.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\mail20.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\msg.exe;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 DOKU - - ..\Resources\Link.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Admin.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\aviso_messenger.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\external-content.duckduckgo.com.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/Dokumentation/Resources/external-content.duckduckgo.com.png b/Dokumentation/Resources/external-content.duckduckgo.com.png new file mode 100644 index 0000000000000000000000000000000000000000..dcd49a10a547a372b8c203e5877488133777d777 GIT binary patch literal 947 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5l;AAz zh%9Dc;5!1sj8nDwq=ABLN#5=*4F5rJ!QSPQfg-9Ut`Q|Ei6yC4$wjF^iowXh&_dV1 zT-VSj#K6SL#MH{zK-a+3%D|w&`IZHWhTQy=%(P0}8W`o0fR1EZ;pyTSV&OkE#MWa| zph(@lOJ17w3s$lnbO>N?c4%VTzHiaOHjNApE>U)27I8({SuEGrUt6Zqv}k41F^(uD zE+%%*7xi2+NBmE}D?k77dF|RIRSyc@+tz=#{C=l;YSvaQl?57H87djiS)$5IN)oE8 zrDyuExh>w9$M{>6i&aKe_NqvJe*UAyd-m2_U&7oqhG#$oov5U?tl)*Ez8Dh zR&)8Rt*t96DjdSY!|z_|nm%1zM_0E|_*&`wNv0QW-aM)L{rh+4P3d>t<2Ri@cW#^7 z6(?y2&P+KD76UuGKCh*RsxD2OAGhA!My~zzQzrALfB*jVPHS;HnPP8id-TSQh`Wmp zlQtkvS?eT)m*Wvy?zmEubCx1EX>I8;NjuvIC#); z$hHh`DAB`p6kV)RTKXH__5=ppLTI^v6H$wPyg}ewQF^!oKDrz*FXJPVgC9+9WlY~ zqXwp?t-E(ypLl%W-8;QaH+8Q3^R}_KFXpswJeY9cl$S(zcXx-|;yuf5s5$SNQnz1T zTwHul*yp;sK3iMc8+YzZnd|#0cuDtsucZbyHfz*mBqbkyeDj89X;A0nfCn#Lthf?X zW|~=EZvO85dqEzy*R!Pd#OXV%o%T82bFpUD=B%o$uA>=ce}e- zzH?nje!l*-Yu5xiT@s9D-f$~?`pN$1*1req*JUo4b0&4+CtxCH@O1TaS?83{1OVIw Bja~o% literal 0 HcmV?d00001 diff --git a/Dokumentation/uscntr_DomUser.Designer.vb b/Dokumentation/uscntr_DomUser.Designer.vb index 9ca6fb2..0ba335a 100644 --- a/Dokumentation/uscntr_DomUser.Designer.vb +++ b/Dokumentation/uscntr_DomUser.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class uscntr_DomUser Inherits System.Windows.Forms.UserControl 'UserControl überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -20,7 +20,7 @@ Partial Class uscntr_DomUser 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. - _ + Private Sub InitializeComponent() Me.cmdSave = New System.Windows.Forms.Button() Me.TxtAvisoBenutzername = New System.Windows.Forms.TextBox() @@ -48,6 +48,9 @@ Partial Class uscntr_DomUser Me.Label1 = New System.Windows.Forms.Label() Me.ListDomUser = New System.Windows.Forms.ListBox() Me.btnSchliessen = New System.Windows.Forms.Button() + Me.chkAutoLogoff = New System.Windows.Forms.CheckBox() + Me.DateTimePicker1 = New System.Windows.Forms.DateTimePicker() + Me.cmd3Uhr = New System.Windows.Forms.Button() Me.SuspendLayout() ' 'cmdSave @@ -308,12 +311,50 @@ Partial Class uscntr_DomUser Me.btnSchliessen.Text = "Schließen" Me.btnSchliessen.UseVisualStyleBackColor = False ' + 'chkAutoLogoff + ' + Me.chkAutoLogoff.AutoSize = True + Me.chkAutoLogoff.CheckAlign = System.Drawing.ContentAlignment.MiddleRight + Me.chkAutoLogoff.Location = New System.Drawing.Point(8, 227) + Me.chkAutoLogoff.Name = "chkAutoLogoff" + Me.chkAutoLogoff.Size = New System.Drawing.Size(78, 17) + Me.chkAutoLogoff.TabIndex = 164 + Me.chkAutoLogoff.Text = "Aut. Logoff" + Me.chkAutoLogoff.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.chkAutoLogoff.UseVisualStyleBackColor = True + ' + 'DateTimePicker1 + ' + Me.DateTimePicker1.Enabled = False + Me.DateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Time + Me.DateTimePicker1.Location = New System.Drawing.Point(103, 224) + Me.DateTimePicker1.Name = "DateTimePicker1" + Me.DateTimePicker1.Size = New System.Drawing.Size(82, 20) + Me.DateTimePicker1.TabIndex = 165 + ' + 'cmd3Uhr + ' + Me.cmd3Uhr.BackColor = System.Drawing.SystemColors.ControlLightLight + Me.cmd3Uhr.Enabled = False + Me.cmd3Uhr.FlatAppearance.BorderColor = System.Drawing.Color.DimGray + Me.cmd3Uhr.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.cmd3Uhr.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.2!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cmd3Uhr.Location = New System.Drawing.Point(191, 224) + Me.cmd3Uhr.Name = "cmd3Uhr" + Me.cmd3Uhr.Size = New System.Drawing.Size(66, 20) + Me.cmd3Uhr.TabIndex = 166 + Me.cmd3Uhr.Text = "03:00" + Me.cmd3Uhr.UseVisualStyleBackColor = False + ' 'uscntr_DomUser ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoSize = True Me.BackColor = System.Drawing.SystemColors.GradientInactiveCaption + Me.Controls.Add(Me.cmd3Uhr) + Me.Controls.Add(Me.DateTimePicker1) + Me.Controls.Add(Me.chkAutoLogoff) Me.Controls.Add(Me.btnSchliessen) Me.Controls.Add(Me.ListDomUser) Me.Controls.Add(Me.txtInfo) @@ -341,7 +382,7 @@ Partial Class uscntr_DomUser Me.Controls.Add(Me.ChkKennwortAnzeigen) Me.Controls.Add(Me.cmdSave) Me.Name = "uscntr_DomUser" - Me.Size = New System.Drawing.Size(678, 498) + Me.Size = New System.Drawing.Size(678, 369) Me.ResumeLayout(False) Me.PerformLayout() @@ -373,4 +414,7 @@ Partial Class uscntr_DomUser Friend WithEvents Label1 As Label Friend WithEvents ListDomUser As ListBox Friend WithEvents btnSchliessen As Button + Friend WithEvents chkAutoLogoff As CheckBox + Friend WithEvents DateTimePicker1 As DateTimePicker + Friend WithEvents cmd3Uhr As Button End Class diff --git a/Dokumentation/uscntr_DomUser.vb b/Dokumentation/uscntr_DomUser.vb index 1e47cbf..0625dea 100644 --- a/Dokumentation/uscntr_DomUser.vb +++ b/Dokumentation/uscntr_DomUser.vb @@ -21,6 +21,11 @@ txtDomKennwort.Text = DomUser.du_Kennwort txtEMailAdresse.Enabled = DomUser.du_Email_Activated + + chkAutoLogoff.Checked = DomUser.du_autologoff + If DomUser.du_autologoff = True Then + DateTimePicker1.Value = DomUser.du_autologofftime + End If End If End Function @@ -35,6 +40,8 @@ DomUser.du_Email_Activated = chkEMailAktiv.Checked DomUser.du_EMail = txtEMailAdresse.Text DomUser.du_Info = txtInfo.Text + DomUser.du_autologoff = chkAutoLogoff.Checked + DomUser.du_autologofftime = DateTimePicker1.Value End Function Private Sub CheckBox1_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox1.CheckedChanged @@ -58,6 +65,7 @@ If chkEMailAktiv.Checked Then txtEMailAdresse.Enabled = True Else + txtEMailAdresse.Text = "" txtEMailAdresse.Enabled = False End If End Sub @@ -96,4 +104,17 @@ cmdSave.PerformClick() ParentForm.Close() End Sub + + Private Sub chkAutoLogoff_CheckedChanged(sender As Object, e As EventArgs) Handles chkAutoLogoff.CheckedChanged + DateTimePicker1.Enabled = chkAutoLogoff.Checked + cmd3Uhr.Enabled = chkAutoLogoff.Checked + End Sub + + Private Sub Button1_Click_1(sender As Object, e As EventArgs) + MsgBox("hier") + End Sub + + Private Sub cmd3Uhr_Click(sender As Object, e As EventArgs) Handles cmd3Uhr.Click + DateTimePicker1.Value = New DateTime(2020, 9, 1, 3, 0, 0) + End Sub End Class diff --git a/Dokumentation/uscntr_DomUserList.Designer.vb b/Dokumentation/uscntr_DomUserList.Designer.vb index c261f4a..c2d8f50 100644 --- a/Dokumentation/uscntr_DomUserList.Designer.vb +++ b/Dokumentation/uscntr_DomUserList.Designer.vb @@ -24,6 +24,9 @@ Partial Class uscntr_DomUserList Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Me.Panel1 = New System.Windows.Forms.Panel() + Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.ExportToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.labAnzahl = New System.Windows.Forms.Label() Me.cmdNeu = New System.Windows.Forms.Button() Me.cmdReset = New System.Windows.Forms.Button() Me.CheckBox1 = New System.Windows.Forms.CheckBox() @@ -35,14 +38,11 @@ Partial Class uscntr_DomUserList Me.dgvListUser = New System.Windows.Forms.DataGridView() Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.LöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.labAnzahl = New System.Windows.Forms.Label() - Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components) - Me.ExportToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.Panel1.SuspendLayout() + Me.ContextMenuStrip2.SuspendLayout() Me.Panel2.SuspendLayout() CType(Me.dgvListUser, System.ComponentModel.ISupportInitialize).BeginInit() Me.ContextMenuStrip1.SuspendLayout() - Me.ContextMenuStrip2.SuspendLayout() Me.SuspendLayout() ' 'Panel1 @@ -63,6 +63,27 @@ Partial Class uscntr_DomUserList Me.Panel1.Size = New System.Drawing.Size(678, 100) Me.Panel1.TabIndex = 0 ' + 'ContextMenuStrip2 + ' + Me.ContextMenuStrip2.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ExportToolStripMenuItem}) + Me.ContextMenuStrip2.Name = "ContextMenuStrip2" + Me.ContextMenuStrip2.Size = New System.Drawing.Size(109, 26) + ' + 'ExportToolStripMenuItem + ' + Me.ExportToolStripMenuItem.Name = "ExportToolStripMenuItem" + Me.ExportToolStripMenuItem.Size = New System.Drawing.Size(108, 22) + Me.ExportToolStripMenuItem.Text = "Export" + ' + 'labAnzahl + ' + Me.labAnzahl.AutoSize = True + Me.labAnzahl.Location = New System.Drawing.Point(535, 10) + Me.labAnzahl.Name = "labAnzahl" + Me.labAnzahl.Size = New System.Drawing.Size(39, 13) + Me.labAnzahl.TabIndex = 139 + Me.labAnzahl.Text = "Label3" + ' 'cmdNeu ' Me.cmdNeu.BackColor = System.Drawing.SystemColors.ControlLightLight @@ -168,27 +189,6 @@ Partial Class uscntr_DomUserList Me.LöschenToolStripMenuItem.Size = New System.Drawing.Size(118, 22) Me.LöschenToolStripMenuItem.Text = "Löschen" ' - 'labAnzahl - ' - Me.labAnzahl.AutoSize = True - Me.labAnzahl.Location = New System.Drawing.Point(535, 10) - Me.labAnzahl.Name = "labAnzahl" - Me.labAnzahl.Size = New System.Drawing.Size(39, 13) - Me.labAnzahl.TabIndex = 139 - Me.labAnzahl.Text = "Label3" - ' - 'ContextMenuStrip2 - ' - Me.ContextMenuStrip2.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ExportToolStripMenuItem}) - Me.ContextMenuStrip2.Name = "ContextMenuStrip2" - Me.ContextMenuStrip2.Size = New System.Drawing.Size(181, 48) - ' - 'ExportToolStripMenuItem - ' - Me.ExportToolStripMenuItem.Name = "ExportToolStripMenuItem" - Me.ExportToolStripMenuItem.Size = New System.Drawing.Size(180, 22) - Me.ExportToolStripMenuItem.Text = "Export" - ' 'uscntr_DomUserList ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -201,10 +201,10 @@ Partial Class uscntr_DomUserList Me.Size = New System.Drawing.Size(678, 498) Me.Panel1.ResumeLayout(False) Me.Panel1.PerformLayout() + Me.ContextMenuStrip2.ResumeLayout(False) Me.Panel2.ResumeLayout(False) CType(Me.dgvListUser, System.ComponentModel.ISupportInitialize).EndInit() Me.ContextMenuStrip1.ResumeLayout(False) - Me.ContextMenuStrip2.ResumeLayout(False) Me.ResumeLayout(False) End Sub diff --git a/Dokumentation/uscntr_DomUserList.vb b/Dokumentation/uscntr_DomUserList.vb index c81a39d..0c054f1 100644 --- a/Dokumentation/uscntr_DomUserList.vb +++ b/Dokumentation/uscntr_DomUserList.vb @@ -75,12 +75,15 @@ Public Class uscntr_DomUserList Me.Parent.Enabled = False AddHandler frm.FormClosing, Function() - Me.Parent.Enabled = True - BringToFront() - LoadDGV() + Try + Me.Parent.Enabled = True + BringToFront() + LoadDGV() + Catch + End Try End Function - frm.ShowDialog() + frm.Show() End Sub @@ -112,7 +115,7 @@ Public Class uscntr_DomUserList LoadDGV() End Function - frm.ShowDialog() + frm.Show() End Sub Private Sub cbDomain_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cbDomain.SelectedIndexChanged, TextBox1.TextChanged, CheckBox1.CheckedChanged @@ -136,4 +139,5 @@ Public Class uscntr_DomUserList Private Sub ExportToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ExportToolStripMenuItem.Click Class1.datatable_2_csv_export(LoadDGV(True)) End Sub + End Class diff --git a/Dokumentation/uscntr_TSSitzungen.Designer.vb b/Dokumentation/uscntr_TSSitzungen.Designer.vb index 484036a..13699c6 100644 --- a/Dokumentation/uscntr_TSSitzungen.Designer.vb +++ b/Dokumentation/uscntr_TSSitzungen.Designer.vb @@ -288,10 +288,10 @@ Partial Class uscntr_TSSitzungen Friend WithEvents Panel2 As Panel Friend WithEvents Label1 As Label Friend WithEvents TextBox1 As TextBox - Friend WithEvents btnReset As Button Friend WithEvents lblAnzahl As Label Friend WithEvents VerbindenMitTeamVToolStripMenuItem As ToolStripMenuItem Friend WithEvents btnClient As Button Friend WithEvents btnSitzung As Button Friend WithEvents ProfildatenÖffnenExplorerToolStripMenuItem As ToolStripMenuItem + Public WithEvents btnReset As Button End Class diff --git a/Dokumentation/uscntr_TSSitzungen.vb b/Dokumentation/uscntr_TSSitzungen.vb index e6cc57f..9a38b27 100644 --- a/Dokumentation/uscntr_TSSitzungen.vb +++ b/Dokumentation/uscntr_TSSitzungen.vb @@ -4,11 +4,16 @@ Dim SelectedIndex As Integer = 0 Dim StartIndex As Integer = 0 - Private Sub uscntr_TSSitzungen_Load(sender As Object, e As EventArgs) Handles Me.Load + + Public Sub uscntr_TSSitzungen_Load(sender As Object, e As EventArgs) Handles Me.Load + + AddHandler Main.ResetButtonPressed, AddressOf Reset + Class1.EnableDoubleBuffered(dgvTSSitzungen) Load2DGV() End Sub + Function Load2DGV() ' (Optional ByVal Client As Boolean = False) If Client = False Then Dim ds As New DataSet @@ -20,8 +25,10 @@ .RowHeadersVisible = False .DataSource = ds.Tables(0) .Columns("Domain").Visible = False - .Columns("LastLogon").Visible = False + .Columns("LastLogon").Visible = True + .Columns("LastLogon").HeaderText = "Sitzungsst." .Columns("BenutzerAnmeldeName").Visible = False + .Columns("LastReport").Visible = False .Columns("Name").Width = 110 'AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill .Columns("TeamviewerID").Width = 80 @@ -42,10 +49,10 @@ .DataSource = ds.Tables(0) '.Columns("Domain").Visible = False '.Columns("LastLogon").Visible = False - '.Columns("BenutzerAnmeldeName").Visible = False - + .Columns("BenutzerAnmeldeName").Visible = False + .Columns("LastReport").Visible = False '.Columns("Name").Width = 110 'AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill - '.Columns("TeamviewerID").Width = 80 + .Columns("TeamviewerID").Width = 80 '.Columns("TSServer").Width = 55 .AutoResizeColumn(1) @@ -71,8 +78,6 @@ End Sub - - Private Sub Timer1_Tick(sender As Object, e As EventArgs) Handles Timer1.Tick Load2DGV() End Sub @@ -131,8 +136,14 @@ Return String.Format(ding, TextBox1.Text) End Function - Private Sub btnReset_Click(sender As Object, e As EventArgs) Handles btnReset.Click + Function Reset() + btnSitzung.PerformClick() TextBox1.Text = "" + End Function + + Public Sub btnReset_Click(sender As Object, e As EventArgs) Handles btnReset.Click + 'TextBox1.Text = "" + Reset() End Sub Private Sub VerbindenMitTeamVToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles VerbindenMitTeamVToolStripMenuItem.Click @@ -178,4 +189,7 @@ SelectedIndex = dgvTSSitzungen.CurrentRow.Index StartIndex = dgvTSSitzungen.FirstDisplayedScrollingRowIndex End Function + + + End Class