Buttonanpassungen - frmNIVerknuepfungen, frmNIVerknuepfungen.Designer

ToolCollection/frmNIVerknuepfungen.Designer.vb

@@ -72,7 +72,6 @@ Partial Class frmNIVerknuepfungen
         Me.btnAddNI_Objekt = New System.Windows.Forms.Button()
         Me.Label40 = New System.Windows.Forms.Label()
         Me.cmbNI_Objekte = New System.Windows.Forms.ComboBox()
-        Me.btnsave_select = New System.Windows.Forms.Button()
         Me.btnSpalteEinfügen = New System.Windows.Forms.Button()
         Me.btnWindreamIndexEinfügen = New System.Windows.Forms.Button()
         Me.Label7 = New System.Windows.Forms.Label()
@@ -85,7 +84,6 @@ Partial Class frmNIVerknuepfungen
         Me.lblDescrangelegteVerknuepf = New System.Windows.Forms.Label()
         Me.tabctrlbottom = New System.Windows.Forms.TabControl()
         Me.TabPage6 = New System.Windows.Forms.TabPage()
-        Me.btnSaveCheckIndex = New System.Windows.Forms.Button()
         Me.btnzuruecksetzen_checksql = New System.Windows.Forms.Button()
         Me.txtGrundgeruest_check = New System.Windows.Forms.Button()
         Me.Panel2 = New System.Windows.Forms.Panel()
@@ -170,8 +168,9 @@ Partial Class frmNIVerknuepfungen
         Me.rbvkt_overwrite = New System.Windows.Forms.RadioButton()
         Me.SplitContainer1 = New System.Windows.Forms.SplitContainer()
         Me.pnlFooter = New System.Windows.Forms.Panel()
-        Me.btnCancel = New System.Windows.Forms.Button()
+        Me.btnCancelAndClose = New System.Windows.Forms.Button()
         Me.btnSaveAll = New System.Windows.Forms.Button()
+        Me.btnSaveAllAndClose = New System.Windows.Forms.Button()
         Me.StatusStrip1.SuspendLayout()
         Me.GroupBox1.SuspendLayout()
         Me.Panel1.SuspendLayout()
@@ -723,7 +722,6 @@ Partial Class frmNIVerknuepfungen
         Me.grbFilterDB.Controls.Add(Me.cmbNI_Objekte)
         Me.grbFilterDB.Controls.Add(Me.btnEindIndex)
         Me.grbFilterDB.Controls.Add(Me.Panel1)
-        Me.grbFilterDB.Controls.Add(Me.btnsave_select)
         Me.grbFilterDB.Controls.Add(Me.btnStandardSQL)
         Me.grbFilterDB.Controls.Add(Me.btnSpalteEinfügen)
         Me.grbFilterDB.Controls.Add(Me.cmbDatenbankSpalten)
@@ -786,22 +784,6 @@ Partial Class frmNIVerknuepfungen
         Me.cmbNI_Objekte.Size = New System.Drawing.Size(191, 21)
         Me.cmbNI_Objekte.TabIndex = 50
         '
-        'btnsave_select
-        '
-        Me.btnsave_select.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.btnsave_select.Enabled = False
-        Me.btnsave_select.Font = New System.Drawing.Font("Segoe UI", 8.25!)
-        Me.btnsave_select.Image = Global.ToolCollection.My.Resources.Resources.save
-        Me.btnsave_select.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnsave_select.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.btnsave_select.Location = New System.Drawing.Point(1114, 32)
-        Me.btnsave_select.Name = "btnsave_select"
-        Me.btnsave_select.Size = New System.Drawing.Size(110, 24)
-        Me.btnsave_select.TabIndex = 47
-        Me.btnsave_select.Text = "Speichern"
-        Me.btnsave_select.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnsave_select.UseVisualStyleBackColor = True
-        '
         'btnSpalteEinfügen
         '
         Me.btnSpalteEinfügen.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -932,7 +914,6 @@ Partial Class frmNIVerknuepfungen
         '
         'TabPage6
         '
-        Me.TabPage6.Controls.Add(Me.btnSaveCheckIndex)
         Me.TabPage6.Controls.Add(Me.btnzuruecksetzen_checksql)
         Me.TabPage6.Controls.Add(Me.txtGrundgeruest_check)
         Me.TabPage6.Controls.Add(Me.Panel2)
@@ -950,21 +931,6 @@ Partial Class frmNIVerknuepfungen
         Me.TabPage6.Text = "Überprüfung deskriptiver Index"
         Me.TabPage6.UseVisualStyleBackColor = True
         '
