jj: work on final indicies

app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj

@@ -632,6 +632,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="PM_ohne_slogan_128px.ico" />
+    <None Include="Resources\cancel.png" />
     <None Include="Resources\shape_square_go.png" />
     <None Include="Resources\Checked-outforEdit_Color_13297.png" />
     <None Include="Resources\Settings.png" />

app/DD_PM_WINDREAM/My Project/Resources.Designer.vb

@@ -190,6 +190,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property cancel() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("cancel", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>

app/DD_PM_WINDREAM/My Project/Resources.resx

@@ -202,9 +202,6 @@
   <data name="flag_pink" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\flag_pink.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="magifier_zoom_out" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\magifier_zoom_out.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="resultset_next" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\resultset_next.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -295,6 +292,12 @@
   <data name="database_save" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\database_save.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="Einstellungen6" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Einstellungen6.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="shape_square_go" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\shape_square_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="syncreon" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\syncreon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -322,8 +325,8 @@
   <data name="Checkbox" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Checkbox.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Einstellungen6" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="magifier_zoom_out" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Einstellungen6.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\magifier_zoom_out.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="key1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\key1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -331,7 +334,7 @@
   <data name="user_red" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\user_red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="shape_square_go" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="cancel" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\shape_square_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\cancel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>

app/DD_PM_WINDREAM/frmAdministration.Designer.vb

@@ -49,7 +49,7 @@ Partial Class frmAdministration
         Dim VEKTOR_DELIMITERLabel As System.Windows.Forms.Label
         Dim WORK_HISTORY_ENTRYLabel As System.Windows.Forms.Label
         Dim SQL_VIEWLabel As System.Windows.Forms.Label
-        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.SplitContainer_Profilzuordnung2 = New System.Windows.Forms.SplitContainer()
         Me.gridAssignedUsers = New DevExpress.XtraGrid.GridControl()
         Me.TBPROFILE_USERBindingSource = New System.Windows.Forms.BindingSource(Me.components)
@@ -180,8 +180,10 @@ Partial Class frmAdministration
         Me.BindingNavigatorMoveNextItem1 = New System.Windows.Forms.ToolStripButton()
         Me.BindingNavigatorMoveLastItem1 = New System.Windows.Forms.ToolStripButton()
         Me.BindingNavigatorSeparator5 = New System.Windows.Forms.ToolStripSeparator()
+        Me.tsBtnCancel = New System.Windows.Forms.ToolStripButton()
         Me.BindingNavigatorDeleteItem = New System.Windows.Forms.ToolStripButton()
-        Me.ToolStripButton4 = New System.Windows.Forms.ToolStripButton()
+        Me.tsBtnSave = New System.Windows.Forms.ToolStripButton()
+        Me.ToolStripButton5 = New System.Windows.Forms.ToolStripButton()
         Me.Label13 = New System.Windows.Forms.Label()
         Me.TabControlFinalIndices = New System.Windows.Forms.TabControl()
         Me.TabPage9 = New System.Windows.Forms.TabPage()
@@ -226,7 +228,7 @@ Partial Class frmAdministration
         Me.ToolStripButton2 = New System.Windows.Forms.ToolStripButton()
         Me.ToolStripButton3 = New System.Windows.Forms.ToolStripButton()
         Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
-        Me.tsBtnCancel = New System.Windows.Forms.ToolStripButton()
+        Me.tsBtnCancel_old = New System.Windows.Forms.ToolStripButton()
         Me.TBPM_PROFILE_FINAL_INDEXINGDataGridView = New System.Windows.Forms.DataGridView()
         Me.GUID = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.DataGridViewTextBoxColumn26 = New System.Windows.Forms.DataGridViewTextBoxColumn()
@@ -308,7 +310,6 @@ Partial Class frmAdministration
         Me.TBDD_GROUPSTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBDD_GROUPSTableAdapter()
         Me.TBPROFILE_GROUPTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPROFILE_GROUPTableAdapter()
         Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog()
-        Me.ToolStripButton5 = New System.Windows.Forms.ToolStripButton()
         GUIDLabel = New System.Windows.Forms.Label()
         NAMELabel = New System.Windows.Forms.Label()
         DESCRIPTIONLabel = New System.Windows.Forms.Label()
@@ -830,6 +831,7 @@ Partial Class frmAdministration
         Me.TableAdapterManager.TBPM_KONFIGURATIONTableAdapter = Nothing
         Me.TableAdapterManager.TBPM_PROFILE_CONTROLSTableAdapter = Nothing
         Me.TableAdapterManager.TBPM_PROFILE_FILESTableAdapter = Nothing
+        Me.TableAdapterManager.TBPM_PROFILE_FINAL_INDEXINGTableAdapter = Nothing
         Me.TableAdapterManager.TBPM_PROFILETableAdapter = Nothing
         Me.TableAdapterManager.TBPM_TYPETableAdapter = Nothing
         Me.TableAdapterManager.UpdateOrder = DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete
@@ -1408,7 +1410,7 @@ Partial Class frmAdministration
         Me.BindingNavigator1.CountItemFormat = "von {0} finalen Indexen"
         Me.BindingNavigator1.DeleteItem = Nothing
         resources.ApplyResources(Me.BindingNavigator1, "BindingNavigator1")
-        Me.BindingNavigator1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BindingNavigatorMoveFirstItem1, Me.BindingNavigatorMovePreviousItem1, Me.BindingNavigatorSeparator3, Me.BindingNavigatorPositionItem1, Me.BindingNavigatorCountItem1, Me.BindingNavigatorSeparator4, Me.BindingNavigatorMoveNextItem1, Me.BindingNavigatorMoveLastItem1, Me.BindingNavigatorSeparator5, Me.BindingNavigatorAddNewItem, Me.BindingNavigatorDeleteItem, Me.ToolStripButton4, Me.ToolStripButton5})
+        Me.BindingNavigator1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BindingNavigatorMoveFirstItem1, Me.BindingNavigatorMovePreviousItem1, Me.BindingNavigatorSeparator3, Me.BindingNavigatorPositionItem1, Me.BindingNavigatorCountItem1, Me.BindingNavigatorSeparator4, Me.BindingNavigatorMoveNextItem1, Me.BindingNavigatorMoveLastItem1, Me.BindingNavigatorSeparator5, Me.BindingNavigatorAddNewItem, Me.tsBtnCancel, Me.BindingNavigatorDeleteItem, Me.tsBtnSave, Me.ToolStripButton5})
         Me.BindingNavigator1.MoveFirstItem = Me.BindingNavigatorMoveFirstItem1
         Me.BindingNavigator1.MoveLastItem = Me.BindingNavigatorMoveLastItem1
         Me.BindingNavigator1.MoveNextItem = Me.BindingNavigatorMoveNextItem1
