From 2be0c784f7ef8c853cccb4d12a3a158e4f12e946 Mon Sep 17 00:00:00 2001 From: ms Date: Mon, 12 Jan 2026 12:04:23 +0100 Subject: [PATCH] =?UTF-8?q?Name=20angepasst,=20akutelle=20VeragProgAllgeme?= =?UTF-8?q?in=20eingef=C3=BCgt.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dokumentation/App.config | 3 +- Dokumentation/DokuDataSet.Designer.vb | 2 +- Dokumentation/DokuDataSet.xsd | 8 +-- Dokumentation/Dokumentation.vbproj | 16 +++--- .../Drucken/frmColumnsPrint.Designer.vb | 4 +- Dokumentation/Drucken/frmPrint.Designer.vb | 4 +- .../Drucken/uscntr_Columns.Designer.vb | 4 +- Dokumentation/Login/Login.vb | 49 +++++++++++-------- Dokumentation/Main.Designer.vb | 26 +++++----- Dokumentation/Main.vb | 1 + .../My Project/Application.Designer.vb | 2 +- Dokumentation/My Project/AssemblyInfo.vb | 6 +-- .../My Project/Resources.Designer.vb | 4 +- Dokumentation/My Project/Resources.resx | 2 +- Dokumentation/My Project/Settings.Designer.vb | 6 +-- Dokumentation/frmHostBearbeiten.Designer.vb | 6 +-- Dokumentation/uscntr_Benutzer.Designer.vb | 2 +- Dokumentation/uscntr_MessageUser.Designer.vb | 2 +- Dokumentation/uscntr_TSSitzungen.Designer.vb | 4 +- Dokumentation/uscntr_Telefon.Designer.vb | 4 +- .../My Project/Settings.Designer.vb | 4 +- 21 files changed, 85 insertions(+), 74 deletions(-) diff --git a/Dokumentation/App.config b/Dokumentation/App.config index 50ba0b8..1ee2a36 100644 --- a/Dokumentation/App.config +++ b/Dokumentation/App.config @@ -5,7 +5,8 @@
- + diff --git a/Dokumentation/DokuDataSet.Designer.vb b/Dokumentation/DokuDataSet.Designer.vb index 3d0c185..ad7d02b 100644 --- a/Dokumentation/DokuDataSet.Designer.vb +++ b/Dokumentation/DokuDataSet.Designer.vb @@ -730,7 +730,7 @@ Namespace DokuDataSetTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = Global.Dokumentation.My.MySettings.Default.DokuConnectionString + Me._connection.ConnectionString = Global.DOKU.My.MySettings.Default.DokuConnectionString End Sub - + @@ -28,13 +28,13 @@ - + - + - + diff --git a/Dokumentation/Dokumentation.vbproj b/Dokumentation/Dokumentation.vbproj index 922eb94..58c0c9f 100644 --- a/Dokumentation/Dokumentation.vbproj +++ b/Dokumentation/Dokumentation.vbproj @@ -7,9 +7,9 @@ AnyCPU {AAC83634-C001-43FC-8E9D-07A263ED0600} WinExe - Dokumentation.My.MyApplication - Dokumentation - Dokumentation + DOKU.My.MyApplication + DOKU + DOKU 512 WindowsForms v4.8 @@ -17,6 +17,8 @@ true false + + \\192.168.0.91\f\Programme\Doku\ false Unc @@ -34,8 +36,6 @@ false true true - - x64 @@ -44,7 +44,7 @@ true true bin\Debug\ - Dokumentation.xml + DOKU.xml 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 false @@ -55,7 +55,7 @@ true true bin\Release\ - Dokumentation.xml + DOKU.xml 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 @@ -244,7 +244,7 @@ False - ..\..\SDL\SDL\VERAG_PROG_ALLGEMEIN\bin\Debug\VERAG_PROG_ALLGEMEIN.dll + ..\..\SDL\VERAG_PROG_ALLGEMEIN\bin\Debug\VERAG_PROG_ALLGEMEIN.dll diff --git a/Dokumentation/Drucken/frmColumnsPrint.Designer.vb b/Dokumentation/Drucken/frmColumnsPrint.Designer.vb index d822205..dac7518 100644 --- a/Dokumentation/Drucken/frmColumnsPrint.Designer.vb +++ b/Dokumentation/Drucken/frmColumnsPrint.Designer.vb @@ -57,7 +57,7 @@ Partial Class frmColumnsPrint Me.CmdPrint.BackColor = System.Drawing.SystemColors.ControlLightLight Me.CmdPrint.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) Me.CmdPrint.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.CmdPrint.Image = Global.Dokumentation.My.Resources.Resources.Print20x20 + Me.CmdPrint.Image = Global.DOKU.My.Resources.Resources.Print20x20 Me.CmdPrint.ImageAlign = System.Drawing.ContentAlignment.MiddleRight Me.CmdPrint.Location = New System.Drawing.Point(239, 40) Me.CmdPrint.Name = "CmdPrint" @@ -71,7 +71,7 @@ Partial Class frmColumnsPrint Me.btnAlleDeaktivieren.BackColor = System.Drawing.SystemColors.ControlLightLight Me.btnAlleDeaktivieren.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) Me.btnAlleDeaktivieren.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnAlleDeaktivieren.Image = Global.Dokumentation.My.Resources.Resources.del + Me.btnAlleDeaktivieren.Image = Global.DOKU.My.Resources.Resources.del Me.btnAlleDeaktivieren.ImageAlign = System.Drawing.ContentAlignment.MiddleRight Me.btnAlleDeaktivieren.Location = New System.Drawing.Point(12, 6) Me.btnAlleDeaktivieren.Name = "btnAlleDeaktivieren" diff --git a/Dokumentation/Drucken/frmPrint.Designer.vb b/Dokumentation/Drucken/frmPrint.Designer.vb index 8c56345..563bfa1 100644 --- a/Dokumentation/Drucken/frmPrint.Designer.vb +++ b/Dokumentation/Drucken/frmPrint.Designer.vb @@ -36,7 +36,7 @@ Partial Class frmPrint Me.CmdPrint.BackColor = System.Drawing.SystemColors.ControlLightLight Me.CmdPrint.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) Me.CmdPrint.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.CmdPrint.Image = Global.Dokumentation.My.Resources.Resources.Print20x20 + Me.CmdPrint.Image = Global.DOKU.My.Resources.Resources.Print20x20 Me.CmdPrint.ImageAlign = System.Drawing.ContentAlignment.MiddleRight Me.CmdPrint.Location = New System.Drawing.Point(193, 69) Me.CmdPrint.Name = "CmdPrint" @@ -92,7 +92,7 @@ Partial Class frmPrint Me.btnManuell.BackColor = System.Drawing.SystemColors.ControlLightLight Me.btnManuell.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) Me.btnManuell.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnManuell.Image = Global.Dokumentation.My.Resources.Resources.Print20x20 + Me.btnManuell.Image = Global.DOKU.My.Resources.Resources.Print20x20 Me.btnManuell.ImageAlign = System.Drawing.ContentAlignment.MiddleRight Me.btnManuell.Location = New System.Drawing.Point(12, 69) Me.btnManuell.Name = "btnManuell" diff --git a/Dokumentation/Drucken/uscntr_Columns.Designer.vb b/Dokumentation/Drucken/uscntr_Columns.Designer.vb index 3780be2..b1f4954 100644 --- a/Dokumentation/Drucken/uscntr_Columns.Designer.vb +++ b/Dokumentation/Drucken/uscntr_Columns.Designer.vb @@ -41,7 +41,7 @@ Partial Class uscntr_Columns ' Me.btnDelete.BackColor = System.Drawing.Color.White Me.btnDelete.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnDelete.Image = Global.Dokumentation.My.Resources.Resources.del + Me.btnDelete.Image = Global.DOKU.My.Resources.Resources.del Me.btnDelete.Location = New System.Drawing.Point(260, 14) Me.btnDelete.Name = "btnDelete" Me.btnDelete.Size = New System.Drawing.Size(48, 23) @@ -52,7 +52,7 @@ Partial Class uscntr_Columns ' Me.btnOK.BackColor = System.Drawing.Color.White Me.btnOK.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnOK.Image = Global.Dokumentation.My.Resources.Resources.Hakerl20 + Me.btnOK.Image = Global.DOKU.My.Resources.Resources.Hakerl20 Me.btnOK.Location = New System.Drawing.Point(314, 14) Me.btnOK.Name = "btnOK" Me.btnOK.Size = New System.Drawing.Size(48, 23) diff --git a/Dokumentation/Login/Login.vb b/Dokumentation/Login/Login.vb index be684a9..860d80f 100644 --- a/Dokumentation/Login/Login.vb +++ b/Dokumentation/Login/Login.vb @@ -39,10 +39,15 @@ Public Class Login Public Function LoadUSRID() If Class1.offline Then Exit Function - Dim ds As New DataSet - cSQL.SQL2DS("select * from [ADMIN].dbo.tblMitarbeiter where mit_aliasad_domain = '" & Environment.UserDomainName & "' AND mit_AliasAD_Username = '" & Environment.UserName & "'", ds) - VERAG_PROG_ALLGEMEIN.cAllgemein.USRID = ds.Tables(0).Rows(0).Item("mit_id") - VERAG_PROG_ALLGEMEIN.cAllgemein.LOAD_DATA() + + Try + Dim ds As New DataSet + cSQL.SQL2DS("select * from [ADMIN].dbo.tblMitarbeiter where mit_aliasad_domain = '" & Environment.UserDomainName & "' AND mit_AliasAD_Username = '" & Environment.UserName & "'", ds) + VERAG_PROG_ALLGEMEIN.cAllgemein.USRID = ds.Tables(0).Rows(0).Item("mit_id") + VERAG_PROG_ALLGEMEIN.cAllgemein.LOAD_DATA() + Catch ex As Exception + MsgBox("Login.vb, LoadUSRID: " & ex.Message) + End Try 'MsgBox(VERAG_PROG_ALLGEMEIN.cAllgemein.USRID) End Function @@ -106,7 +111,7 @@ Public Class Login If txt = True Then lblInfo.Text = "Benutzer ist nicht berechtigt!" End If Catch ex As Exception - MsgBox("Fehler Abfrage: " & ex.Message & debugtext) + MsgBox("Fehler Abfrage Login.vb, Abfrage: " & ex.Message & debugtext) End Try @@ -220,23 +225,27 @@ Public Class Login Function ShowMain(Optional ByVal MessageActivated As Boolean = True) Dim main As New Main + Try + For Each right As cBerechtigungen In Class1.LoggedOnUserRights + If right.Standort = "DokuAdmin" And right.Zugriff = "Y" Then + Class1.LoggedOnUserisAdmin = True + main.BenutzerToolStripMenuItem.Enabled = True + main.NetzwerkeToolStripMenuItem.Enabled = True + main.AllesSichernCSVToolStripMenuItem.Enabled = True + Exit For + Else + main.BenutzerToolStripMenuItem.Enabled = False + main.NetzwerkeToolStripMenuItem.Enabled = False + main.AllesSichernCSVToolStripMenuItem.Enabled = False + End If + Next - For Each right As cBerechtigungen In Class1.LoggedOnUserRights - If right.Standort = "DokuAdmin" And right.Zugriff = "Y" Then - Class1.LoggedOnUserisAdmin = True - main.BenutzerToolStripMenuItem.Enabled = True - main.NetzwerkeToolStripMenuItem.Enabled = True - main.AllesSichernCSVToolStripMenuItem.Enabled = True - Exit For - Else - main.BenutzerToolStripMenuItem.Enabled = False - main.NetzwerkeToolStripMenuItem.Enabled = False - main.AllesSichernCSVToolStripMenuItem.Enabled = False - End If - Next + main.picAVISOMessenger.Enabled = MessageActivated + main.Show() + Catch ex As Exception + MsgBox("Login.vb Showmain: " & ex.Message) + End Try - main.picAVISOMessenger.Enabled = MessageActivated - main.Show() End Function diff --git a/Dokumentation/Main.Designer.vb b/Dokumentation/Main.Designer.vb index 662afd7..10e56f8 100644 --- a/Dokumentation/Main.Designer.vb +++ b/Dokumentation/Main.Designer.vb @@ -225,7 +225,7 @@ Partial Class Main Me.Button3.BackColor = System.Drawing.SystemColors.ControlLightLight Me.Button3.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button3.Image = Global.Dokumentation.My.Resources.Resources.mstsc1 + Me.Button3.Image = Global.DOKU.My.Resources.Resources.mstsc1 Me.Button3.ImageAlign = System.Drawing.ContentAlignment.MiddleRight Me.Button3.Location = New System.Drawing.Point(17, 34) Me.Button3.Name = "Button3" @@ -239,7 +239,7 @@ Partial Class Main Me.Button2.BackColor = System.Drawing.SystemColors.ControlLightLight Me.Button2.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button2.Image = Global.Dokumentation.My.Resources.Resources.Netzwerk20 + Me.Button2.Image = Global.DOKU.My.Resources.Resources.Netzwerk20 Me.Button2.ImageAlign = System.Drawing.ContentAlignment.MiddleRight Me.Button2.Location = New System.Drawing.Point(17, 67) Me.Button2.Name = "Button2" @@ -265,7 +265,7 @@ Partial Class Main 'picAVISOMessenger ' Me.picAVISOMessenger.Anchor = System.Windows.Forms.AnchorStyles.Right - Me.picAVISOMessenger.BackgroundImage = Global.Dokumentation.My.Resources.Resources.aviso_messenger + Me.picAVISOMessenger.BackgroundImage = Global.DOKU.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(427, 40) @@ -279,7 +279,7 @@ Partial Class Main 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.Image = Global.DOKU.My.Resources.Resources.external_content_duckduckgo_com Me.btnTSSitzungen.ImageAlign = System.Drawing.ContentAlignment.MiddleRight Me.btnTSSitzungen.Location = New System.Drawing.Point(139, 68) Me.btnTSSitzungen.Name = "btnTSSitzungen" @@ -324,7 +324,7 @@ Partial Class Main 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.Image = Global.DOKU.My.Resources.Resources.Admin20 Me.btnBenutzerverwaltung.ImageAlign = System.Drawing.ContentAlignment.MiddleRight Me.btnBenutzerverwaltung.Location = New System.Drawing.Point(139, 34) Me.btnBenutzerverwaltung.Name = "btnBenutzerverwaltung" @@ -505,7 +505,7 @@ Partial Class Main Me.Button1.ContextMenuStrip = Me.ContextMenuStrip1 Me.Button1.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button1.Image = Global.Dokumentation.My.Resources.Resources.iconfinder_contat_us_27phone_4211855_115040__Benutzerdefiniert_ + Me.Button1.Image = Global.DOKU.My.Resources.Resources.iconfinder_contat_us_27phone_4211855_115040__Benutzerdefiniert_ Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleRight Me.Button1.Location = New System.Drawing.Point(150, 70) Me.Button1.Name = "Button1" @@ -715,7 +715,7 @@ Partial Class Main Me.btnSync.BackColor = System.Drawing.SystemColors.ControlLightLight Me.btnSync.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) Me.btnSync.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnSync.Image = Global.Dokumentation.My.Resources.Resources.sign_sync_icon_34357 + Me.btnSync.Image = Global.DOKU.My.Resources.Resources.sign_sync_icon_34357 Me.btnSync.ImageAlign = System.Drawing.ContentAlignment.MiddleRight Me.btnSync.Location = New System.Drawing.Point(51, 613) Me.btnSync.Name = "btnSync" @@ -739,7 +739,7 @@ Partial Class Main Me.btnNeu.BackColor = System.Drawing.SystemColors.ControlLightLight Me.btnNeu.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) Me.btnNeu.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnNeu.Image = Global.Dokumentation.My.Resources.Resources.Bearbeiten20 + Me.btnNeu.Image = Global.DOKU.My.Resources.Resources.Bearbeiten20 Me.btnNeu.ImageAlign = System.Drawing.ContentAlignment.MiddleRight Me.btnNeu.Location = New System.Drawing.Point(25, 476) Me.btnNeu.Name = "btnNeu" @@ -795,7 +795,7 @@ Partial Class Main Me.CmdNWDateien.BackColor = System.Drawing.SystemColors.ControlLightLight Me.CmdNWDateien.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) Me.CmdNWDateien.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.CmdNWDateien.Image = Global.Dokumentation.My.Resources.Resources.Folder20 + Me.CmdNWDateien.Image = Global.DOKU.My.Resources.Resources.Folder20 Me.CmdNWDateien.ImageAlign = System.Drawing.ContentAlignment.MiddleRight Me.CmdNWDateien.Location = New System.Drawing.Point(22, 11) Me.CmdNWDateien.Name = "CmdNWDateien" @@ -809,7 +809,7 @@ Partial Class Main Me.CmdNetzwerkbearbeiten.BackColor = System.Drawing.SystemColors.ControlLightLight Me.CmdNetzwerkbearbeiten.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) Me.CmdNetzwerkbearbeiten.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.CmdNetzwerkbearbeiten.Image = Global.Dokumentation.My.Resources.Resources.Netzwerk20 + Me.CmdNetzwerkbearbeiten.Image = Global.DOKU.My.Resources.Resources.Netzwerk20 Me.CmdNetzwerkbearbeiten.ImageAlign = System.Drawing.ContentAlignment.MiddleRight Me.CmdNetzwerkbearbeiten.Location = New System.Drawing.Point(22, 45) Me.CmdNetzwerkbearbeiten.Name = "CmdNetzwerkbearbeiten" @@ -823,7 +823,7 @@ Partial Class Main Me.CmDBearbeiten.BackColor = System.Drawing.SystemColors.ControlLightLight Me.CmDBearbeiten.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) Me.CmDBearbeiten.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.CmDBearbeiten.Image = Global.Dokumentation.My.Resources.Resources.Bearbeiten20 + Me.CmDBearbeiten.Image = Global.DOKU.My.Resources.Resources.Bearbeiten20 Me.CmDBearbeiten.ImageAlign = System.Drawing.ContentAlignment.MiddleRight Me.CmDBearbeiten.Location = New System.Drawing.Point(25, 442) Me.CmDBearbeiten.Name = "CmDBearbeiten" @@ -837,7 +837,7 @@ Partial Class Main Me.CmdFiles.BackColor = System.Drawing.SystemColors.ControlLightLight Me.CmdFiles.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) Me.CmdFiles.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.CmdFiles.Image = Global.Dokumentation.My.Resources.Resources.Folder20 + Me.CmdFiles.Image = Global.DOKU.My.Resources.Resources.Folder20 Me.CmdFiles.ImageAlign = System.Drawing.ContentAlignment.MiddleRight Me.CmdFiles.Location = New System.Drawing.Point(25, 408) Me.CmdFiles.Name = "CmdFiles" @@ -860,7 +860,7 @@ Partial Class Main Me.CmdLink.BackColor = System.Drawing.SystemColors.ControlLightLight Me.CmdLink.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) Me.CmdLink.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.CmdLink.Image = Global.Dokumentation.My.Resources.Resources.Link20 + Me.CmdLink.Image = Global.DOKU.My.Resources.Resources.Link20 Me.CmdLink.ImageAlign = System.Drawing.ContentAlignment.MiddleRight Me.CmdLink.Location = New System.Drawing.Point(25, 374) Me.CmdLink.Name = "CmdLink" diff --git a/Dokumentation/Main.vb b/Dokumentation/Main.vb index 78daea1..dbb1b01 100644 --- a/Dokumentation/Main.vb +++ b/Dokumentation/Main.vb @@ -36,6 +36,7 @@ Public Class Main Private Version As String = My.Resources.Version Public Shared SelectedDGVIndex As Integer + Public Shared FirstDisplayedDGVEntry As Integer Public printds As DataSet = Nothing diff --git a/Dokumentation/My Project/Application.Designer.vb b/Dokumentation/My Project/Application.Designer.vb index af77be8..b6b267d 100644 --- a/Dokumentation/My Project/Application.Designer.vb +++ b/Dokumentation/My Project/Application.Designer.vb @@ -32,7 +32,7 @@ Namespace My _ Protected Overrides Sub OnCreateMainForm() - Me.MainForm = Global.Dokumentation.Login + Me.MainForm = Global.DOKU.Login End Sub _ diff --git a/Dokumentation/My Project/AssemblyInfo.vb b/Dokumentation/My Project/AssemblyInfo.vb index 05d0dc5..9ee8c8d 100644 --- a/Dokumentation/My Project/AssemblyInfo.vb +++ b/Dokumentation/My Project/AssemblyInfo.vb @@ -8,11 +8,11 @@ Imports System.Runtime.InteropServices ' Werte der Assemblyattribute überprüfen - + - - + + diff --git a/Dokumentation/My Project/Resources.Designer.vb b/Dokumentation/My Project/Resources.Designer.vb index fc70e96..b29d776 100644 --- a/Dokumentation/My Project/Resources.Designer.vb +++ b/Dokumentation/My Project/Resources.Designer.vb @@ -39,7 +39,7 @@ Namespace My.Resources Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager Get If Object.ReferenceEquals(resourceMan, Nothing) Then - Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("Dokumentation.Resources", GetType(Resources).Assembly) + Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("DOKU.Resources", GetType(Resources).Assembly) resourceMan = temp End If Return resourceMan @@ -290,7 +290,7 @@ Namespace My.Resources End Property ''' - ''' Sucht eine lokalisierte Zeichenfolge, die Dokumentation ähnelt. + ''' Sucht eine lokalisierte Zeichenfolge, die DOKU ähnelt. ''' Friend ReadOnly Property Programmname() As String Get diff --git a/Dokumentation/My Project/Resources.resx b/Dokumentation/My Project/Resources.resx index dcfa8bc..4535cb0 100644 --- a/Dokumentation/My Project/Resources.resx +++ b/Dokumentation/My Project/Resources.resx @@ -161,7 +161,7 @@ ..\Resources\mstsc1.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - Dokumentation + DOKU ..\Resources\Link.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/Dokumentation/My Project/Settings.Designer.vb b/Dokumentation/My Project/Settings.Designer.vb index d0bc9d1..6ab0c48 100644 --- a/Dokumentation/My Project/Settings.Designer.vb +++ b/Dokumentation/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase @@ -75,9 +75,9 @@ Namespace My Friend Module MySettingsProperty _ - Friend ReadOnly Property Settings() As Global.Dokumentation.My.MySettings + Friend ReadOnly Property Settings() As Global.DOKU.My.MySettings Get - Return Global.Dokumentation.My.MySettings.Default + Return Global.DOKU.My.MySettings.Default End Get End Property End Module diff --git a/Dokumentation/frmHostBearbeiten.Designer.vb b/Dokumentation/frmHostBearbeiten.Designer.vb index f438315..84c3bbc 100644 --- a/Dokumentation/frmHostBearbeiten.Designer.vb +++ b/Dokumentation/frmHostBearbeiten.Designer.vb @@ -705,7 +705,7 @@ Partial Class frmHostBearbeiten 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.Image = Global.DOKU.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) @@ -734,7 +734,7 @@ Partial Class frmHostBearbeiten 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.Image = Global.DOKU.My.Resources.Resources.mstsc1 Me.cmdRDP.Location = New System.Drawing.Point(231, 340) Me.cmdRDP.Name = "cmdRDP" Me.cmdRDP.Size = New System.Drawing.Size(32, 32) @@ -746,7 +746,7 @@ Partial Class frmHostBearbeiten Me.cmdPutty.BackColor = System.Drawing.SystemColors.ControlLightLight 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.Image = Global.DOKU.My.Resources.Resources.ico_putty_exe0001 Me.cmdPutty.Location = New System.Drawing.Point(85, 339) Me.cmdPutty.Name = "cmdPutty" Me.cmdPutty.Size = New System.Drawing.Size(32, 32) diff --git a/Dokumentation/uscntr_Benutzer.Designer.vb b/Dokumentation/uscntr_Benutzer.Designer.vb index 16f2dc9..779db31 100644 --- a/Dokumentation/uscntr_Benutzer.Designer.vb +++ b/Dokumentation/uscntr_Benutzer.Designer.vb @@ -44,7 +44,7 @@ Partial Class uscntr_Benutzer Me.btnLoad.BackColor = System.Drawing.SystemColors.ControlLightLight Me.btnLoad.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) Me.btnLoad.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnLoad.Image = Global.Dokumentation.My.Resources.Resources.Link20 + Me.btnLoad.Image = Global.DOKU.My.Resources.Resources.Link20 Me.btnLoad.ImageAlign = System.Drawing.ContentAlignment.MiddleRight Me.btnLoad.Location = New System.Drawing.Point(963, 384) Me.btnLoad.Name = "btnLoad" diff --git a/Dokumentation/uscntr_MessageUser.Designer.vb b/Dokumentation/uscntr_MessageUser.Designer.vb index 5899d09..43e73a4 100644 --- a/Dokumentation/uscntr_MessageUser.Designer.vb +++ b/Dokumentation/uscntr_MessageUser.Designer.vb @@ -38,7 +38,7 @@ Partial Class uscntr_MessageUser ' 'btnDelete ' - Me.btnDelete.Image = Global.Dokumentation.My.Resources.Resources.del + Me.btnDelete.Image = Global.DOKU.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) diff --git a/Dokumentation/uscntr_TSSitzungen.Designer.vb b/Dokumentation/uscntr_TSSitzungen.Designer.vb index 3ee6628..bcdf43a 100644 --- a/Dokumentation/uscntr_TSSitzungen.Designer.vb +++ b/Dokumentation/uscntr_TSSitzungen.Designer.vb @@ -161,7 +161,7 @@ Partial Class uscntr_TSSitzungen Me.cmdNachricht.BackColor = System.Drawing.SystemColors.ControlLightLight Me.cmdNachricht.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) Me.cmdNachricht.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.cmdNachricht.Image = Global.Dokumentation.My.Resources.Resources.mail20 + Me.cmdNachricht.Image = Global.DOKU.My.Resources.Resources.mail20 Me.cmdNachricht.ImageAlign = System.Drawing.ContentAlignment.MiddleRight Me.cmdNachricht.Location = New System.Drawing.Point(8, 31) Me.cmdNachricht.Margin = New System.Windows.Forms.Padding(8) @@ -189,7 +189,7 @@ Partial Class uscntr_TSSitzungen Me.CmdUpdate.BackColor = System.Drawing.SystemColors.ControlLightLight Me.CmdUpdate.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) Me.CmdUpdate.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.CmdUpdate.Image = Global.Dokumentation.My.Resources.Resources.Update + Me.CmdUpdate.Image = Global.DOKU.My.Resources.Resources.Update Me.CmdUpdate.ImageAlign = System.Drawing.ContentAlignment.MiddleRight Me.CmdUpdate.Location = New System.Drawing.Point(206, 31) Me.CmdUpdate.Margin = New System.Windows.Forms.Padding(8) diff --git a/Dokumentation/uscntr_Telefon.Designer.vb b/Dokumentation/uscntr_Telefon.Designer.vb index 66d98e6..c1b5e72 100644 --- a/Dokumentation/uscntr_Telefon.Designer.vb +++ b/Dokumentation/uscntr_Telefon.Designer.vb @@ -25,9 +25,9 @@ Partial Class uscntr_Telefon Me.components = New System.ComponentModel.Container() Me.FlatButton1 = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.Label2 = New System.Windows.Forms.Label() - Me.DokuDataSet = New Dokumentation.DokuDataSet() + Me.DokuDataSet = New DOKU.DokuDataSet() Me.TbLNotfallKontakteBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.TbL_NotfallKontakteTableAdapter = New Dokumentation.DokuDataSetTableAdapters.TbL_NotfallKontakteTableAdapter() + Me.TbL_NotfallKontakteTableAdapter = New DOKU.DokuDataSetTableAdapters.TbL_NotfallKontakteTableAdapter() Me.TbLNotfallKontakteBindingSource1 = New System.Windows.Forms.BindingSource(Me.components) Me.ComboBox1 = New System.Windows.Forms.ComboBox() Me.Label3 = New System.Windows.Forms.Label() diff --git a/Dokumentation_Updater/My Project/Settings.Designer.vb b/Dokumentation_Updater/My Project/Settings.Designer.vb index f9a9f4e..5405ff2 100644 --- a/Dokumentation_Updater/My Project/Settings.Designer.vb +++ b/Dokumentation_Updater/My Project/Settings.Designer.vb @@ -62,8 +62,8 @@ Namespace My Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _ Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()> _ Friend Module MySettingsProperty - - _ + + Friend ReadOnly Property Settings() As Global.Dokumentation_Updater.My.MySettings Get Return Global.Dokumentation_Updater.My.MySettings.Default