diff --git a/MultiTool.Form/GridLoader.vb b/MultiTool.Form/GridLoader.vb index 5446018..a036400 100644 --- a/MultiTool.Form/GridLoader.vb +++ b/MultiTool.Form/GridLoader.vb @@ -11,12 +11,7 @@ Public Class GridLoader MyBase.New(pLogConfig, pLogConfig.GetLogger()) End Sub - Public Function GetGridFromElement(pTable As Schemas.Schema.Table) As GridControl - Dim oGrid As New GridControl With { - .Dock = DockStyle.Fill, - .Name = pTable.Name - } - + Public Function GetGridFromElement(pGrid As GridControl, pTable As Schemas.Schema.Table) As GridControl Dim oInvisibleColumns As New List(Of String) From { "BELEGKEY", "Zeilennummer", @@ -28,10 +23,11 @@ Public Class GridLoader "Laufnummer" } - oGrid.ForceInitialize() - oGrid.MainView.PopulateColumns() + pGrid.Name = pTable.Name + pGrid.ForceInitialize() + pGrid.MainView.PopulateColumns() - Dim oView As GridView = oGrid.DefaultView + Dim oView As GridView = pGrid.DefaultView oView.OptionsBehavior.ReadOnly = True oView.OptionsBehavior.Editable = False @@ -63,7 +59,7 @@ Public Class GridLoader WithReadOnlyOptions(). WithClipboardHandler() - Return oGrid + Return pGrid End Function Private Function GetColumnType(pColumn As Schemas.Schema.Column) diff --git a/MultiTool.Form/MultiTool.Form.vbproj b/MultiTool.Form/MultiTool.Form.vbproj index 8f48816..e664ec2 100644 --- a/MultiTool.Form/MultiTool.Form.vbproj +++ b/MultiTool.Form/MultiTool.Form.vbproj @@ -50,6 +50,9 @@ MultiTool.ico + + My Project\app.manifest + @@ -276,6 +279,7 @@ + MyApplicationCodeGenerator Application.Designer.vb @@ -292,6 +296,7 @@ + diff --git a/MultiTool.Form/My Project/Resources.Designer.vb b/MultiTool.Form/My Project/Resources.Designer.vb index 816467b..27b7983 100644 --- a/MultiTool.Form/My Project/Resources.Designer.vb +++ b/MultiTool.Form/My Project/Resources.Designer.vb @@ -80,6 +80,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property actions_deletecircled() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("actions_deletecircled", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' diff --git a/MultiTool.Form/My Project/Resources.resx b/MultiTool.Form/My Project/Resources.resx index ce77e24..7ff7ac6 100644 --- a/MultiTool.Form/My Project/Resources.resx +++ b/MultiTool.Form/My Project/Resources.resx @@ -124,6 +124,9 @@ ..\Resources\redo.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\bo_unknown1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\wraptext.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -148,12 +151,12 @@ ..\Resources\open21.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\parameters.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\paymentrefund.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\open1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\bo_unknown.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -169,8 +172,8 @@ ..\Resources\singlepageview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\open1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\parameters.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\export.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -214,7 +217,7 @@ ..\Resources\itemtypechecked.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\bo_unknown1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_deletecircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a \ No newline at end of file diff --git a/MultiTool.Form/My Project/app.manifest b/MultiTool.Form/My Project/app.manifest new file mode 100644 index 0000000..e534ca8 --- /dev/null +++ b/MultiTool.Form/My Project/app.manifest @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/MultiTool.Form/Resources/actions_deletecircled.svg b/MultiTool.Form/Resources/actions_deletecircled.svg new file mode 100644 index 0000000..d8c9bb3 --- /dev/null +++ b/MultiTool.Form/Resources/actions_deletecircled.svg @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/MultiTool.Form/frmImportMain.Designer.vb b/MultiTool.Form/frmImportMain.Designer.vb index edbe514..a9a7077 100644 --- a/MultiTool.Form/frmImportMain.Designer.vb +++ b/MultiTool.Form/frmImportMain.Designer.vb @@ -51,10 +51,12 @@ Partial Class frmImportMain Me.txtCurrentFile = New DevExpress.XtraBars.BarStaticItem() Me.btnConfig = New DevExpress.XtraBars.BarButtonItem() Me.txtCulture = New DevExpress.XtraBars.BarStaticItem() + Me.btnRemoveRow = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroup7 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup5 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() @@ -73,6 +75,14 @@ Partial Class frmImportMain Me.SplitContainerGrids2 = New DevExpress.XtraEditors.SplitContainerControl() Me.BehaviorManager = New DevExpress.Utils.Behaviors.BehaviorManager(Me.components) Me.SplashScreenManager = New DevExpress.XtraSplashScreen.SplashScreenManager(Me, GetType(Global.MultiTool.Form.frmWaitForm), True, True) + Me.GridControl1 = New DevExpress.XtraGrid.GridControl() + Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.GridControl2 = New DevExpress.XtraGrid.GridControl() + Me.GridView2 = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.GridControl3 = New DevExpress.XtraGrid.GridControl() + Me.GridView3 = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.GridControl4 = New DevExpress.XtraGrid.GridControl() + Me.GridView4 = New DevExpress.XtraGrid.Views.Grid.GridView() CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerMain.SuspendLayout() CType(Me.GridControlFiles, System.ComponentModel.ISupportInitialize).BeginInit() @@ -92,34 +102,30 @@ Partial Class frmImportMain CType(Me.SplitContainerGrids2, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerGrids2.SuspendLayout() CType(Me.BehaviorManager, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridView2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridControl3, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridView3, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridControl4, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridView4, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'SplitContainerMain ' resources.ApplyResources(Me.SplitContainerMain, "SplitContainerMain") Me.SplitContainerMain.Name = "SplitContainerMain" - resources.ApplyResources(Me.SplitContainerMain.Panel1, "SplitContainerMain.Panel1") Me.SplitContainerMain.Panel1.Controls.Add(Me.GridControlFiles) Me.SplitContainerMain.Panel1.Controls.Add(Me.PanelControl1) - resources.ApplyResources(Me.SplitContainerMain.Panel2, "SplitContainerMain.Panel2") + resources.ApplyResources(Me.SplitContainerMain.Panel1, "SplitContainerMain.Panel1") Me.SplitContainerMain.Panel2.Controls.Add(Me.SplitContainerGrids) + resources.ApplyResources(Me.SplitContainerMain.Panel2, "SplitContainerMain.Panel2") Me.SplitContainerMain.SplitterPosition = 380 ' 'GridControlFiles ' resources.ApplyResources(Me.GridControlFiles, "GridControlFiles") - Me.GridControlFiles.EmbeddedNavigator.AccessibleDescription = resources.GetString("GridControlFiles.EmbeddedNavigator.AccessibleDescription") - Me.GridControlFiles.EmbeddedNavigator.AccessibleName = resources.GetString("GridControlFiles.EmbeddedNavigator.AccessibleName") - Me.GridControlFiles.EmbeddedNavigator.AllowHtmlTextInToolTip = CType(resources.GetObject("GridControlFiles.EmbeddedNavigator.AllowHtmlTextInToolTip"), DevExpress.Utils.DefaultBoolean) - Me.GridControlFiles.EmbeddedNavigator.Anchor = CType(resources.GetObject("GridControlFiles.EmbeddedNavigator.Anchor"), System.Windows.Forms.AnchorStyles) - Me.GridControlFiles.EmbeddedNavigator.BackgroundImage = CType(resources.GetObject("GridControlFiles.EmbeddedNavigator.BackgroundImage"), System.Drawing.Image) - Me.GridControlFiles.EmbeddedNavigator.BackgroundImageLayout = CType(resources.GetObject("GridControlFiles.EmbeddedNavigator.BackgroundImageLayout"), System.Windows.Forms.ImageLayout) - Me.GridControlFiles.EmbeddedNavigator.ImeMode = CType(resources.GetObject("GridControlFiles.EmbeddedNavigator.ImeMode"), System.Windows.Forms.ImeMode) - Me.GridControlFiles.EmbeddedNavigator.MaximumSize = CType(resources.GetObject("GridControlFiles.EmbeddedNavigator.MaximumSize"), System.Drawing.Size) - Me.GridControlFiles.EmbeddedNavigator.TextLocation = CType(resources.GetObject("GridControlFiles.EmbeddedNavigator.TextLocation"), DevExpress.XtraEditors.NavigatorButtonsTextLocation) - Me.GridControlFiles.EmbeddedNavigator.ToolTip = resources.GetString("GridControlFiles.EmbeddedNavigator.ToolTip") - Me.GridControlFiles.EmbeddedNavigator.ToolTipIconType = CType(resources.GetObject("GridControlFiles.EmbeddedNavigator.ToolTipIconType"), DevExpress.Utils.ToolTipIconType) - Me.GridControlFiles.EmbeddedNavigator.ToolTipTitle = resources.GetString("GridControlFiles.EmbeddedNavigator.ToolTipTitle") Me.GridControlFiles.MainView = Me.GridViewFiles Me.GridControlFiles.MenuManager = Me.RibbonControl Me.GridControlFiles.Name = "GridControlFiles" @@ -129,7 +135,6 @@ Partial Class frmImportMain 'GridViewFiles ' Me.GridViewFiles.Bands.AddRange(New DevExpress.XtraGrid.Views.BandedGrid.GridBand() {Me.gridBand3}) - resources.ApplyResources(Me.GridViewFiles, "GridViewFiles") Me.GridViewFiles.Columns.AddRange(New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn() {Me.colSelected, Me.colFilename, Me.colMandator, Me.colCreatedAt}) Me.GridViewFiles.GridControl = Me.GridControlFiles Me.GridViewFiles.Name = "GridViewFiles" @@ -192,14 +197,10 @@ Partial Class frmImportMain ' 'RibbonControl ' - resources.ApplyResources(Me.RibbonControl, "RibbonControl") Me.RibbonControl.ExpandCollapseItem.Id = 0 - Me.RibbonControl.ExpandCollapseItem.ImageOptions.ImageIndex = CType(resources.GetObject("RibbonControl.ExpandCollapseItem.ImageOptions.ImageIndex"), Integer) - Me.RibbonControl.ExpandCollapseItem.ImageOptions.LargeImageIndex = CType(resources.GetObject("RibbonControl.ExpandCollapseItem.ImageOptions.LargeImageIndex"), Integer) - Me.RibbonControl.ExpandCollapseItem.ImageOptions.SvgImage = CType(resources.GetObject("RibbonControl.ExpandCollapseItem.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.RibbonControl.ExpandCollapseItem.SearchTags = resources.GetString("RibbonControl.ExpandCollapseItem.SearchTags") - Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.txtVersion, Me.txtFilesLoaded, Me.btnLoadFiles, Me.btnTransferFile, Me.btnOpenInputDirectory, Me.btnOpenOutputDirectory, Me.btnOpenSchemaDirectory, Me.btnReloadFile, Me.btnTransferAllFiles, Me.BarButtonItem1, Me.btnShowXml, Me.btnOpenLogDirectory, Me.btnOpenConfigDirectory, Me.txtCurrentFile, Me.btnConfig, Me.txtCulture}) - Me.RibbonControl.MaxItemId = 27 + Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.txtVersion, Me.txtFilesLoaded, Me.btnLoadFiles, Me.btnTransferFile, Me.btnOpenInputDirectory, Me.btnOpenOutputDirectory, Me.btnOpenSchemaDirectory, Me.btnReloadFile, Me.btnTransferAllFiles, Me.BarButtonItem1, Me.btnShowXml, Me.btnOpenLogDirectory, Me.btnOpenConfigDirectory, Me.txtCurrentFile, Me.btnConfig, Me.txtCulture, Me.btnRemoveRow}) + resources.ApplyResources(Me.RibbonControl, "RibbonControl") + Me.RibbonControl.MaxItemId = 28 Me.RibbonControl.Name = "RibbonControl" Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage2}) Me.RibbonControl.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemComboBox1, Me.RepositoryItemProgressBar1}) @@ -210,12 +211,9 @@ Partial Class frmImportMain ' 'txtVersion ' - resources.ApplyResources(Me.txtVersion, "txtVersion") Me.txtVersion.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right + resources.ApplyResources(Me.txtVersion, "txtVersion") Me.txtVersion.Id = 1 - Me.txtVersion.ImageOptions.ImageIndex = CType(resources.GetObject("txtVersion.ImageOptions.ImageIndex"), Integer) - Me.txtVersion.ImageOptions.LargeImageIndex = CType(resources.GetObject("txtVersion.ImageOptions.LargeImageIndex"), Integer) - Me.txtVersion.ImageOptions.SvgImage = CType(resources.GetObject("txtVersion.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.txtVersion.Name = "txtVersion" Me.txtVersion.Tag = "Version {0}" ' @@ -223,9 +221,6 @@ Partial Class frmImportMain ' resources.ApplyResources(Me.txtFilesLoaded, "txtFilesLoaded") Me.txtFilesLoaded.Id = 2 - Me.txtFilesLoaded.ImageOptions.ImageIndex = CType(resources.GetObject("txtFilesLoaded.ImageOptions.ImageIndex"), Integer) - Me.txtFilesLoaded.ImageOptions.LargeImageIndex = CType(resources.GetObject("txtFilesLoaded.ImageOptions.LargeImageIndex"), Integer) - Me.txtFilesLoaded.ImageOptions.SvgImage = CType(resources.GetObject("txtFilesLoaded.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.txtFilesLoaded.Name = "txtFilesLoaded" Me.txtFilesLoaded.Tag = "{0} Dateien geladen" ' @@ -233,8 +228,6 @@ Partial Class frmImportMain ' resources.ApplyResources(Me.btnLoadFiles, "btnLoadFiles") Me.btnLoadFiles.Id = 3 - Me.btnLoadFiles.ImageOptions.ImageIndex = CType(resources.GetObject("btnLoadFiles.ImageOptions.ImageIndex"), Integer) - Me.btnLoadFiles.ImageOptions.LargeImageIndex = CType(resources.GetObject("btnLoadFiles.ImageOptions.LargeImageIndex"), Integer) Me.btnLoadFiles.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.export Me.btnLoadFiles.Name = "btnLoadFiles" ' @@ -242,8 +235,6 @@ Partial Class frmImportMain ' resources.ApplyResources(Me.btnTransferFile, "btnTransferFile") Me.btnTransferFile.Id = 4 - Me.btnTransferFile.ImageOptions.ImageIndex = CType(resources.GetObject("btnTransferFile.ImageOptions.ImageIndex"), Integer) - Me.btnTransferFile.ImageOptions.LargeImageIndex = CType(resources.GetObject("btnTransferFile.ImageOptions.LargeImageIndex"), Integer) Me.btnTransferFile.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.actions_send1 Me.btnTransferFile.Name = "btnTransferFile" ' @@ -251,8 +242,6 @@ Partial Class frmImportMain ' resources.ApplyResources(Me.btnOpenInputDirectory, "btnOpenInputDirectory") Me.btnOpenInputDirectory.Id = 6 - Me.btnOpenInputDirectory.ImageOptions.ImageIndex = CType(resources.GetObject("btnOpenInputDirectory.ImageOptions.ImageIndex"), Integer) - Me.btnOpenInputDirectory.ImageOptions.LargeImageIndex = CType(resources.GetObject("btnOpenInputDirectory.ImageOptions.LargeImageIndex"), Integer) Me.btnOpenInputDirectory.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.open22 Me.btnOpenInputDirectory.Name = "btnOpenInputDirectory" ' @@ -260,8 +249,6 @@ Partial Class frmImportMain ' resources.ApplyResources(Me.btnOpenOutputDirectory, "btnOpenOutputDirectory") Me.btnOpenOutputDirectory.Id = 7 - Me.btnOpenOutputDirectory.ImageOptions.ImageIndex = CType(resources.GetObject("btnOpenOutputDirectory.ImageOptions.ImageIndex"), Integer) - Me.btnOpenOutputDirectory.ImageOptions.LargeImageIndex = CType(resources.GetObject("btnOpenOutputDirectory.ImageOptions.LargeImageIndex"), Integer) Me.btnOpenOutputDirectory.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.up Me.btnOpenOutputDirectory.Name = "btnOpenOutputDirectory" ' @@ -269,8 +256,6 @@ Partial Class frmImportMain ' resources.ApplyResources(Me.btnOpenSchemaDirectory, "btnOpenSchemaDirectory") Me.btnOpenSchemaDirectory.Id = 9 - Me.btnOpenSchemaDirectory.ImageOptions.ImageIndex = CType(resources.GetObject("btnOpenSchemaDirectory.ImageOptions.ImageIndex"), Integer) - Me.btnOpenSchemaDirectory.ImageOptions.LargeImageIndex = CType(resources.GetObject("btnOpenSchemaDirectory.ImageOptions.LargeImageIndex"), Integer) Me.btnOpenSchemaDirectory.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.open1 Me.btnOpenSchemaDirectory.Name = "btnOpenSchemaDirectory" ' @@ -279,8 +264,6 @@ Partial Class frmImportMain resources.ApplyResources(Me.btnReloadFile, "btnReloadFile") Me.btnReloadFile.Enabled = False Me.btnReloadFile.Id = 11 - Me.btnReloadFile.ImageOptions.ImageIndex = CType(resources.GetObject("btnReloadFile.ImageOptions.ImageIndex"), Integer) - Me.btnReloadFile.ImageOptions.LargeImageIndex = CType(resources.GetObject("btnReloadFile.ImageOptions.LargeImageIndex"), Integer) Me.btnReloadFile.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.rotatecounterclockwise Me.btnReloadFile.Name = "btnReloadFile" ' @@ -289,8 +272,6 @@ Partial Class frmImportMain resources.ApplyResources(Me.btnTransferAllFiles, "btnTransferAllFiles") Me.btnTransferAllFiles.Enabled = False Me.btnTransferAllFiles.Id = 13 - Me.btnTransferAllFiles.ImageOptions.ImageIndex = CType(resources.GetObject("btnTransferAllFiles.ImageOptions.ImageIndex"), Integer) - Me.btnTransferAllFiles.ImageOptions.LargeImageIndex = CType(resources.GetObject("btnTransferAllFiles.ImageOptions.LargeImageIndex"), Integer) Me.btnTransferAllFiles.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.actions_send Me.btnTransferAllFiles.Name = "btnTransferAllFiles" ' @@ -299,8 +280,6 @@ Partial Class frmImportMain resources.ApplyResources(Me.BarButtonItem1, "BarButtonItem1") Me.BarButtonItem1.Enabled = False Me.BarButtonItem1.Id = 14 - Me.BarButtonItem1.ImageOptions.ImageIndex = CType(resources.GetObject("BarButtonItem1.ImageOptions.ImageIndex"), Integer) - Me.BarButtonItem1.ImageOptions.LargeImageIndex = CType(resources.GetObject("BarButtonItem1.ImageOptions.LargeImageIndex"), Integer) Me.BarButtonItem1.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.mailmergepreview Me.BarButtonItem1.Name = "BarButtonItem1" ' @@ -309,8 +288,6 @@ Partial Class frmImportMain resources.ApplyResources(Me.btnShowXml, "btnShowXml") Me.btnShowXml.Enabled = False Me.btnShowXml.Id = 15 - Me.btnShowXml.ImageOptions.ImageIndex = CType(resources.GetObject("btnShowXml.ImageOptions.ImageIndex"), Integer) - Me.btnShowXml.ImageOptions.LargeImageIndex = CType(resources.GetObject("btnShowXml.ImageOptions.LargeImageIndex"), Integer) Me.btnShowXml.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.togglefieldcodes Me.btnShowXml.Name = "btnShowXml" ' @@ -318,8 +295,6 @@ Partial Class frmImportMain ' resources.ApplyResources(Me.btnOpenLogDirectory, "btnOpenLogDirectory") Me.btnOpenLogDirectory.Id = 16 - Me.btnOpenLogDirectory.ImageOptions.ImageIndex = CType(resources.GetObject("btnOpenLogDirectory.ImageOptions.ImageIndex"), Integer) - Me.btnOpenLogDirectory.ImageOptions.LargeImageIndex = CType(resources.GetObject("btnOpenLogDirectory.ImageOptions.LargeImageIndex"), Integer) Me.btnOpenLogDirectory.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.logical Me.btnOpenLogDirectory.Name = "btnOpenLogDirectory" ' @@ -327,8 +302,6 @@ Partial Class frmImportMain ' resources.ApplyResources(Me.btnOpenConfigDirectory, "btnOpenConfigDirectory") Me.btnOpenConfigDirectory.Id = 17 - Me.btnOpenConfigDirectory.ImageOptions.ImageIndex = CType(resources.GetObject("btnOpenConfigDirectory.ImageOptions.ImageIndex"), Integer) - Me.btnOpenConfigDirectory.ImageOptions.LargeImageIndex = CType(resources.GetObject("btnOpenConfigDirectory.ImageOptions.LargeImageIndex"), Integer) Me.btnOpenConfigDirectory.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.parameters Me.btnOpenConfigDirectory.Name = "btnOpenConfigDirectory" ' @@ -336,9 +309,6 @@ Partial Class frmImportMain ' resources.ApplyResources(Me.txtCurrentFile, "txtCurrentFile") Me.txtCurrentFile.Id = 23 - Me.txtCurrentFile.ImageOptions.ImageIndex = CType(resources.GetObject("txtCurrentFile.ImageOptions.ImageIndex"), Integer) - Me.txtCurrentFile.ImageOptions.LargeImageIndex = CType(resources.GetObject("txtCurrentFile.ImageOptions.LargeImageIndex"), Integer) - Me.txtCurrentFile.ImageOptions.SvgImage = CType(resources.GetObject("txtCurrentFile.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.txtCurrentFile.Name = "txtCurrentFile" Me.txtCurrentFile.Tag = "Aktuelle Datei: {0}" ' @@ -346,25 +316,27 @@ Partial Class frmImportMain ' resources.ApplyResources(Me.btnConfig, "btnConfig") Me.btnConfig.Id = 24 - Me.btnConfig.ImageOptions.ImageIndex = CType(resources.GetObject("btnConfig.ImageOptions.ImageIndex"), Integer) - Me.btnConfig.ImageOptions.LargeImageIndex = CType(resources.GetObject("btnConfig.ImageOptions.LargeImageIndex"), Integer) Me.btnConfig.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.bo_unknown Me.btnConfig.Name = "btnConfig" ' 'txtCulture ' - resources.ApplyResources(Me.txtCulture, "txtCulture") Me.txtCulture.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right + resources.ApplyResources(Me.txtCulture, "txtCulture") Me.txtCulture.Id = 26 - Me.txtCulture.ImageOptions.ImageIndex = CType(resources.GetObject("txtCulture.ImageOptions.ImageIndex"), Integer) - Me.txtCulture.ImageOptions.LargeImageIndex = CType(resources.GetObject("txtCulture.ImageOptions.LargeImageIndex"), Integer) - Me.txtCulture.ImageOptions.SvgImage = CType(resources.GetObject("txtCulture.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.txtCulture.Name = "txtCulture" Me.txtCulture.Tag = "Culture: {0}" ' + 'btnRemoveRow + ' + resources.ApplyResources(Me.btnRemoveRow, "btnRemoveRow") + Me.btnRemoveRow.Id = 27 + Me.btnRemoveRow.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.actions_deletecircled + Me.btnRemoveRow.Name = "btnRemoveRow" + ' 'RibbonPage1 ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup4, Me.RibbonPageGroup3}) + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup4, Me.RibbonPageGroup3, Me.RibbonPageGroup7}) Me.RibbonPage1.Name = "RibbonPage1" resources.ApplyResources(Me.RibbonPage1, "RibbonPage1") ' @@ -390,6 +362,12 @@ Partial Class frmImportMain Me.RibbonPageGroup3.Name = "RibbonPageGroup3" resources.ApplyResources(Me.RibbonPageGroup3, "RibbonPageGroup3") ' + 'RibbonPageGroup7 + ' + Me.RibbonPageGroup7.ItemLinks.Add(Me.btnRemoveRow) + Me.RibbonPageGroup7.Name = "RibbonPageGroup7" + resources.ApplyResources(Me.RibbonPageGroup7, "RibbonPageGroup7") + ' 'RibbonPage2 ' Me.RibbonPage2.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup5, Me.RibbonPageGroup2, Me.RibbonPageGroup6}) @@ -426,17 +404,16 @@ Partial Class frmImportMain ' 'RepositoryItemProgressBar1 ' - resources.ApplyResources(Me.RepositoryItemProgressBar1, "RepositoryItemProgressBar1") Me.RepositoryItemProgressBar1.Name = "RepositoryItemProgressBar1" Me.RepositoryItemProgressBar1.ShowTitle = True ' 'RibbonStatusBar ' - resources.ApplyResources(Me.RibbonStatusBar, "RibbonStatusBar") Me.RibbonStatusBar.ItemLinks.Add(Me.txtCulture) Me.RibbonStatusBar.ItemLinks.Add(Me.txtVersion) Me.RibbonStatusBar.ItemLinks.Add(Me.txtFilesLoaded) Me.RibbonStatusBar.ItemLinks.Add(Me.txtCurrentFile) + resources.ApplyResources(Me.RibbonStatusBar, "RibbonStatusBar") Me.RibbonStatusBar.Name = "RibbonStatusBar" Me.RibbonStatusBar.Ribbon = Me.RibbonControl ' @@ -449,9 +426,9 @@ Partial Class frmImportMain ' 'LabelControl1 ' - resources.ApplyResources(Me.LabelControl1, "LabelControl1") Me.LabelControl1.Appearance.Font = CType(resources.GetObject("LabelControl1.Appearance.Font"), System.Drawing.Font) Me.LabelControl1.Appearance.Options.UseFont = True + resources.ApplyResources(Me.LabelControl1, "LabelControl1") Me.LabelControl1.Name = "LabelControl1" ' 'lookupMandator @@ -464,7 +441,6 @@ Partial Class frmImportMain ' 'GridLookUpEdit1View ' - resources.ApplyResources(Me.GridLookUpEdit1View, "GridLookUpEdit1View") Me.GridLookUpEdit1View.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colId, Me.colName}) Me.GridLookUpEdit1View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus Me.GridLookUpEdit1View.Name = "GridLookUpEdit1View" @@ -488,10 +464,10 @@ Partial Class frmImportMain resources.ApplyResources(Me.SplitContainerGrids, "SplitContainerGrids") Me.SplitContainerGrids.Horizontal = False Me.SplitContainerGrids.Name = "SplitContainerGrids" - resources.ApplyResources(Me.SplitContainerGrids.Panel1, "SplitContainerGrids.Panel1") Me.SplitContainerGrids.Panel1.Controls.Add(Me.SplitContainerGrids1) - resources.ApplyResources(Me.SplitContainerGrids.Panel2, "SplitContainerGrids.Panel2") + resources.ApplyResources(Me.SplitContainerGrids.Panel1, "SplitContainerGrids.Panel1") Me.SplitContainerGrids.Panel2.Controls.Add(Me.SplitContainerGrids2) + resources.ApplyResources(Me.SplitContainerGrids.Panel2, "SplitContainerGrids.Panel2") Me.SplitContainerGrids.SplitterPosition = 288 ' 'SplitContainerGrids1 @@ -499,16 +475,20 @@ Partial Class frmImportMain resources.ApplyResources(Me.SplitContainerGrids1, "SplitContainerGrids1") Me.SplitContainerGrids1.Horizontal = False Me.SplitContainerGrids1.Name = "SplitContainerGrids1" + Me.SplitContainerGrids1.Panel1.Controls.Add(Me.GridControl1) resources.ApplyResources(Me.SplitContainerGrids1.Panel1, "SplitContainerGrids1.Panel1") + Me.SplitContainerGrids1.Panel2.Controls.Add(Me.GridControl2) resources.ApplyResources(Me.SplitContainerGrids1.Panel2, "SplitContainerGrids1.Panel2") - Me.SplitContainerGrids1.SplitterPosition = 118 + Me.SplitContainerGrids1.SplitterPosition = 129 ' 'SplitContainerGrids2 ' resources.ApplyResources(Me.SplitContainerGrids2, "SplitContainerGrids2") Me.SplitContainerGrids2.Horizontal = False Me.SplitContainerGrids2.Name = "SplitContainerGrids2" + Me.SplitContainerGrids2.Panel1.Controls.Add(Me.GridControl3) resources.ApplyResources(Me.SplitContainerGrids2.Panel1, "SplitContainerGrids2.Panel1") + Me.SplitContainerGrids2.Panel2.Controls.Add(Me.GridControl4) resources.ApplyResources(Me.SplitContainerGrids2.Panel2, "SplitContainerGrids2.Panel2") Me.SplitContainerGrids2.SplitterPosition = 126 ' @@ -516,6 +496,55 @@ Partial Class frmImportMain ' Me.SplashScreenManager.ClosingDelay = 500 ' + 'GridControl1 + ' + resources.ApplyResources(Me.GridControl1, "GridControl1") + Me.GridControl1.MainView = Me.GridView1 + Me.GridControl1.MenuManager = Me.RibbonControl + Me.GridControl1.Name = "GridControl1" + Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) + ' + 'GridView1 + ' + Me.GridView1.GridControl = Me.GridControl1 + Me.GridView1.Name = "GridView1" + ' + 'GridControl2 + ' + resources.ApplyResources(Me.GridControl2, "GridControl2") + Me.GridControl2.MainView = Me.GridView2 + Me.GridControl2.Name = "GridControl2" + Me.GridControl2.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView2}) + ' + 'GridView2 + ' + Me.GridView2.GridControl = Me.GridControl2 + Me.GridView2.Name = "GridView2" + ' + 'GridControl3 + ' + resources.ApplyResources(Me.GridControl3, "GridControl3") + Me.GridControl3.MainView = Me.GridView3 + Me.GridControl3.Name = "GridControl3" + Me.GridControl3.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView3}) + ' + 'GridView3 + ' + Me.GridView3.GridControl = Me.GridControl3 + Me.GridView3.Name = "GridView3" + ' + 'GridControl4 + ' + resources.ApplyResources(Me.GridControl4, "GridControl4") + Me.GridControl4.MainView = Me.GridView4 + Me.GridControl4.Name = "GridControl4" + Me.GridControl4.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView4}) + ' + 'GridView4 + ' + Me.GridView4.GridControl = Me.GridControl4 + Me.GridView4.Name = "GridView4" + ' 'frmImportMain ' resources.ApplyResources(Me, "$this") @@ -548,6 +577,14 @@ Partial Class frmImportMain CType(Me.SplitContainerGrids2, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainerGrids2.ResumeLayout(False) CType(Me.BehaviorManager, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridView2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridControl3, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridView3, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridControl4, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridView4, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -601,4 +638,14 @@ Partial Class frmImportMain Friend WithEvents RepositoryItemProgressBar1 As Repository.RepositoryItemProgressBar Friend WithEvents SplashScreenManager As DevExpress.XtraSplashScreen.SplashScreenManager Friend WithEvents txtCulture As DevExpress.XtraBars.BarStaticItem + Friend WithEvents btnRemoveRow As DevExpress.XtraBars.BarButtonItem + Friend WithEvents RibbonPageGroup7 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents GridControl1 As DevExpress.XtraGrid.GridControl + Friend WithEvents GridView1 As GridView + Friend WithEvents GridControl2 As DevExpress.XtraGrid.GridControl + Friend WithEvents GridView2 As GridView + Friend WithEvents GridControl3 As DevExpress.XtraGrid.GridControl + Friend WithEvents GridView3 As GridView + Friend WithEvents GridControl4 As DevExpress.XtraGrid.GridControl + Friend WithEvents GridView4 As GridView End Class diff --git a/MultiTool.Form/frmImportMain.resx b/MultiTool.Form/frmImportMain.resx index a5caf11..951018e 100644 --- a/MultiTool.Form/frmImportMain.resx +++ b/MultiTool.Form/frmImportMain.resx @@ -118,103 +118,24 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Inherit - - - - 0, 0 - - - SplitContainerGrids.Panel1 - - - BarButtonItem1 - - - - - - $this - - - DevExpress.XtraEditors.PanelControl, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - + Fill - - Vorlagenverzeichnis öffnen + + + 0, 158 - - Panel1 + + Fill - - colName + + 0, 33 - - DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + gridBand3 - - DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - 0 - - - RibbonPageGroup5 - - - btnOpenConfigDirectory - - - 0 - - - RibbonPageGroup1 - - - Auswertung - - - SplitContainerGrids2 - - - - 0 - - - DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - btnTransferFile - - - -1 - - - RibbonPageGroup3 - - - btnOpenLogDirectory - - - DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - -1 - - - 825, 266 - - - XML-Datei anzeigen - - - DevExpress.XtraBars.Ribbon.RibbonStatusBar, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - -1 + + Ausgewählt @@ -235,405 +156,161 @@ ZWVuIiAvPg0KICA8L2c+DQo8L3N2Zz4L - - -1 - - - -1 - - - -1 + + + True 27 - - -1 + + Dateiname - - 280, 20 + + True - - DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + 296 - - -1 + + Eingegangen - - 323 + + True - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + 125 - - GridLookUpEdit1View + + Mandant - - 2 - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - DevExpress.XtraEditors.Repository.RepositoryItemProgressBar, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - 0 - - - - - - WebService Multitool für WinLine - - - RibbonPage2 - - - btnReloadFile - - - colFilename - - - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - -1 - - - RibbonStatusBar - - - colSelected - - - 825, 288 - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + False - + Combo SIVT - - LabelControl1 + + 144 - - btnOpenSchemaDirectory + + + Right - - DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - Tahoma, 8.25pt, style=Bold - - - GridControlFiles - - - Mandant - - - 6, 13 - - - Belegvorschau für aktuelle Datei anzeigen - - - Panel2 - - - DevExpress.XtraSplashScreen.SplashScreenManager, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - Combo - - - GridViewFiles - - - DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - -1 - - - Top - - - -1 - - - 2 - - - 0 - - - -1 - - - Eingegangen - - - 0, 722 - - - RepositoryItemComboBox1 - - - colCreatedAt - - - SplitContainerMain.Panel2 - - + gridBand3 - - $this + + 323 - - Einlesen + + Version 1.0.0.0 - - Konfiguration - - - -1 - - - Id - - - txtVersion - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - -1 - - - True - - - -1 - - - -1 - - - Ausgangsverzeichnis öffnen - - - 0 - - - colMandator - - - -1 - - - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - 5, 9 - - - btnShowXml - - - -1 - - - 1215, 24 - - - -1 - - - SplitContainerMain - - - 0 - - - lookupMandator - - - DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - 825, 564 - - - gridBand3 - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - Top, Left - - - Übermittlung - - - Aktuelle Datei neu laden - - - Start - - - btnOpenOutputDirectory - - - - - - SplitContainerMain.Panel1 - - - -1 - - - - - - Fill - - - True - - - 1215, 564 - - - 1 - - - DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - -1 - - - Ausgewählt - - - -1 - - - -1 - - - Tile - - - DevExpress.Utils.Behaviors.BehaviorManager, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - 1215, 158 - - - Panel1 - - - DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - 1 - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - Aktuelle Datei übermitteln - - - Konfiguration - - - DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - + + 0 Dateien geladen Dateien einlesen - - txtFilesLoaded + + Aktuelle Datei übermitteln - - colId + + Eingangsverzeichnis öffnen - - 50, 13 + + Ausgangsverzeichnis öffnen - - + + Vorlagenverzeichnis öffnen - - btnOpenInputDirectory + + Aktuelle Datei neu laden + + + Ausgewählte Dateien übermitteln + + + Belegvorschau für aktuelle Datei anzeigen + + + XML-Datei anzeigen + + + Logverzeichnis öffnen + + + Konfigurationsverzeichnis öffnen + + + Aktuelle Datei: Keine + + + Konfiguration + + + Culture xx-xx + + + Zeile löschen + + + 0, 0 + + + Einlesen + + + Auswertung + + + Übermittlung + + + Bearbeitung + + + Start + + + Verzeichnisse + + + Debugging + + + Konfiguration + + + Erweitert + + + False Combo - - + + 1215, 158 - - SplitContainerGrids + + 0, 722 - - False + + 1215, 24 - - True + + RibbonStatusBar - - txtCulture + + DevExpress.XtraBars.Ribbon.RibbonStatusBar, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - Panel1 - - - 296 - - - DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - PanelControl1 - - - DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + $this 1 @@ -641,116 +318,350 @@ RibbonControl - - PanelControl1 + + DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - btnLoadFiles + + $this - - -1 - - - Aktuelle Datei: Keine - - - DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - False - - - Mandant - - - Fill - - - -1 - - + 2 - - True - - - DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - Eingangsverzeichnis öffnen - - - DevExpress.XtraEditors.GridLookUpEdit, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplashScreenManager - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - frmImportMain - - - Verzeichnisse - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - -1 - - - 0, 0 - - - 1 - - - SplitContainerGrids1 - 380, 531 - - Culture xx-xx - - - 0, 0 - - - DevExpress.XtraBars.Ribbon.RibbonForm, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - Ausgewählte Dateien übermitteln - - + 0 - - Konfigurationsverzeichnis öffnen + + GridControlFiles - - -1 + + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - Fill + + SplitContainerMain.Panel1 + + + 0 True - - + + Tahoma, 8.25pt, style=Bold - - Dateiname + + 5, 9 - - DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + 50, 13 + + + 2 + + + Mandant + + + LabelControl1 + + + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + PanelControl1 + + + 0 + + + 75, 6 + + + Combo + + + Id + + + True + + + 0 + + + Name + + + True + + + 1 + + + 280, 20 + + + 1 + + + lookupMandator + + + DevExpress.XtraEditors.GridLookUpEdit, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + PanelControl1 + + + 1 + + + Top + + + 0, 0 + + + 380, 33 + + + 2 + + + PanelControl1 + + + DevExpress.XtraEditors.PanelControl, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerMain.Panel1 + + + 1 + + + Panel1 + + + Fill + + + 0, 0 + + + Fill + + + 0, 0 + + + Fill + + + 0, 0 + + + 825, 129 + + + 0 + + + GridControl1 + + + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerGrids1.Panel1 + + + 0 + + + Panel1 + + + Fill + + + 0, 0 + + + 825, 149 + + + 0 + + + GridControl2 + + + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerGrids1.Panel2 + + + 0 + + + Panel2 + + + 825, 288 + + + 0 + + + SplitContainerGrids1 + + + DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerGrids.Panel1 + + + 0 + + + Panel1 + + + Fill + + + 0, 0 + + + Fill + + + 0, 0 + + + 825, 126 + + + 0 + + + GridControl3 + + + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerGrids2.Panel1 + + + 0 + + + Panel1 + + + Fill + + + 0, 0 + + + 825, 130 + + + 0 + + + GridControl4 + + + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerGrids2.Panel2 + + + 0 + + + Panel2 + + + 825, 266 + + + 0 + + + SplitContainerGrids2 + + + DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerGrids.Panel2 + + + 0 + + + Panel2 + + + 825, 564 + + + 0 + + + SplitContainerGrids + + + DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerMain.Panel2 + + + 0 + + + Panel2 + + + 1215, 564 + + + 2 + + + SplitContainerMain + + + DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + $this + + + 0 + + + 189, 17 + + + True + + + 6, 13 + + + 1215, 746 @@ -773,207 +684,277 @@ ZWxsb3ciIC8+DQogIDwvZz4NCjwvc3ZnPgs= - - 380, 33 + + WebService Multitool für WinLine - - 0 + + GridViewFiles - - - Right + + DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - Center - - - -1 - - - -1 - - - btnTransferAllFiles - - - 1 - - - RepositoryItemProgressBar1 - - - RibbonPage1 - - - 2 - - - Logverzeichnis öffnen - - - Name - - - Fill - - - 0, 0 - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - Erweitert - - + gridBand3 - - RibbonPageGroup6 - - - PanelControl1 - - - SplitContainerMain.Panel1 - - - Default - - - DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - BehaviorManager - - - 0, 33 - - - 125 - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - DevExpress.XtraGrid.Views.BandedGrid.GridBand, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - Panel2 + + colSelected - - 1215, 746 + + DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - + + colFilename - - + + DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - -1 + + colCreatedAt - - Panel2 + + DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - 0 Dateien geladen + + colMandator - - None + + DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - True + + cmbMandators - - SplitContainerGrids.Panel2 + + DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + txtVersion + + + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + txtFilesLoaded + + + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + btnLoadFiles + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + btnTransferFile + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + btnOpenInputDirectory + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + btnOpenOutputDirectory + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + btnOpenSchemaDirectory + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + btnReloadFile + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + btnTransferAllFiles + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + BarButtonItem1 + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + btnShowXml + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + btnOpenLogDirectory + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + btnOpenConfigDirectory + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + txtCurrentFile + + + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + btnConfig + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + txtCulture + + + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + btnRemoveRow + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RibbonPage1 + + + DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RibbonPageGroup1 + + + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RibbonPageGroup4 + + + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RibbonPageGroup3 DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + RibbonPageGroup7 + + + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RibbonPage2 + + + DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RibbonPageGroup5 + + + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + RibbonPageGroup2 - - -1 + + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - RibbonPageGroup4 + + RibbonPageGroup6 - - cmbMandators + + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - -1 - - - 0 - - - Debugging - - - txtCurrentFile - - - -1 - - - Panel1 - - - 75, 6 - - - - - - 0, 0 - - - DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - Panel2 - - - 0 - - - -1 - - - $this - - - btnConfig - - - 144 - - - 0, 158 + + RepositoryItemComboBox1 DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - Version 1.0.0.0 + + RepositoryItemProgressBar1 - - 0, 0 + + DevExpress.XtraEditors.Repository.RepositoryItemProgressBar, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + GridLookUpEdit1View + + + DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + colId + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + colName + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + BehaviorManager + + + DevExpress.Utils.Behaviors.BehaviorManager, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplashScreenManager + + + DevExpress.XtraSplashScreen.SplashScreenManager, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + GridView1 + + + DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + GridView2 + + + DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + GridView3 + + + DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + GridView4 + + + DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + frmImportMain + + + DevExpress.XtraBars.Ribbon.RibbonForm, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - True - - - 189, 17 - \ No newline at end of file diff --git a/MultiTool.Form/frmImportMain.vb b/MultiTool.Form/frmImportMain.vb index 27b1059..6b39474 100644 --- a/MultiTool.Form/frmImportMain.vb +++ b/MultiTool.Form/frmImportMain.vb @@ -31,10 +31,10 @@ Public Class frmImportMain Private GridLoader As GridLoader Private GridBuilder As GridBuilder - Private CurrentSchemaName As String - Private CurrentSchema As Schema - - Private CurrentDocument As Document + Private CurrentSchemaName As String = Nothing + Private CurrentSchema As Schema = Nothing + Private CurrentGrid As GridControl = Nothing + Private CurrentDocument As Document = Nothing Public Sub New() InitializeComponent() @@ -140,6 +140,10 @@ Public Class frmImportMain CurrentSchema = SchemaLoader.GetSchemaFromFile(CurrentSchemaName) Grids = CreateGridsAndColumns(CurrentSchema) + + For Each oGrid As GridControl In Grids + AddHandler oGrid.GotFocus, AddressOf Grid_Focus + Next Catch ex As Exception FormHelper.ShowError(ex, My.Resources.frmImportMainExtra.Laden_der_Winline_Daten) Finally @@ -148,6 +152,9 @@ Public Class frmImportMain End Try End Sub + Private Sub Grid_Focus(sender As GridControl, e As EventArgs) + CurrentGrid = sender + End Sub Private Function CreateGridsAndColumns(pSchema As Schemas.Schema) As List(Of GridControl) Dim oGrids As New List(Of GridControl) @@ -155,30 +162,26 @@ Public Class frmImportMain For Each oTable In pSchema.Tables If oTableCounter = 0 Then - Dim oGrid = GridLoader.GetGridFromElement(oTable) + Dim oGrid = GridLoader.GetGridFromElement(GridControl1, oTable) AddHandler oGrid.DoubleClick, AddressOf Grid_MouseDoubleClick - SplitContainerGrids1.Panel1.Controls.Add(oGrid) oGrids.Add(oGrid) End If If oTableCounter = 1 Then - Dim oGrid = GridLoader.GetGridFromElement(oTable) + Dim oGrid = GridLoader.GetGridFromElement(GridControl2, oTable) AddHandler oGrid.DoubleClick, AddressOf Grid_MouseDoubleClick - SplitContainerGrids1.Panel2.Controls.Add(oGrid) oGrids.Add(oGrid) End If If oTableCounter = 2 Then - Dim oGrid = GridLoader.GetGridFromElement(oTable) + Dim oGrid = GridLoader.GetGridFromElement(GridControl3, oTable) AddHandler oGrid.DoubleClick, AddressOf Grid_MouseDoubleClick - SplitContainerGrids2.Panel1.Controls.Add(oGrid) oGrids.Add(oGrid) End If If oTableCounter = 3 Then - Dim oGrid = GridLoader.GetGridFromElement(oTable) + Dim oGrid = GridLoader.GetGridFromElement(GridControl4, oTable) AddHandler oGrid.DoubleClick, AddressOf Grid_MouseDoubleClick - SplitContainerGrids2.Panel2.Controls.Add(oGrid) oGrids.Add(oGrid) End If @@ -296,6 +299,10 @@ Public Class frmImportMain Try Dim oDatasources As New Dictionary(Of String, DataTable) + For Each oGrid In Grids + oGrid.DataSource = Nothing + Next + ' List of Root Elements in XML For Each oRow In pDocument.Rows Dim oGrid As GridControl = Grids. @@ -314,6 +321,7 @@ Public Class frmImportMain oDatasources.Add(oRow.Name, oTable) + oGrid.DataSource = Nothing oGrid.DataSource = oTable End If @@ -440,5 +448,31 @@ Public Class frmImportMain oForm.ShowDialog() End Sub + Private Sub btnRemoveRow_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnRemoveRow.ItemClick + If CurrentGrid Is Nothing Then + Exit Sub + End If + Dim oMessage As String = "Wollen Sie die ausgewählte Zeile wirklich löschen?" + If MsgBox(oMessage, MsgBoxStyle.Question Or MsgBoxStyle.YesNo, Text) = MsgBoxResult.Yes Then + ' Get GUID of currently selected row + Dim oView As GridView = CurrentGrid.FocusedView + Dim oRow As DataRowView = oView.GetRow(oView.FocusedRowHandle) + Dim oGuid = oRow.Row.Item("GUID") + + ' Get currently selected document + Dim oDocument As Document = GridViewFiles.GetRow(GridViewFiles.FocusedRowHandle) + + Dim oNewRows = oDocument.Rows. + Where(Function(r) r.Id.ToString <> oGuid). + ToList() + oDocument.Rows = oNewRows + + Dim oIndex = DocumentLoader.Files.IndexOf(oDocument) + DocumentLoader.Files.Item(oIndex) = oDocument + + lookupMandator.EditValue = oDocument.Mandator + LoadDocument(oDocument) + End If + End Sub End Class \ No newline at end of file diff --git a/MultiTool.Shared/Documents/DocumentLoader.vb b/MultiTool.Shared/Documents/DocumentLoader.vb index ccc92d2..95cba41 100644 --- a/MultiTool.Shared/Documents/DocumentLoader.vb +++ b/MultiTool.Shared/Documents/DocumentLoader.vb @@ -10,8 +10,7 @@ Namespace Documents Private ReadOnly Winline As Winline.Data - Public Files As New List(Of Document) - + Public Property Files As New List(Of Document) Public Sub New(pLogConfig As LogConfig, pWinline As Winline.Data) MyBase.New(pLogConfig, pLogConfig.GetLogger())