@@ -1471,16 +1473,28 @@ Partial Class frmAdministration
         Me.BindingNavigatorSeparator5.Name = "BindingNavigatorSeparator5"
         resources.ApplyResources(Me.BindingNavigatorSeparator5, "BindingNavigatorSeparator5")
         '
+        'tsBtnCancel
+        '
+        Me.tsBtnCancel.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.cancel
+        resources.ApplyResources(Me.tsBtnCancel, "tsBtnCancel")
+        Me.tsBtnCancel.Name = "tsBtnCancel"
+        '
         'BindingNavigatorDeleteItem
         '
         resources.ApplyResources(Me.BindingNavigatorDeleteItem, "BindingNavigatorDeleteItem")
         Me.BindingNavigatorDeleteItem.Name = "BindingNavigatorDeleteItem"
         '
-        'ToolStripButton4
+        'tsBtnSave
         '
-        Me.ToolStripButton4.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.save
+        Me.tsBtnSave.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.save
-        resources.ApplyResources(Me.ToolStripButton4, "ToolStripButton4")
+        resources.ApplyResources(Me.tsBtnSave, "tsBtnSave")
-        Me.ToolStripButton4.Name = "ToolStripButton4"
+        Me.tsBtnSave.Name = "tsBtnSave"
+        '
+        'ToolStripButton5
+        '
+        Me.ToolStripButton5.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.refresh_16xMD
+        resources.ApplyResources(Me.ToolStripButton5, "ToolStripButton5")
+        Me.ToolStripButton5.Name = "ToolStripButton5"
         '
         'Label13
         '
@@ -1695,7 +1709,7 @@ Partial Class frmAdministration
         Me.TBPM_PROFILE_FINAL_INDEXINGBindingNavigator.CountItem = Me.BindingNavigatorCountItem4
         Me.TBPM_PROFILE_FINAL_INDEXINGBindingNavigator.DeleteItem = Nothing
         resources.ApplyResources(Me.TBPM_PROFILE_FINAL_INDEXINGBindingNavigator, "TBPM_PROFILE_FINAL_INDEXINGBindingNavigator")
