WIP

EDIDocumentImport/frmRowEditor.Designer.vb

@@ -20,9 +20,9 @@ Partial Class frmRowEditor
     <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
         Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl()
-        Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
-        Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem()
-        Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem()
+        Me.btnSave = New DevExpress.XtraBars.BarButtonItem()
+        Me.btnApplyFromWinline = New DevExpress.XtraBars.BarButtonItem()
+        Me.btnApplyFromOriginal = New DevExpress.XtraBars.BarButtonItem()
         Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
@@ -43,7 +43,7 @@ Partial Class frmRowEditor
         '
         Me.RibbonControl1.CommandLayout = DevExpress.XtraBars.Ribbon.CommandLayout.Simplified
         Me.RibbonControl1.ExpandCollapseItem.Id = 0
-        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3})
+        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.btnSave, Me.btnApplyFromWinline, Me.btnApplyFromOriginal})
         Me.RibbonControl1.Location = New System.Drawing.Point(0, 0)
         Me.RibbonControl1.MaxItemId = 4
         Me.RibbonControl1.Name = "RibbonControl1"
@@ -53,26 +53,26 @@ Partial Class frmRowEditor
         Me.RibbonControl1.Size = New System.Drawing.Size(914, 63)
         Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1
         '
-        'BarButtonItem1
+        'btnSave
         '
-        Me.BarButtonItem1.Caption = "Save"
-        Me.BarButtonItem1.Id = 1
-        Me.BarButtonItem1.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.save
-        Me.BarButtonItem1.Name = "BarButtonItem1"
+        Me.btnSave.Caption = "Speichern und Schließen"
+        Me.btnSave.Id = 1
+        Me.btnSave.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.save
+        Me.btnSave.Name = "btnSave"
         '
-        'BarButtonItem2
+        'btnApplyFromWinline
         '
-        Me.BarButtonItem2.Caption = "Aus Winline übernehmen"
-        Me.BarButtonItem2.Id = 2
-        Me.BarButtonItem2.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.actions_arrow4down
-        Me.BarButtonItem2.Name = "BarButtonItem2"
+        Me.btnApplyFromWinline.Caption = "Aus Winline übernehmen"
+        Me.btnApplyFromWinline.Id = 2
+        Me.btnApplyFromWinline.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.actions_arrow4down
+        Me.btnApplyFromWinline.Name = "btnApplyFromWinline"
         '
-        'BarButtonItem3
+        'btnApplyFromOriginal
         '
-        Me.BarButtonItem3.Caption = "Zurücksetzen"
-        Me.BarButtonItem3.Id = 3
-        Me.BarButtonItem3.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.resetview
-        Me.BarButtonItem3.Name = "BarButtonItem3"
+        Me.btnApplyFromOriginal.Caption = "Zurücksetzen"
+        Me.btnApplyFromOriginal.Id = 3
+        Me.btnApplyFromOriginal.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.resetview
+        Me.btnApplyFromOriginal.Name = "btnApplyFromOriginal"
         '
         'RibbonPage1
         '
@@ -82,14 +82,14 @@ Partial Class frmRowEditor
         '
         'RibbonPageGroup1
         '
-        Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1)
+        Me.RibbonPageGroup1.ItemLinks.Add(Me.btnSave)
         Me.RibbonPageGroup1.Name = "RibbonPageGroup1"
         Me.RibbonPageGroup1.Text = "RibbonPageGroup1"
         '
         'RibbonPageGroup2
         '
-        Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem2)
-        Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem3)
+        Me.RibbonPageGroup2.ItemLinks.Add(Me.btnApplyFromWinline)
+        Me.RibbonPageGroup2.ItemLinks.Add(Me.btnApplyFromOriginal)
         Me.RibbonPageGroup2.Name = "RibbonPageGroup2"
         Me.RibbonPageGroup2.Text = "RibbonPageGroup2"
         '
@@ -121,6 +121,7 @@ Partial Class frmRowEditor
         Me.GridView1.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.Key, Me.ValueOriginal, Me.ValueExternal, Me.ValueFinal})
         Me.GridView1.GridControl = Me.GridControl1
         Me.GridView1.Name = "GridView1"
+        Me.GridView1.OptionsView.RowAutoHeight = True
         '
         'Key
         '
@@ -193,14 +194,14 @@ Partial Class frmRowEditor
     Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
     Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar
     Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage
-    Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents btnSave As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents GridControl1 As DevExpress.XtraGrid.GridControl
     Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView
     Friend WithEvents Key As DevExpress.XtraGrid.Columns.GridColumn
     Friend WithEvents ValueOriginal As DevExpress.XtraGrid.Columns.GridColumn
     Friend WithEvents ValueFinal As DevExpress.XtraGrid.Columns.GridColumn
     Friend WithEvents ValueExternal As DevExpress.XtraGrid.Columns.GridColumn
-    Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem
-    Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents btnApplyFromWinline As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents btnApplyFromOriginal As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
 End Class