diff --git a/ToolCollection/ToolCollection.vbproj b/ToolCollection/ToolCollection.vbproj index 6994a3d..0e203b8 100644 --- a/ToolCollection/ToolCollection.vbproj +++ b/ToolCollection/ToolCollection.vbproj @@ -334,18 +334,6 @@ Form - - frmLogin_DI.vb - - - Form - - - frmLogin_NI.vb - - - Form - frmMIProfileigenschaften.vb @@ -507,12 +495,6 @@ frmDIRegelverwaltung.vb - - frmLogin_DI.vb - - - frmLogin_NI.vb - frmMIProfileigenschaften.vb diff --git a/ToolCollection/frmDIProfilEigenschaften.vb b/ToolCollection/frmDIProfilEigenschaften.vb index f990b3f..0cf42fd 100644 --- a/ToolCollection/frmDIProfilEigenschaften.vb +++ b/ToolCollection/frmDIProfilEigenschaften.vb @@ -57,11 +57,11 @@ Public Class frmDIProfilEigenschaften End Sub Private Sub LoadProfilesInCombobox() 'Schreibt die Profile in die Combobox in der Toolbar. - Try - ClassDIProfile.Init() - Me.cmbProfilauswahl.DropDownItems.Clear() + 'Try + ClassDIProfile.Init() - If ClassDIProfile.Profile IsNot Nothing Then + Me.cmbProfilauswahl.DropDownItems.Clear() + If ClassDIProfile.Profile IsNot Nothing Then Dim anz As Integer = 0 For Each item As ClassDIProfil In ClassDIProfile.Profile Me.cmbProfilauswahl.DropDownItems.Add(item.Profilname) @@ -73,9 +73,9 @@ Public Class frmDIProfilEigenschaften Prof_Anzahl = anz Me.tslblAnzahl.Text = "Anzahl Profile: " & anz End If - Catch ex As Exception - MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler beim Laden der Profile in Auswahlliste:") - End Try + 'Catch ex As Exception + ' MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler beim Laden der Profile in Auswahlliste:") + 'End Try End Sub Sub Lade_Profil(ByVal profilname As String) ' das ausgewählte Profil in selectedProfile laden @@ -257,7 +257,8 @@ Public Class frmDIProfilEigenschaften Private Sub btnHinzufügen_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnHinzufügen.Click ' das Formular zum Erstellen eines neuen Profil öffnen - frmLogin_DI.ShowDialog() + frmDIProfilHinzufuegen.ShowDialog() + 'frmLogin_DI.ShowDialog() 'frmDIProfilHinzufuegen.ShowDialog() ' wenn das Formular geschlossen wurde, werden die Profile neu in die Combobox geladen Me.LoadProfilesInCombobox() @@ -282,6 +283,8 @@ Public Class frmDIProfilEigenschaften Me.btnLöschen.Enabled = False ' kein Profil als selektiert wählen Me.selectedProfile = Nothing + + Me.lblProfil.Text = "Kein Profil gewählt" ' die Profile neu in die Combobox laden Me.LoadProfilesInCombobox() End If diff --git a/ToolCollection/frmDIProfilHinzufuegen.vb b/ToolCollection/frmDIProfilHinzufuegen.vb index bae0bba..fe029e3 100644 --- a/ToolCollection/frmDIProfilHinzufuegen.vb +++ b/ToolCollection/frmDIProfilHinzufuegen.vb @@ -31,7 +31,6 @@ Me.chkQuellverzeichnisLoeschen.Checked = False Me.ObjekttypenEintragen() - frmLogin_DI.Close() Label6.Visible = False End Sub Private Sub btnQuellordner_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnQuellordner.Click diff --git a/ToolCollection/frmLogin_DI.Designer.vb b/ToolCollection/frmLogin_DI.Designer.vb deleted file mode 100644 index e92d5ce..0000000 --- a/ToolCollection/frmLogin_DI.Designer.vb +++ /dev/null @@ -1,95 +0,0 @@ - _ -Partial Class frmLogin_DI - 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.txtPW = New System.Windows.Forms.TextBox() - Me.Label1 = New System.Windows.Forms.Label() - Me.btnAbbruch = New System.Windows.Forms.Button() - Me.btnok = New System.Windows.Forms.Button() - Me.SuspendLayout() - ' - 'txtPW - ' - Me.txtPW.Location = New System.Drawing.Point(12, 23) - Me.txtPW.Name = "txtPW" - Me.txtPW.Size = New System.Drawing.Size(248, 22) - Me.txtPW.TabIndex = 7 - Me.txtPW.UseSystemPasswordChar = True - ' - 'Label1 - ' - Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(9, 7) - Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(56, 13) - Me.Label1.TabIndex = 6 - Me.Label1.Text = "Passwort:" - ' - 'btnAbbruch - ' - Me.btnAbbruch.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.btnAbbruch.DialogResult = System.Windows.Forms.DialogResult.Cancel - Me.btnAbbruch.Location = New System.Drawing.Point(105, 56) - Me.btnAbbruch.Name = "btnAbbruch" - Me.btnAbbruch.Size = New System.Drawing.Size(75, 23) - Me.btnAbbruch.TabIndex = 5 - Me.btnAbbruch.Text = "Abbruch" - Me.btnAbbruch.UseVisualStyleBackColor = True - ' - 'btnok - ' - Me.btnok.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.btnok.DialogResult = System.Windows.Forms.DialogResult.Cancel - Me.btnok.Location = New System.Drawing.Point(186, 56) - Me.btnok.Name = "btnok" - Me.btnok.Size = New System.Drawing.Size(75, 23) - Me.btnok.TabIndex = 4 - Me.btnok.Text = "Weiter" - Me.btnok.UseVisualStyleBackColor = True - ' - 'frmLogin_DI - ' - Me.AcceptButton = Me.btnok - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.CancelButton = Me.btnok - Me.ClientSize = New System.Drawing.Size(285, 91) - Me.Controls.Add(Me.txtPW) - Me.Controls.Add(Me.Label1) - Me.Controls.Add(Me.btnAbbruch) - Me.Controls.Add(Me.btnok) - Me.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow - Me.Name = "frmLogin_DI" - Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Text = "Passwort eingeben" - Me.TopMost = True - Me.ResumeLayout(False) - Me.PerformLayout() - - End Sub - Friend WithEvents txtPW As System.Windows.Forms.TextBox - Friend WithEvents Label1 As System.Windows.Forms.Label - Friend WithEvents btnAbbruch As System.Windows.Forms.Button - Friend WithEvents btnok As System.Windows.Forms.Button -End Class diff --git a/ToolCollection/frmLogin_DI.resx b/ToolCollection/frmLogin_DI.resx deleted file mode 100644 index 1af7de1..0000000 --- a/ToolCollection/frmLogin_DI.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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/ToolCollection/frmLogin_DI.vb b/ToolCollection/frmLogin_DI.vb deleted file mode 100644 index 4e7fdc4..0000000 --- a/ToolCollection/frmLogin_DI.vb +++ /dev/null @@ -1,33 +0,0 @@ -Public Class frmLogin_DI - Private Sub btnok_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnok.Click - If Me.txtPW.Text <> "" Then - If Me.txtPW.Text = My.Settings.vPW_admin Then - Me.Hide() - frmDIProfilHinzufuegen.Show() - Cursor = Cursors.Default - Else - MsgBox("Das eingegebene Passwort stimmt nicht überein!", MsgBoxStyle.Critical, "Falsche Eingabe:") - Me.txtPW.Text = "" - Me.txtPW.Focus() - End If - End If - End Sub - Private Sub frmLogin_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load - Me.txtPW.Text = "" - End Sub - - Private Sub btnAbbruch_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnAbbruch.Click - Me.Close() - End Sub - - Private Sub txtPW_GotFocus(ByVal sender As Object, ByVal e As System.EventArgs) Handles txtPW.GotFocus - Me.txtPW.BackColor = Color.Lime - End Sub - - Private Sub txtPW_LostFocus(ByVal sender As Object, ByVal e As System.EventArgs) Handles txtPW.LostFocus - Me.txtPW.BackColor = Color.White - End Sub - Private Sub frmLogin_Shown(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Shown - Me.txtPW.Focus() - End Sub -End Class \ No newline at end of file diff --git a/ToolCollection/frmLogin_NI.Designer.vb b/ToolCollection/frmLogin_NI.Designer.vb deleted file mode 100644 index e39d3a2..0000000 --- a/ToolCollection/frmLogin_NI.Designer.vb +++ /dev/null @@ -1,94 +0,0 @@ - _ -Partial Class frmLogin_NI - 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.btnok = New System.Windows.Forms.Button() - Me.btnAbbruch = New System.Windows.Forms.Button() - Me.Label1 = New System.Windows.Forms.Label() - Me.txtPW = New System.Windows.Forms.TextBox() - Me.SuspendLayout() - ' - 'btnok - ' - Me.btnok.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.btnok.Location = New System.Drawing.Point(188, 74) - Me.btnok.Name = "btnok" - Me.btnok.Size = New System.Drawing.Size(75, 23) - Me.btnok.TabIndex = 0 - Me.btnok.Text = "Weiter" - Me.btnok.UseVisualStyleBackColor = True - ' - 'btnAbbruch - ' - Me.btnAbbruch.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.btnAbbruch.DialogResult = System.Windows.Forms.DialogResult.Cancel - Me.btnAbbruch.Location = New System.Drawing.Point(107, 74) - Me.btnAbbruch.Name = "btnAbbruch" - Me.btnAbbruch.Size = New System.Drawing.Size(75, 23) - Me.btnAbbruch.TabIndex = 1 - Me.btnAbbruch.Text = "Abbruch" - Me.btnAbbruch.UseVisualStyleBackColor = True - ' - 'Label1 - ' - Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(12, 9) - Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(56, 13) - Me.Label1.TabIndex = 2 - Me.Label1.Text = "Passwort:" - ' - 'txtPW - ' - Me.txtPW.Location = New System.Drawing.Point(15, 25) - Me.txtPW.Name = "txtPW" - Me.txtPW.Size = New System.Drawing.Size(248, 22) - Me.txtPW.TabIndex = 3 - Me.txtPW.UseSystemPasswordChar = True - ' - 'frmLogin - ' - Me.AcceptButton = Me.btnok - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.CancelButton = Me.btnAbbruch - Me.ClientSize = New System.Drawing.Size(285, 109) - Me.Controls.Add(Me.txtPW) - Me.Controls.Add(Me.Label1) - Me.Controls.Add(Me.btnAbbruch) - Me.Controls.Add(Me.btnok) - Me.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow - Me.Name = "frmLogin" - Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Text = "Passwort notwendig:" - Me.TopMost = True - Me.ResumeLayout(False) - Me.PerformLayout() - - End Sub - Friend WithEvents btnok As System.Windows.Forms.Button - Friend WithEvents btnAbbruch As System.Windows.Forms.Button - Friend WithEvents Label1 As System.Windows.Forms.Label - Friend WithEvents txtPW As System.Windows.Forms.TextBox -End Class diff --git a/ToolCollection/frmLogin_NI.resx b/ToolCollection/frmLogin_NI.resx deleted file mode 100644 index 1af7de1..0000000 --- a/ToolCollection/frmLogin_NI.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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/ToolCollection/frmLogin_NI.vb b/ToolCollection/frmLogin_NI.vb deleted file mode 100644 index a91af74..0000000 --- a/ToolCollection/frmLogin_NI.vb +++ /dev/null @@ -1,34 +0,0 @@ -Public Class frmLogin_NI - - Private Sub btnok_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnok.Click - If Me.txtPW.Text <> "" Then - If Me.txtPW.Text = My.Settings.vPW_admin Then - Me.Hide() - frmNIProfilhinzufuegen.ShowDialog() - Cursor = Cursors.Default - Else - MsgBox("Das eingegebene Passwort stimmt nicht überein!", MsgBoxStyle.Critical, "Falsche Eingabe:") - Me.txtPW.Text = "" - Me.txtPW.Focus() - End If - End If - End Sub - Private Sub frmLogin_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load - Me.txtPW.Text = "" - End Sub - - Private Sub btnAbbruch_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnAbbruch.Click - Me.Close() - End Sub - - Private Sub txtPW_GotFocus(ByVal sender As Object, ByVal e As System.EventArgs) Handles txtPW.GotFocus - Me.txtPW.BackColor = Color.Lime - End Sub - - Private Sub txtPW_LostFocus(ByVal sender As Object, ByVal e As System.EventArgs) Handles txtPW.LostFocus - Me.txtPW.BackColor = Color.White - End Sub - Private Sub frmLogin_Shown(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Shown - Me.txtPW.Focus() - End Sub -End Class \ No newline at end of file diff --git a/ToolCollection/frmNIProfileigenschaften.Designer.vb b/ToolCollection/frmNIProfileigenschaften.Designer.vb index 0d6db11..9d96749 100644 --- a/ToolCollection/frmNIProfileigenschaften.Designer.vb +++ b/ToolCollection/frmNIProfileigenschaften.Designer.vb @@ -24,15 +24,15 @@ Partial Class frmNIProfileigenschaften Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmNIProfileigenschaften)) - Dim TreeNode1 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Datei 1") - Dim TreeNode2 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Datei 2") - Dim TreeNode3 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Datei 3") - Dim TreeNode4 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Parent", New System.Windows.Forms.TreeNode() {TreeNode1, TreeNode2, TreeNode3}) - Dim TreeNode5 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("-1", New System.Windows.Forms.TreeNode() {TreeNode4}) - Dim TreeNode6 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("-2", New System.Windows.Forms.TreeNode() {TreeNode5}) - Dim TreeNode7 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("-3", New System.Windows.Forms.TreeNode() {TreeNode6}) - Dim TreeNode8 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("-4", New System.Windows.Forms.TreeNode() {TreeNode7}) - Dim TreeNode9 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Windream-/W-Laufwerk", New System.Windows.Forms.TreeNode() {TreeNode8}) + Dim TreeNode10 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Datei 1") + Dim TreeNode11 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Datei 2") + Dim TreeNode12 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Datei 3") + Dim TreeNode13 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Parent", New System.Windows.Forms.TreeNode() {TreeNode10, TreeNode11, TreeNode12}) + Dim TreeNode14 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("-1", New System.Windows.Forms.TreeNode() {TreeNode13}) + Dim TreeNode15 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("-2", New System.Windows.Forms.TreeNode() {TreeNode14}) + Dim TreeNode16 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("-3", New System.Windows.Forms.TreeNode() {TreeNode15}) + Dim TreeNode17 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("-4", New System.Windows.Forms.TreeNode() {TreeNode16}) + Dim TreeNode18 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Windream-/W-Laufwerk", New System.Windows.Forms.TreeNode() {TreeNode17}) Me.StatusStrip1 = New System.Windows.Forms.StatusStrip() Me.btnSpeichern = New System.Windows.Forms.ToolStripDropDownButton() Me.btnLöschen = New System.Windows.Forms.ToolStripDropDownButton() @@ -148,6 +148,7 @@ Partial Class frmNIProfileigenschaften Me.Label16 = New System.Windows.Forms.Label() Me.txtObjekttyp = New System.Windows.Forms.TextBox() Me.btnopenSuche = New System.Windows.Forms.Button() + Me.pnlProfileigenschaften = New System.Windows.Forms.Panel() Me.StatusStrip1.SuspendLayout() Me.gbxDatenbank.SuspendLayout() Me.gbxDatei.SuspendLayout() @@ -165,6 +166,7 @@ Partial Class frmNIProfileigenschaften Me.GroupBox5.SuspendLayout() Me.GroupBox3.SuspendLayout() Me.TabPage4.SuspendLayout() + Me.pnlProfileigenschaften.SuspendLayout() Me.SuspendLayout() ' 'StatusStrip1 @@ -176,7 +178,7 @@ Partial Class frmNIProfileigenschaften Me.StatusStrip1.Name = "StatusStrip1" Me.StatusStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.ManagerRenderMode Me.StatusStrip1.ShowItemToolTips = True - Me.StatusStrip1.Size = New System.Drawing.Size(920, 22) + Me.StatusStrip1.Size = New System.Drawing.Size(991, 22) Me.StatusStrip1.SizingGrip = False Me.StatusStrip1.TabIndex = 23 Me.StatusStrip1.Text = "StatusStrip1" @@ -524,7 +526,7 @@ Partial Class frmNIProfileigenschaften Me.lblDateiendung.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblDateiendung.Location = New System.Drawing.Point(130, 25) Me.lblDateiendung.Name = "lblDateiendung" - Me.lblDateiendung.Size = New System.Drawing.Size(114, 13) + Me.lblDateiendung.Size = New System.Drawing.Size(113, 13) Me.lblDateiendung.TabIndex = 3 Me.lblDateiendung.Text = "Dateiendungen/Typ*" ' @@ -555,11 +557,12 @@ Partial Class frmNIProfileigenschaften ' 'btnVerknüpfungen ' - Me.btnVerknüpfungen.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Me.btnVerknüpfungen.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.btnVerknüpfungen.Location = New System.Drawing.Point(754, 36) + Me.btnVerknüpfungen.Location = New System.Drawing.Point(746, 26) Me.btnVerknüpfungen.Name = "btnVerknüpfungen" - Me.btnVerknüpfungen.Size = New System.Drawing.Size(150, 23) + Me.btnVerknüpfungen.Size = New System.Drawing.Size(171, 23) Me.btnVerknüpfungen.TabIndex = 49 Me.btnVerknüpfungen.Text = "Verknüpfungen verwalten ..." Me.btnVerknüpfungen.UseVisualStyleBackColor = True @@ -569,7 +572,7 @@ Partial Class frmNIProfileigenschaften ' Me.txtWindreamsuche.BackColor = System.Drawing.SystemColors.Info Me.txtWindreamsuche.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtWindreamsuche.Location = New System.Drawing.Point(18, 126) + Me.txtWindreamsuche.Location = New System.Drawing.Point(7, 118) Me.txtWindreamsuche.Name = "txtWindreamsuche" Me.txtWindreamsuche.Size = New System.Drawing.Size(451, 22) Me.txtWindreamsuche.TabIndex = 6 @@ -577,7 +580,7 @@ Partial Class frmNIProfileigenschaften 'btnWindreamsuche ' Me.btnWindreamsuche.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.btnWindreamsuche.Location = New System.Drawing.Point(475, 125) + Me.btnWindreamsuche.Location = New System.Drawing.Point(464, 117) Me.btnWindreamsuche.Name = "btnWindreamsuche" Me.btnWindreamsuche.Size = New System.Drawing.Size(24, 21) Me.btnWindreamsuche.TabIndex = 3 @@ -587,7 +590,7 @@ Partial Class frmNIProfileigenschaften 'Label2 ' Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(15, 63) + Me.Label2.Location = New System.Drawing.Point(4, 55) Me.Label2.Name = "Label2" Me.Label2.Size = New System.Drawing.Size(61, 13) Me.Label2.TabIndex = 37 @@ -596,7 +599,7 @@ Partial Class frmNIProfileigenschaften 'Label1 ' Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(15, 22) + Me.Label1.Location = New System.Drawing.Point(4, 14) Me.Label1.Name = "Label1" Me.Label1.Size = New System.Drawing.Size(70, 13) Me.Label1.TabIndex = 36 @@ -604,7 +607,7 @@ Partial Class frmNIProfileigenschaften ' 'txtProfilname ' - Me.txtProfilname.Location = New System.Drawing.Point(18, 38) + Me.txtProfilname.Location = New System.Drawing.Point(7, 30) Me.txtProfilname.Name = "txtProfilname" Me.txtProfilname.Size = New System.Drawing.Size(396, 22) Me.txtProfilname.TabIndex = 35 @@ -613,7 +616,7 @@ Partial Class frmNIProfileigenschaften ' Me.chkbxAktiv.AutoSize = True Me.chkbxAktiv.BackColor = System.Drawing.Color.Transparent - Me.chkbxAktiv.Location = New System.Drawing.Point(429, 40) + Me.chkbxAktiv.Location = New System.Drawing.Point(418, 32) Me.chkbxAktiv.Name = "chkbxAktiv" Me.chkbxAktiv.Size = New System.Drawing.Size(119, 17) Me.chkbxAktiv.TabIndex = 52 @@ -671,7 +674,7 @@ Partial Class frmNIProfileigenschaften 'Label7 ' Me.Label7.AutoSize = True - Me.Label7.Location = New System.Drawing.Point(426, 63) + Me.Label7.Location = New System.Drawing.Point(415, 55) Me.Label7.Name = "Label7" Me.Label7.Size = New System.Drawing.Size(98, 13) Me.Label7.TabIndex = 73 @@ -681,7 +684,7 @@ Partial Class frmNIProfileigenschaften ' Me.txtlastRun.BackColor = System.Drawing.Color.WhiteSmoke Me.txtlastRun.Enabled = False - Me.txtlastRun.Location = New System.Drawing.Point(429, 79) + Me.txtlastRun.Location = New System.Drawing.Point(418, 71) Me.txtlastRun.Name = "txtlastRun" Me.txtlastRun.Size = New System.Drawing.Size(160, 22) Me.txtlastRun.TabIndex = 74 @@ -733,7 +736,7 @@ Partial Class frmNIProfileigenschaften Me.lblSave.AutoSize = True Me.lblSave.BackColor = System.Drawing.Color.Yellow Me.lblSave.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblSave.Location = New System.Drawing.Point(643, 79) + Me.lblSave.Location = New System.Drawing.Point(656, 71) Me.lblSave.Name = "lblSave" Me.lblSave.Size = New System.Drawing.Size(261, 17) Me.lblSave.TabIndex = 76 @@ -765,10 +768,10 @@ Partial Class frmNIProfileigenschaften Me.TabControl1.Controls.Add(Me.TabPage2) Me.TabControl1.Controls.Add(Me.TabPage3) Me.TabControl1.Controls.Add(Me.TabPage4) - Me.TabControl1.Location = New System.Drawing.Point(18, 159) + Me.TabControl1.Location = New System.Drawing.Point(3, 222) Me.TabControl1.Name = "TabControl1" Me.TabControl1.SelectedIndex = 0 - Me.TabControl1.Size = New System.Drawing.Size(890, 442) + Me.TabControl1.Size = New System.Drawing.Size(985, 481) Me.TabControl1.TabIndex = 78 ' 'TabPage1 @@ -781,7 +784,7 @@ Partial Class frmNIProfileigenschaften Me.TabPage1.Location = New System.Drawing.Point(4, 22) Me.TabPage1.Name = "TabPage1" Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage1.Size = New System.Drawing.Size(882, 416) + Me.TabPage1.Size = New System.Drawing.Size(977, 455) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = "Typ und Quelle" Me.TabPage1.UseVisualStyleBackColor = True @@ -802,7 +805,7 @@ Partial Class frmNIProfileigenschaften Me.grbxLDAP.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.grbxLDAP.Location = New System.Drawing.Point(407, 210) Me.grbxLDAP.Name = "grbxLDAP" - Me.grbxLDAP.Size = New System.Drawing.Size(413, 176) + Me.grbxLDAP.Size = New System.Drawing.Size(508, 215) Me.grbxLDAP.TabIndex = 79 Me.grbxLDAP.TabStop = False Me.grbxLDAP.Text = "Indexierung gegen Active Directory:" @@ -904,7 +907,7 @@ Partial Class frmNIProfileigenschaften Me.grbxVolltext.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.grbxVolltext.Location = New System.Drawing.Point(568, 18) Me.grbxVolltext.Name = "grbxVolltext" - Me.grbxVolltext.Size = New System.Drawing.Size(293, 162) + Me.grbxVolltext.Size = New System.Drawing.Size(392, 201) Me.grbxVolltext.TabIndex = 78 Me.grbxVolltext.TabStop = False Me.grbxVolltext.Text = "Indexierung gegen den Volltext" @@ -957,7 +960,7 @@ Partial Class frmNIProfileigenschaften Me.TabPage2.Location = New System.Drawing.Point(4, 22) Me.TabPage2.Name = "TabPage2" Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage2.Size = New System.Drawing.Size(882, 416) + Me.TabPage2.Size = New System.Drawing.Size(970, 556) Me.TabPage2.TabIndex = 1 Me.TabPage2.Text = "Kennzeichnung und Active Directory" Me.TabPage2.UseVisualStyleBackColor = True @@ -1251,7 +1254,7 @@ Partial Class frmNIProfileigenschaften Me.Label4.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label4.Location = New System.Drawing.Point(6, 18) Me.Label4.Name = "Label4" - Me.Label4.Size = New System.Drawing.Size(639, 15) + Me.Label4.Size = New System.Drawing.Size(638, 15) Me.Label4.TabIndex = 71 Me.Label4.Text = "Wählen Sie hier einen Ordner in windream, in welchen die Datei, nach erfolgreiche" & "r Indexierung verschoben werden soll." @@ -1290,7 +1293,7 @@ Partial Class frmNIProfileigenschaften Me.Label24.AutoSize = True Me.Label24.Location = New System.Drawing.Point(461, 56) Me.Label24.Name = "Label24" - Me.Label24.Size = New System.Drawing.Size(121, 13) + Me.Label24.Size = New System.Drawing.Size(122, 13) Me.Label24.TabIndex = 63 Me.Label24.Text = "Beispiel Ordnerebene:" ' @@ -1320,31 +1323,31 @@ Partial Class frmNIProfileigenschaften Me.TreeViewOrdnerVererbung.ImageList = Me.ImageList1 Me.TreeViewOrdnerVererbung.Location = New System.Drawing.Point(464, 72) Me.TreeViewOrdnerVererbung.Name = "TreeViewOrdnerVererbung" - TreeNode1.ImageKey = "page.png" - TreeNode1.Name = "Knoten3" - TreeNode1.SelectedImageIndex = 1 - TreeNode1.Text = "Datei 1" - TreeNode2.ImageKey = "page.png" - TreeNode2.Name = "Knoten4" - TreeNode2.SelectedImageIndex = 1 - TreeNode2.Text = "Datei 2" - TreeNode3.ImageKey = "page.png" - TreeNode3.Name = "Knoten5" - TreeNode3.SelectedImageIndex = 1 - TreeNode3.Text = "Datei 3" - TreeNode4.Name = "Knoten4" - TreeNode4.Text = "Parent" - TreeNode5.Name = "Knoten3" - TreeNode5.Text = "-1" - TreeNode6.Name = "Knoten2" - TreeNode6.Text = "-2" - TreeNode7.Name = "Knoten5" - TreeNode7.Text = "-3" - TreeNode8.Name = "Knoten1" - TreeNode8.Text = "-4" - TreeNode9.Name = "Knoten0" - TreeNode9.Text = "Windream-/W-Laufwerk" - Me.TreeViewOrdnerVererbung.Nodes.AddRange(New System.Windows.Forms.TreeNode() {TreeNode9}) + TreeNode10.ImageKey = "page.png" + TreeNode10.Name = "Knoten3" + TreeNode10.SelectedImageIndex = 1 + TreeNode10.Text = "Datei 1" + TreeNode11.ImageKey = "page.png" + TreeNode11.Name = "Knoten4" + TreeNode11.SelectedImageIndex = 1 + TreeNode11.Text = "Datei 2" + TreeNode12.ImageKey = "page.png" + TreeNode12.Name = "Knoten5" + TreeNode12.SelectedImageIndex = 1 + TreeNode12.Text = "Datei 3" + TreeNode13.Name = "Knoten4" + TreeNode13.Text = "Parent" + TreeNode14.Name = "Knoten3" + TreeNode14.Text = "-1" + TreeNode15.Name = "Knoten2" + TreeNode15.Text = "-2" + TreeNode16.Name = "Knoten5" + TreeNode16.Text = "-3" + TreeNode17.Name = "Knoten1" + TreeNode17.Text = "-4" + TreeNode18.Name = "Knoten0" + TreeNode18.Text = "Windream-/W-Laufwerk" + Me.TreeViewOrdnerVererbung.Nodes.AddRange(New System.Windows.Forms.TreeNode() {TreeNode18}) Me.TreeViewOrdnerVererbung.SelectedImageIndex = 0 Me.TreeViewOrdnerVererbung.Size = New System.Drawing.Size(220, 157) Me.TreeViewOrdnerVererbung.TabIndex = 59 @@ -1401,7 +1404,7 @@ Partial Class frmNIProfileigenschaften ' Me.Label16.AutoSize = True Me.Label16.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label16.Location = New System.Drawing.Point(15, 110) + Me.Label16.Location = New System.Drawing.Point(4, 102) Me.Label16.Name = "Label16" Me.Label16.Size = New System.Drawing.Size(174, 13) Me.Label16.TabIndex = 79 @@ -1409,7 +1412,7 @@ Partial Class frmNIProfileigenschaften ' 'txtObjekttyp ' - Me.txtObjekttyp.Location = New System.Drawing.Point(18, 79) + Me.txtObjekttyp.Location = New System.Drawing.Point(7, 71) Me.txtObjekttyp.Name = "txtObjekttyp" Me.txtObjekttyp.ReadOnly = True Me.txtObjekttyp.Size = New System.Drawing.Size(396, 22) @@ -1421,7 +1424,7 @@ Partial Class frmNIProfileigenschaften Me.btnopenSuche.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnopenSuche.Image = Global.ToolCollection.My.Resources.Resources.plugin Me.btnopenSuche.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnopenSuche.Location = New System.Drawing.Point(505, 117) + Me.btnopenSuche.Location = New System.Drawing.Point(494, 109) Me.btnopenSuche.Name = "btnopenSuche" Me.btnopenSuche.Padding = New System.Windows.Forms.Padding(0, 0, 2, 2) Me.btnopenSuche.Size = New System.Drawing.Size(68, 36) @@ -1430,26 +1433,35 @@ Partial Class frmNIProfileigenschaften Me.btnopenSuche.TextAlign = System.Drawing.ContentAlignment.MiddleRight Me.btnopenSuche.UseVisualStyleBackColor = True ' + 'pnlProfileigenschaften + ' + Me.pnlProfileigenschaften.Controls.Add(Me.TabControl1) + Me.pnlProfileigenschaften.Controls.Add(Me.txtObjekttyp) + Me.pnlProfileigenschaften.Controls.Add(Me.lblSave) + Me.pnlProfileigenschaften.Controls.Add(Me.btnopenSuche) + Me.pnlProfileigenschaften.Controls.Add(Me.btnVerknüpfungen) + Me.pnlProfileigenschaften.Controls.Add(Me.Label16) + Me.pnlProfileigenschaften.Controls.Add(Me.txtProfilname) + Me.pnlProfileigenschaften.Controls.Add(Me.btnWindreamsuche) + Me.pnlProfileigenschaften.Controls.Add(Me.Label2) + Me.pnlProfileigenschaften.Controls.Add(Me.txtWindreamsuche) + Me.pnlProfileigenschaften.Controls.Add(Me.Label1) + Me.pnlProfileigenschaften.Controls.Add(Me.txtlastRun) + Me.pnlProfileigenschaften.Controls.Add(Me.chkbxAktiv) + Me.pnlProfileigenschaften.Controls.Add(Me.Label7) + Me.pnlProfileigenschaften.Dock = System.Windows.Forms.DockStyle.Fill + Me.pnlProfileigenschaften.Location = New System.Drawing.Point(0, 22) + Me.pnlProfileigenschaften.Name = "pnlProfileigenschaften" + Me.pnlProfileigenschaften.Size = New System.Drawing.Size(991, 706) + Me.pnlProfileigenschaften.TabIndex = 81 + ' 'frmNIProfileigenschaften ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(920, 603) - Me.Controls.Add(Me.txtObjekttyp) - Me.Controls.Add(Me.btnopenSuche) - Me.Controls.Add(Me.Label16) - Me.Controls.Add(Me.btnWindreamsuche) - Me.Controls.Add(Me.txtWindreamsuche) - Me.Controls.Add(Me.TabControl1) - Me.Controls.Add(Me.lblSave) - Me.Controls.Add(Me.txtlastRun) - Me.Controls.Add(Me.Label7) - Me.Controls.Add(Me.chkbxAktiv) + Me.ClientSize = New System.Drawing.Size(991, 728) + Me.Controls.Add(Me.pnlProfileigenschaften) Me.Controls.Add(Me.StatusStrip1) - Me.Controls.Add(Me.btnVerknüpfungen) - Me.Controls.Add(Me.txtProfilname) - Me.Controls.Add(Me.Label1) - Me.Controls.Add(Me.Label2) Me.DataBindings.Add(New System.Windows.Forms.Binding("Location", Global.ToolCollection.My.MySettings.Default, "frmNIProfileigenschaften", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) Me.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) @@ -1488,6 +1500,8 @@ Partial Class frmNIProfileigenschaften Me.GroupBox3.PerformLayout() Me.TabPage4.ResumeLayout(False) Me.TabPage4.PerformLayout() + Me.pnlProfileigenschaften.ResumeLayout(False) + Me.pnlProfileigenschaften.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() @@ -1607,4 +1621,5 @@ Partial Class frmNIProfileigenschaften Friend WithEvents Label20 As System.Windows.Forms.Label Friend WithEvents Label25 As System.Windows.Forms.Label Friend WithEvents btnMoveRename As Button + Friend WithEvents pnlProfileigenschaften As Panel End Class diff --git a/ToolCollection/frmNIProfileigenschaften.resx b/ToolCollection/frmNIProfileigenschaften.resx index 5262658..d1e981a 100644 --- a/ToolCollection/frmNIProfileigenschaften.resx +++ b/ToolCollection/frmNIProfileigenschaften.resx @@ -130,17 +130,17 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAIySURBVDhPlZJrTxNBFIaJicnG36BWiYbISkDiDaEt - C5TWBgQT6P1Cu5UC0pZe0qZQG/WDJv4SfxeIir1hpbu97Pb1TEmXbvqJD08yc2be98w5Z0YAXIvmlnhr - cK87RCZnIHhdbIBmMMzLXn+i4XCb+rGrC0ycO0Q3m4eaSA2ZNAMhvhmKoLWzh39vN77XV9cesbhOjOIn - dAk1mUFnd18zkf1bPGVHJ5YACkWw9bnVnqguWG5cGqSzXDeZUbuHH4Cv36DmC8wArZDIy74gT9nR3o8D - dC4HQzhffq1UhaWbVy8g1HiSU97HFTWTAz5/gZLOohmOgLKjvRcD8ke9dc1iI/Ei19dpBoxOdJdridtK - J3ZA5XwEjookLAC5PGRfALUlq1KdX9DEDJ0Bg57LSR6/ijyV4w0ALi+QyaK2uKxWzIJOzNBtGJLbx0YF - 0DTgcAMbTuAgRXXbUJqZG5qObiO5vLzk8aEdiQKpDAnTQJzKoQbKm05UjWb8nprWmWiLhtPDS24v2uI2 - QGOUXB5Qs5TynEm9WF0HojtovFlH6elznI6NayaXYoebp+xoh99R1iQkejo1SynPmrjSixnubPqZUrdY - gbCIC5sdZxOTOLk32jPpGdDPEhoOF9ohEdKmC9QspfzKqDXs18QU93P8sfLXLECyr+DP5BMc3zEImgGD - fpZQX1lDxTSvUrOGun36cIz7MfpAGRQzdJcqRrNQejk7JO5zYrjPHd++q4kZugvXByP/AXK7pMeJCyzg - AAAAAElFTkSuQmCC + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAItSURBVDhPnZHbThNhFEaJicnEZ1BRojEyEpB4QqBl + OBUbEEig9FymRU5CDzBpMxwa8UITn8TnAlGxtFSgM6Wd6TIFHanjjV58yfcn/1rJ3rsJaPqXlGdj1y6/ + Gz8omWaUjPgnZMGRqKgHQomSx+ewC+pwZoNaWsVMrNkk5bAsluU5zhaXOZmc+ng8Nn7/t+AnTHaHWnYH + M6VQXVqxJHpoVixHolRXE7CVpd6LLnei0D905UKwnhZqKcWsbWzD+w+Y6lZdwJkcE/VgRCyHZSorcdjY + Ro/IFIdfGAVp8GrDCGY8JRiv44apZODtO4z1NOXoHHpolsryKqib5/1oaMQoSAOCfQfQVF1YEs5i80Z1 + NQnZN7CZBXULMip6MMzRoMso9PVbsE1QTzksC5o/ZKJuQyAM3gAoaY4Ghs28U2qA/yrQfMH6qSCtgscH + UzOQXKM4PEKuq8d2nUbYGxA1f5DK3AKsKZBch3gSVuLo0zMUep187ehskFilNOMXNV+ASmweUgqa109B + GjAOexzm6dgELCxSejlB7tET9u+1WpIL2OMTNW+ASvQVJFNoHh+Fvn7jsNsh5J52CQedj43jIRdEY5yO + uDloa2fvVsu55FxwMjkllTxeKnIMbdpL3ikZh897rYV9aesQPrc+ML47JTT3KN/aH7J7o1lqGKHockvH + o+PkHX1mrqvHtu39u/eETy13jMtwg6CefK9Tyj3rtsG/std8W9i9ftOCbYL/yQ9yu6TH5dYZBAAAAABJ + RU5ErkJggg== @@ -161,7 +161,7 @@ einen Startindex erhält, der nicht in der Datenbank existiert. Diese Kennzeichn AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAK - CQAAAk1TRnQBSQFMAgEBAgEAAZgBAAGYAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CQAAAk1TRnQBSQFMAgEBAgEAAaABAAGgAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/ToolCollection/frmNIProfileigenschaften.vb b/ToolCollection/frmNIProfileigenschaften.vb index 8b96550..d702217 100644 --- a/ToolCollection/frmNIProfileigenschaften.vb +++ b/ToolCollection/frmNIProfileigenschaften.vb @@ -142,6 +142,7 @@ Public Class frmNIProfileigenschaften ' die Profile neu in die Combobox der Toolbar laden (für den Fall das Profilname geändert wurde) Me.LoadProfilesInCombobox() + Me.pnlProfileigenschaften.Visible = False ' die Profileigenschaften auf diesem Panel ausblenden ' den Speichern-Button deaktivieren Me.btnSpeichern.Enabled = False @@ -158,6 +159,7 @@ Public Class frmNIProfileigenschaften ' wenn ein Profil selektiert ist: den originalen Profilnamen setzen If Me._selectedProfile IsNot Nothing Then Me._selectedProfile.SetBackToOriginal() + Me.pnlProfileigenschaften.Visible = False ' den Speichern-Button deaktivieren Me.btnSpeichern.Enabled = False ' den Löschen-Button deaktivieren @@ -174,6 +176,8 @@ Public Class frmNIProfileigenschaften Return "keineAenderung" ' wenn ein Profil selektiert ist: den originalen Profilnamen setzen If Me._selectedProfile IsNot Nothing Then Me._selectedProfile.SetBackToOriginal() + + Me.pnlProfileigenschaften.Visible = False ' den Speichern-Button deaktivieren Me.btnSpeichern.Enabled = False ' den Löschen-Button deaktivieren @@ -249,6 +253,7 @@ Public Class frmNIProfileigenschaften Me._selectedProfile = ClassNIProfile.getProfilByName(name) ' wenn das selektierte Profil gefunden wurde If Me._selectedProfile IsNot Nothing Then + Me.pnlProfileigenschaften.Visible = True Me.lblSave.Visible = False ' die Steuerelemente für die Profilinformationen mit den Daten füllen Me.txtProfilname.Text = Me._selectedProfile.Profilname @@ -541,7 +546,8 @@ Public Class frmNIProfileigenschaften End Sub Private Sub btnHinzufügen_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnHinzufügen.Click - frmLogin_NI.ShowDialog() + 'frmLogin_NI.ShowDialog() + frmNIProfilhinzufuegen.ShowDialog() ' wenn das Formular geschlossen wurde, werden die Profile neu in die Combobox geladen Me.LoadProfilesInCombobox() End Sub @@ -644,20 +650,24 @@ Public Class frmNIProfileigenschaften If result = MsgBoxResult.Yes Then ' das Profil löschen If ClassNIProfile.DeleteProfil(Me._selectedProfile.OriginalProfilname) Then + + Me.pnlProfileigenschaften.Visible = False ' den Speichern-Button deaktivieren Me.btnSpeichern.Enabled = False ' den Löschen-Button deaktivieren Me.btnLöschen.Enabled = False ' kein Profil als selektiert wählen Me._selectedProfile = Nothing + + Me.lblProfil.Text = "Kein Profil gewählt" ' die Profile neu in die Combobox laden Me.LoadProfilesInCombobox() 'Das erste Profil laden - Try - Lade_Profil(Me.cmbProfilauswahl.DropDownItems(0).ToString) - Catch ex As Exception + 'Try + ' Lade_Profil(Me.cmbProfilauswahl.DropDownItems(0).ToString) + 'Catch ex As Exception - End Try + 'End Try End If End If @@ -1103,6 +1113,11 @@ Public Class frmNIProfileigenschaften Else grpbxMORE.Enabled = False End If + If Me._selectedProfile Is Nothing Then + Me.pnlProfileigenschaften.Visible = False + Else + Lade_Profil(Me._selectedProfile.Profilname) + End If End Sub Private Sub chkbxUserIdent_CheckedChanged(sender As Object, e As EventArgs) Handles chkbxUserIdent.CheckedChanged diff --git a/ToolCollection/frmNIProfilhinzufuegen.vb b/ToolCollection/frmNIProfilhinzufuegen.vb index 96c9cfe..c5f9097 100644 --- a/ToolCollection/frmNIProfilhinzufuegen.vb +++ b/ToolCollection/frmNIProfilhinzufuegen.vb @@ -34,7 +34,6 @@ Public Class frmNIProfilhinzufuegen ' Standardbuttons festlegen Me.AcceptButton = Me.btnOK Me.CancelButton = Me.btnAbbrechen - frmLogin_NI.Close() End Sub Private Sub btnOK_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnOK.Click