-        Me.TBPM_PROFILE_FINAL_INDEXINGBindingNavigator.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BindingNavigatorMoveFirstItem4, Me.BindingNavigatorMovePreviousItem4, Me.BindingNavigatorSeparator12, Me.BindingNavigatorPositionItem4, Me.BindingNavigatorCountItem4, Me.BindingNavigatorSeparator13, Me.BindingNavigatorMoveNextItem4, Me.BindingNavigatorMoveLastItem4, Me.BindingNavigatorSeparator14, Me.ToolStripButton2, Me.ToolStripButton3, Me.ToolStripButton1, Me.tsBtnCancel})
+        Me.TBPM_PROFILE_FINAL_INDEXINGBindingNavigator.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BindingNavigatorMoveFirstItem4, Me.BindingNavigatorMovePreviousItem4, Me.BindingNavigatorSeparator12, Me.BindingNavigatorPositionItem4, Me.BindingNavigatorCountItem4, Me.BindingNavigatorSeparator13, Me.BindingNavigatorMoveNextItem4, Me.BindingNavigatorMoveLastItem4, Me.BindingNavigatorSeparator14, Me.ToolStripButton2, Me.ToolStripButton3, Me.ToolStripButton1, Me.tsBtnCancel_old})
         Me.TBPM_PROFILE_FINAL_INDEXINGBindingNavigator.MoveFirstItem = Me.BindingNavigatorMoveFirstItem4
         Me.TBPM_PROFILE_FINAL_INDEXINGBindingNavigator.MoveLastItem = Me.BindingNavigatorMoveLastItem4
         Me.TBPM_PROFILE_FINAL_INDEXINGBindingNavigator.MoveNextItem = Me.BindingNavigatorMoveNextItem4
@@ -1770,11 +1784,11 @@ Partial Class frmAdministration
         resources.ApplyResources(Me.ToolStripButton1, "ToolStripButton1")
         Me.ToolStripButton1.Name = "ToolStripButton1"
         '
-        'tsBtnCancel
+        'tsBtnCancel_old
         '
-        Me.tsBtnCancel.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.delete_12x12
+        Me.tsBtnCancel_old.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.delete_12x12
-        resources.ApplyResources(Me.tsBtnCancel, "tsBtnCancel")
+        resources.ApplyResources(Me.tsBtnCancel_old, "tsBtnCancel_old")
-        Me.tsBtnCancel.Name = "tsBtnCancel"
+        Me.tsBtnCancel_old.Name = "tsBtnCancel_old"
         '
         'TBPM_PROFILE_FINAL_INDEXINGDataGridView
         '
@@ -2144,8 +2158,8 @@ Partial Class frmAdministration
         'TBPM_ERROR_LOGDataGridView
         '
         Me.TBPM_ERROR_LOGDataGridView.AllowUserToAddRows = False
-        DataGridViewCellStyle2.BackColor = System.Drawing.Color.Cyan
+        DataGridViewCellStyle1.BackColor = System.Drawing.Color.Cyan
-        Me.TBPM_ERROR_LOGDataGridView.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
+        Me.TBPM_ERROR_LOGDataGridView.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
         Me.TBPM_ERROR_LOGDataGridView.AutoGenerateColumns = False
         Me.TBPM_ERROR_LOGDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.TBPM_ERROR_LOGDataGridView.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.DataGridViewTextBoxColumn17, Me.DataGridViewTextBoxColumn22, Me.DataGridViewTextBoxColumn23, Me.DataGridViewTextBoxColumn24, Me.DataGridViewTextBoxColumn25})
@@ -2336,12 +2350,6 @@ Partial Class frmAdministration
         '
         Me.OpenFileDialog1.FileName = "OpenFileDialog1"
         '
-        'ToolStripButton5
-        '
-        Me.ToolStripButton5.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.refresh_16xMD
-        resources.ApplyResources(Me.ToolStripButton5, "ToolStripButton5")
-        Me.ToolStripButton5.Name = "ToolStripButton5"
-        '
         'frmAdministration
         '
         resources.ApplyResources(Me, "$this")
@@ -2683,7 +2691,7 @@ Partial Class frmAdministration
     Friend WithEvents GridColumn2 As DevExpress.XtraGrid.Columns.GridColumn
     Friend WithEvents GridColumn3 As DevExpress.XtraGrid.Columns.GridColumn
     Friend WithEvents GridColumn4 As DevExpress.XtraGrid.Columns.GridColumn
-    Friend WithEvents tsBtnCancel As ToolStripButton
+    Friend WithEvents tsBtnCancel_old As ToolStripButton
     Friend WithEvents OpenFileDialog1 As OpenFileDialog
     Friend WithEvents gridFinalIndex As DevExpress.XtraGrid.GridControl
     Friend WithEvents viewFinalIndex As DevExpress.XtraGrid.Views.Grid.GridView
