From f717deac501f2da40c0c9ce75f6ac04af297d67a Mon Sep 17 00:00:00 2001 From: ms Date: Tue, 22 Nov 2022 10:53:34 +0100 Subject: [PATCH] Update VeragProgAllgemein; Feature: RDP direkt starten; --- Doku/My Project/licenses.licx | 4 - Dokumentation/Administration/NetzwerkAdmin.vb | 2 +- Dokumentation/Classes/cChilkat_Helper.vb | 25 ++ Dokumentation/Classes/cExtProgramme.vb | 70 ++-- Dokumentation/Classes/cHost.vb | 5 + Dokumentation/Classes/cPascom.vb | 123 +++++++ Dokumentation/Dokumentation.vbproj | 62 +++- Dokumentation/Drucken/licenses.licx | 4 - Dokumentation/Main.Designer.vb | 328 ++++++++++-------- Dokumentation/Main.resx | 6 + Dokumentation/Main.vb | 62 +++- .../My Project/Resources.Designer.vb | 4 +- Dokumentation/My Project/Resources.resx | 2 +- Dokumentation/My Project/licenses.licx | 4 - Dokumentation/PrintDGV.vb | 2 +- Dokumentation/frmHostBearbeiten.Designer.vb | 44 ++- Dokumentation/frmHostBearbeiten.vb | 10 +- Dokumentation/frmLeer.Designer.vb | 4 +- Dokumentation/licenses.licx | 4 - Dokumentation/uscntr_ConnectTel.Designer.vb | 101 ++++++ Dokumentation/uscntr_ConnectTel.resx | 120 +++++++ Dokumentation/uscntr_ConnectTel.vb | 16 + Dokumentation/uscntr_DomUser.Designer.vb | 38 +- Dokumentation/uscntr_DomUser.vb | 8 + Dokumentation_Updater/App.config | 6 +- .../Dokumentation_Updater.vbproj | 4 +- .../My Project/Application.Designer.vb | 28 +- .../My Project/Resources.Designer.vb | 49 +-- .../My Project/Settings.Designer.vb | 72 ++-- .../My Project/licenses.licx | 4 - licenses.licx | 4 - 31 files changed, 900 insertions(+), 315 deletions(-) delete mode 100644 Doku/My Project/licenses.licx create mode 100644 Dokumentation/Classes/cChilkat_Helper.vb create mode 100644 Dokumentation/Classes/cPascom.vb delete mode 100644 Dokumentation/Drucken/licenses.licx delete mode 100644 Dokumentation/My Project/licenses.licx delete mode 100644 Dokumentation/licenses.licx create mode 100644 Dokumentation/uscntr_ConnectTel.Designer.vb create mode 100644 Dokumentation/uscntr_ConnectTel.resx create mode 100644 Dokumentation/uscntr_ConnectTel.vb delete mode 100644 Dokumentation_Updater/My Project/licenses.licx delete mode 100644 licenses.licx diff --git a/Doku/My Project/licenses.licx b/Doku/My Project/licenses.licx deleted file mode 100644 index 81fb76d..0000000 --- a/Doku/My Project/licenses.licx +++ /dev/null @@ -1,4 +0,0 @@ -GrapeCity.ActiveReports.Export.Pdf.Section.PdfExport, GrapeCity.ActiveReports.Export.Pdf.v12 -GrapeCity.ActiveReports.PageReport, GrapeCity.ActiveReports.v12 -GrapeCity.ActiveReports.SectionReport, GrapeCity.ActiveReports.v12 -GrapeCity.ActiveReports.Viewer.Win.Viewer, GrapeCity.ActiveReports.Viewer.Win.v12 diff --git a/Dokumentation/Administration/NetzwerkAdmin.vb b/Dokumentation/Administration/NetzwerkAdmin.vb index 1aeddc8..ece4de8 100644 --- a/Dokumentation/Administration/NetzwerkAdmin.vb +++ b/Dokumentation/Administration/NetzwerkAdmin.vb @@ -172,7 +172,7 @@ Public Class NetzwerkAdmin Private Sub CmdNetzwerkAdd_Click(sender As Object, e As EventArgs) Handles CmdNetzwerkAdd.Click NetzwerkHinzu.Show() End Sub - Private Sub Closing(ByVal sender As Object, ByVal e As System.Windows.Forms.FormClosingEventArgs) Handles Me.FormClosing + Private Shadows Sub Closing(ByVal sender As Object, ByVal e As System.Windows.Forms.FormClosingEventArgs) Handles Me.FormClosing Main.LstStandortLoad() Main.allesladen() End Sub diff --git a/Dokumentation/Classes/cChilkat_Helper.vb b/Dokumentation/Classes/cChilkat_Helper.vb new file mode 100644 index 0000000..b380722 --- /dev/null +++ b/Dokumentation/Classes/cChilkat_Helper.vb @@ -0,0 +1,25 @@ +Imports Chilkat + +Public Class cChilkat_Helper + Public Shared Sub UnlockCilkat() + Dim glob As Chilkat.[Global] = New Chilkat.[Global]() + Dim success As Boolean = glob.UnlockBundle("VERAGS.CB1122022_JJ6kgS2zoR0g") + + If success <> True Then + Debug.WriteLine(glob.LastErrorText) + Return + End If + + Dim status As Integer = glob.UnlockStatus + + If status = 2 Then + Debug.WriteLine("Unlocked using purchased unlock code.") + Else + Debug.WriteLine("Unlocked in trial mode.") + End If + + Debug.WriteLine(glob.LastErrorText) + + + End Sub +End Class diff --git a/Dokumentation/Classes/cExtProgramme.vb b/Dokumentation/Classes/cExtProgramme.vb index 8a69e1e..bf5fa1d 100644 --- a/Dokumentation/Classes/cExtProgramme.vb +++ b/Dokumentation/Classes/cExtProgramme.vb @@ -1,4 +1,6 @@ -Public Class cExtProgramme +Imports System.IO + +Public Class cExtProgramme Public Shared Function startlink(URL As String) @@ -24,16 +26,16 @@ End Function - Public Shared Function startputty(IP As String) + Public Shared Function startputty(IP As String, Optional ByVal Port As Integer = 22) Dim Benutzer, Passwort As String Class1.GetUserPasswort(IP, Benutzer, Passwort) Try Dim putty As New Process putty.StartInfo.FileName = "putty.exe" If Benutzer = "" And Passwort = "" Then - putty.StartInfo.Arguments = IP + putty.StartInfo.Arguments = IP & " -P " & Port Else - putty.StartInfo.Arguments = IP & " -l " & Benutzer & " -pw " & Passwort + putty.StartInfo.Arguments = IP & " -P " & Port & " -l " & Benutzer & " -pw " & Passwort End If putty.Start() @@ -43,6 +45,15 @@ End Try End Function + Public Shared Function commandcmd(command As String) + + Dim cmd As New Process + cmd.StartInfo.FileName = "cmd.exe" + cmd.StartInfo.Arguments = "/c " & command + cmd.Start() + + End Function + Public Shared Function pingip(ip As String, Optional ByVal Argument As String = "") Dim ping As New Process 'ping.StartInfo.FileName = "cmd.exe" @@ -67,35 +78,58 @@ End Function Public Shared Function StartTeamviewer(ID As String, Optional Passwort As String = "BmWr501956") + Dim p As String = "" If Passwort.Length < 1 Then Passwort = "BmWr501956" End If + If File.Exists("C:\Program Files (x86)\TeamViewer\Teamviewer.exe") Then + p = "C:\Program Files (x86)\TeamViewer" + Else + p = "C:\Program Files\TeamViewer" + End If Dim teamviewer As New Process With teamviewer.StartInfo .FileName = "Teamviewer.exe" - .WorkingDirectory = "C:\Program Files (x86)\TeamViewer" + .WorkingDirectory = p .Arguments = "-i " & ID & " -P " & Passwort End With - - teamviewer.Start() + Try + teamviewer.Start() + Catch ex As Exception + MsgBox(ex.Message) + End Try End Function - Public Shared Function RDPConnect(host As String, Optional ByVal Username As String = "", Optional ByVal Password As String = "") + Public Shared Function RDPConnect(host As String, Optional ByVal Username As String = "", Optional ByVal Password As String = "", Optional ByVal Fenster As Boolean = False) Dim mstsc As New Process Dim AnmeldeDatenVorhanden As Boolean = False + Dim rdpASadmin As String = "" + Dim FensterString As String = "" + + If Fenster = True Then + FensterString = " /w:1280 /h:1024" + Else + FensterString = " /f" + End If + + If host = "rdpintern.verag.ag" Then + commandcmd("cmdkey /delete:" & host) + commandcmd("cmdkey /delete:TERMSRV/" & host) + ElseIf host.StartsWith("TS") Then + rdpASadmin = " /admin" + End If If Username.Length > 0 And Password.Length > 0 Then - Dim Anmeldung As New Process : AnmeldeDatenVorhanden = True - With Anmeldung - .StartInfo.FileName = Environment.ExpandEnvironmentVariables("%SystemRoot%\system32\cmdkey.exe") - .StartInfo.Arguments = "/add:TERMSRV/" & host & " /user:" & Username & " /pass:" & Password - .Start() - End With + AnmeldeDatenVorhanden = True + commandcmd("cmdkey /generic:" & host & " /user:" & Username & " /pass:" & Password) + End If + Threading.Thread.Sleep(1000) + mstsc.StartInfo.FileName = "mstsc.exe" mstsc.StartInfo.UseShellExecute = False - mstsc.StartInfo.Arguments = " /v: " & host + mstsc.StartInfo.Arguments = " /v: " & host & rdpASadmin & FensterString mstsc.Start() @@ -103,11 +137,7 @@ Threading.Thread.Sleep(3000) Dim Abmeldung As New Process - With Abmeldung - .StartInfo.FileName = Environment.ExpandEnvironmentVariables("%SystemRoot%\system32\cmdkey.exe") - .StartInfo.Arguments = "/delete:TERMSRV/" & host - End With - + commandcmd("cmdkey /delete:" & host) End If diff --git a/Dokumentation/Classes/cHost.vb b/Dokumentation/Classes/cHost.vb index 9c7a23a..f9b4bac 100644 --- a/Dokumentation/Classes/cHost.vb +++ b/Dokumentation/Classes/cHost.vb @@ -24,6 +24,7 @@ Public Class cHost Property Firewall As Boolean = False Property TeamviewerID As String = "" Property TeamviewerKennwort As String = "" + Property SSHPort As Decimal = 22 @@ -54,6 +55,7 @@ Public Class cHost list.Add(New SQLVariable("Firewall", Firewall)) list.Add(New SQLVariable("TeamviewerID", TeamviewerID)) list.Add(New SQLVariable("TeamviewerKennwort", TeamviewerKennwort)) + list.Add(New SQLVariable("SSHPort", SSHPort)) Return list End Function @@ -83,6 +85,7 @@ Public Class cHost list.Add(New SQLVariable("Firewall", Firewall)) list.Add(New SQLVariable("TeamviewerID", TeamviewerID)) list.Add(New SQLVariable("TeamviewerKennwort", TeamviewerKennwort)) + list.Add(New SQLVariable("SSHPort", SSHPort)) Return list End Function @@ -111,6 +114,7 @@ Public Class cHost Me.Firewall = False Me.TeamviewerID = "" Me.TeamviewerKennwort = "" + Me.SSHPort = 22 End Function Public Shared Function getHostsEntrys(ByRef ds As DataSet, ByVal HostIP As String) @@ -297,6 +301,7 @@ Diese Einträge werden ebenfalls gelöscht. Fortfahren?", "Hosteintrag löschen" newhost.Standort = Me.Standort newhost.DHCP = Me.DHCP newhost.Firewall = Me.Firewall + newhost.SSHPort = Me.SSHPort Dim update, where As String getUpdateCmd(update, where, "", "", newhost.Linked, newhost) diff --git a/Dokumentation/Classes/cPascom.vb b/Dokumentation/Classes/cPascom.vb new file mode 100644 index 0000000..8d57b33 --- /dev/null +++ b/Dokumentation/Classes/cPascom.vb @@ -0,0 +1,123 @@ +Imports System.Reflection +Imports Chilkat +Public Class cPascom + + Dim API_USER_AUTHORIZATION = "bW9ieTpnWlhTSVprTnhmaUQxOEU=" + Property Arbeitsplatz As String = "" + Property Username As String = "" + + Public Function Anmelden() As Boolean + If Arbeitsplatz.Length > 0 And Username.Length > 0 Then + Try + + 'Benutzername: moby + + 'Passwort: XgDsFmMSutaMLA1 + + 'BASIC Auth String: bW9ieTpYZ0RzRm1NU3V0YU1MQTE = + + cChilkat_Helper.UnlockCilkat() + Dim API_STRING = "pbx3.flashnet.at" + + Dim rest As New Chilkat.Rest + Dim success As Boolean + + Dim bTls As Boolean = True + Dim port As Integer = 443 + Dim bAutoReconnect As Boolean = True + + + success = rest.Connect(API_STRING, port, bTls, bAutoReconnect) + If (success <> True) Then + Debug.WriteLine("ConnectFailReason: " & rest.ConnectFailReason) + Debug.WriteLine(rest.LastErrorText) + + Return False + End If + + rest.AddHeader("Content-Type", "application/json") + rest.SetAuthBasic("moby", "XgDsFmMSutaMLA1") + + + Dim json As New Chilkat.JsonObject + + Dim successJsonLoad As Boolean = json.Load(" + {""action"":""relocate"",""username"":""" & Username & """}}") + + If (successJsonLoad <> True) Then + MsgBox(json.LastErrorText) + Return False + End If + + + Dim sbRequestBody As New Chilkat.StringBuilder + json.EmitSb(sbRequestBody) + + ' MsgBox(sbRequestBody.ToString) + Dim sbResponseBody As New Chilkat.StringBuilder + success = rest.FullRequestSb("POST", "/verag/services/location/" & Arbeitsplatz, sbRequestBody, sbResponseBody) + If (success <> True) Then + Debug.WriteLine(rest.LastErrorText) + Return False + End If + Dim respStatusCode As Integer = rest.ResponseStatusCode + + If (respStatusCode <> 202) Then + + ' MsgBox(sbResponseBody.GetAsString()) + + Return False + End If + + + Dim jsonResp = New Chilkat.JsonObject() + jsonResp.LoadSb(sbResponseBody) + + Dim gatewayId = jsonResp.StringOf("gatewayId") + Dim Resp_error = jsonResp.StringOf("error") + Dim Resp_errorCode = jsonResp.StringOf("errorCode") + + + Return True + + + + + Catch ex As Exception + + Return False + End Try + Return True + Else + Return False + End If + + + End Function + + 'Public Function GetTelArbeitsplatz4Host() As Boolean + ' Try + ' Dim lines = IO.File.ReadAllLines("\\dc01.verag.ost.dmn\NETLOGON\Telefonarbeitsplaetze.ini") + ' Dim colCount = lines.First.Split(";"c).Length + + ' For Each line In lines + ' Dim objFields = From field In line.Split(";"c) + + + ' If String.Compare(cRes.LocalUser.Hostname, objFields(0).ToString, True) = 0 Then + ' Arbeitsplatz = objFields(1).ToString + ' '_ConString = objFields(2).ToString + ' Return True + ' Exit Function + ' End If + + ' ' End Select + ' Next + ' Return False + ' Catch ex As Exception + ' ' MsgBox("Fehler beim Lesen TSAnmeldung.ini: " & vbCrLf & ex.Message) + ' End Try + 'End Function + + +End Class diff --git a/Dokumentation/Dokumentation.vbproj b/Dokumentation/Dokumentation.vbproj index 1af37c1..6558369 100644 --- a/Dokumentation/Dokumentation.vbproj +++ b/Dokumentation/Dokumentation.vbproj @@ -90,15 +90,16 @@ + + False + ..\..\..\ChilkatDotNet47.dll + ..\packages\ClosedXML.0.94.2\lib\net46\ClosedXML.dll ..\packages\DhcpServerApi.0.3.0.0\lib\net40\DhcpServerApi.dll - - ..\packages\DocumentFormat.OpenXml.2.7.2\lib\net46\DocumentFormat.OpenXml.dll - ..\packages\Dynamsoft.DotNet.TWAIN.8.0.0\lib\net40\Dynamsoft.BarcodeGenerator.dll @@ -135,13 +136,40 @@ ..\packages\Ghostscript.NET.1.2.1\lib\net40\Ghostscript.NET.dll - - - - - - - + + False + C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.dll + + + False + C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.Core.Document.dll + + + C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\zh-CN\GrapeCity.ActiveReports.Design.Win.resources.dll + + + C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\zh-CN\GrapeCity.ActiveReports.Designer.resources.dll + + + False + C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.Document.dll + + + False + C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.Export.Excel.dll + + + False + C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.Export.Pdf.dll + + + False + C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.Viewer.Common.dll + + + False + C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.Viewer.Win.dll + ..\packages\iTextSharp.5.5.13.1\lib\itextsharp.dll @@ -223,11 +251,13 @@ Form + + frmColumnsPrint.vb @@ -258,6 +288,12 @@ Form + + uscntr_ConnectTel.vb + + + UserControl + uscntr_DomUserList.vb @@ -469,7 +505,6 @@ frmColumnsPrint.vb - rptLeer.vb @@ -485,7 +520,9 @@ frmPopUp.vb - + + uscntr_ConnectTel.vb + uscntr_DomUser.vb @@ -537,7 +574,6 @@ Main.vb - VbMyResourcesResXFileCodeGenerator Resources.Designer.vb diff --git a/Dokumentation/Drucken/licenses.licx b/Dokumentation/Drucken/licenses.licx deleted file mode 100644 index 81fb76d..0000000 --- a/Dokumentation/Drucken/licenses.licx +++ /dev/null @@ -1,4 +0,0 @@ -GrapeCity.ActiveReports.Export.Pdf.Section.PdfExport, GrapeCity.ActiveReports.Export.Pdf.v12 -GrapeCity.ActiveReports.PageReport, GrapeCity.ActiveReports.v12 -GrapeCity.ActiveReports.SectionReport, GrapeCity.ActiveReports.v12 -GrapeCity.ActiveReports.Viewer.Win.Viewer, GrapeCity.ActiveReports.Viewer.Win.v12 diff --git a/Dokumentation/Main.Designer.vb b/Dokumentation/Main.Designer.vb index 407b700..df5f626 100644 --- a/Dokumentation/Main.Designer.vb +++ b/Dokumentation/Main.Designer.vb @@ -27,10 +27,18 @@ Partial Class Main Dim DataGridViewCellStyle1 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.Label20 = New System.Windows.Forms.Label() + Me.chkPano = New System.Windows.Forms.CheckBox() + 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() Me.Label1 = New System.Windows.Forms.Label() @@ -42,7 +50,9 @@ Partial Class Main Me.RadGlobal = New System.Windows.Forms.RadioButton() Me.RadNurNetzwerk = New System.Windows.Forms.RadioButton() Me.RadStandort = New System.Windows.Forms.RadioButton() + Me.ChkTools = New System.Windows.Forms.CheckBox() Me.LblUhrzeit = New System.Windows.Forms.Label() + Me.ChKZugangsdaten = New System.Windows.Forms.CheckBox() Me.Panel1 = New System.Windows.Forms.Panel() Me.LblNetzwerkinfo = New System.Windows.Forms.Label() Me.MenuStrip1 = New System.Windows.Forms.MenuStrip() @@ -58,13 +68,7 @@ Partial Class Main Me.ExitToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem() 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() Me.lblCount = New System.Windows.Forms.Label() Me.btnNeu = New System.Windows.Forms.Button() Me.ChkDHCPClients = New System.Windows.Forms.CheckBox() @@ -76,9 +80,7 @@ Partial Class Main Me.CmDBearbeiten = New System.Windows.Forms.Button() Me.CmdFiles = New System.Windows.Forms.Button() Me.LstAllgemein = New System.Windows.Forms.ListBox() - Me.ChkTools = New System.Windows.Forms.CheckBox() Me.CmdLink = New System.Windows.Forms.Button() - Me.ChKZugangsdaten = New System.Windows.Forms.CheckBox() Me.LstNetzwerk = New System.Windows.Forms.ListBox() Me.LstStandort = New System.Windows.Forms.ListBox() Me.CMdTest2 = New System.Windows.Forms.Button() @@ -101,6 +103,7 @@ Partial Class Main Me.PuttyToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.PingToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.PingtToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.SpoolerNeuStartenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.PanTools = New System.Windows.Forms.Panel() Me.CmdPintT = New System.Windows.Forms.Button() Me.btnTest3 = New System.Windows.Forms.Button() @@ -113,16 +116,17 @@ Partial Class Main Me.panTSSitzungen = New System.Windows.Forms.Panel() Me.Timer_Refresh = New System.Windows.Forms.Timer(Me.components) Me.Timer1 = New System.Windows.Forms.Timer(Me.components) - Me.SpoolerNeuStartenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.RDPFensterToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() 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.MenuStrip1.SuspendLayout() Me.Panel3.SuspendLayout() - CType(Me.picAVISOMessenger, System.ComponentModel.ISupportInitialize).BeginInit() Me.PanNetzwerk.SuspendLayout() CType(Me.DgVMain, System.ComponentModel.ISupportInitialize).BeginInit() Me.DGVMainContext.SuspendLayout() @@ -138,59 +142,141 @@ 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(1697, 130) + Me.Panel2.Size = New System.Drawing.Size(1494, 130) Me.Panel2.TabIndex = 1 ' 'Panel4 ' Me.Panel4.BackColor = System.Drawing.SystemColors.GradientInactiveCaption + Me.Panel4.Controls.Add(Me.Label20) + Me.Panel4.Controls.Add(Me.chkPano) + 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) Me.Panel4.Controls.Add(Me.Label1) Me.Panel4.Controls.Add(Me.PanType) Me.Panel4.Controls.Add(Me.PictureBox1) Me.Panel4.Controls.Add(Me.PanSuche) + Me.Panel4.Controls.Add(Me.ChkTools) 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.Name = "Panel4" - Me.Panel4.Size = New System.Drawing.Size(1425, 106) + Me.Panel4.Size = New System.Drawing.Size(1222, 106) Me.Panel4.TabIndex = 14 ' + '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.Name = "Label20" + Me.Label20.Size = New System.Drawing.Size(28, 19) + Me.Label20.TabIndex = 42 + Me.Label20.Text = "99" + Me.Label20.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.Label20.Visible = False + ' + 'chkPano + ' + Me.chkPano.AutoSize = True + Me.chkPano.Location = New System.Drawing.Point(327, 71) + 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 + ' + 'picAVISOMessenger + ' + Me.picAVISOMessenger.Anchor = System.Windows.Forms.AnchorStyles.Right + 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(466, 39) + 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.excel20 Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button1.Location = New System.Drawing.Point(440, 52) + Me.Button1.Location = New System.Drawing.Point(161, 5) Me.Button1.Name = "Button1" Me.Button1.Size = New System.Drawing.Size(151, 28) Me.Button1.TabIndex = 43 Me.Button1.Text = "Telefonliste" 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(210, 26) + ' + 'TelefonManuellZuweisenToolStripMenuItem + ' + Me.TelefonManuellZuweisenToolStripMenuItem.Name = "TelefonManuellZuweisenToolStripMenuItem" + Me.TelefonManuellZuweisenToolStripMenuItem.Size = New System.Drawing.Size(209, 22) + Me.TelefonManuellZuweisenToolStripMenuItem.Text = "Telefon manuell zuweisen" + ' + '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(161, 73) + 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 + ' 'LblDEBUGMODE ' 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, 33) Me.LblDEBUGMODE.Name = "LblDEBUGMODE" - Me.LblDEBUGMODE.Size = New System.Drawing.Size(114, 16) + Me.LblDEBUGMODE.Size = New System.Drawing.Size(113, 16) Me.LblDEBUGMODE.TabIndex = 13 Me.LblDEBUGMODE.Text = "LblDebugmode" Me.LblDEBUGMODE.Visible = False ' + 'chkTSSitzungen + ' + Me.chkTSSitzungen.AutoSize = True + Me.chkTSSitzungen.Location = New System.Drawing.Point(327, 5) + Me.chkTSSitzungen.Name = "chkTSSitzungen" + Me.chkTSSitzungen.Size = New System.Drawing.Size(157, 17) + Me.chkTSSitzungen.TabIndex = 19 + Me.chkTSSitzungen.Text = "Terminalsitzungen anzeigen" + Me.chkTSSitzungen.UseVisualStyleBackColor = True + ' 'LblVersion ' Me.LblVersion.Anchor = System.Windows.Forms.AnchorStyles.Right Me.LblVersion.AutoSize = True - Me.LblVersion.Location = New System.Drawing.Point(1078, 81) + Me.LblVersion.Location = New System.Drawing.Point(3, 5) Me.LblVersion.Name = "LblVersion" Me.LblVersion.Size = New System.Drawing.Size(42, 13) Me.LblVersion.TabIndex = 17 @@ -205,13 +291,27 @@ Partial Class Main Me.LblInfo.TabIndex = 16 Me.LblInfo.Text = "LblInfo" ' + 'btnBenutzerverwaltung + ' + Me.btnBenutzerverwaltung.BackColor = System.Drawing.SystemColors.ControlLightLight + Me.btnBenutzerverwaltung.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) + 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(161, 39) + Me.btnBenutzerverwaltung.Name = "btnBenutzerverwaltung" + Me.btnBenutzerverwaltung.Size = New System.Drawing.Size(151, 28) + Me.btnBenutzerverwaltung.TabIndex = 20 + Me.btnBenutzerverwaltung.Text = "Benutzerverwaltung" + Me.btnBenutzerverwaltung.UseVisualStyleBackColor = False + ' 'CmdSucheReset ' Me.CmdSucheReset.Anchor = System.Windows.Forms.AnchorStyles.Right 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(929, 71) + Me.CmdSucheReset.Location = New System.Drawing.Point(726, 71) Me.CmdSucheReset.Name = "CmdSucheReset" Me.CmdSucheReset.Size = New System.Drawing.Size(121, 23) Me.CmdSucheReset.TabIndex = 15 @@ -222,7 +322,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(743, 23) + Me.TxtSuche.Location = New System.Drawing.Point(540, 23) Me.TxtSuche.Name = "TxtSuche" Me.TxtSuche.Size = New System.Drawing.Size(138, 20) Me.TxtSuche.TabIndex = 3 @@ -232,7 +332,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(696, 26) + Me.Label1.Location = New System.Drawing.Point(493, 26) Me.Label1.Name = "Label1" Me.Label1.Size = New System.Drawing.Size(47, 13) Me.Label1.TabIndex = 4 @@ -243,7 +343,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(887, 5) + Me.PanType.Location = New System.Drawing.Point(684, 5) Me.PanType.Name = "PanType" Me.PanType.Size = New System.Drawing.Size(183, 41) Me.PanType.TabIndex = 12 @@ -269,11 +369,11 @@ Partial Class Main ' 'PictureBox1 ' - Me.PictureBox1.Anchor = System.Windows.Forms.AnchorStyles.Right + 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(1081, 2) + Me.PictureBox1.Location = New System.Drawing.Point(881, 4) Me.PictureBox1.Name = "PictureBox1" - Me.PictureBox1.Size = New System.Drawing.Size(333, 67) + Me.PictureBox1.Size = New System.Drawing.Size(332, 76) Me.PictureBox1.TabIndex = 1 Me.PictureBox1.TabStop = False ' @@ -283,7 +383,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(743, 49) + Me.PanSuche.Location = New System.Drawing.Point(540, 49) Me.PanSuche.Name = "PanSuche" Me.PanSuche.Size = New System.Drawing.Size(314, 31) Me.PanSuche.TabIndex = 11 @@ -320,16 +420,36 @@ Partial Class Main Me.RadStandort.Text = "Ges. Standort" Me.RadStandort.UseVisualStyleBackColor = True ' + 'ChkTools + ' + Me.ChkTools.AutoSize = True + Me.ChkTools.Location = New System.Drawing.Point(327, 51) + Me.ChkTools.Name = "ChkTools" + Me.ChkTools.Size = New System.Drawing.Size(107, 17) + Me.ChkTools.TabIndex = 10 + Me.ChkTools.Text = "Tools einblenden" + Me.ChkTools.UseVisualStyleBackColor = True + ' 'LblUhrzeit ' Me.LblUhrzeit.Anchor = System.Windows.Forms.AnchorStyles.Right - Me.LblUhrzeit.Location = New System.Drawing.Point(1178, 81) + Me.LblUhrzeit.Location = New System.Drawing.Point(975, 81) Me.LblUhrzeit.Name = "LblUhrzeit" Me.LblUhrzeit.Size = New System.Drawing.Size(235, 13) Me.LblUhrzeit.TabIndex = 7 Me.LblUhrzeit.Text = "LblUhrzeit" Me.LblUhrzeit.TextAlign = System.Drawing.ContentAlignment.TopRight ' + 'ChKZugangsdaten + ' + Me.ChKZugangsdaten.AutoSize = True + Me.ChKZugangsdaten.Location = New System.Drawing.Point(327, 28) + Me.ChKZugangsdaten.Name = "ChKZugangsdaten" + Me.ChKZugangsdaten.Size = New System.Drawing.Size(141, 17) + Me.ChKZugangsdaten.TabIndex = 4 + Me.ChKZugangsdaten.Text = "Zugangsdaten anzeigen" + Me.ChKZugangsdaten.UseVisualStyleBackColor = True + ' 'Panel1 ' Me.Panel1.BackColor = System.Drawing.SystemColors.GradientInactiveCaption @@ -355,7 +475,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(1697, 24) + Me.MenuStrip1.Size = New System.Drawing.Size(1494, 24) Me.MenuStrip1.TabIndex = 2 Me.MenuStrip1.Text = "MenuStrip1" ' @@ -431,29 +551,9 @@ Partial Class Main Me.ToolStripMenuItemINFO.Size = New System.Drawing.Size(24, 20) Me.ToolStripMenuItemINFO.Text = "?" ' - 'btnBenutzerverwaltung - ' - Me.btnBenutzerverwaltung.BackColor = System.Drawing.SystemColors.ControlLightLight - Me.btnBenutzerverwaltung.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) - 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, 685) - Me.btnBenutzerverwaltung.Name = "btnBenutzerverwaltung" - Me.btnBenutzerverwaltung.Size = New System.Drawing.Size(151, 28) - Me.btnBenutzerverwaltung.TabIndex = 20 - Me.btnBenutzerverwaltung.Text = "Benutzerverwaltung" - Me.btnBenutzerverwaltung.UseVisualStyleBackColor = False - ' '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) - Me.Panel3.Controls.Add(Me.chkTSSitzungen) Me.Panel3.Controls.Add(Me.lblCount) Me.Panel3.Controls.Add(Me.btnNeu) Me.Panel3.Controls.Add(Me.ChkDHCPClients) @@ -463,78 +563,15 @@ Partial Class Main Me.Panel3.Controls.Add(Me.CmDBearbeiten) Me.Panel3.Controls.Add(Me.CmdFiles) Me.Panel3.Controls.Add(Me.LstAllgemein) - Me.Panel3.Controls.Add(Me.ChkTools) Me.Panel3.Controls.Add(Me.CmdLink) - Me.Panel3.Controls.Add(Me.ChKZugangsdaten) Me.Panel3.Controls.Add(Me.LstNetzwerk) Me.Panel3.Controls.Add(Me.LstStandort) 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, 863) + Me.Panel3.Size = New System.Drawing.Size(200, 765) 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, 804) - Me.Label20.Name = "Label20" - Me.Label20.Size = New System.Drawing.Size(28, 19) - Me.Label20.TabIndex = 42 - Me.Label20.Text = "99" - Me.Label20.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.Label20.Visible = False - ' - 'picAVISOMessenger - ' - Me.picAVISOMessenger.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - 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(135, 805) - Me.picAVISOMessenger.Name = "picAVISOMessenger" - Me.picAVISOMessenger.Size = New System.Drawing.Size(59, 55) - Me.picAVISOMessenger.TabIndex = 41 - Me.picAVISOMessenger.TabStop = False - ' - 'chkTSSitzungen - ' - Me.chkTSSitzungen.AutoSize = True - 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 - Me.chkTSSitzungen.Text = "Terminalsitzungen anzeigen" - Me.chkTSSitzungen.UseVisualStyleBackColor = True - ' 'lblCount ' Me.lblCount.AutoSize = True @@ -561,14 +598,13 @@ Partial Class Main 'ChkDHCPClients ' Me.ChkDHCPClients.AutoSize = True - Me.ChkDHCPClients.Checked = True - Me.ChkDHCPClients.CheckState = System.Windows.Forms.CheckState.Checked Me.ChkDHCPClients.Location = New System.Drawing.Point(25, 662) Me.ChkDHCPClients.Name = "ChkDHCPClients" Me.ChkDHCPClients.Size = New System.Drawing.Size(136, 17) Me.ChkDHCPClients.TabIndex = 16 Me.ChkDHCPClients.Text = "DHCP Clients anzeigen" Me.ChkDHCPClients.UseVisualStyleBackColor = True + Me.ChkDHCPClients.Visible = False ' 'ChkFreieHosts ' @@ -666,16 +702,6 @@ Partial Class Main Me.LstAllgemein.Size = New System.Drawing.Size(151, 95) Me.LstAllgemein.TabIndex = 11 ' - 'ChkTools - ' - Me.ChkTools.AutoSize = True - 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 - Me.ChkTools.Text = "Tools einblenden" - Me.ChkTools.UseVisualStyleBackColor = True - ' 'CmdLink ' Me.CmdLink.BackColor = System.Drawing.SystemColors.ControlLightLight @@ -690,16 +716,6 @@ Partial Class Main Me.CmdLink.Text = "Link öffnen" Me.CmdLink.UseVisualStyleBackColor = False ' - 'ChKZugangsdaten - ' - Me.ChKZugangsdaten.AutoSize = True - 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 - Me.ChKZugangsdaten.Text = "Zugangsdaten anzeigen" - Me.ChKZugangsdaten.UseVisualStyleBackColor = True - ' 'LstNetzwerk ' Me.LstNetzwerk.BackColor = System.Drawing.SystemColors.ControlLightLight @@ -721,7 +737,7 @@ Partial Class Main 'CMdTest2 ' Me.CMdTest2.Dock = System.Windows.Forms.DockStyle.Right - Me.CMdTest2.Location = New System.Drawing.Point(988, 0) + Me.CMdTest2.Location = New System.Drawing.Point(785, 0) Me.CMdTest2.Name = "CMdTest2" Me.CMdTest2.Size = New System.Drawing.Size(75, 100) Me.CMdTest2.TabIndex = 3 @@ -731,7 +747,7 @@ Partial Class Main 'CmdTest ' Me.CmdTest.Dock = System.Windows.Forms.DockStyle.Right - Me.CmdTest.Location = New System.Drawing.Point(913, 0) + Me.CmdTest.Location = New System.Drawing.Point(710, 0) Me.CmdTest.Name = "CmdTest" Me.CmdTest.Size = New System.Drawing.Size(75, 100) Me.CmdTest.TabIndex = 2 @@ -774,14 +790,14 @@ 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(1063, 763) + Me.DgVMain.Size = New System.Drawing.Size(860, 665) Me.DgVMain.TabIndex = 3 ' 'DGVMainContext ' - Me.DGVMainContext.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DgvMainContextMenuItemHost, Me.DateienToolStripMenuItem, Me.SMBToolStripMenuItem, Me.DgvMainContextMenuItemLink, Me.IPAdresseInZwischenablageToolStripMenuItem, Me.TeamviewerVerbindenToolStripMenuItem, Me.RDPToolStripMenuItem, Me.ToolStripSeparator3, Me.ObjektLöschenToolStripMenuItem, Me.ToolStripSeparator2, Me.NetzwerkdateienToolStripMenuItem, Me.ToolsToolStripMenuItem}) + Me.DGVMainContext.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DgvMainContextMenuItemHost, Me.DateienToolStripMenuItem, Me.SMBToolStripMenuItem, Me.DgvMainContextMenuItemLink, Me.IPAdresseInZwischenablageToolStripMenuItem, Me.TeamviewerVerbindenToolStripMenuItem, Me.RDPToolStripMenuItem, Me.RDPFensterToolStripMenuItem, Me.ToolStripSeparator3, Me.ObjektLöschenToolStripMenuItem, Me.ToolStripSeparator2, Me.NetzwerkdateienToolStripMenuItem, Me.ToolsToolStripMenuItem}) Me.DGVMainContext.Name = "ContextMenuStrip2" - Me.DGVMainContext.Size = New System.Drawing.Size(230, 258) + Me.DGVMainContext.Size = New System.Drawing.Size(230, 280) ' 'DgvMainContextMenuItemHost ' @@ -823,7 +839,7 @@ Partial Class Main ' Me.RDPToolStripMenuItem.Name = "RDPToolStripMenuItem" Me.RDPToolStripMenuItem.Size = New System.Drawing.Size(229, 22) - Me.RDPToolStripMenuItem.Text = "RDP" + Me.RDPToolStripMenuItem.Text = "RDP Vollbild" ' 'ToolStripSeparator3 ' @@ -857,21 +873,27 @@ Partial Class Main 'PuttyToolStripMenuItem ' Me.PuttyToolStripMenuItem.Name = "PuttyToolStripMenuItem" - Me.PuttyToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.PuttyToolStripMenuItem.Size = New System.Drawing.Size(176, 22) Me.PuttyToolStripMenuItem.Text = "Putty" ' 'PingToolStripMenuItem ' Me.PingToolStripMenuItem.Name = "PingToolStripMenuItem" - Me.PingToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.PingToolStripMenuItem.Size = New System.Drawing.Size(176, 22) Me.PingToolStripMenuItem.Text = "Ping" ' 'PingtToolStripMenuItem ' Me.PingtToolStripMenuItem.Name = "PingtToolStripMenuItem" - Me.PingtToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.PingtToolStripMenuItem.Size = New System.Drawing.Size(176, 22) Me.PingtToolStripMenuItem.Text = "Ping -t" ' + 'SpoolerNeuStartenToolStripMenuItem + ' + Me.SpoolerNeuStartenToolStripMenuItem.Name = "SpoolerNeuStartenToolStripMenuItem" + Me.SpoolerNeuStartenToolStripMenuItem.Size = New System.Drawing.Size(176, 22) + Me.SpoolerNeuStartenToolStripMenuItem.Text = "Spooler neu starten" + ' 'PanTools ' Me.PanTools.BackColor = System.Drawing.SystemColors.GradientInactiveCaption @@ -883,9 +905,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, 893) + Me.PanTools.Location = New System.Drawing.Point(200, 795) Me.PanTools.Name = "PanTools" - Me.PanTools.Size = New System.Drawing.Size(1063, 100) + Me.PanTools.Size = New System.Drawing.Size(860, 100) Me.PanTools.TabIndex = 4 Me.PanTools.Visible = False ' @@ -904,7 +926,7 @@ Partial Class Main 'btnTest3 ' Me.btnTest3.Dock = System.Windows.Forms.DockStyle.Right - Me.btnTest3.Location = New System.Drawing.Point(838, 0) + Me.btnTest3.Location = New System.Drawing.Point(635, 0) Me.btnTest3.Name = "btnTest3" Me.btnTest3.Size = New System.Drawing.Size(75, 100) Me.btnTest3.TabIndex = 13 @@ -955,9 +977,9 @@ Partial Class Main 'panTSSitzungen ' Me.panTSSitzungen.Dock = System.Windows.Forms.DockStyle.Right - Me.panTSSitzungen.Location = New System.Drawing.Point(1263, 130) + Me.panTSSitzungen.Location = New System.Drawing.Point(1060, 130) Me.panTSSitzungen.Name = "panTSSitzungen" - Me.panTSSitzungen.Size = New System.Drawing.Size(434, 863) + Me.panTSSitzungen.Size = New System.Drawing.Size(434, 765) Me.panTSSitzungen.TabIndex = 5 Me.panTSSitzungen.Visible = False ' @@ -969,17 +991,17 @@ Partial Class Main 'Timer1 ' ' - 'SpoolerNeuStartenToolStripMenuItem + 'RDPFensterToolStripMenuItem ' - Me.SpoolerNeuStartenToolStripMenuItem.Name = "SpoolerNeuStartenToolStripMenuItem" - Me.SpoolerNeuStartenToolStripMenuItem.Size = New System.Drawing.Size(180, 22) - Me.SpoolerNeuStartenToolStripMenuItem.Text = "Spooler neu starten" + Me.RDPFensterToolStripMenuItem.Name = "RDPFensterToolStripMenuItem" + Me.RDPFensterToolStripMenuItem.Size = New System.Drawing.Size(229, 22) + Me.RDPFensterToolStripMenuItem.Text = "RDP Fenster" ' 'Main ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(1697, 993) + Me.ClientSize = New System.Drawing.Size(1494, 895) Me.Controls.Add(Me.DgVMain) Me.Controls.Add(Me.PanTools) Me.Controls.Add(Me.panTSSitzungen) @@ -995,6 +1017,8 @@ Partial Class Main Me.Panel2.PerformLayout() 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() @@ -1006,7 +1030,6 @@ Partial Class Main Me.MenuStrip1.PerformLayout() Me.Panel3.ResumeLayout(False) Me.Panel3.PerformLayout() - CType(Me.picAVISOMessenger, System.ComponentModel.ISupportInitialize).EndInit() Me.PanNetzwerk.ResumeLayout(False) CType(Me.DgVMain, System.ComponentModel.ISupportInitialize).EndInit() Me.DGVMainContext.ResumeLayout(False) @@ -1104,4 +1127,7 @@ Partial Class Main Friend WithEvents chkPano As CheckBox Friend WithEvents RDPToolStripMenuItem As ToolStripMenuItem Friend WithEvents SpoolerNeuStartenToolStripMenuItem As ToolStripMenuItem + Friend WithEvents ContextMenuStrip1 As ContextMenuStrip + Friend WithEvents TelefonManuellZuweisenToolStripMenuItem As ToolStripMenuItem + Friend WithEvents RDPFensterToolStripMenuItem As ToolStripMenuItem End Class diff --git a/Dokumentation/Main.resx b/Dokumentation/Main.resx index 009b9ae..8216b95 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 + + 1156, 17 + @@ -277,6 +280,9 @@ 17, 17 + + True + 289, 17 diff --git a/Dokumentation/Main.vb b/Dokumentation/Main.vb index 1f8332d..00c6afc 100644 --- a/Dokumentation/Main.vb +++ b/Dokumentation/Main.vb @@ -304,7 +304,7 @@ Public Class Main End Function Public Function dbload() - con.ConnectionString = Class1.DBConString + If con.State <> 1 Then con.ConnectionString = Class1.DBConString conadmin.ConnectionString = Class1.DBConString cmd.Connection = con cmdadmin.Connection = conadmin @@ -419,15 +419,16 @@ Public Class Main DHCPAbfragen = Class1.ReadNullAs0(reader, "DHCPAbfragen") Loop reader.Close() - If DHCPAbfragen = True Then - If ChkDHCPClients.Checked = True Then - Dim NWAdresse As String - Class1.Name2Netzwerk(Standort, Netzwerk, NWAdresse) - Dim DHCPServer As String = Class1.GetDHCPServer(NWAdresse) - GetDHCPClients(NWAdresse, DHCPServer, ChkFreieHosts.Checked, ds) - Else - End If - End If + 'Funktioniert wieder mal nicht.... + 'If DHCPAbfragen = True Then + ' If ChkDHCPClients.Checked = True Then + ' Dim NWAdresse As String + ' Class1.Name2Netzwerk(Standort, Netzwerk, NWAdresse) + ' Dim DHCPServer As String = Class1.GetDHCPServer(NWAdresse) + ' GetDHCPClients(NWAdresse, DHCPServer, ChkFreieHosts.Checked, ds) + ' Else + ' End If + 'End If ' DHCPRefresh = False End If @@ -551,7 +552,8 @@ Public Class Main Else DgVMain.Rows(0).Selected = True End If - Catch + Catch ex As Exception + 'MsgBox("With DGV2: " & ex.Message) End Try ''--------------------------------------------------------------------------------------------------------/START//Farbig hervorheben, Check DHCP Filter @@ -645,7 +647,7 @@ Public Class Main End Function Private Sub CmdTest_Click(sender As Object, e As EventArgs) Handles CmdTest.Click - DHCP.DHCP1("192.168.0.98") + MsgBox("Hallo Andreas") End Sub Private Sub CMdTest2_Click(sender As Object, e As EventArgs) Handles CMdTest2.Click DeleteGastWLANUser("ABABAB") @@ -1038,7 +1040,11 @@ exit" End Sub Private Sub CmdPutty_Click(sender As Object, e As EventArgs) Handles CmdPutty.Click, PuttyToolStripMenuItem.Click - cExtProgramme.startputty(Class1.MainHost(DgVMain.CurrentRow.Cells("IPAdresse").Value)) + Dim host As New cHost + host.gethost(DgVMain.CurrentRow.Cells("IPAdresse").Value) + + cExtProgramme.startputty(host.IPAdresse, host.SSHPort) + 'cExtProgramme.startputty(Class1.MainHost(DgVMain.CurrentRow.Cells("IPAdresse").Value)) End Sub Private Sub ChkTools_CheckedChanged(sender As Object, e As EventArgs) Handles ChkTools.CheckedChanged @@ -1676,7 +1682,17 @@ exit" Dim Host2Connect As New cHost Host2Connect.gethost(Class1.MainHost(DgVMain.CurrentRow.Cells("IPAdresse").Value)) If Host2Connect.FQDN.Length > 1 Then - cExtProgramme.RDPConnect(Host2Connect.FQDN, Host2Connect.Benutzer, Host2Connect.Passwort) + cExtProgramme.RDPConnect(Host2Connect.FQDN, Host2Connect.Benutzer, Host2Connect.Passwort, False) + Else + MsgBox("Hostname wurde nicht gefunden.") + End If + End Sub + + Private Sub RDPFensterToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles RDPFensterToolStripMenuItem.Click + Dim Host2Connect As New cHost + Host2Connect.gethost(Class1.MainHost(DgVMain.CurrentRow.Cells("IPAdresse").Value)) + If Host2Connect.FQDN.Length > 1 Then + cExtProgramme.RDPConnect(Host2Connect.FQDN, Host2Connect.Benutzer, Host2Connect.Passwort, True) Else MsgBox("Hostname wurde nicht gefunden.") End If @@ -1702,6 +1718,24 @@ exit" End If End Sub + Private Sub TelefonManuellZuweisenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles TelefonManuellZuweisenToolStripMenuItem.Click + Dim frm As New frmLeer + frm.Text = "Telefone anmelden" + Dim usrcntrl As New uscntr_ConnectTel + + + usrcntrl.Dock = DockStyle.Fill : frm.PanMain.Controls.Add(usrcntrl) + frm.Size = usrcntrl.Size + frm.Show() + + AddHandler frm.FormClosing, Function() + + End Function + + 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 bf60a07..41bffce 100644 --- a/Dokumentation/My Project/Resources.Designer.vb +++ b/Dokumentation/My Project/Resources.Designer.vb @@ -22,7 +22,7 @@ Namespace My.Resources ''' ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. ''' - _ @@ -289,7 +289,7 @@ Namespace My.Resources End Property ''' - ''' Sucht eine lokalisierte Zeichenfolge, die 0.0.1.72 ähnelt. + ''' Sucht eine lokalisierte Zeichenfolge, die 0.0.1.79 ähnelt. ''' Friend ReadOnly Property Version() As String Get diff --git a/Dokumentation/My Project/Resources.resx b/Dokumentation/My Project/Resources.resx index 5cd95ff..1b05bd6 100644 --- a/Dokumentation/My Project/Resources.resx +++ b/Dokumentation/My Project/Resources.resx @@ -155,7 +155,7 @@ ..\Resources\Admin.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - 0.0.1.72 + 0.0.1.79 ..\Resources\Link.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/Dokumentation/My Project/licenses.licx b/Dokumentation/My Project/licenses.licx deleted file mode 100644 index 81fb76d..0000000 --- a/Dokumentation/My Project/licenses.licx +++ /dev/null @@ -1,4 +0,0 @@ -GrapeCity.ActiveReports.Export.Pdf.Section.PdfExport, GrapeCity.ActiveReports.Export.Pdf.v12 -GrapeCity.ActiveReports.PageReport, GrapeCity.ActiveReports.v12 -GrapeCity.ActiveReports.SectionReport, GrapeCity.ActiveReports.v12 -GrapeCity.ActiveReports.Viewer.Win.Viewer, GrapeCity.ActiveReports.Viewer.Win.v12 diff --git a/Dokumentation/PrintDGV.vb b/Dokumentation/PrintDGV.vb index e68f914..8c380cc 100644 --- a/Dokumentation/PrintDGV.vb +++ b/Dokumentation/PrintDGV.vb @@ -1,5 +1,5 @@ Imports System.Collections.Generic -Imports Microsoft.VisualBasic.PowerPacks.Printing +'Imports Microsoft.VisualBasic.PowerPacks.Printing Imports System.Data.Common Public Class PrintDGV diff --git a/Dokumentation/frmHostBearbeiten.Designer.vb b/Dokumentation/frmHostBearbeiten.Designer.vb index 216839e..ca9dcff 100644 --- a/Dokumentation/frmHostBearbeiten.Designer.vb +++ b/Dokumentation/frmHostBearbeiten.Designer.vb @@ -72,6 +72,8 @@ Partial Class frmHostBearbeiten Me.CmdDelete = New System.Windows.Forms.Button() Me.TxtBenutzername = New System.Windows.Forms.TextBox() Me.Panel1 = New System.Windows.Forms.Panel() + Me.txtSSHPort = New System.Windows.Forms.TextBox() + Me.Label14 = New System.Windows.Forms.Label() Me.cmdRDP = New System.Windows.Forms.Button() Me.cmdPutty = New System.Windows.Forms.Button() Me.cmdTVConnect = New System.Windows.Forms.Button() @@ -87,6 +89,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.Button1 = New System.Windows.Forms.Button() Me.ContextMenuStrip2.SuspendLayout() Me.ContextMenuStrip1.SuspendLayout() Me.Panel1.SuspendLayout() @@ -528,6 +531,9 @@ Partial Class frmHostBearbeiten ' 'Panel1 ' + Me.Panel1.Controls.Add(Me.Button1) + Me.Panel1.Controls.Add(Me.txtSSHPort) + Me.Panel1.Controls.Add(Me.Label14) Me.Panel1.Controls.Add(Me.cmdRDP) Me.Panel1.Controls.Add(Me.cmdPutty) Me.Panel1.Controls.Add(Me.cmdTVConnect) @@ -582,13 +588,29 @@ Partial Class frmHostBearbeiten Me.Panel1.Size = New System.Drawing.Size(643, 460) Me.Panel1.TabIndex = 137 ' + 'txtSSHPort + ' + Me.txtSSHPort.Location = New System.Drawing.Point(123, 352) + Me.txtSSHPort.Name = "txtSSHPort" + Me.txtSSHPort.Size = New System.Drawing.Size(75, 20) + Me.txtSSHPort.TabIndex = 149 + ' + 'Label14 + ' + Me.Label14.AutoSize = True + Me.Label14.Location = New System.Drawing.Point(123, 339) + Me.Label14.Name = "Label14" + Me.Label14.Size = New System.Drawing.Size(51, 13) + Me.Label14.TabIndex = 148 + Me.Label14.Text = "SSH Port" + ' 'cmdRDP ' Me.cmdRDP.BackColor = System.Drawing.SystemColors.ControlLightLight Me.cmdRDP.FlatAppearance.BorderColor = System.Drawing.Color.DimGray Me.cmdRDP.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.cmdRDP.Image = Global.Dokumentation.My.Resources.Resources.mstsc1 - Me.cmdRDP.Location = New System.Drawing.Point(269, 340) + Me.cmdRDP.Location = New System.Drawing.Point(231, 340) Me.cmdRDP.Name = "cmdRDP" Me.cmdRDP.Size = New System.Drawing.Size(32, 32) Me.cmdRDP.TabIndex = 147 @@ -600,7 +622,7 @@ Partial Class frmHostBearbeiten Me.cmdPutty.FlatAppearance.BorderColor = System.Drawing.Color.DimGray Me.cmdPutty.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.cmdPutty.Image = Global.Dokumentation.My.Resources.Resources.ico_putty_exe0001 - Me.cmdPutty.Location = New System.Drawing.Point(231, 340) + Me.cmdPutty.Location = New System.Drawing.Point(85, 339) Me.cmdPutty.Name = "cmdPutty" Me.cmdPutty.Size = New System.Drawing.Size(32, 32) Me.cmdPutty.TabIndex = 146 @@ -740,6 +762,21 @@ Partial Class frmHostBearbeiten Me.PanNavTop.Size = New System.Drawing.Size(309, 32) Me.PanNavTop.TabIndex = 141 ' + 'Button1 + ' + Me.Button1.BackColor = System.Drawing.SystemColors.ControlLightLight + Me.Button1.FlatAppearance.BorderColor = System.Drawing.Color.DimGray + Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button1.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Underline), System.Drawing.FontStyle), System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Button1.ForeColor = System.Drawing.Color.Red + Me.Button1.Image = Global.Dokumentation.My.Resources.Resources.mstsc1 + Me.Button1.Location = New System.Drawing.Point(271, 340) + Me.Button1.Name = "Button1" + Me.Button1.Size = New System.Drawing.Size(32, 32) + Me.Button1.TabIndex = 150 + Me.Button1.Text = "[ ]" + Me.Button1.UseVisualStyleBackColor = False + ' 'frmHostBearbeiten ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -832,4 +869,7 @@ Partial Class frmHostBearbeiten Friend WithEvents cmdTVConnect As Button Friend WithEvents cmdPutty As Button Friend WithEvents cmdRDP As Button + Friend WithEvents Label14 As Label + Friend WithEvents txtSSHPort As TextBox + Friend WithEvents Button1 As Button End Class diff --git a/Dokumentation/frmHostBearbeiten.vb b/Dokumentation/frmHostBearbeiten.vb index a0e4ea3..bf46eac 100644 --- a/Dokumentation/frmHostBearbeiten.vb +++ b/Dokumentation/frmHostBearbeiten.vb @@ -36,6 +36,7 @@ txtTeamviewer.Text = host.TeamviewerID txtTVKennwort.Text = host.TeamviewerKennwort + txtSSHPort.Text = host.SSHPort Me.Text = host.FQDN @@ -83,6 +84,7 @@ .TeamviewerID = txtTeamviewer.Text .TeamviewerKennwort = txtTVKennwort.Text + .SSHPort = txtSSHPort.Text End With End Function @@ -379,10 +381,14 @@ End Sub Private Sub cmdPutty_Click(sender As Object, e As EventArgs) Handles cmdPutty.Click - cExtProgramme.startputty(Class1.MainHost(TxtIP.Text)) + cExtProgramme.startputty(Class1.MainHost(TxtIP.Text), txtSSHPort.Text) End Sub Private Sub cmdRDP_Click(sender As Object, e As EventArgs) Handles cmdRDP.Click - cExtProgramme.RDPConnect(host.FQDN, host.Benutzer, host.Passwort) + cExtProgramme.RDPConnect(host.FQDN, host.Benutzer, host.Passwort, False) + End Sub + + Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click + cExtProgramme.RDPConnect(host.FQDN, host.Benutzer, host.Passwort, True) End Sub End Class \ No newline at end of file diff --git a/Dokumentation/frmLeer.Designer.vb b/Dokumentation/frmLeer.Designer.vb index c9747e9..79f9124 100644 --- a/Dokumentation/frmLeer.Designer.vb +++ b/Dokumentation/frmLeer.Designer.vb @@ -34,7 +34,7 @@ Partial Class frmLeer Me.PanMain.Dock = System.Windows.Forms.DockStyle.Fill Me.PanMain.Location = New System.Drawing.Point(0, 0) Me.PanMain.Name = "PanMain" - Me.PanMain.Size = New System.Drawing.Size(246, 450) + Me.PanMain.Size = New System.Drawing.Size(357, 200) Me.PanMain.TabIndex = 0 ' 'frmLeer @@ -43,7 +43,7 @@ Partial Class frmLeer Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoSize = True Me.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ClientSize = New System.Drawing.Size(246, 450) + Me.ClientSize = New System.Drawing.Size(357, 200) Me.Controls.Add(Me.PanMain) Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.KeyPreview = True diff --git a/Dokumentation/licenses.licx b/Dokumentation/licenses.licx deleted file mode 100644 index 81fb76d..0000000 --- a/Dokumentation/licenses.licx +++ /dev/null @@ -1,4 +0,0 @@ -GrapeCity.ActiveReports.Export.Pdf.Section.PdfExport, GrapeCity.ActiveReports.Export.Pdf.v12 -GrapeCity.ActiveReports.PageReport, GrapeCity.ActiveReports.v12 -GrapeCity.ActiveReports.SectionReport, GrapeCity.ActiveReports.v12 -GrapeCity.ActiveReports.Viewer.Win.Viewer, GrapeCity.ActiveReports.Viewer.Win.v12 diff --git a/Dokumentation/uscntr_ConnectTel.Designer.vb b/Dokumentation/uscntr_ConnectTel.Designer.vb new file mode 100644 index 0000000..01a409e --- /dev/null +++ b/Dokumentation/uscntr_ConnectTel.Designer.vb @@ -0,0 +1,101 @@ + _ +Partial Class uscntr_ConnectTel + 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 + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + '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.TextBox1 = New System.Windows.Forms.TextBox() + Me.TextBox2 = New System.Windows.Forms.TextBox() + Me.Label1 = New System.Windows.Forms.Label() + Me.Label2 = New System.Windows.Forms.Label() + Me.FlatButton1 = New VERAG_PROG_ALLGEMEIN.FlatButton() + Me.SuspendLayout() + ' + 'TextBox1 + ' + Me.TextBox1.Location = New System.Drawing.Point(124, 23) + Me.TextBox1.Name = "TextBox1" + Me.TextBox1.Size = New System.Drawing.Size(100, 20) + Me.TextBox1.TabIndex = 0 + ' + 'TextBox2 + ' + Me.TextBox2.Location = New System.Drawing.Point(124, 63) + Me.TextBox2.Name = "TextBox2" + Me.TextBox2.Size = New System.Drawing.Size(100, 20) + Me.TextBox2.TabIndex = 1 + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Location = New System.Drawing.Point(29, 26) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(78, 13) + Me.Label1.TabIndex = 2 + Me.Label1.Text = "Benutzername:" + ' + 'Label2 + ' + Me.Label2.AutoSize = True + Me.Label2.Location = New System.Drawing.Point(43, 66) + Me.Label2.Name = "Label2" + Me.Label2.Size = New System.Drawing.Size(64, 13) + Me.Label2.TabIndex = 3 + Me.Label2.Text = "Arbeitsplatz:" + ' + 'FlatButton1 + ' + Me.FlatButton1.allowBorder = False + Me.FlatButton1.BackColor = System.Drawing.SystemColors.AppWorkspace + Me.FlatButton1.FlatAppearance.BorderSize = 0 + Me.FlatButton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.FlatButton1.ForeColor = System.Drawing.Color.Black + Me.FlatButton1.Location = New System.Drawing.Point(183, 105) + Me.FlatButton1.Name = "FlatButton1" + Me.FlatButton1.Size = New System.Drawing.Size(113, 23) + Me.FlatButton1.TabIndex = 4 + Me.FlatButton1.Text = "Telefon anmelden" + Me.FlatButton1.UseVisualStyleBackColor = False + ' + 'uscntr_ConnectTel + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.AutoSize = True + Me.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.Controls.Add(Me.FlatButton1) + Me.Controls.Add(Me.Label2) + Me.Controls.Add(Me.Label1) + Me.Controls.Add(Me.TextBox2) + Me.Controls.Add(Me.TextBox1) + Me.Name = "uscntr_ConnectTel" + Me.Size = New System.Drawing.Size(299, 131) + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents TextBox1 As TextBox + Friend WithEvents TextBox2 As TextBox + Friend WithEvents Label1 As Label + Friend WithEvents Label2 As Label + Friend WithEvents FlatButton1 As VERAG_PROG_ALLGEMEIN.FlatButton +End Class diff --git a/Dokumentation/uscntr_ConnectTel.resx b/Dokumentation/uscntr_ConnectTel.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/Dokumentation/uscntr_ConnectTel.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Dokumentation/uscntr_ConnectTel.vb b/Dokumentation/uscntr_ConnectTel.vb new file mode 100644 index 0000000..200bfda --- /dev/null +++ b/Dokumentation/uscntr_ConnectTel.vb @@ -0,0 +1,16 @@ +Public Class uscntr_ConnectTel + + + Private Sub FlatButton1_Click(sender As Object, e As EventArgs) Handles FlatButton1.Click + If TextBox1.TextLength > 0 And TextBox2.TextLength > 0 Then + + Dim pascom As New cPascom + pascom.Username = TextBox1.Text + pascom.Arbeitsplatz = TextBox2.Text + pascom.Anmelden() + + Else + End If + + End Sub +End Class diff --git a/Dokumentation/uscntr_DomUser.Designer.vb b/Dokumentation/uscntr_DomUser.Designer.vb index 74dcce0..014712c 100644 --- a/Dokumentation/uscntr_DomUser.Designer.vb +++ b/Dokumentation/uscntr_DomUser.Designer.vb @@ -51,6 +51,8 @@ Partial Class uscntr_DomUser Me.chkAutoLogoff = New System.Windows.Forms.CheckBox() Me.DateTimePicker1 = New System.Windows.Forms.DateTimePicker() Me.cmd3Uhr = New System.Windows.Forms.Button() + Me.btnRDP = New System.Windows.Forms.Button() + Me.Button1 = New System.Windows.Forms.Button() Me.SuspendLayout() ' 'cmdSave @@ -233,7 +235,7 @@ Partial Class uscntr_DomUser Me.Label9.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label9.Location = New System.Drawing.Point(144, 156) Me.Label9.Name = "Label9" - Me.Label9.Size = New System.Drawing.Size(13, 16) + Me.Label9.Size = New System.Drawing.Size(12, 16) Me.Label9.TabIndex = 156 Me.Label9.Text = "\" ' @@ -315,7 +317,7 @@ Partial Class uscntr_DomUser ' Me.chkAutoLogoff.AutoSize = True Me.chkAutoLogoff.CheckAlign = System.Drawing.ContentAlignment.MiddleRight - Me.chkAutoLogoff.Location = New System.Drawing.Point(8, 227) + Me.chkAutoLogoff.Location = New System.Drawing.Point(8, 290) Me.chkAutoLogoff.Name = "chkAutoLogoff" Me.chkAutoLogoff.Size = New System.Drawing.Size(78, 17) Me.chkAutoLogoff.TabIndex = 164 @@ -327,7 +329,7 @@ Partial Class uscntr_DomUser ' Me.DateTimePicker1.Enabled = False Me.DateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Time - Me.DateTimePicker1.Location = New System.Drawing.Point(103, 224) + Me.DateTimePicker1.Location = New System.Drawing.Point(103, 287) Me.DateTimePicker1.Name = "DateTimePicker1" Me.DateTimePicker1.Size = New System.Drawing.Size(82, 20) Me.DateTimePicker1.TabIndex = 165 @@ -339,19 +341,45 @@ Partial Class uscntr_DomUser 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.Location = New System.Drawing.Point(191, 287) 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 ' + 'btnRDP + ' + Me.btnRDP.BackColor = System.Drawing.SystemColors.ControlLightLight + Me.btnRDP.FlatAppearance.BorderColor = System.Drawing.Color.DimGray + Me.btnRDP.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnRDP.Location = New System.Drawing.Point(8, 219) + Me.btnRDP.Name = "btnRDP" + Me.btnRDP.Size = New System.Drawing.Size(104, 23) + Me.btnRDP.TabIndex = 167 + Me.btnRDP.Text = "RDP" + Me.btnRDP.UseVisualStyleBackColor = False + ' + 'Button1 + ' + Me.Button1.BackColor = System.Drawing.SystemColors.ControlLightLight + Me.Button1.FlatAppearance.BorderColor = System.Drawing.Color.DimGray + Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button1.Location = New System.Drawing.Point(118, 219) + Me.Button1.Name = "Button1" + Me.Button1.Size = New System.Drawing.Size(104, 23) + Me.Button1.TabIndex = 168 + Me.Button1.Text = "RDP Fenster" + Me.Button1.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.Button1) + Me.Controls.Add(Me.btnRDP) Me.Controls.Add(Me.cmd3Uhr) Me.Controls.Add(Me.DateTimePicker1) Me.Controls.Add(Me.chkAutoLogoff) @@ -417,4 +445,6 @@ Partial Class uscntr_DomUser Friend WithEvents chkAutoLogoff As CheckBox Friend WithEvents DateTimePicker1 As DateTimePicker Friend WithEvents cmd3Uhr As Button + Friend WithEvents btnRDP As Button + Friend WithEvents Button1 As Button End Class diff --git a/Dokumentation/uscntr_DomUser.vb b/Dokumentation/uscntr_DomUser.vb index 0625dea..901945b 100644 --- a/Dokumentation/uscntr_DomUser.vb +++ b/Dokumentation/uscntr_DomUser.vb @@ -117,4 +117,12 @@ 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 + + Private Sub btnRDP_Click(sender As Object, e As EventArgs) Handles btnRDP.Click + cExtProgramme.RDPConnect("rdpintern.verag.ag", txtDomaene.Text & "\" & txtBenutzer.Text, txtDomKennwort.Text, False) + End Sub + + Private Sub Button1_Click_2(sender As Object, e As EventArgs) Handles Button1.Click + cExtProgramme.RDPConnect("rdpintern.verag.ag", txtDomaene.Text & "\" & txtBenutzer.Text, txtDomKennwort.Text, True) + End Sub End Class diff --git a/Dokumentation_Updater/App.config b/Dokumentation_Updater/App.config index 5534e28..a86c646 100644 --- a/Dokumentation_Updater/App.config +++ b/Dokumentation_Updater/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/Dokumentation_Updater/Dokumentation_Updater.vbproj b/Dokumentation_Updater/Dokumentation_Updater.vbproj index 73dcf75..fdefd13 100644 --- a/Dokumentation_Updater/Dokumentation_Updater.vbproj +++ b/Dokumentation_Updater/Dokumentation_Updater.vbproj @@ -11,9 +11,10 @@ Dokumentation_Updater 512 WindowsForms - v4.6.1 + v4.8 true true + AnyCPU @@ -149,6 +150,7 @@ True Application.myapp + True True diff --git a/Dokumentation_Updater/My Project/Application.Designer.vb b/Dokumentation_Updater/My Project/Application.Designer.vb index ed25b63..94ba112 100644 --- a/Dokumentation_Updater/My Project/Application.Designer.vb +++ b/Dokumentation_Updater/My Project/Application.Designer.vb @@ -1,10 +1,10 @@ '------------------------------------------------------------------------------ ' -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 ' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. ' '------------------------------------------------------------------------------ @@ -13,15 +13,15 @@ Option Explicit On Namespace My - - 'NOTE: This file is auto-generated; do not modify it directly. To make changes, - ' or if you encounter build errors in this file, go to the Project Designer - ' (go to Project Properties or double-click the My Project node in - ' Solution Explorer), and make changes on the Application tab. + + 'HINWEIS: Diese Datei wird automatisch generiert und darf nicht direkt bearbeitet werden. Wenn Sie Änderungen vornehmen möchten + ' oder in dieser Datei Buildfehler auftreten, wechseln Sie zum Projekt-Designer. + ' (Wechseln Sie dazu zu den Projekteigenschaften, oder doppelklicken Sie auf den Knoten "Mein Projekt" im + ' Projektmappen-Explorer). Nehmen Sie auf der Registerkarte "Anwendung" entsprechende Änderungen vor. ' Partial Friend Class MyApplication - - _ + + _ Public Sub New() MyBase.New(Global.Microsoft.VisualBasic.ApplicationServices.AuthenticationMode.Windows) Me.IsSingleInstance = false @@ -29,10 +29,10 @@ Namespace My Me.SaveMySettingsOnExit = true Me.ShutDownStyle = Global.Microsoft.VisualBasic.ApplicationServices.ShutdownMode.AfterMainFormCloses End Sub - - _ + + _ Protected Overrides Sub OnCreateMainForm() - Me.MainForm = Global.Dokumentation_Updater.Update + Me.MainForm = Global.Dokumentation_Updater.Form1 End Sub End Class End Namespace diff --git a/Dokumentation_Updater/My Project/Resources.Designer.vb b/Dokumentation_Updater/My Project/Resources.Designer.vb index d0715b7..59380ee 100644 --- a/Dokumentation_Updater/My Project/Resources.Designer.vb +++ b/Dokumentation_Updater/My Project/Resources.Designer.vb @@ -1,40 +1,41 @@ '------------------------------------------------------------------------------ ' -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 ' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. ' '------------------------------------------------------------------------------ Option Strict On Option Explicit On +Imports System Namespace My.Resources - - 'This class was auto-generated by the StronglyTypedResourceBuilder - 'class via a tool like ResGen or Visual Studio. - 'To add or remove a member, edit your .ResX file then rerun ResGen - 'with the /str option, or rebuild your VS project. + + 'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert + '-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. + 'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen + 'mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. ''' - ''' A strongly-typed resource class, for looking up localized strings, etc. + ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. ''' - _ + _ Friend Module Resources - + Private resourceMan As Global.System.Resources.ResourceManager - + Private resourceCulture As Global.System.Globalization.CultureInfo - + ''' - ''' Returns the cached ResourceManager instance used by this class. + ''' Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. ''' - _ + _ Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager Get If Object.ReferenceEquals(resourceMan, Nothing) Then @@ -44,17 +45,17 @@ Namespace My.Resources Return resourceMan End Get End Property - + ''' - ''' Overrides the current thread's CurrentUICulture property for all - ''' resource lookups using this strongly typed resource class. + ''' Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle + ''' Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. ''' - _ + _ Friend Property Culture() As Global.System.Globalization.CultureInfo Get Return resourceCulture End Get - Set(ByVal value As Global.System.Globalization.CultureInfo) + Set resourceCulture = value End Set End Property diff --git a/Dokumentation_Updater/My Project/Settings.Designer.vb b/Dokumentation_Updater/My Project/Settings.Designer.vb index 39aeeaa..f9a9f4e 100644 --- a/Dokumentation_Updater/My Project/Settings.Designer.vb +++ b/Dokumentation_Updater/My Project/Settings.Designer.vb @@ -1,10 +1,10 @@ '------------------------------------------------------------------------------ ' -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 ' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. ' '------------------------------------------------------------------------------ @@ -13,42 +13,42 @@ Option Explicit On Namespace My - - _ + + _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase - - Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings), MySettings) - -#Region "My.Settings Auto-Save Functionality" + + Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings) + +#Region "Automatische My.Settings-Speicherfunktion" #If _MyType = "WindowsForms" Then - Private Shared addedHandler As Boolean + Private Shared addedHandler As Boolean - Private Shared addedHandlerLockObject As New Object + Private Shared addedHandlerLockObject As New Object - _ - Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs) - If My.Application.SaveMySettingsOnExit Then - My.Settings.Save() - End If - End Sub + _ + Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs) + If My.Application.SaveMySettingsOnExit Then + My.Settings.Save() + End If + End Sub #End If #End Region - + Public Shared ReadOnly Property [Default]() As MySettings Get - + #If _MyType = "WindowsForms" Then - If Not addedHandler Then - SyncLock addedHandlerLockObject - If Not addedHandler Then - AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings - addedHandler = True - End If - End SyncLock - End If + If Not addedHandler Then + SyncLock addedHandlerLockObject + If Not addedHandler Then + AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings + addedHandler = True + End If + End SyncLock + End If #End If Return defaultInstance End Get @@ -57,13 +57,13 @@ Namespace My End Namespace Namespace My - - _ + + _ Friend Module MySettingsProperty - - _ + + _ Friend ReadOnly Property Settings() As Global.Dokumentation_Updater.My.MySettings Get Return Global.Dokumentation_Updater.My.MySettings.Default diff --git a/Dokumentation_Updater/My Project/licenses.licx b/Dokumentation_Updater/My Project/licenses.licx deleted file mode 100644 index 81fb76d..0000000 --- a/Dokumentation_Updater/My Project/licenses.licx +++ /dev/null @@ -1,4 +0,0 @@ -GrapeCity.ActiveReports.Export.Pdf.Section.PdfExport, GrapeCity.ActiveReports.Export.Pdf.v12 -GrapeCity.ActiveReports.PageReport, GrapeCity.ActiveReports.v12 -GrapeCity.ActiveReports.SectionReport, GrapeCity.ActiveReports.v12 -GrapeCity.ActiveReports.Viewer.Win.Viewer, GrapeCity.ActiveReports.Viewer.Win.v12 diff --git a/licenses.licx b/licenses.licx deleted file mode 100644 index 81fb76d..0000000 --- a/licenses.licx +++ /dev/null @@ -1,4 +0,0 @@ -GrapeCity.ActiveReports.Export.Pdf.Section.PdfExport, GrapeCity.ActiveReports.Export.Pdf.v12 -GrapeCity.ActiveReports.PageReport, GrapeCity.ActiveReports.v12 -GrapeCity.ActiveReports.SectionReport, GrapeCity.ActiveReports.v12 -GrapeCity.ActiveReports.Viewer.Win.Viewer, GrapeCity.ActiveReports.Viewer.Win.v12