diff --git a/Dokumentation/Classes/Class1.vb b/Dokumentation/Classes/Class1.vb index c1b410e..52a69fe 100644 --- a/Dokumentation/Classes/Class1.vb +++ b/Dokumentation/Classes/Class1.vb @@ -845,4 +845,14 @@ Public Class Class1 Next End Sub + Public Shared Function WriteToFile(filepath As String, texttowrite As String) + Try + Dim objWriter As New System.IO.StreamWriter(filepath) + objWriter.Write(texttowrite) + objWriter.Close() + Catch ex As Exception + MsgBox(filepath & vbCrLf & " konnte nicht geschrieben werden." & vbCrLf & ex.Message) + End Try + End Function + End Class diff --git a/Dokumentation/Classes/cExtProgramme.vb b/Dokumentation/Classes/cExtProgramme.vb index a07770c..8a69e1e 100644 --- a/Dokumentation/Classes/cExtProgramme.vb +++ b/Dokumentation/Classes/cExtProgramme.vb @@ -52,13 +52,14 @@ ping.Start() End Function - Public Shared Function msgsend(argumente As String) + Public Shared Function msgsend(argumente As String, Optional ByVal ReturnOrder As Boolean = False) Try Dim msg As New Process System.IO.File.WriteAllBytes("msg.exe", My.Resources.msg) msg.StartInfo.FileName = "msg.exe" 'msg.StartInfo.WorkingDirectory = "C:\Windows\System32\" msg.StartInfo.Arguments = argumente + If ReturnOrder = True Then Return "msg.exe " & argumente : Exit Function msg.Start() Catch ex As Exception MsgBox(ex.Message) @@ -79,4 +80,39 @@ teamviewer.Start() End Function + Public Shared Function RDPConnect(host As String, Optional ByVal Username As String = "", Optional ByVal Password As String = "") + Dim mstsc As New Process + Dim AnmeldeDatenVorhanden As Boolean = False + + 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 + End If + + mstsc.StartInfo.FileName = "mstsc.exe" + mstsc.StartInfo.UseShellExecute = False + mstsc.StartInfo.Arguments = " /v: " & host + + mstsc.Start() + + If AnmeldeDatenVorhanden = True Then + 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 + + + End If + + + + End Function + End Class diff --git a/Dokumentation/Classes/cTSUser.vb b/Dokumentation/Classes/cTSUser.vb index 4cffad9..d257016 100644 --- a/Dokumentation/Classes/cTSUser.vb +++ b/Dokumentation/Classes/cTSUser.vb @@ -14,4 +14,10 @@ Me.NameKurz = Me.BenutzerAnmeldeName.Substring(i + 1, Me.BenutzerAnmeldeName.Length - (i + 1)) End Function + Public Shared Function genNameKurz(langername As String) + Dim i As Integer = langername.IndexOf("\") + Dim kn As String = langername.Substring(i + 1, langername.Length - (i + 1)) + Return kn + End Function + End Class diff --git a/Dokumentation/Dokumentation.vbproj b/Dokumentation/Dokumentation.vbproj index 0b9959f..2e33516 100644 --- a/Dokumentation/Dokumentation.vbproj +++ b/Dokumentation/Dokumentation.vbproj @@ -43,6 +43,7 @@ bin\Debug\ Dokumentation.xml 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + false AnyCPU @@ -171,9 +172,11 @@ + + @@ -246,6 +249,12 @@ Form + + frmPopUp.vb + + + Form + uscntr_DomUserList.vb @@ -264,6 +273,12 @@ UserControl + + uscntr_MessageUser.vb + + + UserControl + uscntr_TSSitzungen.vb @@ -464,6 +479,9 @@ frmNotify.vb + + frmPopUp.vb + uscntr_DomUser.vb @@ -471,6 +489,9 @@ uscntr_DomUserList.vb + + uscntr_MessageUser.vb + uscntr_TSSitzungen.vb @@ -581,6 +602,7 @@ + diff --git a/Dokumentation/Main.Designer.vb b/Dokumentation/Main.Designer.vb index 6320dda..407b700 100644 --- a/Dokumentation/Main.Designer.vb +++ b/Dokumentation/Main.Designer.vb @@ -24,7 +24,7 @@ Partial Class Main Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(Main)) - Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + 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.Button1 = New System.Windows.Forms.Button() @@ -92,6 +92,7 @@ Partial Class Main Me.DgvMainContextMenuItemLink = New System.Windows.Forms.ToolStripMenuItem() Me.IPAdresseInZwischenablageToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.TeamviewerVerbindenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.RDPToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator() Me.ObjektLöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator() @@ -112,6 +113,7 @@ 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.Panel2.SuspendLayout() Me.Panel4.SuspendLayout() Me.PanType.SuspendLayout() @@ -320,8 +322,8 @@ Partial Class Main ' 'LblUhrzeit ' - Me.LblUhrzeit.Anchor = System.Windows.Forms.AnchorStyles.Left - Me.LblUhrzeit.Location = New System.Drawing.Point(1051, 81) + Me.LblUhrzeit.Anchor = System.Windows.Forms.AnchorStyles.Right + Me.LblUhrzeit.Location = New System.Drawing.Point(1178, 81) Me.LblUhrzeit.Name = "LblUhrzeit" Me.LblUhrzeit.Size = New System.Drawing.Size(235, 13) Me.LblUhrzeit.TabIndex = 7 @@ -754,14 +756,14 @@ 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 Me.DgVMain.Dock = System.Windows.Forms.DockStyle.Fill @@ -777,9 +779,9 @@ Partial Class Main ' 'DGVMainContext ' - Me.DGVMainContext.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DgvMainContextMenuItemHost, Me.DateienToolStripMenuItem, Me.SMBToolStripMenuItem, Me.DgvMainContextMenuItemLink, Me.IPAdresseInZwischenablageToolStripMenuItem, Me.TeamviewerVerbindenToolStripMenuItem, 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.ToolStripSeparator3, Me.ObjektLöschenToolStripMenuItem, Me.ToolStripSeparator2, Me.NetzwerkdateienToolStripMenuItem, Me.ToolsToolStripMenuItem}) Me.DGVMainContext.Name = "ContextMenuStrip2" - Me.DGVMainContext.Size = New System.Drawing.Size(230, 214) + Me.DGVMainContext.Size = New System.Drawing.Size(230, 258) ' 'DgvMainContextMenuItemHost ' @@ -817,6 +819,12 @@ Partial Class Main Me.TeamviewerVerbindenToolStripMenuItem.Size = New System.Drawing.Size(229, 22) Me.TeamviewerVerbindenToolStripMenuItem.Text = "Teamviewer verbinden" ' + 'RDPToolStripMenuItem + ' + Me.RDPToolStripMenuItem.Name = "RDPToolStripMenuItem" + Me.RDPToolStripMenuItem.Size = New System.Drawing.Size(229, 22) + Me.RDPToolStripMenuItem.Text = "RDP" + ' 'ToolStripSeparator3 ' Me.ToolStripSeparator3.Name = "ToolStripSeparator3" @@ -841,7 +849,7 @@ Partial Class Main ' 'ToolsToolStripMenuItem ' - Me.ToolsToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.PuttyToolStripMenuItem, Me.PingToolStripMenuItem, Me.PingtToolStripMenuItem}) + Me.ToolsToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.PuttyToolStripMenuItem, Me.PingToolStripMenuItem, Me.PingtToolStripMenuItem, Me.SpoolerNeuStartenToolStripMenuItem}) Me.ToolsToolStripMenuItem.Name = "ToolsToolStripMenuItem" Me.ToolsToolStripMenuItem.Size = New System.Drawing.Size(229, 22) Me.ToolsToolStripMenuItem.Text = "Tools" @@ -849,19 +857,19 @@ Partial Class Main 'PuttyToolStripMenuItem ' Me.PuttyToolStripMenuItem.Name = "PuttyToolStripMenuItem" - Me.PuttyToolStripMenuItem.Size = New System.Drawing.Size(110, 22) + Me.PuttyToolStripMenuItem.Size = New System.Drawing.Size(180, 22) Me.PuttyToolStripMenuItem.Text = "Putty" ' 'PingToolStripMenuItem ' Me.PingToolStripMenuItem.Name = "PingToolStripMenuItem" - Me.PingToolStripMenuItem.Size = New System.Drawing.Size(110, 22) + Me.PingToolStripMenuItem.Size = New System.Drawing.Size(180, 22) Me.PingToolStripMenuItem.Text = "Ping" ' 'PingtToolStripMenuItem ' Me.PingtToolStripMenuItem.Name = "PingtToolStripMenuItem" - Me.PingtToolStripMenuItem.Size = New System.Drawing.Size(110, 22) + Me.PingtToolStripMenuItem.Size = New System.Drawing.Size(180, 22) Me.PingtToolStripMenuItem.Text = "Ping -t" ' 'PanTools @@ -958,6 +966,15 @@ Partial Class Main Me.Timer_Refresh.Enabled = True Me.Timer_Refresh.Interval = 5000 ' + 'Timer1 + ' + ' + 'SpoolerNeuStartenToolStripMenuItem + ' + Me.SpoolerNeuStartenToolStripMenuItem.Name = "SpoolerNeuStartenToolStripMenuItem" + Me.SpoolerNeuStartenToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.SpoolerNeuStartenToolStripMenuItem.Text = "Spooler neu starten" + ' 'Main ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -1085,4 +1102,6 @@ Partial Class Main Public WithEvents PictureBox1 As PictureBox Friend WithEvents btnTSSitzungen As Button Friend WithEvents chkPano As CheckBox + Friend WithEvents RDPToolStripMenuItem As ToolStripMenuItem + Friend WithEvents SpoolerNeuStartenToolStripMenuItem As ToolStripMenuItem End Class diff --git a/Dokumentation/Main.resx b/Dokumentation/Main.resx index ecd1a6a..009b9ae 100644 --- a/Dokumentation/Main.resx +++ b/Dokumentation/Main.resx @@ -117,9 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 17, 17 - diff --git a/Dokumentation/Main.vb b/Dokumentation/Main.vb index 26fe6b5..060664d 100644 --- a/Dokumentation/Main.vb +++ b/Dokumentation/Main.vb @@ -1,5 +1,7 @@ Imports System.Data.SqlClient Imports System.IO +Imports System.Threading +Imports System.ServiceProcess Imports System.DirectoryServices.AccountManagement Public Class Main @@ -664,9 +666,53 @@ Public Class Main End Sub Private Sub btnTest3_Click(sender As Object, e As EventArgs) Handles btnTest3.Click - Class1.ini.save() + RestartServices("TS12.verag.ost.dmn", "Druckerwarteschlange") End Sub + Public Sub RestartServices(Servername As String, Dienst As String) + + 'Dim Servername As String = "TS12.verag.ost.dmn" + + Select Case Dienst + Case "Druckerwarteschlange" + MsgBox("Druckerwarteschlange und Abhängigkeiten werden neu gestartet." & vbCrLf & "Bitte ~ 15 Sekunden warten...") + Try + Dim sc As New ServiceController("pdf24", Servername) + Dim sc2 As New ServiceController("Spooler", Servername) + + + DienstStartStop(sc, "stop") + Thread.Sleep(3300) + DienstStartStop(sc2, "stop") + Thread.Sleep(3300) + + sc = New ServiceController("pdf24", Servername) + sc2 = New ServiceController("Spooler", Servername) + + DienstStartStop(sc, "start") + Thread.Sleep(5300) + DienstStartStop(sc2, "start") + Thread.Sleep(5300) + Catch + End Try + + + End Select + End Sub + + Public Function DienstStartStop(sc As ServiceController, startstop As String) + Dim scs As ServiceControllerStatus = sc.Status + Select Case startstop + Case "start" + If scs.ToString = "Stopped" Then sc.Start() + Case "stop" + If scs.ToString = "Running" Then sc.Stop() + End Select + + + End Function + + Public Function GetDHCPClients(Netzwerk As String, DHCPServer As String, Fill As Boolean, ByRef ds As DataSet) Dim NWShort As String @@ -688,18 +734,18 @@ Public Class Main ''----------------------------------------Fill True: Wenn DHCP Clients bereits im DS enthalten sind werden diese Hosts geändert. ' If Fill = True Then Dim HostRow() As Data.DataRow - HostRow = ds.Tables(0).Select("IPAdresse = '" & DHCPClientIP & "'") + HostRow = ds.Tables(0).Select("IPAdresse = '" & DHCPClientIP & "'") ' MsgBox(DHCPClientIP & HostRow.Length) If HostRow.Length > 0 Then - HostRow(0)("FQDN") = "*" & dhcpclients(i).ClientName - HostRow(0)("QINFO") = "DHCP Client" + HostRow(0)("FQDN") = "*" & dhcpclients(i).ClientName + HostRow(0)("QINFO") = "DHCP Client" - ''----------------------------------------Fill False: DHCP Clients werden hinzugefügt - Else - 'MsgBox("fill not true") - Dim rows() As DataRow = ds.Tables(0).Select("IPAdresse = '" & DHCPClientIP & "'") + ''----------------------------------------Fill False: DHCP Clients werden hinzugefügt + Else + 'MsgBox("fill not true") + Dim rows() As DataRow = ds.Tables(0).Select("IPAdresse = '" & DHCPClientIP & "'") If rows.Count > 0 Then Dim FQDN As String = rows(0).Item("FQDN") Else @@ -771,17 +817,21 @@ Public Class Main Private Sub TxtSuche_TextChanged(sender As Object, e As EventArgs) Handles TxtSuche.TextChanged, RadNurNetzwerk.CheckedChanged, RadGlobal.CheckedChanged, RadStandort.CheckedChanged, LstType.SelectedIndexChanged ', TxtSuche.MouseClick If TxtSuche.TextLength < 1 And LstType.SelectedItem = "" Then Suchbegriff = "%%" + ChkFreieHosts.Checked = Class1.ini.prop_FreiHostsAnzeigen + ChkDHCPClients.Checked = Class1.ini.prop_DHCPClientsAnzeigen ' ChkFreieHosts.Checked = False dgvload_filter(Suchbegriff) ElseIf TxtSuche.TextLength < 1 And Not LstType.SelectedItem = "" Then 'ChkDHCPClients.Checked = False 'ChkFreieHosts.Checked = False + ChkFreieHosts.Checked = False + ChkDHCPClients.Checked = False dgvload_filter(Suchbegriff) Else Suchbegriff = "%" & Class1.hochkomma(TxtSuche.Text) & "%" 'ChkDHCPClients.Checked = False - 'ChkFreieHosts.Checked = False + ChkFreieHosts.Checked = False dgvload_filter(Suchbegriff) End If @@ -1520,6 +1570,7 @@ Public Class Main Private Sub btnTSSitzungen_Click(sender As Object, e As EventArgs) Handles btnTSSitzungen.Click Dim TSSitzungen As New frmLeer TSSitzungen.PanMain.Controls.Clear() + TSSitzungen.Text = "Sitzungen" Dim dingsi As New uscntr_TSSitzungen TSSitzungen.AutoSize = AutoSizeMode.GrowAndShrink TSSitzungen.Size = New Size(434, 863) @@ -1528,6 +1579,35 @@ Public Class Main TSSitzungen.Show() End Sub + Private Sub RDPToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles RDPToolStripMenuItem.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) + Else + MsgBox("Hostname wurde nicht gefunden.") + End If + End Sub + + Private Sub DgVMain_CellContentClick_1(sender As Object, e As DataGridViewCellEventArgs) Handles DgVMain.CellContentClick + + End Sub + + Private Sub Timer1_Tick_1(sender As Object, e As EventArgs) Handles Timer1.Tick + + End Sub + + Private Sub SpoolerNeuStartenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles SpoolerNeuStartenToolStripMenuItem.Click + Dim Host2Connect As New cHost + Host2Connect.gethost(Class1.MainHost(DgVMain.CurrentRow.Cells("IPAdresse").Value)) + If Host2Connect.FQDN.Length > 1 Then + If MessageBox.Show("Druckerwarteschlange auf " & Host2Connect.FQDN & " neu starten?", "Spooler neu starten.", MessageBoxButtons.OKCancel) = DialogResult.OK Then + RestartServices(Host2Connect.FQDN, "Druckerwarteschlange") + End If + Else + MsgBox("Hostname wurde nicht gefunden.") + End If + End Sub Private Sub Main_Closed(sender As Object, e As EventArgs) Handles Me.Closed diff --git a/Dokumentation/My Project/Resources.Designer.vb b/Dokumentation/My Project/Resources.Designer.vb index b0b6529..9c85999 100644 --- a/Dokumentation/My Project/Resources.Designer.vb +++ b/Dokumentation/My Project/Resources.Designer.vb @@ -210,6 +210,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property mstsc1() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("mstsc1", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -279,7 +289,7 @@ Namespace My.Resources End Property ''' - ''' Sucht eine lokalisierte Zeichenfolge, die 0.0.1.64 ähnelt. + ''' Sucht eine lokalisierte Zeichenfolge, die 0.0.1.69 ähnelt. ''' Friend ReadOnly Property Version() As String Get diff --git a/Dokumentation/My Project/Resources.resx b/Dokumentation/My Project/Resources.resx index bc09d0b..d2a75d3 100644 --- a/Dokumentation/My Project/Resources.resx +++ b/Dokumentation/My Project/Resources.resx @@ -124,20 +124,23 @@ ..\Resources\Hakerl20.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\msg.exe;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\Resources\del.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Bearbeiten20.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\pdf512.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\mail20.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Admin20.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - 0.0.1.64 + + ..\Resources\Link.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Link.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Dokumentation ..\Resources\ico_putty_exe0001.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -145,21 +148,21 @@ ..\Resources\Netzwerk20.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Link.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\external-content.duckduckgo.com.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Admin20.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Admin.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + 0.0.1.69 + + + ..\Resources\Link.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\aviso_messenger.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - Dokumentation - - - ..\Resources\excel20.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Print20x20.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -172,19 +175,19 @@ ..\Resources\Print.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\pdf512.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\excel20.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\msg.exe;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\mail20.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a DOKU - - ..\Resources\Admin.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Bearbeiten20.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\external-content.duckduckgo.com.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\mstsc1.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/Dokumentation/Resources/mstsc1.bmp b/Dokumentation/Resources/mstsc1.bmp new file mode 100644 index 0000000..fa214d9 Binary files /dev/null and b/Dokumentation/Resources/mstsc1.bmp differ diff --git a/Dokumentation/frmHostBearbeiten.Designer.vb b/Dokumentation/frmHostBearbeiten.Designer.vb index f3e637e..216839e 100644 --- a/Dokumentation/frmHostBearbeiten.Designer.vb +++ b/Dokumentation/frmHostBearbeiten.Designer.vb @@ -72,6 +72,7 @@ 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.cmdRDP = New System.Windows.Forms.Button() Me.cmdPutty = New System.Windows.Forms.Button() Me.cmdTVConnect = New System.Windows.Forms.Button() Me.txtTeamviewer = New System.Windows.Forms.TextBox() @@ -527,6 +528,7 @@ Partial Class frmHostBearbeiten ' 'Panel1 ' + Me.Panel1.Controls.Add(Me.cmdRDP) Me.Panel1.Controls.Add(Me.cmdPutty) Me.Panel1.Controls.Add(Me.cmdTVConnect) Me.Panel1.Controls.Add(Me.txtTeamviewer) @@ -580,6 +582,18 @@ Partial Class frmHostBearbeiten Me.Panel1.Size = New System.Drawing.Size(643, 460) Me.Panel1.TabIndex = 137 ' + '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.Name = "cmdRDP" + Me.cmdRDP.Size = New System.Drawing.Size(32, 32) + Me.cmdRDP.TabIndex = 147 + Me.cmdRDP.UseVisualStyleBackColor = False + ' 'cmdPutty ' Me.cmdPutty.BackColor = System.Drawing.SystemColors.ControlLightLight @@ -817,4 +831,5 @@ Partial Class frmHostBearbeiten Friend WithEvents chkTeamViewerKennwortAnzeigen As CheckBox Friend WithEvents cmdTVConnect As Button Friend WithEvents cmdPutty As Button + Friend WithEvents cmdRDP As Button End Class diff --git a/Dokumentation/frmHostBearbeiten.vb b/Dokumentation/frmHostBearbeiten.vb index 820e4ac..a0e4ea3 100644 --- a/Dokumentation/frmHostBearbeiten.vb +++ b/Dokumentation/frmHostBearbeiten.vb @@ -381,4 +381,8 @@ Private Sub cmdPutty_Click(sender As Object, e As EventArgs) Handles cmdPutty.Click cExtProgramme.startputty(Class1.MainHost(TxtIP.Text)) End Sub + + Private Sub cmdRDP_Click(sender As Object, e As EventArgs) Handles cmdRDP.Click + cExtProgramme.RDPConnect(host.FQDN, host.Benutzer, host.Passwort) + End Sub End Class \ No newline at end of file diff --git a/Dokumentation/frmPopUp.Designer.vb b/Dokumentation/frmPopUp.Designer.vb new file mode 100644 index 0000000..fbf62ae --- /dev/null +++ b/Dokumentation/frmPopUp.Designer.vb @@ -0,0 +1,74 @@ + _ +Partial Class frmPopUp + Inherits System.Windows.Forms.Form + + 'Das Formular ü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.components = New System.ComponentModel.Container() + Me.lblNachricht = New System.Windows.Forms.Label() + Me.lblCountdown = New System.Windows.Forms.Label() + Me.Timer1 = New System.Windows.Forms.Timer(Me.components) + Me.SuspendLayout() + ' + 'lblNachricht + ' + Me.lblNachricht.AutoSize = True + Me.lblNachricht.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblNachricht.Location = New System.Drawing.Point(93, 59) + Me.lblNachricht.Name = "lblNachricht" + Me.lblNachricht.Size = New System.Drawing.Size(296, 20) + Me.lblNachricht.TabIndex = 0 + Me.lblNachricht.Text = "Dienst xxxxxxxxxx wird neu gestartet" + Me.lblNachricht.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + ' + 'lblCountdown + ' + Me.lblCountdown.AutoSize = True + Me.lblCountdown.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblCountdown.Location = New System.Drawing.Point(221, 107) + Me.lblCountdown.Name = "lblCountdown" + Me.lblCountdown.Size = New System.Drawing.Size(25, 25) + Me.lblCountdown.TabIndex = 1 + Me.lblCountdown.Text = "3" + Me.lblCountdown.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + ' + 'Timer1 + ' + Me.Timer1.Interval = 1000 + ' + 'frmPopUp + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(464, 183) + Me.Controls.Add(Me.lblCountdown) + Me.Controls.Add(Me.lblNachricht) + Me.Name = "frmPopUp" + Me.Text = "frmPopUp" + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents lblNachricht As Label + Friend WithEvents lblCountdown As Label + Friend WithEvents Timer1 As Timer +End Class diff --git a/Dokumentation/frmPopUp.resx b/Dokumentation/frmPopUp.resx new file mode 100644 index 0000000..d0d99f4 --- /dev/null +++ b/Dokumentation/frmPopUp.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + 17, 17 + + \ No newline at end of file diff --git a/Dokumentation/frmPopUp.vb b/Dokumentation/frmPopUp.vb new file mode 100644 index 0000000..1b30e9a --- /dev/null +++ b/Dokumentation/frmPopUp.vb @@ -0,0 +1,23 @@ +Public Class frmPopUp + + Property CountdownStartSec As Int32 + Property TimeOpen As Int32 = 0 + Property Nachricht As String = "" + Property CountdownIsStarted As Boolean = True + + Private Sub frmPopUp_Load(sender As Object, e As EventArgs) Handles MyBase.Load + MsgBox(Nachricht) + lblNachricht.Text = Nachricht + + If CountdownIsStarted = True Then Timer1.Enabled = True + End Sub + + Private Sub Timer1_Tick(sender As Object, e As EventArgs) Handles Timer1.Tick + TimeOpen = TimeOpen + 1 + If CountdownStartSec > 0 Then + lblCountdown.Text = (CountdownStartSec - TimeOpen).ToString + Else + Me.Close() + End If + End Sub +End Class \ No newline at end of file diff --git a/Dokumentation/uscntr_MessageUser.Designer.vb b/Dokumentation/uscntr_MessageUser.Designer.vb new file mode 100644 index 0000000..5899d09 --- /dev/null +++ b/Dokumentation/uscntr_MessageUser.Designer.vb @@ -0,0 +1,64 @@ + _ +Partial Class uscntr_MessageUser + 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.Label1 = New System.Windows.Forms.Label() + Me.btnDelete = New System.Windows.Forms.Button() + Me.SuspendLayout() + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label1.Location = New System.Drawing.Point(3, 4) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(51, 15) + Me.Label1.TabIndex = 0 + Me.Label1.Text = "Label1" + ' + 'btnDelete + ' + Me.btnDelete.Image = Global.Dokumentation.My.Resources.Resources.del + Me.btnDelete.Location = New System.Drawing.Point(192, 1) + Me.btnDelete.Name = "btnDelete" + Me.btnDelete.Size = New System.Drawing.Size(38, 23) + Me.btnDelete.TabIndex = 1 + Me.btnDelete.UseVisualStyleBackColor = True + ' + 'uscntr_MessageUser + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.Controls.Add(Me.btnDelete) + Me.Controls.Add(Me.Label1) + Me.Name = "uscntr_MessageUser" + Me.Size = New System.Drawing.Size(233, 24) + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents Label1 As Label + Friend WithEvents btnDelete As Button +End Class diff --git a/Dokumentation/uscntr_MessageUser.resx b/Dokumentation/uscntr_MessageUser.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/Dokumentation/uscntr_MessageUser.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_MessageUser.vb b/Dokumentation/uscntr_MessageUser.vb new file mode 100644 index 0000000..b09a873 --- /dev/null +++ b/Dokumentation/uscntr_MessageUser.vb @@ -0,0 +1,3 @@ +Public Class uscntr_MessageUser + +End Class diff --git a/Dokumentation/uscntr_SendMSG.Designer.vb b/Dokumentation/uscntr_SendMSG.Designer.vb index 06b080f..a786784 100644 --- a/Dokumentation/uscntr_SendMSG.Designer.vb +++ b/Dokumentation/uscntr_SendMSG.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class uscntr_SendMSG Inherits System.Windows.Forms.UserControl 'UserControl überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -20,28 +20,51 @@ Partial Class uscntr_SendMSG '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.Label1 = New System.Windows.Forms.Label() + Me.components = New System.ComponentModel.Container() + Me.PanMain = New System.Windows.Forms.Panel() Me.cmdSenden = New System.Windows.Forms.Button() + Me.cmdVorschau = New System.Windows.Forms.Button() + Me.Timer1 = New System.Windows.Forms.Timer(Me.components) + Me.Label1 = New System.Windows.Forms.Label() + Me.TextBox1 = New System.Windows.Forms.TextBox() Me.Panel1 = New System.Windows.Forms.Panel() Me.PanServerListe = New System.Windows.Forms.Panel() - Me.PanMain = New System.Windows.Forms.Panel() - Me.LabelInfo = New System.Windows.Forms.Label() - Me.cmdVorschau = New System.Windows.Forms.Button() Me.Panel1.SuspendLayout() - Me.PanMain.SuspendLayout() Me.SuspendLayout() ' - 'TextBox1 + 'PanMain ' - Me.TextBox1.Location = New System.Drawing.Point(8, 21) - Me.TextBox1.Margin = New System.Windows.Forms.Padding(8) - Me.TextBox1.Multiline = True - Me.TextBox1.Name = "TextBox1" - Me.TextBox1.Size = New System.Drawing.Size(444, 71) - Me.TextBox1.TabIndex = 0 + Me.PanMain.AutoSize = True + Me.PanMain.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.PanMain.Dock = System.Windows.Forms.DockStyle.Fill + Me.PanMain.Location = New System.Drawing.Point(196, 85) + Me.PanMain.MaximumSize = New System.Drawing.Size(0, 500) + Me.PanMain.MinimumSize = New System.Drawing.Size(240, 300) + Me.PanMain.Name = "PanMain" + Me.PanMain.Size = New System.Drawing.Size(254, 300) + Me.PanMain.TabIndex = 4 + ' + 'cmdSenden + ' + Me.cmdSenden.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.cmdSenden.Location = New System.Drawing.Point(358, 49) + Me.cmdSenden.Name = "cmdSenden" + Me.cmdSenden.Size = New System.Drawing.Size(75, 23) + Me.cmdSenden.TabIndex = 2 + Me.cmdSenden.Text = "Senden" + Me.cmdSenden.UseVisualStyleBackColor = True + ' + 'cmdVorschau + ' + Me.cmdVorschau.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.cmdVorschau.Location = New System.Drawing.Point(358, 21) + Me.cmdVorschau.Name = "cmdVorschau" + Me.cmdVorschau.Size = New System.Drawing.Size(75, 23) + Me.cmdVorschau.TabIndex = 3 + Me.cmdVorschau.Text = "Vorschau" + Me.cmdVorschau.UseVisualStyleBackColor = True ' 'Label1 ' @@ -52,97 +75,62 @@ Partial Class uscntr_SendMSG Me.Label1.TabIndex = 1 Me.Label1.Text = "Nachricht:" ' - 'cmdSenden + 'TextBox1 ' - Me.cmdSenden.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.cmdSenden.Location = New System.Drawing.Point(383, 274) - Me.cmdSenden.Name = "cmdSenden" - Me.cmdSenden.Size = New System.Drawing.Size(75, 23) - Me.cmdSenden.TabIndex = 2 - Me.cmdSenden.Text = "Senden" - Me.cmdSenden.UseVisualStyleBackColor = True + Me.TextBox1.Location = New System.Drawing.Point(8, 21) + Me.TextBox1.Margin = New System.Windows.Forms.Padding(8) + Me.TextBox1.Multiline = True + Me.TextBox1.Name = "TextBox1" + Me.TextBox1.Size = New System.Drawing.Size(339, 51) + Me.TextBox1.TabIndex = 0 ' 'Panel1 ' Me.Panel1.AutoSize = True + Me.Panel1.Controls.Add(Me.cmdSenden) Me.Panel1.Controls.Add(Me.TextBox1) + Me.Panel1.Controls.Add(Me.cmdVorschau) Me.Panel1.Controls.Add(Me.Label1) Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top Me.Panel1.Location = New System.Drawing.Point(0, 0) Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(461, 100) + Me.Panel1.Size = New System.Drawing.Size(450, 85) Me.Panel1.TabIndex = 3 ' 'PanServerListe ' Me.PanServerListe.AutoSize = True Me.PanServerListe.Dock = System.Windows.Forms.DockStyle.Left - Me.PanServerListe.Location = New System.Drawing.Point(0, 100) + Me.PanServerListe.Location = New System.Drawing.Point(0, 85) Me.PanServerListe.MinimumSize = New System.Drawing.Size(196, 0) Me.PanServerListe.Name = "PanServerListe" - Me.PanServerListe.Size = New System.Drawing.Size(196, 200) + Me.PanServerListe.Size = New System.Drawing.Size(196, 300) Me.PanServerListe.TabIndex = 0 ' - 'PanMain - ' - Me.PanMain.AutoSize = True - Me.PanMain.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.PanMain.Controls.Add(Me.LabelInfo) - Me.PanMain.Controls.Add(Me.cmdVorschau) - Me.PanMain.Controls.Add(Me.cmdSenden) - Me.PanMain.Dock = System.Windows.Forms.DockStyle.Fill - Me.PanMain.Location = New System.Drawing.Point(0, 0) - Me.PanMain.MinimumSize = New System.Drawing.Size(461, 300) - Me.PanMain.Name = "PanMain" - Me.PanMain.Size = New System.Drawing.Size(461, 300) - Me.PanMain.TabIndex = 4 - ' - 'LabelInfo - ' - Me.LabelInfo.AutoSize = True - Me.LabelInfo.Location = New System.Drawing.Point(202, 111) - Me.LabelInfo.Name = "LabelInfo" - Me.LabelInfo.Size = New System.Drawing.Size(51, 13) - Me.LabelInfo.TabIndex = 4 - Me.LabelInfo.Text = "LabelInfo" - ' - 'cmdVorschau - ' - Me.cmdVorschau.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.cmdVorschau.Location = New System.Drawing.Point(205, 274) - Me.cmdVorschau.Name = "cmdVorschau" - Me.cmdVorschau.Size = New System.Drawing.Size(75, 23) - Me.cmdVorschau.TabIndex = 3 - Me.cmdVorschau.Text = "Vorschau" - Me.cmdVorschau.UseVisualStyleBackColor = True - ' 'uscntr_SendMSG ' 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.PanMain) Me.Controls.Add(Me.PanServerListe) Me.Controls.Add(Me.Panel1) - Me.Controls.Add(Me.PanMain) - Me.MinimumSize = New System.Drawing.Size(461, 199) + Me.MinimumSize = New System.Drawing.Size(450, 199) Me.Name = "uscntr_SendMSG" - Me.Size = New System.Drawing.Size(461, 300) + Me.Size = New System.Drawing.Size(450, 385) Me.Panel1.ResumeLayout(False) Me.Panel1.PerformLayout() - Me.PanMain.ResumeLayout(False) - Me.PanMain.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() End Sub - - Friend WithEvents TextBox1 As TextBox + Friend WithEvents PanMain As Panel + Friend WithEvents cmdVorschau As Button + Friend WithEvents Timer1 As Timer Friend WithEvents Label1 As Label + Friend WithEvents TextBox1 As TextBox Friend WithEvents cmdSenden As Button Friend WithEvents Panel1 As Panel Friend WithEvents PanServerListe As Panel - Friend WithEvents PanMain As Panel - Friend WithEvents cmdVorschau As Button - Friend WithEvents LabelInfo As Label End Class diff --git a/Dokumentation/uscntr_SendMSG.resx b/Dokumentation/uscntr_SendMSG.resx index 1af7de1..d0d99f4 100644 --- a/Dokumentation/uscntr_SendMSG.resx +++ b/Dokumentation/uscntr_SendMSG.resx @@ -117,4 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + \ No newline at end of file diff --git a/Dokumentation/uscntr_SendMSG.vb b/Dokumentation/uscntr_SendMSG.vb index 1dcbf43..35a1765 100644 --- a/Dokumentation/uscntr_SendMSG.vb +++ b/Dokumentation/uscntr_SendMSG.vb @@ -1,15 +1,31 @@ -Public Class uscntr_SendMSG +Imports System.IO + +Public Class uscntr_SendMSG Dim recserver As New List(Of String) Public recuser As New cTSUser Dim msg As String = " {0} /Server:{1} '{2}'" 'Username, Server, Nachricht Dim msgfin As String = "" Dim SingleUserRec As Boolean = False + Public RecUsersList As New List(Of cRecUsers) + Public RecArt As String = "" Private Sub uscntr_SendMSG_Load(sender As Object, e As EventArgs) Handles Me.Load - LabelInfo.Text = "" - FillPanWithServer() - SelectUniUser() + 'txtLabelInfo.Text = "" + 'FillPanWithServer() + Select Case RecArt + Case "", "Server" + FillPanWithServer() + SelectUniUser() + Case "User" + PanServerListe.Controls.Clear() + + For Each u As cRecUsers In RecUsersList + ' u.username & vbCrLf + Next + FillPanWithUser() + End Select + End Sub Function FillPanWithServer() @@ -19,18 +35,51 @@ Dim h As Integer = 0 For Each Server As String In Class1.TerminalServerList - Dim usrcntrl As New uscntr_TSServer - usrcntrl.btnServer.Text = Server + If Server Like "TS*" Or Server Like "Term*" Or Server Like "TERM*" Then + Dim usrcntrl As New uscntr_TSServer + usrcntrl.btnServer.Text = Server + usrcntrl.Location = New Point(0, i * usrcntrl.Height) + i = i + 1 + h = i * usrcntrl.Height + PanServerListe.Controls.Add(usrcntrl) + AddHandler usrcntrl.btnServer.Click, Function() + UpdateSelectedServerList() + End Function + End If + Next + + + Me.Height = h + 100 + End Function + + Function FillPanWithUser() + PanMain.Controls.Clear() + PanMain.AutoScroll = True + + Dim i As Integer = 0 + Dim h As Integer = 0 + + For Each User As cRecUsers In RecUsersList + + Dim usrcntrl As New uscntr_MessageUser + usrcntrl.Label1.Text = User.userclientpc & " | " & User.username usrcntrl.Location = New Point(0, i * usrcntrl.Height) + + PanMain.Controls.Add(usrcntrl) + AddHandler usrcntrl.btnDelete.Click, Function() + PanMain.Controls.Remove(usrcntrl) + RecUsersList.Remove(User) + ReloadUsers() + End Function i = i + 1 h = i * usrcntrl.Height - PanServerListe.Controls.Add(usrcntrl) - AddHandler usrcntrl.btnServer.Click, Function() - UpdateSelectedServerList() - End Function - Next - Me.Height = h + 100 + + + End Function + + Function ReloadUsers() + FillPanWithUser() End Function Sub UpdateSelectedServerList() @@ -44,20 +93,25 @@ End Sub Private Sub cmdVorschau_Click(sender As Object, e As EventArgs) Handles cmdVorschau.Click - If SingleUserRec = True Then - MsgBox("msg" & msgfin) - Else - For Each srv As String In recserver - MsgBox(String.Format(msg, "*", srv, TextBox1.Text)) - Next - End If + 'If SingleUserRec = True Then + ' MsgBox("msg" & msgfin) + 'Else + ' For Each srv As String In recserver + ' MsgBox(String.Format(msg, "*", srv, TextBox1.Text)) + ' Next + 'End If + Dim mehmehmeh As String = "" + For Each uUsersr In RecUsersList + mehmehmeh &= uUsersr.userclientpc & " | " & uUsersr.username & vbCrLf + Next + ' MsgBox(mehmehmeh) End Sub Function SelectUniUser() 'wenn nur ein Empfänger If recuser.BenutzerAnmeldeName.Length > 0 Then SingleUserRec = True recuser.genNameKurz() - LabelInfo.Text = String.Format(msg, recuser.NameKurz, recuser.TSServer, "Das ist ein Test!") + 'LabelInfo.Text = String.Format(msg, recuser.NameKurz, recuser.TSServer, "Das ist ein Test!") For Each uc As uscntr_TSServer In PanServerListe.Controls If uc.btnServer.Text = recuser.TSServer Then uc.btnServer.PerformClick() uc.btnServer.Enabled = False @@ -76,17 +130,45 @@ Private Sub cmdSenden_Click(sender As Object, e As EventArgs) Handles cmdSenden.Click If MsgBox("Nachricht senden?", MsgBoxStyle.OkCancel, "Senden?") = MsgBoxResult.Ok Then - If SingleUserRec = True Then - cExtProgramme.msgsend(msgfin) - Else - For Each srv As String In recserver - cExtProgramme.msgsend(String.Format(msg, "*", srv, TextBox1.Text)) - Threading.Thread.Sleep(3000) - Next - End If + Select Case RecArt + Case "", "Server" + SendServer() + Case "User" + SendUser() + End Select + End If End Sub + Private Function SendServer() + If SingleUserRec = True Then + cExtProgramme.msgsend(msgfin) + Else + For Each srv As String In recserver + cExtProgramme.msgsend(String.Format(msg, "*", srv, TextBox1.Text)) + Threading.Thread.Sleep(3000) + Next + End If + End Function + + Private Function SendUser() + If Not RecUsersList.Count > 0 Then MsgBox("Keine User in Liste") : Exit Function + If Not File.Exists(Application.StartupPath & "\msgsend.bat") Then File.Create(Application.StartupPath & "\msgsend.bat") + Dim msgbat As String = Application.StartupPath & "\msgsend.bat" + Dim battext As String = "" + For Each u As cRecUsers In RecUsersList + 'MsgBox(u.username) + battext &= (cExtProgramme.msgsend(String.Format(msg, u.username, u.userclientpc & "." & u.domain, TextBox1.Text), True)) & vbCrLf + + Next + + Class1.WriteToFile(msgbat, battext) + Threading.Thread.Sleep(3000) + + Process.Start(msgbat) + 'MsgBox(battext) + End Function + Function ErsterEintragVonListOfString(liste As List(Of String)) If liste.Count > 0 Then Return liste(0) @@ -94,4 +176,20 @@ Return "" End If End Function + + Private Sub PanMain_Paint(sender As Object, e As PaintEventArgs) Handles PanMain.Paint + + End Sub +End Class + +Public Class cRecUsers + Property domain As String = "" + Property username As String = "" + Property userclientpc As String = "" + + Public Sub New(_domain As String, _username As String, _userclientpc As String) + Me.domain = _domain + Me.username = _username + Me.userclientpc = _userclientpc + End Sub End Class diff --git a/Dokumentation/uscntr_TSSitzungen.Designer.vb b/Dokumentation/uscntr_TSSitzungen.Designer.vb index 13699c6..20ab7c2 100644 --- a/Dokumentation/uscntr_TSSitzungen.Designer.vb +++ b/Dokumentation/uscntr_TSSitzungen.Designer.vb @@ -23,7 +23,7 @@ Partial Class uscntr_TSSitzungen _ Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.dgvTSSitzungen = New System.Windows.Forms.DataGridView() Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.VerbindenMitTeamVToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -42,6 +42,7 @@ Partial Class uscntr_TSSitzungen Me.btnReset = New System.Windows.Forms.Button() Me.Label1 = New System.Windows.Forms.Label() Me.TextBox1 = New System.Windows.Forms.TextBox() + Me.timDisUpdateTimer = New System.Windows.Forms.Timer(Me.components) CType(Me.dgvTSSitzungen, System.ComponentModel.ISupportInitialize).BeginInit() Me.ContextMenuStrip1.SuspendLayout() Me.Panel1.SuspendLayout() @@ -54,19 +55,18 @@ Partial Class uscntr_TSSitzungen Me.dgvTSSitzungen.AllowUserToDeleteRows = False Me.dgvTSSitzungen.AllowUserToResizeRows = False Me.dgvTSSitzungen.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill - 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.dgvTSSitzungen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1 + DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvTSSitzungen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle2 Me.dgvTSSitzungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvTSSitzungen.ContextMenuStrip = Me.ContextMenuStrip1 Me.dgvTSSitzungen.Dock = System.Windows.Forms.DockStyle.Fill Me.dgvTSSitzungen.Location = New System.Drawing.Point(0, 58) - Me.dgvTSSitzungen.MultiSelect = False Me.dgvTSSitzungen.Name = "dgvTSSitzungen" Me.dgvTSSitzungen.ReadOnly = True Me.dgvTSSitzungen.RowTemplate.ReadOnly = True @@ -254,6 +254,10 @@ Partial Class uscntr_TSSitzungen Me.TextBox1.Size = New System.Drawing.Size(158, 20) Me.TextBox1.TabIndex = 0 ' + 'timDisUpdateTimer + ' + Me.timDisUpdateTimer.Interval = 60000 + ' 'uscntr_TSSitzungen ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -294,4 +298,5 @@ Partial Class uscntr_TSSitzungen Friend WithEvents btnSitzung As Button Friend WithEvents ProfildatenÖffnenExplorerToolStripMenuItem As ToolStripMenuItem Public WithEvents btnReset As Button + Friend WithEvents timDisUpdateTimer As Timer End Class diff --git a/Dokumentation/uscntr_TSSitzungen.resx b/Dokumentation/uscntr_TSSitzungen.resx index bbde99b..81da7d7 100644 --- a/Dokumentation/uscntr_TSSitzungen.resx +++ b/Dokumentation/uscntr_TSSitzungen.resx @@ -123,6 +123,9 @@ 17, 17 + + 263, 17 + 44 diff --git a/Dokumentation/uscntr_TSSitzungen.vb b/Dokumentation/uscntr_TSSitzungen.vb index 9a38b27..408bff9 100644 --- a/Dokumentation/uscntr_TSSitzungen.vb +++ b/Dokumentation/uscntr_TSSitzungen.vb @@ -17,22 +17,33 @@ Function Load2DGV() ' (Optional ByVal Client As Boolean = False) If Client = False Then Dim ds As New DataSet - cSQL.SQL2DS("SELECT * FROM TbL_TSSitzungen WHERE Name LIKE '" & ReturnOfTheWhere() & "' OR TSServer LIKE '" & ReturnOfTheWhere() & "' ORDER BY NAME", ds) + cSQL.SQL2DS("SELECT * FROM TbL_TSSitzungen WHERE Name LIKE '" & ReturnOfTheWhere() & "' OR TSServer LIKE '" & ReturnOfTheWhere() & "' OR Company LIKE '" & ReturnOfTheWhere() & "' ORDER BY NAME", ds) + + dgvTSSitzungen.DataSource = ds.Tables(0) With dgvTSSitzungen .DefaultCellStyle.BackColor = Color.White .AlternatingRowsDefaultCellStyle.BackColor = Color.AliceBlue .RowHeadersVisible = False - .DataSource = ds.Tables(0) + '.DataSource = ds.Tables(0) + .Columns("LastReport").Visible = False .Columns("Domain").Visible = False + .Columns("BenutzerAnmeldeName").Visible = False + .Columns("TeamviewerID").Visible = False + + .Columns("Name").Width = 160 + .Columns("LastLogon").Visible = True .Columns("LastLogon").HeaderText = "Sitzungsst." - .Columns("BenutzerAnmeldeName").Visible = False - .Columns("LastReport").Visible = False + .Columns("LastLogon").Width = 65 - .Columns("Name").Width = 110 'AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill - .Columns("TeamviewerID").Width = 80 - .Columns("TSServer").Width = 55 + + .Columns("Company").Visible = True + .Columns("Company").HeaderText = "Firma" + '.Columns("TeamviewerID").Width = 80 + + '.Columns("TSServer").Width = 80 + .Columns("TSServer").HeaderText = "Host" .AutoResizeColumn(1) End With @@ -47,10 +58,12 @@ With dgvTSSitzungen .RowHeadersVisible = False .DataSource = ds.Tables(0) - '.Columns("Domain").Visible = False - '.Columns("LastLogon").Visible = False + .Columns("Domain").Visible = False + .Columns("BenutzerAnmeldeName").Visible = False .Columns("LastReport").Visible = False + .Columns("Company").Visible = False + '.Columns("Name").Width = 110 'AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill .Columns("TeamviewerID").Width = 80 '.Columns("TSServer").Width = 55 @@ -112,17 +125,38 @@ Dim send As New frmLeer send.Text = "Nachricht senden" Dim usrcntrl As New uscntr_SendMSG + If Client = True Then usrcntrl.RecArt = "User" usrcntrl.Dock = DockStyle.Fill : send.PanMain.Controls.Add(usrcntrl) send.Show() End Sub Private Sub NachrichtSendenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles NachrichtSendenToolStripMenuItem.Click Dim send As New frmLeer - send.Text = "Nachricht senden an " & dgvTSSitzungen.CurrentRow.Cells("Name").Value.ToString + Dim usrcntrl As New uscntr_SendMSG - usrcntrl.recuser.Name = dgvTSSitzungen.CurrentRow.Cells("Name").Value.ToString - usrcntrl.recuser.BenutzerAnmeldeName = dgvTSSitzungen.CurrentRow.Cells("BenutzerAnmeldeName").Value.ToString - usrcntrl.recuser.TSServer = dgvTSSitzungen.CurrentRow.Cells("TSServer").Value.ToString & "." & dgvTSSitzungen.CurrentRow.Cells("Domain").Value.ToString + + If dgvTSSitzungen.SelectedRows.Count = 1 Then + send.Text = "Nachricht senden an " & dgvTSSitzungen.CurrentRow.Cells("Name").Value.ToString + usrcntrl.recuser.Name = dgvTSSitzungen.CurrentRow.Cells("Name").Value.ToString + usrcntrl.recuser.BenutzerAnmeldeName = dgvTSSitzungen.CurrentRow.Cells("BenutzerAnmeldeName").Value.ToString + Select Case Client + Case False + usrcntrl.recuser.TSServer = dgvTSSitzungen.CurrentRow.Cells("TSServer").Value.ToString & "." & dgvTSSitzungen.CurrentRow.Cells("Domain").Value.ToString + Case True + usrcntrl.recuser.TSServer = dgvTSSitzungen.CurrentRow.Cells("ClientName").Value.ToString & "." & dgvTSSitzungen.CurrentRow.Cells("Domain").Value.ToString + End Select + Else + send.Text = "Nachricht an mehrere Empfänger" + usrcntrl.RecArt = "User" + For Each r As DataGridViewRow In dgvTSSitzungen.SelectedRows + Dim u As New cRecUsers(r.Cells("Domain").Value.ToString, cTSUser.genNameKurz(r.Cells("BenutzerAnmeldeName").Value.ToString), r.Cells("TSServer").Value.ToString) + usrcntrl.RecUsersList.Add(u) + Next + + ' MsgBox("!") + End If + + usrcntrl.Dock = DockStyle.Fill : send.PanMain.Controls.Add(usrcntrl) send.Show() End Sub @@ -180,6 +214,13 @@ End Sub Private Sub dgvTSSitzungen_CellContentClick_1(sender As Object, e As DataGridViewCellEventArgs) Handles dgvTSSitzungen.CellContentClick, dgvTSSitzungen.CellClick + Timer1.Enabled = False + chkAutoUpdate.Checked = False + If timDisUpdateTimer.Enabled = True Then + timDisUpdateTimer.Stop() : timDisUpdateTimer.Start() + Else + timDisUpdateTimer.Enabled = True + End If SelectIndexes() End Sub Private Sub DGVScroll() Handles dgvTSSitzungen.Scroll @@ -190,6 +231,10 @@ StartIndex = dgvTSSitzungen.FirstDisplayedScrollingRowIndex End Function - - + Private Sub timDisUpdateTimer_Tick(sender As Object, e As EventArgs) Handles timDisUpdateTimer.Tick + ' MsgBox("Tick!") + chkAutoUpdate.Checked = True + Timer1.Enabled = True + timDisUpdateTimer.Enabled = False + End Sub End Class