@@ -2700,7 +2708,7 @@ Partial Class frmAdministration
     Friend WithEvents BindingNavigatorMoveLastItem1 As ToolStripButton
     Friend WithEvents BindingNavigatorSeparator5 As ToolStripSeparator
     Friend WithEvents PropertyGrid1 As PropertyGrid
-    Friend WithEvents ToolStripButton4 As ToolStripButton
+    Friend WithEvents tsBtnSave As ToolStripButton
     Friend WithEvents Panel5 As Panel
     Friend WithEvents colINDEXNAME As DevExpress.XtraGrid.Columns.GridColumn
     Friend WithEvents colVALUE As DevExpress.XtraGrid.Columns.GridColumn
@@ -2712,4 +2720,5 @@ Partial Class frmAdministration
     Friend WithEvents colCONNECTION_ID As DevExpress.XtraGrid.Columns.GridColumn
     Friend WithEvents colSQL_COMMAND As DevExpress.XtraGrid.Columns.GridColumn
     Friend WithEvents ToolStripButton5 As ToolStripButton
+    Friend WithEvents tsBtnCancel As ToolStripButton
 End Class

app/DD_PM_WINDREAM/frmAdministration.vb

@@ -725,7 +725,7 @@ Public Class frmAdministration
     End Sub
     Private Sub ToolStripButton2_Click(sender As Object, e As EventArgs) Handles ToolStripButton2.Click
         TabControlFinalIndices.Enabled = True
-        tsBtnCancel.Visible = True
+        tsBtnCancel_old.Visible = True
         cmbIndexe.Items.Clear()
         cmbIndexe2.Items.Clear()
         Dim indexe = _windreamPM.GetIndicesByObjecttype(cmbObjekttypen.Text)
@@ -742,7 +742,7 @@ Public Class frmAdministration
     Private Sub CancelFinalIndexInsert()
         TabControlFinalIndices.Enabled = False
         INSERT_ACTIVE = False
-        tsBtnCancel.Visible = False
+        tsBtnCancel_old.Visible = False
 
         txtBezeichner.Text = String.Empty
         txtindexwert_final.Text = String.Empty
@@ -976,7 +976,7 @@ Public Class frmAdministration
         End Try
     End Sub
 
-    Private Sub tsBtnCancel_Click(sender As Object, e As EventArgs) Handles tsBtnCancel.Click
+    Private Sub tsBtnCancel_Click(sender As Object, e As EventArgs) Handles tsBtnCancel_old.Click
         CancelFinalIndexInsert()
     End Sub
 
@@ -1035,9 +1035,12 @@ Public Class frmAdministration
 
     Private Sub BindingNavigatorAddNewItem_Click(sender As Object, e As EventArgs) Handles BindingNavigatorAddNewItem.Click
         INSERT_ACTIVE = True
+
+        tsBtnCancel.Visible = True
+        BindingNavigatorAddNewItem.Visible = False
     End Sub
 
-    Private Sub ToolStripButton4_Click_1(sender As Object, e As EventArgs) Handles ToolStripButton4.Click
+    Private Sub ToolStripButton4_Click_1(sender As Object, e As EventArgs) Handles tsBtnSave.Click
         Try
             Dim obj As FinalIndexProperties = PropertyGrid1.SelectedObject
 
@@ -1087,6 +1090,10 @@ Public Class frmAdministration
         Catch ex As Exception
             MsgBox("Error while Saving Final Index: " & ex.Message, MsgBoxStyle.Critical)
             ClassLogger.Add("Error while Saving Final Index: " & ex.Message)
+        Finally
+            tsBtnCancel.Visible = False
+            BindingNavigatorAddNewItem.Visible = True
+            INSERT_ACTIVE = False
         End Try
     End Sub
 
@@ -1123,4 +1130,16 @@ Public Class frmAdministration
     Private Sub ToolStripButton5_Click(sender As Object, e As EventArgs) Handles ToolStripButton5.Click
         Refresh_Final_indexe()
     End Sub
+
+    Private Sub tsBtnCancel_Click_1(sender As Object, e As EventArgs) Handles tsBtnCancel.Click
+        CancelFinalIndexInsert()
+    End Sub
+
+    'Private Sub viewFinalIndex_ValidateRow(sender As Object, e As Views.Base.ValidateRowEventArgs) Handles viewFinalIndex.ValidateRow
+    '    Dim rowView As DataRowView = e.Row
+
+    '    If rowView.IsNew Then
+    '        Dim props As FinalIndexProperties = PropertyGrid1.SelectedObject
+    '    End If
+    'End Sub
 End Class