-        'btnSaveCheckIndex
-        '
-        Me.btnSaveCheckIndex.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.btnSaveCheckIndex.BackColor = System.Drawing.SystemColors.Control
-        Me.btnSaveCheckIndex.Enabled = False
-        Me.btnSaveCheckIndex.Image = Global.ToolCollection.My.Resources.Resources.save
-        Me.btnSaveCheckIndex.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnSaveCheckIndex.Location = New System.Drawing.Point(1120, 21)
-        Me.btnSaveCheckIndex.Name = "btnSaveCheckIndex"
-        Me.btnSaveCheckIndex.Size = New System.Drawing.Size(110, 24)
-        Me.btnSaveCheckIndex.TabIndex = 52
-        Me.btnSaveCheckIndex.Text = "Speichern"
-        Me.btnSaveCheckIndex.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnSaveCheckIndex.UseVisualStyleBackColor = True
-        '
         'btnzuruecksetzen_checksql
         '
         Me.btnzuruecksetzen_checksql.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -1944,7 +1910,8 @@ Partial Class frmNIVerknuepfungen
         'pnlFooter
         '
         Me.pnlFooter.BackColor = System.Drawing.Color.Transparent
-        Me.pnlFooter.Controls.Add(Me.btnCancel)
+        Me.pnlFooter.Controls.Add(Me.btnSaveAllAndClose)
+        Me.pnlFooter.Controls.Add(Me.btnCancelAndClose)
         Me.pnlFooter.Controls.Add(Me.btnSaveAll)
         Me.pnlFooter.Dock = System.Windows.Forms.DockStyle.Fill
         Me.pnlFooter.Location = New System.Drawing.Point(0, 250)
@@ -1952,30 +1919,41 @@ Partial Class frmNIVerknuepfungen
         Me.pnlFooter.Size = New System.Drawing.Size(1265, 44)
         Me.pnlFooter.TabIndex = 53
         '
-        'btnCancel
+        'btnCancelAndClose
         '
-        Me.btnCancel.Anchor = System.Windows.Forms.AnchorStyles.Top
+        Me.btnCancelAndClose.Anchor = System.Windows.Forms.AnchorStyles.Top
-        Me.btnCancel.BackColor = System.Drawing.SystemColors.Control
+        Me.btnCancelAndClose.BackColor = System.Drawing.SystemColors.ControlLightLight
-        Me.btnCancel.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.btnCancelAndClose.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btnCancel.Location = New System.Drawing.Point(997, 5)
+        Me.btnCancelAndClose.Location = New System.Drawing.Point(1009, 6)
-        Me.btnCancel.Name = "btnCancel"
+        Me.btnCancelAndClose.Name = "btnCancelAndClose"
-        Me.btnCancel.Size = New System.Drawing.Size(120, 30)
+        Me.btnCancelAndClose.Size = New System.Drawing.Size(120, 30)
-        Me.btnCancel.TabIndex = 1
+        Me.btnCancelAndClose.TabIndex = 1
-        Me.btnCancel.Text = "Abbrechen"
+        Me.btnCancelAndClose.Text = "Abbrechen"
-        Me.btnCancel.UseVisualStyleBackColor = False
+        Me.btnCancelAndClose.UseVisualStyleBackColor = False
         '
         'btnSaveAll
         '
         Me.btnSaveAll.Anchor = System.Windows.Forms.AnchorStyles.Top
-        Me.btnSaveAll.BackColor = System.Drawing.SystemColors.Control
+        Me.btnSaveAll.BackColor = System.Drawing.SystemColors.ControlLightLight
         Me.btnSaveAll.Enabled = False
         Me.btnSaveAll.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btnSaveAll.Location = New System.Drawing.Point(1123, 5)
+        Me.btnSaveAll.Location = New System.Drawing.Point(1135, 6)
         Me.btnSaveAll.Name = "btnSaveAll"
         Me.btnSaveAll.Size = New System.Drawing.Size(120, 30)
         Me.btnSaveAll.TabIndex = 0
-        Me.btnSaveAll.Text = "Speichern"
+        Me.btnSaveAll.Text = "Übernehmen"
-        Me.btnSaveAll.UseVisualStyleBackColor = True
+        Me.btnSaveAll.UseVisualStyleBackColor = False
+        '
+        'btnSaveAllAndClose
+        '
+        Me.btnSaveAllAndClose.BackColor = System.Drawing.SystemColors.ControlLightLight
+        Me.btnSaveAllAndClose.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.btnSaveAllAndClose.Location = New System.Drawing.Point(883, 6)
+        Me.btnSaveAllAndClose.Name = "btnSaveAllAndClose"
+        Me.btnSaveAllAndClose.Size = New System.Drawing.Size(120, 30)
+        Me.btnSaveAllAndClose.TabIndex = 2
+        Me.btnSaveAllAndClose.Text = "Ok"
+        Me.btnSaveAllAndClose.UseVisualStyleBackColor = False
         '
         'frmNIVerknuepfungen
         '
