diff --git a/Doku.sln b/Doku.sln
index a142475..1752e81 100644
--- a/Doku.sln
+++ b/Doku.sln
@@ -7,8 +7,6 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Dokumentation", "Dokumentat
EndProject
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Dokumentation_Updater", "Dokumentation_Updater\Dokumentation_Updater.vbproj", "{5C2A947D-17F3-4975-8781-3B662FC72EAB}"
EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VERAG_PROG_ALLGEMEIN", "..\SDL\SDL\VERAG_PROG_ALLGEMEIN\VERAG_PROG_ALLGEMEIN.vbproj", "{A3B497BD-842C-4A2B-B398-ED1976849DF1}"
-EndProject
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DokuServices", "DokuServices\DokuServices.vbproj", "{318A9460-5A6B-47A6-8916-E023BD850E21}"
EndProject
Global
@@ -25,10 +23,6 @@ Global
{5C2A947D-17F3-4975-8781-3B662FC72EAB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5C2A947D-17F3-4975-8781-3B662FC72EAB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5C2A947D-17F3-4975-8781-3B662FC72EAB}.Release|Any CPU.Build.0 = Release|Any CPU
- {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|Any CPU.Build.0 = Release|Any CPU
{318A9460-5A6B-47A6-8916-E023BD850E21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{318A9460-5A6B-47A6-8916-E023BD850E21}.Debug|Any CPU.Build.0 = Debug|Any CPU
{318A9460-5A6B-47A6-8916-E023BD850E21}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/Dokumentation/Classes/cPascom.vb b/Dokumentation/Classes/cPascom.vb
index 4528444..ab6923c 100644
--- a/Dokumentation/Classes/cPascom.vb
+++ b/Dokumentation/Classes/cPascom.vb
@@ -219,7 +219,7 @@ Public Class cPascom
End If
rest.AddHeader("Content-Type", "application/json")
- rest.SetAuthBasic("moby", "XgDsFmMSutaMLA1")
+ rest.SetAuthBasic("2XboAropSm6gsEmyc51hnC05Ovdmvlsd", "C5zA1eNAtZcUE0JujZ0uwEpJv0tkOESz")
Dim json As New Chilkat.JsonObject
diff --git a/Dokumentation/Main.Designer.vb b/Dokumentation/Main.Designer.vb
index cdbf8e9..d108fb3 100644
--- a/Dokumentation/Main.Designer.vb
+++ b/Dokumentation/Main.Designer.vb
@@ -24,23 +24,21 @@ 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()
+ Dim DataGridViewCellStyle3 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.lblRufbereitschaft = New System.Windows.Forms.Label()
Me.lblOfflinemodus = New System.Windows.Forms.Label()
Me.Button3 = New System.Windows.Forms.Button()
Me.Button2 = New System.Windows.Forms.Button()
- Me.lblNotruf = New System.Windows.Forms.Label()
Me.Label20 = New System.Windows.Forms.Label()
Me.picAVISOMessenger = New System.Windows.Forms.PictureBox()
- Me.Button1 = New System.Windows.Forms.Button()
- Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
- Me.TelefonManuellZuweisenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.btnTSSitzungen = New System.Windows.Forms.Button()
Me.LblDEBUGMODE = New System.Windows.Forms.Label()
Me.chkTSSitzungen = New System.Windows.Forms.CheckBox()
Me.LblVersion = New System.Windows.Forms.Label()
- Me.LblInfo = New System.Windows.Forms.Label()
Me.btnBenutzerverwaltung = New System.Windows.Forms.Button()
Me.CmdSucheReset = New System.Windows.Forms.Button()
Me.TxtSuche = New System.Windows.Forms.TextBox()
@@ -58,6 +56,10 @@ Partial Class Main
Me.ChKZugangsdaten = New System.Windows.Forms.CheckBox()
Me.Panel1 = New System.Windows.Forms.Panel()
Me.LblNetzwerkinfo = New System.Windows.Forms.Label()
+ Me.Button1 = New System.Windows.Forms.Button()
+ Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
+ Me.TelefonManuellZuweisenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.LblInfo = New System.Windows.Forms.Label()
Me.MenuStrip1 = New System.Windows.Forms.MenuStrip()
Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
Me.NetzwerkeToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -72,8 +74,13 @@ Partial Class Main
Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripMenuItemINFO = New System.Windows.Forms.ToolStripMenuItem()
Me.TicketsystemToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.SnipeITToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.PascomToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.UnifiToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.VCenterToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.ProxMoxToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.PortainerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.FirewallToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.Panel3 = New System.Windows.Forms.Panel()
Me.lblTempServerraum15 = New System.Windows.Forms.Label()
Me.lblTempServerraum100 = New System.Windows.Forms.Label()
@@ -132,16 +139,15 @@ Partial Class Main
Me.Timer_Refresh = New System.Windows.Forms.Timer(Me.components)
Me.Timer1 = New System.Windows.Forms.Timer(Me.components)
Me.Timer_Temperatur = New System.Windows.Forms.Timer(Me.components)
- Me.ProxMoxToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
- Me.PortainerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.Panel2.SuspendLayout()
Me.Panel4.SuspendLayout()
CType(Me.picAVISOMessenger, System.ComponentModel.ISupportInitialize).BeginInit()
- Me.ContextMenuStrip1.SuspendLayout()
Me.PanType.SuspendLayout()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.PanSuche.SuspendLayout()
Me.Panel1.SuspendLayout()
+ Me.ContextMenuStrip1.SuspendLayout()
Me.MenuStrip1.SuspendLayout()
Me.Panel3.SuspendLayout()
Me.PanNetzwerk.SuspendLayout()
@@ -159,24 +165,22 @@ 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(1494, 130)
+ Me.Panel2.Size = New System.Drawing.Size(1172, 130)
Me.Panel2.TabIndex = 1
'
'Panel4
'
Me.Panel4.BackColor = System.Drawing.SystemColors.GradientInactiveCaption
+ Me.Panel4.Controls.Add(Me.lblRufbereitschaft)
Me.Panel4.Controls.Add(Me.lblOfflinemodus)
Me.Panel4.Controls.Add(Me.Button3)
Me.Panel4.Controls.Add(Me.Button2)
- Me.Panel4.Controls.Add(Me.lblNotruf)
Me.Panel4.Controls.Add(Me.Label20)
Me.Panel4.Controls.Add(Me.picAVISOMessenger)
- Me.Panel4.Controls.Add(Me.Button1)
Me.Panel4.Controls.Add(Me.btnTSSitzungen)
Me.Panel4.Controls.Add(Me.LblDEBUGMODE)
Me.Panel4.Controls.Add(Me.chkTSSitzungen)
Me.Panel4.Controls.Add(Me.LblVersion)
- Me.Panel4.Controls.Add(Me.LblInfo)
Me.Panel4.Controls.Add(Me.btnBenutzerverwaltung)
Me.Panel4.Controls.Add(Me.CmdSucheReset)
Me.Panel4.Controls.Add(Me.TxtSuche)
@@ -188,11 +192,22 @@ Partial Class Main
Me.Panel4.Controls.Add(Me.LblUhrzeit)
Me.Panel4.Controls.Add(Me.ChKZugangsdaten)
Me.Panel4.Dock = System.Windows.Forms.DockStyle.Fill
- Me.Panel4.Location = New System.Drawing.Point(272, 24)
+ Me.Panel4.Location = New System.Drawing.Point(286, 24)
Me.Panel4.Name = "Panel4"
- Me.Panel4.Size = New System.Drawing.Size(1222, 106)
+ Me.Panel4.Size = New System.Drawing.Size(886, 106)
Me.Panel4.TabIndex = 14
'
+ 'lblRufbereitschaft
+ '
+ Me.lblRufbereitschaft.AutoSize = True
+ Me.lblRufbereitschaft.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.lblRufbereitschaft.ForeColor = System.Drawing.Color.DarkRed
+ Me.lblRufbereitschaft.Location = New System.Drawing.Point(79, 11)
+ Me.lblRufbereitschaft.Name = "lblRufbereitschaft"
+ Me.lblRufbereitschaft.Size = New System.Drawing.Size(104, 15)
+ Me.lblRufbereitschaft.TabIndex = 48
+ Me.lblRufbereitschaft.Text = "Rufbereitschaft"
+ '
'lblOfflinemodus
'
Me.lblOfflinemodus.AutoSize = True
@@ -211,7 +226,7 @@ Partial Class Main
Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button3.Image = Global.Dokumentation.My.Resources.Resources.mstsc1
Me.Button3.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
- Me.Button3.Location = New System.Drawing.Point(74, 39)
+ Me.Button3.Location = New System.Drawing.Point(17, 34)
Me.Button3.Name = "Button3"
Me.Button3.Size = New System.Drawing.Size(116, 28)
Me.Button3.TabIndex = 46
@@ -225,29 +240,20 @@ Partial Class Main
Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button2.Image = Global.Dokumentation.My.Resources.Resources.Netzwerk20
Me.Button2.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
- Me.Button2.Location = New System.Drawing.Point(74, 72)
+ Me.Button2.Location = New System.Drawing.Point(17, 67)
Me.Button2.Name = "Button2"
Me.Button2.Size = New System.Drawing.Size(116, 28)
Me.Button2.TabIndex = 45
Me.Button2.Text = "Profile SMB"
Me.Button2.UseVisualStyleBackColor = False
'
- 'lblNotruf
- '
- Me.lblNotruf.AutoSize = True
- Me.lblNotruf.Location = New System.Drawing.Point(327, 15)
- Me.lblNotruf.Name = "lblNotruf"
- Me.lblNotruf.Size = New System.Drawing.Size(57, 13)
- Me.lblNotruf.TabIndex = 44
- Me.lblNotruf.Text = "Notruf an: "
- '
'Label20
'
Me.Label20.Anchor = System.Windows.Forms.AnchorStyles.Right
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(503, 75)
+ Me.Label20.Location = New System.Drawing.Point(120, 75)
Me.Label20.Name = "Label20"
Me.Label20.Size = New System.Drawing.Size(28, 19)
Me.Label20.TabIndex = 42
@@ -261,39 +267,12 @@ 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(475, 48)
+ Me.picAVISOMessenger.Location = New System.Drawing.Point(89, 40)
Me.picAVISOMessenger.Name = "picAVISOMessenger"
Me.picAVISOMessenger.Size = New System.Drawing.Size(59, 55)
Me.picAVISOMessenger.TabIndex = 41
Me.picAVISOMessenger.TabStop = False
'
- 'Button1
- '
- Me.Button1.BackColor = System.Drawing.SystemColors.ControlLightLight
- Me.Button1.ContextMenuStrip = Me.ContextMenuStrip1
- Me.Button1.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer))
- Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
- Me.Button1.Image = Global.Dokumentation.My.Resources.Resources.iconfinder_contat_us_27phone_4211855_115040__Benutzerdefiniert_
- Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
- Me.Button1.Location = New System.Drawing.Point(196, 5)
- Me.Button1.Name = "Button1"
- Me.Button1.Size = New System.Drawing.Size(116, 28)
- Me.Button1.TabIndex = 43
- Me.Button1.Text = "Telefon"
- Me.Button1.UseVisualStyleBackColor = False
- '
- 'ContextMenuStrip1
- '
- Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.TelefonManuellZuweisenToolStripMenuItem})
- Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
- Me.ContextMenuStrip1.Size = New System.Drawing.Size(211, 26)
- '
- 'TelefonManuellZuweisenToolStripMenuItem
- '
- Me.TelefonManuellZuweisenToolStripMenuItem.Name = "TelefonManuellZuweisenToolStripMenuItem"
- Me.TelefonManuellZuweisenToolStripMenuItem.Size = New System.Drawing.Size(210, 22)
- Me.TelefonManuellZuweisenToolStripMenuItem.Text = "Telefon manuell zuweisen"
- '
'btnTSSitzungen
'
Me.btnTSSitzungen.BackColor = System.Drawing.SystemColors.ControlLightLight
@@ -301,7 +280,7 @@ Partial Class Main
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(196, 73)
+ Me.btnTSSitzungen.Location = New System.Drawing.Point(139, 68)
Me.btnTSSitzungen.Name = "btnTSSitzungen"
Me.btnTSSitzungen.Size = New System.Drawing.Size(116, 28)
Me.btnTSSitzungen.TabIndex = 43
@@ -312,7 +291,7 @@ Partial Class Main
'
Me.LblDEBUGMODE.AutoSize = True
Me.LblDEBUGMODE.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.LblDEBUGMODE.Location = New System.Drawing.Point(7, 22)
+ Me.LblDEBUGMODE.Location = New System.Drawing.Point(879, 10)
Me.LblDEBUGMODE.Name = "LblDEBUGMODE"
Me.LblDEBUGMODE.Size = New System.Drawing.Size(113, 16)
Me.LblDEBUGMODE.TabIndex = 13
@@ -322,7 +301,7 @@ Partial Class Main
'chkTSSitzungen
'
Me.chkTSSitzungen.AutoSize = True
- Me.chkTSSitzungen.Location = New System.Drawing.Point(327, 34)
+ Me.chkTSSitzungen.Location = New System.Drawing.Point(277, 26)
Me.chkTSSitzungen.Name = "chkTSSitzungen"
Me.chkTSSitzungen.Size = New System.Drawing.Size(157, 17)
Me.chkTSSitzungen.TabIndex = 19
@@ -333,21 +312,12 @@ Partial Class Main
'
Me.LblVersion.Anchor = System.Windows.Forms.AnchorStyles.Right
Me.LblVersion.AutoSize = True
- Me.LblVersion.Location = New System.Drawing.Point(3, 5)
+ Me.LblVersion.Location = New System.Drawing.Point(563, 85)
Me.LblVersion.Name = "LblVersion"
Me.LblVersion.Size = New System.Drawing.Size(42, 13)
Me.LblVersion.TabIndex = 17
Me.LblVersion.Text = "Version"
'
- 'LblInfo
- '
- Me.LblInfo.AutoSize = True
- Me.LblInfo.Location = New System.Drawing.Point(7, 87)
- Me.LblInfo.Name = "LblInfo"
- Me.LblInfo.Size = New System.Drawing.Size(39, 13)
- Me.LblInfo.TabIndex = 16
- Me.LblInfo.Text = "LblInfo"
- '
'btnBenutzerverwaltung
'
Me.btnBenutzerverwaltung.BackColor = System.Drawing.SystemColors.ControlLightLight
@@ -355,7 +325,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(196, 39)
+ Me.btnBenutzerverwaltung.Location = New System.Drawing.Point(139, 34)
Me.btnBenutzerverwaltung.Name = "btnBenutzerverwaltung"
Me.btnBenutzerverwaltung.Size = New System.Drawing.Size(116, 28)
Me.btnBenutzerverwaltung.TabIndex = 20
@@ -368,7 +338,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(726, 71)
+ Me.CmdSucheReset.Location = New System.Drawing.Point(390, 71)
Me.CmdSucheReset.Name = "CmdSucheReset"
Me.CmdSucheReset.Size = New System.Drawing.Size(121, 23)
Me.CmdSucheReset.TabIndex = 15
@@ -379,7 +349,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(540, 23)
+ Me.TxtSuche.Location = New System.Drawing.Point(204, 23)
Me.TxtSuche.Name = "TxtSuche"
Me.TxtSuche.Size = New System.Drawing.Size(138, 20)
Me.TxtSuche.TabIndex = 3
@@ -389,7 +359,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(493, 26)
+ Me.Label1.Location = New System.Drawing.Point(157, 26)
Me.Label1.Name = "Label1"
Me.Label1.Size = New System.Drawing.Size(47, 13)
Me.Label1.TabIndex = 4
@@ -400,7 +370,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(684, 5)
+ Me.PanType.Location = New System.Drawing.Point(348, 5)
Me.PanType.Name = "PanType"
Me.PanType.Size = New System.Drawing.Size(183, 41)
Me.PanType.TabIndex = 12
@@ -428,9 +398,9 @@ Partial Class Main
'
Me.PictureBox1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.PictureBox1.Image = CType(resources.GetObject("PictureBox1.Image"), System.Drawing.Image)
- Me.PictureBox1.Location = New System.Drawing.Point(873, 6)
+ Me.PictureBox1.Location = New System.Drawing.Point(566, 10)
Me.PictureBox1.Name = "PictureBox1"
- Me.PictureBox1.Size = New System.Drawing.Size(340, 74)
+ Me.PictureBox1.Size = New System.Drawing.Size(320, 70)
Me.PictureBox1.TabIndex = 1
Me.PictureBox1.TabStop = False
'
@@ -440,7 +410,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(540, 49)
+ Me.PanSuche.Location = New System.Drawing.Point(204, 49)
Me.PanSuche.Name = "PanSuche"
Me.PanSuche.Size = New System.Drawing.Size(314, 31)
Me.PanSuche.TabIndex = 11
@@ -480,7 +450,7 @@ Partial Class Main
'ChkTools
'
Me.ChkTools.AutoSize = True
- Me.ChkTools.Location = New System.Drawing.Point(327, 80)
+ Me.ChkTools.Location = New System.Drawing.Point(277, 72)
Me.ChkTools.Name = "ChkTools"
Me.ChkTools.Size = New System.Drawing.Size(107, 17)
Me.ChkTools.TabIndex = 10
@@ -490,7 +460,7 @@ Partial Class Main
'LblUhrzeit
'
Me.LblUhrzeit.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.LblUhrzeit.Location = New System.Drawing.Point(975, 81)
+ Me.LblUhrzeit.Location = New System.Drawing.Point(639, 85)
Me.LblUhrzeit.Name = "LblUhrzeit"
Me.LblUhrzeit.Size = New System.Drawing.Size(235, 13)
Me.LblUhrzeit.TabIndex = 7
@@ -500,7 +470,7 @@ Partial Class Main
'ChKZugangsdaten
'
Me.ChKZugangsdaten.AutoSize = True
- Me.ChKZugangsdaten.Location = New System.Drawing.Point(327, 57)
+ Me.ChKZugangsdaten.Location = New System.Drawing.Point(277, 49)
Me.ChKZugangsdaten.Name = "ChKZugangsdaten"
Me.ChKZugangsdaten.Size = New System.Drawing.Size(141, 17)
Me.ChKZugangsdaten.TabIndex = 4
@@ -511,10 +481,12 @@ Partial Class Main
'
Me.Panel1.BackColor = System.Drawing.SystemColors.GradientInactiveCaption
Me.Panel1.Controls.Add(Me.LblNetzwerkinfo)
+ Me.Panel1.Controls.Add(Me.Button1)
+ Me.Panel1.Controls.Add(Me.LblInfo)
Me.Panel1.Dock = System.Windows.Forms.DockStyle.Left
Me.Panel1.Location = New System.Drawing.Point(0, 24)
Me.Panel1.Name = "Panel1"
- Me.Panel1.Size = New System.Drawing.Size(272, 106)
+ Me.Panel1.Size = New System.Drawing.Size(286, 106)
Me.Panel1.TabIndex = 13
'
'LblNetzwerkinfo
@@ -526,13 +498,50 @@ Partial Class Main
Me.LblNetzwerkinfo.TabIndex = 0
Me.LblNetzwerkinfo.Text = "Netzwerkinfo"
'
+ 'Button1
+ '
+ Me.Button1.BackColor = System.Drawing.SystemColors.ControlLightLight
+ Me.Button1.ContextMenuStrip = Me.ContextMenuStrip1
+ Me.Button1.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer))
+ Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+ Me.Button1.Image = Global.Dokumentation.My.Resources.Resources.iconfinder_contat_us_27phone_4211855_115040__Benutzerdefiniert_
+ Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
+ Me.Button1.Location = New System.Drawing.Point(150, 70)
+ Me.Button1.Name = "Button1"
+ Me.Button1.Size = New System.Drawing.Size(116, 28)
+ Me.Button1.TabIndex = 43
+ Me.Button1.Text = "Telefon"
+ Me.Button1.UseVisualStyleBackColor = False
+ Me.Button1.Visible = False
+ '
+ 'ContextMenuStrip1
+ '
+ Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.TelefonManuellZuweisenToolStripMenuItem})
+ Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
+ Me.ContextMenuStrip1.Size = New System.Drawing.Size(211, 26)
+ '
+ 'TelefonManuellZuweisenToolStripMenuItem
+ '
+ Me.TelefonManuellZuweisenToolStripMenuItem.Name = "TelefonManuellZuweisenToolStripMenuItem"
+ Me.TelefonManuellZuweisenToolStripMenuItem.Size = New System.Drawing.Size(210, 22)
+ Me.TelefonManuellZuweisenToolStripMenuItem.Text = "Telefon manuell zuweisen"
+ '
+ 'LblInfo
+ '
+ Me.LblInfo.AutoSize = True
+ Me.LblInfo.Location = New System.Drawing.Point(92, 5)
+ Me.LblInfo.Name = "LblInfo"
+ Me.LblInfo.Size = New System.Drawing.Size(39, 13)
+ Me.LblInfo.TabIndex = 16
+ Me.LblInfo.Text = "LblInfo"
+ '
'MenuStrip1
'
Me.MenuStrip1.BackColor = System.Drawing.SystemColors.GradientActiveCaption
- Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem1, Me.ToolStripMenuItem2, Me.ToolStripMenuItemINFO, Me.TicketsystemToolStripMenuItem, Me.PascomToolStripMenuItem, Me.UnifiToolStripMenuItem, Me.ProxMoxToolStripMenuItem, Me.PortainerToolStripMenuItem})
+ Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem1, Me.ToolStripMenuItem2, Me.ToolStripMenuItemINFO, Me.TicketsystemToolStripMenuItem, Me.SnipeITToolStripMenuItem, Me.PascomToolStripMenuItem, Me.UnifiToolStripMenuItem, Me.VCenterToolStripMenuItem, Me.ProxMoxToolStripMenuItem, Me.PortainerToolStripMenuItem, Me.FirewallToolStripMenuItem})
Me.MenuStrip1.Location = New System.Drawing.Point(0, 0)
Me.MenuStrip1.Name = "MenuStrip1"
- Me.MenuStrip1.Size = New System.Drawing.Size(1494, 24)
+ Me.MenuStrip1.Size = New System.Drawing.Size(1172, 24)
Me.MenuStrip1.TabIndex = 2
Me.MenuStrip1.Text = "MenuStrip1"
'
@@ -615,6 +624,12 @@ Partial Class Main
Me.TicketsystemToolStripMenuItem.Size = New System.Drawing.Size(88, 20)
Me.TicketsystemToolStripMenuItem.Text = "Ticketsystem"
'
+ 'SnipeITToolStripMenuItem
+ '
+ Me.SnipeITToolStripMenuItem.Name = "SnipeITToolStripMenuItem"
+ Me.SnipeITToolStripMenuItem.Size = New System.Drawing.Size(58, 20)
+ Me.SnipeITToolStripMenuItem.Text = "SnipeIT"
+ '
'PascomToolStripMenuItem
'
Me.PascomToolStripMenuItem.Name = "PascomToolStripMenuItem"
@@ -627,6 +642,31 @@ Partial Class Main
Me.UnifiToolStripMenuItem.Size = New System.Drawing.Size(44, 20)
Me.UnifiToolStripMenuItem.Text = "Unifi"
'
+ 'VCenterToolStripMenuItem
+ '
+ Me.VCenterToolStripMenuItem.Name = "VCenterToolStripMenuItem"
+ Me.VCenterToolStripMenuItem.Size = New System.Drawing.Size(60, 20)
+ Me.VCenterToolStripMenuItem.Text = "vCenter"
+ '
+ 'ProxMoxToolStripMenuItem
+ '
+ Me.ProxMoxToolStripMenuItem.Name = "ProxMoxToolStripMenuItem"
+ Me.ProxMoxToolStripMenuItem.Size = New System.Drawing.Size(65, 20)
+ Me.ProxMoxToolStripMenuItem.Text = "ProxMox"
+ '
+ 'PortainerToolStripMenuItem
+ '
+ Me.PortainerToolStripMenuItem.Name = "PortainerToolStripMenuItem"
+ Me.PortainerToolStripMenuItem.Size = New System.Drawing.Size(67, 20)
+ Me.PortainerToolStripMenuItem.Text = "Portainer"
+ '
+ 'FirewallToolStripMenuItem
+ '
+ Me.FirewallToolStripMenuItem.DoubleClickEnabled = True
+ Me.FirewallToolStripMenuItem.Name = "FirewallToolStripMenuItem"
+ Me.FirewallToolStripMenuItem.Size = New System.Drawing.Size(59, 20)
+ Me.FirewallToolStripMenuItem.Text = "Firewall"
+ '
'Panel3
'
Me.Panel3.BackColor = System.Drawing.SystemColors.GradientInactiveCaption
@@ -648,7 +688,7 @@ 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, 831)
+ Me.Panel3.Size = New System.Drawing.Size(200, 442)
Me.Panel3.TabIndex = 2
'
'lblTempServerraum15
@@ -849,7 +889,7 @@ Partial Class Main
'CMdTest2
'
Me.CMdTest2.Dock = System.Windows.Forms.DockStyle.Right
- Me.CMdTest2.Location = New System.Drawing.Point(785, 0)
+ Me.CMdTest2.Location = New System.Drawing.Point(463, 0)
Me.CMdTest2.Name = "CMdTest2"
Me.CMdTest2.Size = New System.Drawing.Size(75, 100)
Me.CMdTest2.TabIndex = 3
@@ -859,7 +899,7 @@ Partial Class Main
'CmdTest
'
Me.CmdTest.Dock = System.Windows.Forms.DockStyle.Right
- Me.CmdTest.Location = New System.Drawing.Point(710, 0)
+ Me.CmdTest.Location = New System.Drawing.Point(388, 0)
Me.CmdTest.Name = "CmdTest"
Me.CmdTest.Size = New System.Drawing.Size(75, 100)
Me.CmdTest.TabIndex = 2
@@ -884,25 +924,41 @@ Partial Class Main
Me.DgVMain.AllowUserToDeleteRows = False
Me.DgVMain.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
Me.DgVMain.BorderStyle = System.Windows.Forms.BorderStyle.None
- 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
+ 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
Me.DgVMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.DgVMain.ContextMenuStrip = Me.DGVMainContext
+ DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window
+ 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.ControlText
+ DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+ Me.DgVMain.DefaultCellStyle = DataGridViewCellStyle2
Me.DgVMain.Dock = System.Windows.Forms.DockStyle.Fill
Me.DgVMain.Location = New System.Drawing.Point(200, 130)
Me.DgVMain.MultiSelect = False
Me.DgVMain.Name = "DgVMain"
Me.DgVMain.ReadOnly = True
Me.DgVMain.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.[Single]
+ DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.DgVMain.RowHeadersDefaultCellStyle = DataGridViewCellStyle3
Me.DgVMain.RowHeadersVisible = False
Me.DgVMain.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
- Me.DgVMain.Size = New System.Drawing.Size(860, 731)
+ Me.DgVMain.Size = New System.Drawing.Size(538, 342)
Me.DgVMain.TabIndex = 3
'
'DGVMainContext
@@ -1051,9 +1107,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, 861)
+ Me.PanTools.Location = New System.Drawing.Point(200, 472)
Me.PanTools.Name = "PanTools"
- Me.PanTools.Size = New System.Drawing.Size(860, 100)
+ Me.PanTools.Size = New System.Drawing.Size(538, 100)
Me.PanTools.TabIndex = 4
Me.PanTools.Visible = False
'
@@ -1072,7 +1128,7 @@ Partial Class Main
'btnTest3
'
Me.btnTest3.Dock = System.Windows.Forms.DockStyle.Right
- Me.btnTest3.Location = New System.Drawing.Point(635, 0)
+ Me.btnTest3.Location = New System.Drawing.Point(313, 0)
Me.btnTest3.Name = "btnTest3"
Me.btnTest3.Size = New System.Drawing.Size(75, 100)
Me.btnTest3.TabIndex = 13
@@ -1123,9 +1179,9 @@ Partial Class Main
'panTSSitzungen
'
Me.panTSSitzungen.Dock = System.Windows.Forms.DockStyle.Right
- Me.panTSSitzungen.Location = New System.Drawing.Point(1060, 130)
+ Me.panTSSitzungen.Location = New System.Drawing.Point(738, 130)
Me.panTSSitzungen.Name = "panTSSitzungen"
- Me.panTSSitzungen.Size = New System.Drawing.Size(434, 831)
+ Me.panTSSitzungen.Size = New System.Drawing.Size(434, 442)
Me.panTSSitzungen.TabIndex = 5
Me.panTSSitzungen.Visible = False
'
@@ -1142,23 +1198,16 @@ Partial Class Main
Me.Timer_Temperatur.Enabled = True
Me.Timer_Temperatur.Interval = 30000
'
- 'ProxMoxToolStripMenuItem
+ 'ContextMenuStrip2
'
- Me.ProxMoxToolStripMenuItem.Name = "ProxMoxToolStripMenuItem"
- Me.ProxMoxToolStripMenuItem.Size = New System.Drawing.Size(65, 20)
- Me.ProxMoxToolStripMenuItem.Text = "ProxMox"
- '
- 'PortainerToolStripMenuItem
- '
- Me.PortainerToolStripMenuItem.Name = "PortainerToolStripMenuItem"
- Me.PortainerToolStripMenuItem.Size = New System.Drawing.Size(67, 20)
- Me.PortainerToolStripMenuItem.Text = "Portainer"
+ Me.ContextMenuStrip2.Name = "ContextMenuStrip2"
+ Me.ContextMenuStrip2.Size = New System.Drawing.Size(61, 4)
'
'Main
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
- Me.ClientSize = New System.Drawing.Size(1494, 961)
+ Me.ClientSize = New System.Drawing.Size(1172, 572)
Me.Controls.Add(Me.DgVMain)
Me.Controls.Add(Me.PanTools)
Me.Controls.Add(Me.panTSSitzungen)
@@ -1166,7 +1215,7 @@ Partial Class Main
Me.Controls.Add(Me.Panel2)
Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
Me.MainMenuStrip = Me.MenuStrip1
- Me.MinimumSize = New System.Drawing.Size(1024, 740)
+ Me.MinimumSize = New System.Drawing.Size(1024, 541)
Me.Name = "Main"
Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
Me.Text = "Dokumentation"
@@ -1175,7 +1224,6 @@ Partial Class Main
Me.Panel4.ResumeLayout(False)
Me.Panel4.PerformLayout()
CType(Me.picAVISOMessenger, System.ComponentModel.ISupportInitialize).EndInit()
- Me.ContextMenuStrip1.ResumeLayout(False)
Me.PanType.ResumeLayout(False)
Me.PanType.PerformLayout()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
@@ -1183,6 +1231,7 @@ Partial Class Main
Me.PanSuche.PerformLayout()
Me.Panel1.ResumeLayout(False)
Me.Panel1.PerformLayout()
+ Me.ContextMenuStrip1.ResumeLayout(False)
Me.MenuStrip1.ResumeLayout(False)
Me.MenuStrip1.PerformLayout()
Me.Panel3.ResumeLayout(False)
@@ -1282,7 +1331,6 @@ Partial Class Main
Friend WithEvents ContextMenuStrip1 As ContextMenuStrip
Friend WithEvents TelefonManuellZuweisenToolStripMenuItem As ToolStripMenuItem
Friend WithEvents RDPFensterToolStripMenuItem As ToolStripMenuItem
- Friend WithEvents lblNotruf As Label
Friend WithEvents TicketsystemToolStripMenuItem As ToolStripMenuItem
Friend WithEvents PascomToolStripMenuItem As ToolStripMenuItem
Friend WithEvents UnifiToolStripMenuItem As ToolStripMenuItem
@@ -1304,4 +1352,9 @@ Partial Class Main
Friend WithEvents Timer_Temperatur As Timer
Friend WithEvents ProxMoxToolStripMenuItem As ToolStripMenuItem
Friend WithEvents PortainerToolStripMenuItem As ToolStripMenuItem
+ Friend WithEvents VCenterToolStripMenuItem As ToolStripMenuItem
+ Friend WithEvents FirewallToolStripMenuItem As ToolStripMenuItem
+ Friend WithEvents ContextMenuStrip2 As ContextMenuStrip
+ Friend WithEvents lblRufbereitschaft As Label
+ Friend WithEvents SnipeITToolStripMenuItem As ToolStripMenuItem
End Class
diff --git a/Dokumentation/Main.resx b/Dokumentation/Main.resx
index 004e271..e3db9e4 100644
--- a/Dokumentation/Main.resx
+++ b/Dokumentation/Main.resx
@@ -117,12 +117,6 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 33, 15
-
-
- 1156, 17
-
@@ -280,8 +274,11 @@
2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV//Z
-
- True
+
+ 1156, 17
+
+
+ 33, 15
True
@@ -310,6 +307,9 @@
1312, 17
+
+ 1463, 17
+
64
diff --git a/Dokumentation/Main.vb b/Dokumentation/Main.vb
index 94b3270..8043ca4 100644
--- a/Dokumentation/Main.vb
+++ b/Dokumentation/Main.vb
@@ -1,12 +1,13 @@
Imports System.Data.SqlClient
-Imports System.IO
-Imports System.Threading
-Imports System.ServiceProcess
Imports System.DirectoryServices.AccountManagement
-Imports System.Web.UI.WebControls
+Imports System.IO
Imports System.Management.Automation
Imports System.Management.Automation.Runspaces
Imports System.Security
+Imports System.ServiceProcess
+Imports System.Threading
+Imports System.Web.UI.WebControls
+Imports Chilkat
Public Class Main
Public con As New SqlConnection
@@ -54,6 +55,7 @@ Public Class Main
btnBenutzerverwaltung.Enabled = Not Class1.offline
chkTSSitzungen.Checked = Not Class1.offline
lblOfflinemodus.Visible = Class1.offline
+ If Not Class1.offline Then getIT()
Me.KeyPreview = True
@@ -1258,7 +1260,7 @@ exit"
If Class1.offline Then Exit Function
dbload()
Dim pascom As New cPascom
- lblNotruf.Text = "Notruf geht an: " & pascom.getredirect("555")
+ 'lblNotruf.Text = "Notruf geht an: " & pascom.getredirect("555")
Dim RemoteVersion As String = ""
LblVersion.Text = "Version: " & Version
Try
@@ -1322,7 +1324,7 @@ exit"
End Sub
- Public Async Function AktualisiereTemperaturenAsync() As Task
+ Public Async Function AktualisiereTemperaturenAsync() As Task(Of Task)
Dim prtg As New cPRTG()
' Aufgaben parallel starten
@@ -1470,6 +1472,7 @@ exit"
' MsgBox(newMsg)
Label20.Text = newMsg
Label20.Visible = (newMsg > 0)
+ getIT()
If newMsg Then
' Me.Icon = My.Resources.avisoNewMsg
@@ -1852,6 +1855,56 @@ exit"
cExtProgramme.startlink("https://192.168.85.250:9443")
End Sub
+ Private Sub VCenterToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles VCenterToolStripMenuItem.Click
+ cExtProgramme.startlink("https://vcenter.verag.ost.dmn/ui")
+ End Sub
+
+ Private Sub FirewallToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles FirewallToolStripMenuItem.Click
+ cExtProgramme.startlink("https://192.168.0.109:4444")
+ End Sub
+
+ Private Sub FirewallToolStripMenuItem_DoubleClick(sender As Object, e As EventArgs) Handles FirewallToolStripMenuItem.DoubleClick
+ MsgBox("DoubleTrouble")
+ End Sub
+
+ Private Sub lblRufbereitschaft_Click(sender As Object, e As EventArgs) Handles lblRufbereitschaft.Click
+
+ getIT()
+ End Sub
+
+ Private Sub lblRufbereitschaft_DoubleClick(sender As Object, e As EventArgs) Handles lblRufbereitschaft.DoubleClick
+
+ Dim pascom As New cPascom
+ If pascom.getredirect("199").Length > 2 Then
+ pascom.Weiterleitung("199", "")
+ Else
+ pascom.Weiterleitung("199", "555")
+ End If
+
+ getIT()
+ End Sub
+
+ Private Function getIT()
+ Dim pascom As New cPascom
+ 'lblRufbereitschaft.Text = pascom.getredirect("199")
+ Dim text As String = ""
+
+ If pascom.getredirect("199").Length <= 2 Then
+ text = "199 - Umleitung deaktiviert"
+ Else
+ text = "199 - Umgeleitet auf: " & pascom.getredirect("199")
+ End If
+
+ If lblRufbereitschaft.Text <> text Then
+ lblRufbereitschaft.Text = text
+ End If
+
+ End Function
+
+ Private Sub SnipeITToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles SnipeITToolStripMenuItem.Click
+ cExtProgramme.startlink("https://snipeit.verag.ag/")
+ End Sub
+
Private Sub Main_Closed(sender As Object, e As EventArgs) Handles Me.Closed
Class1.ini.prop_Kompansicht = ChkKompAnsicht.Checked
diff --git a/Dokumentation/My Project/Resources.Designer.vb b/Dokumentation/My Project/Resources.Designer.vb
index c19dec3..fe6120d 100644
--- a/Dokumentation/My Project/Resources.Designer.vb
+++ b/Dokumentation/My Project/Resources.Designer.vb
@@ -319,7 +319,7 @@ Namespace My.Resources
End Property
'''
- ''' Sucht eine lokalisierte Zeichenfolge, die 0.0.2.08 ähnelt.
+ ''' Sucht eine lokalisierte Zeichenfolge, die 0.0.2.12 ähnelt.
'''
Friend ReadOnly Property Version() As String
Get
diff --git a/Dokumentation/My Project/Resources.resx b/Dokumentation/My Project/Resources.resx
index ce55bf9..84a4644 100644
--- a/Dokumentation/My Project/Resources.resx
+++ b/Dokumentation/My Project/Resources.resx
@@ -137,7 +137,7 @@
..\Resources\mail20.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
- 0.0.2.08
+ 0.0.2.12
..\Resources\Link.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
diff --git a/Dokumentation/frmHostBearbeiten.Designer.vb b/Dokumentation/frmHostBearbeiten.Designer.vb
index 4693c03..f438315 100644
--- a/Dokumentation/frmHostBearbeiten.Designer.vb
+++ b/Dokumentation/frmHostBearbeiten.Designer.vb
@@ -100,6 +100,7 @@ Partial Class frmHostBearbeiten
Me.PanFirewall = New System.Windows.Forms.Panel()
Me.PanSlaves = New System.Windows.Forms.Panel()
Me.PanNavTop = New System.Windows.Forms.Panel()
+ Me.btn_IntelAMT = New System.Windows.Forms.Button()
Me.ContextMenuStrip3.SuspendLayout()
Me.ContextMenuStrip2.SuspendLayout()
Me.ContextMenuStrip1.SuspendLayout()
@@ -445,30 +446,30 @@ Partial Class frmHostBearbeiten
'
Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MitHTTPFüllenToolStripMenuItem, Me.MitHTTPSFuellen, Me.KopierenToolStripMenuItem, Me.FFPortToolStripMenuItem})
Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
- Me.ContextMenuStrip1.Size = New System.Drawing.Size(163, 92)
+ Me.ContextMenuStrip1.Size = New System.Drawing.Size(165, 92)
'
'MitHTTPFüllenToolStripMenuItem
'
Me.MitHTTPFüllenToolStripMenuItem.Name = "MitHTTPFüllenToolStripMenuItem"
- Me.MitHTTPFüllenToolStripMenuItem.Size = New System.Drawing.Size(162, 22)
+ Me.MitHTTPFüllenToolStripMenuItem.Size = New System.Drawing.Size(164, 22)
Me.MitHTTPFüllenToolStripMenuItem.Text = "mit HTTP füllen"
'
'MitHTTPSFuellen
'
Me.MitHTTPSFuellen.Name = "MitHTTPSFuellen"
- Me.MitHTTPSFuellen.Size = New System.Drawing.Size(162, 22)
+ Me.MitHTTPSFuellen.Size = New System.Drawing.Size(164, 22)
Me.MitHTTPSFuellen.Text = "Mit HTTPS füllen"
'
'KopierenToolStripMenuItem
'
Me.KopierenToolStripMenuItem.Name = "KopierenToolStripMenuItem"
- Me.KopierenToolStripMenuItem.Size = New System.Drawing.Size(162, 22)
+ Me.KopierenToolStripMenuItem.Size = New System.Drawing.Size(164, 22)
Me.KopierenToolStripMenuItem.Text = "Kopieren"
'
'FFPortToolStripMenuItem
'
Me.FFPortToolStripMenuItem.Name = "FFPortToolStripMenuItem"
- Me.FFPortToolStripMenuItem.Size = New System.Drawing.Size(162, 22)
+ Me.FFPortToolStripMenuItem.Size = New System.Drawing.Size(164, 22)
Me.FFPortToolStripMenuItem.Text = "FF Port"
Me.FFPortToolStripMenuItem.Visible = False
'
@@ -562,6 +563,7 @@ Partial Class frmHostBearbeiten
'Panel1
'
Me.Panel1.ContextMenuStrip = Me.ContextMenuStrip3
+ Me.Panel1.Controls.Add(Me.btn_IntelAMT)
Me.Panel1.Controls.Add(Me.Button3)
Me.Panel1.Controls.Add(Me.txtAnydesk)
Me.Panel1.Controls.Add(Me.Label15)
@@ -885,6 +887,18 @@ Partial Class frmHostBearbeiten
Me.PanNavTop.Size = New System.Drawing.Size(309, 32)
Me.PanNavTop.TabIndex = 141
'
+ 'btn_IntelAMT
+ '
+ Me.btn_IntelAMT.BackColor = System.Drawing.SystemColors.ControlLightLight
+ Me.btn_IntelAMT.FlatAppearance.BorderColor = System.Drawing.Color.DimGray
+ Me.btn_IntelAMT.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+ Me.btn_IntelAMT.Location = New System.Drawing.Point(332, 463)
+ Me.btn_IntelAMT.Name = "btn_IntelAMT"
+ Me.btn_IntelAMT.Size = New System.Drawing.Size(96, 23)
+ Me.btn_IntelAMT.TabIndex = 158
+ Me.btn_IntelAMT.Text = "IntelAMT"
+ Me.btn_IntelAMT.UseVisualStyleBackColor = False
+ '
'frmHostBearbeiten
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -991,4 +1005,5 @@ Partial Class frmHostBearbeiten
Friend WithEvents CheckBox1 As CheckBox
Friend WithEvents ContextMenuStrip3 As ContextMenuStrip
Friend WithEvents IPAdresseKopierenToolStripMenuItem As ToolStripMenuItem
+ Friend WithEvents btn_IntelAMT As Button
End Class
diff --git a/Dokumentation/frmHostBearbeiten.vb b/Dokumentation/frmHostBearbeiten.vb
index 01f0e74..1260f0c 100644
--- a/Dokumentation/frmHostBearbeiten.vb
+++ b/Dokumentation/frmHostBearbeiten.vb
@@ -428,4 +428,8 @@
Private Sub IPAdresseKopierenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles IPAdresseKopierenToolStripMenuItem.Click
Clipboard.SetText(TxtIP.Text)
End Sub
+
+ Private Sub btn_IntelAMT_Click(sender As Object, e As EventArgs) Handles btn_IntelAMT.Click
+ cExtProgramme.startlink("https://" & TxtIP.Text & ":16993")
+ End Sub
End Class
\ No newline at end of file