@@ -2051,7 +2029,6 @@ Partial Class frmNIVerknuepfungen
     Friend WithEvents btnTestSQL As System.Windows.Forms.Button
     Friend WithEvents btnlvw_down As System.Windows.Forms.Button
     Friend WithEvents btnlvw_up As System.Windows.Forms.Button
-    Friend WithEvents btnsave_select As System.Windows.Forms.Button
     Friend WithEvents btnWindreamIndexEinfügenSQL As System.Windows.Forms.Button
     Friend WithEvents btnaddUniqueIndex As System.Windows.Forms.Button
     Friend WithEvents lbxQuelle1 As System.Windows.Forms.ListBox
@@ -2173,8 +2150,8 @@ Partial Class frmNIVerknuepfungen
     Friend WithEvents rbFunctionsTb As RadioButton
     Friend WithEvents rbFunctionsSc As RadioButton
     Friend WithEvents Label2 As Label
-    Friend WithEvents btnSaveCheckIndex As Button
     Friend WithEvents pnlFooter As Panel
     Friend WithEvents btnSaveAll As Button
-    Friend WithEvents btnCancel As Button
+    Friend WithEvents btnCancelAndClose As Button
+    Friend WithEvents btnSaveAllAndClose As Button
 End Class

ToolCollection/frmNIVerknuepfungen.vb

@@ -1681,21 +1681,21 @@ Public Class frmNIVerknuepfungen
 
 
     Private Sub lvwVerknuepfungen_SelectedIndexChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles lvwVerknuepfungen.SelectedIndexChanged
-        If Not Me._selectedProfil.IsSaved Then
+        If Not Me._selectedProfil._links.IsSaved Then
 
             Dim msgResult As MsgBoxResult = MsgBox("Möchten Sie die Änderungen speichern?", MsgBoxStyle.YesNoCancel, "Änderungen übernehmen?")
             If msgResult = MsgBoxResult.Yes Then
 
-                If Not Me._selectedProfil.IsSaved Then
+                'If Not Me._selectedProfil.IsSaved Then
-                    SaveProfile()
+                '    SaveProfile()
-                End If
+                'End If
 
                 If Not Me._selectedProfil._links.IsSaved Then
                     SaveLinks()
                 End If
-
+            Else
+                Me._selectedProfil._links.setLinksSaved()
             End If
-
         End If
 
         Select Case Me._selectedProfil.Ni_Art
@@ -2045,11 +2045,10 @@ Public Class frmNIVerknuepfungen
                 'Me._selectedProfil.Save(True, "link")
                 If Me._selectedProfil._links.selectedLink.SaveLink(Me._selectedProfil.Profilname, Me._selectedProfil.Ni_Art) = True Then
                     Me._selectedProfil._links.setLinksSaved()
-                    Me.btnsave_select.Enabled = False
                     Me.btnSaveAll.Enabled = False
                     'MsgBox("Verknüpfung erfolgreich gespeichert!", MsgBoxStyle.Information)
                 End If
-                With btnsave_select
+                With btnSaveAll
                     .Enabled = False
                     .ForeColor = Drawing.Color.Black
                 End With
@@ -2059,11 +2058,6 @@ Public Class frmNIVerknuepfungen
         End Try
     End Sub
 
-    Private Sub btnsave_select_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnsave_select.Click
-        SaveLinks()
-        SaveProfile()
-        SaveScript()
-    End Sub
     Private Sub txtSelectAnweisung_TextChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles txtSelectAnweisung.TextChanged
         Try
             ' wenn im ListView eine Zeile selektiert wurde
@@ -2693,7 +2687,6 @@ Public Class frmNIVerknuepfungen
                 ' die Änderungen speichern
                 If Me._selectedProfil.Save(True, "profile") = True Then
                     Me._selectedProfil.setSaved()
-                    Me.btnSaveCheckIndex.Enabled = False
                     Me.btnSaveAll.Enabled = False
                 Else
                     MsgBox("Das Profil konnte nicht erfolgreich gespeichert werden.", MsgBoxStyle.Exclamation, "Fehler beim Speichern eines Profils")
@@ -2704,12 +2697,6 @@ Public Class frmNIVerknuepfungen
         End If
     End Sub
 
-    Private Sub btnSaveCheckIndex_Click(sender As Object, e As EventArgs) Handles btnSaveCheckIndex.Click
-        SaveLinks()
-        SaveProfile()
-        SaveScript()
-    End Sub
-
     Private Sub txtCheckIndexSQL_TextChanged(sender As System.Object, e As System.EventArgs) Handles txtCheckIndexSQL.TextChanged
 
         If Me._selectedProfil IsNot Nothing Then