diff --git a/EDIDocumentImport/ImporterForm.vbproj b/EDIDocumentImport/ImporterForm.vbproj index 2c563b2..89a1ab8 100644 --- a/EDIDocumentImport/ImporterForm.vbproj +++ b/EDIDocumentImport/ImporterForm.vbproj @@ -215,6 +215,12 @@ Form + + frmConfig.vb + + + Form + @@ -245,6 +251,9 @@ frmWaitForm.vb + + frmConfig.vb + @@ -262,6 +271,8 @@ + + diff --git a/EDIDocumentImport/My Project/Resources.Designer.vb b/EDIDocumentImport/My Project/Resources.Designer.vb index 32ffec8..ee4225d 100644 --- a/EDIDocumentImport/My Project/Resources.Designer.vb +++ b/EDIDocumentImport/My Project/Resources.Designer.vb @@ -100,6 +100,26 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property bo_unknown() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("bo_unknown", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property bo_unknown1() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("bo_unknown1", 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/EDIDocumentImport/My Project/Resources.resx b/EDIDocumentImport/My Project/Resources.resx index 967ef32..ce77e24 100644 --- a/EDIDocumentImport/My Project/Resources.resx +++ b/EDIDocumentImport/My Project/Resources.resx @@ -121,15 +121,15 @@ ..\Resources\logical.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\redo.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 ..\Resources\tableproperties.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\save.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\preview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -154,6 +154,9 @@ ..\Resources\paymentrefund.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 + ..\Resources\deletetablerows.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -190,6 +193,9 @@ ..\Resources\actions_send.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\save.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\open22.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -208,7 +214,7 @@ ..\Resources\itemtypechecked.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\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 \ No newline at end of file diff --git a/EDIDocumentImport/Resources/bo_unknown.svg b/EDIDocumentImport/Resources/bo_unknown.svg new file mode 100644 index 0000000..4306bf7 --- /dev/null +++ b/EDIDocumentImport/Resources/bo_unknown.svg @@ -0,0 +1,12 @@ + + + + + + + + + \ No newline at end of file diff --git a/EDIDocumentImport/Resources/bo_unknown1.svg b/EDIDocumentImport/Resources/bo_unknown1.svg new file mode 100644 index 0000000..4306bf7 --- /dev/null +++ b/EDIDocumentImport/Resources/bo_unknown1.svg @@ -0,0 +1,12 @@ + + + + + + + + + \ No newline at end of file diff --git a/EDIDocumentImport/frmConfig.Designer.vb b/EDIDocumentImport/frmConfig.Designer.vb new file mode 100644 index 0000000..0dfb22a --- /dev/null +++ b/EDIDocumentImport/frmConfig.Designer.vb @@ -0,0 +1,370 @@ +Imports DevExpress.XtraEditors +Imports DevExpress.XtraLayout +Imports DevExpress.XtraTab + + +Partial Class frmConfig + Inherits DevExpress.XtraBars.Ribbon.RibbonForm + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + MyBase.Dispose(disposing) + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmConfig)) + Me.ToolbarFormManager1 = New DevExpress.XtraBars.ToolbarForm.ToolbarFormManager(Me.components) + Me.barDockControlTop = New DevExpress.XtraBars.BarDockControl() + Me.barDockControlBottom = New DevExpress.XtraBars.BarDockControl() + Me.barDockControlLeft = New DevExpress.XtraBars.BarDockControl() + Me.barDockControlRight = New DevExpress.XtraBars.BarDockControl() + Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl() + Me.XtraTabPage1 = New DevExpress.XtraTab.XtraTabPage() + Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl() + Me.txtBaseURL = New DevExpress.XtraEditors.TextEdit() + Me.txtUsername = New DevExpress.XtraEditors.TextEdit() + Me.txtPassword = New DevExpress.XtraEditors.TextEdit() + Me.txtImportBasePath = New DevExpress.XtraEditors.TextEdit() + Me.txtImportRelativePath = New DevExpress.XtraEditors.TextEdit() + Me.Root = New DevExpress.XtraLayout.LayoutControlGroup() + Me.LayoutControlGroup1 = New DevExpress.XtraLayout.LayoutControlGroup() + Me.LayoutControlItem6 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem5 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem() + Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() + Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() + Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() + Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() + CType(Me.ToolbarFormManager1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.XtraTabControl1.SuspendLayout() + Me.XtraTabPage1.SuspendLayout() + CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.LayoutControl1.SuspendLayout() + CType(Me.txtBaseURL.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtUsername.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtPassword.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtImportBasePath.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtImportRelativePath.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'ToolbarFormManager1 + ' + Me.ToolbarFormManager1.DockControls.Add(Me.barDockControlTop) + Me.ToolbarFormManager1.DockControls.Add(Me.barDockControlBottom) + Me.ToolbarFormManager1.DockControls.Add(Me.barDockControlLeft) + Me.ToolbarFormManager1.DockControls.Add(Me.barDockControlRight) + Me.ToolbarFormManager1.Form = Me + ' + 'barDockControlTop + ' + Me.barDockControlTop.CausesValidation = False + Me.barDockControlTop.Dock = System.Windows.Forms.DockStyle.Top + Me.barDockControlTop.Location = New System.Drawing.Point(0, 0) + Me.barDockControlTop.Manager = Me.ToolbarFormManager1 + Me.barDockControlTop.Size = New System.Drawing.Size(832, 0) + ' + 'barDockControlBottom + ' + Me.barDockControlBottom.CausesValidation = False + Me.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom + Me.barDockControlBottom.Location = New System.Drawing.Point(0, 509) + Me.barDockControlBottom.Manager = Me.ToolbarFormManager1 + Me.barDockControlBottom.Size = New System.Drawing.Size(832, 0) + ' + 'barDockControlLeft + ' + Me.barDockControlLeft.CausesValidation = False + Me.barDockControlLeft.Dock = System.Windows.Forms.DockStyle.Left + Me.barDockControlLeft.Location = New System.Drawing.Point(0, 0) + Me.barDockControlLeft.Manager = Me.ToolbarFormManager1 + Me.barDockControlLeft.Size = New System.Drawing.Size(0, 509) + ' + 'barDockControlRight + ' + Me.barDockControlRight.CausesValidation = False + Me.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right + Me.barDockControlRight.Location = New System.Drawing.Point(832, 0) + Me.barDockControlRight.Manager = Me.ToolbarFormManager1 + Me.barDockControlRight.Size = New System.Drawing.Size(0, 509) + ' + 'XtraTabControl1 + ' + Me.XtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill + Me.XtraTabControl1.Location = New System.Drawing.Point(0, 63) + Me.XtraTabControl1.Name = "XtraTabControl1" + Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPage1 + Me.XtraTabControl1.Size = New System.Drawing.Size(832, 422) + Me.XtraTabControl1.TabIndex = 1 + Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage1}) + ' + 'XtraTabPage1 + ' + Me.XtraTabPage1.Controls.Add(Me.LayoutControl1) + Me.XtraTabPage1.Name = "XtraTabPage1" + Me.XtraTabPage1.Size = New System.Drawing.Size(830, 397) + Me.XtraTabPage1.Text = "Basis" + ' + 'LayoutControl1 + ' + Me.LayoutControl1.Controls.Add(Me.txtBaseURL) + Me.LayoutControl1.Controls.Add(Me.txtUsername) + Me.LayoutControl1.Controls.Add(Me.txtPassword) + Me.LayoutControl1.Controls.Add(Me.txtImportBasePath) + Me.LayoutControl1.Controls.Add(Me.txtImportRelativePath) + Me.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Fill + Me.LayoutControl1.Location = New System.Drawing.Point(0, 0) + Me.LayoutControl1.Name = "LayoutControl1" + Me.LayoutControl1.Root = Me.Root + Me.LayoutControl1.Size = New System.Drawing.Size(830, 397) + Me.LayoutControl1.TabIndex = 0 + Me.LayoutControl1.Text = "LayoutControl1" + ' + 'txtBaseURL + ' + Me.txtBaseURL.Location = New System.Drawing.Point(133, 48) + Me.txtBaseURL.MenuManager = Me.ToolbarFormManager1 + Me.txtBaseURL.Name = "txtBaseURL" + Me.txtBaseURL.Size = New System.Drawing.Size(670, 20) + Me.txtBaseURL.StyleController = Me.LayoutControl1 + Me.txtBaseURL.TabIndex = 4 + ' + 'txtUsername + ' + Me.txtUsername.Location = New System.Drawing.Point(133, 78) + Me.txtUsername.MenuManager = Me.ToolbarFormManager1 + Me.txtUsername.Name = "txtUsername" + Me.txtUsername.Size = New System.Drawing.Size(277, 20) + Me.txtUsername.StyleController = Me.LayoutControl1 + Me.txtUsername.TabIndex = 5 + ' + 'txtPassword + ' + Me.txtPassword.Location = New System.Drawing.Point(526, 78) + Me.txtPassword.MenuManager = Me.ToolbarFormManager1 + Me.txtPassword.Name = "txtPassword" + Me.txtPassword.Size = New System.Drawing.Size(277, 20) + Me.txtPassword.StyleController = Me.LayoutControl1 + Me.txtPassword.TabIndex = 6 + ' + 'txtImportBasePath + ' + Me.txtImportBasePath.Location = New System.Drawing.Point(133, 108) + Me.txtImportBasePath.MenuManager = Me.ToolbarFormManager1 + Me.txtImportBasePath.Name = "txtImportBasePath" + Me.txtImportBasePath.Size = New System.Drawing.Size(670, 20) + Me.txtImportBasePath.StyleController = Me.LayoutControl1 + Me.txtImportBasePath.TabIndex = 7 + ' + 'txtImportRelativePath + ' + Me.txtImportRelativePath.Location = New System.Drawing.Point(133, 138) + Me.txtImportRelativePath.MenuManager = Me.ToolbarFormManager1 + Me.txtImportRelativePath.Name = "txtImportRelativePath" + Me.txtImportRelativePath.Size = New System.Drawing.Size(670, 20) + Me.txtImportRelativePath.StyleController = Me.LayoutControl1 + Me.txtImportRelativePath.TabIndex = 8 + ' + 'Root + ' + Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] + Me.Root.GroupBordersVisible = False + Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlGroup1}) + Me.Root.Name = "Root" + Me.Root.Size = New System.Drawing.Size(830, 397) + Me.Root.TextVisible = False + ' + 'LayoutControlGroup1 + ' + Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem6, Me.LayoutControlItem5, Me.LayoutControlItem2, Me.LayoutControlItem1, Me.LayoutControlItem3}) + Me.LayoutControlGroup1.Location = New System.Drawing.Point(0, 0) + Me.LayoutControlGroup1.Name = "LayoutControlGroup1" + Me.LayoutControlGroup1.Size = New System.Drawing.Size(810, 377) + Me.LayoutControlGroup1.Text = "WebService" + ' + 'LayoutControlItem6 + ' + Me.LayoutControlItem6.Control = Me.txtImportRelativePath + Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 90) + Me.LayoutControlItem6.Name = "LayoutControlItem6" + Me.LayoutControlItem6.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem6.Size = New System.Drawing.Size(786, 242) + Me.LayoutControlItem6.Text = "Import Relativer Pfad" + Me.LayoutControlItem6.TextSize = New System.Drawing.Size(103, 13) + ' + 'LayoutControlItem5 + ' + Me.LayoutControlItem5.Control = Me.txtImportBasePath + Me.LayoutControlItem5.Location = New System.Drawing.Point(0, 60) + Me.LayoutControlItem5.Name = "LayoutControlItem5" + Me.LayoutControlItem5.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem5.Size = New System.Drawing.Size(786, 30) + Me.LayoutControlItem5.Text = "Import Basis Pfad" + Me.LayoutControlItem5.TextSize = New System.Drawing.Size(103, 13) + ' + 'LayoutControlItem2 + ' + Me.LayoutControlItem2.Control = Me.txtUsername + Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 30) + Me.LayoutControlItem2.Name = "LayoutControlItem2" + Me.LayoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem2.Size = New System.Drawing.Size(393, 30) + Me.LayoutControlItem2.Text = "Username" + Me.LayoutControlItem2.TextSize = New System.Drawing.Size(103, 13) + ' + 'LayoutControlItem1 + ' + Me.LayoutControlItem1.Control = Me.txtBaseURL + Me.LayoutControlItem1.Location = New System.Drawing.Point(0, 0) + Me.LayoutControlItem1.Name = "LayoutControlItem1" + Me.LayoutControlItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem1.Size = New System.Drawing.Size(786, 30) + Me.LayoutControlItem1.Text = "BaseURL" + Me.LayoutControlItem1.TextSize = New System.Drawing.Size(103, 13) + ' + 'LayoutControlItem3 + ' + Me.LayoutControlItem3.Control = Me.txtPassword + Me.LayoutControlItem3.Location = New System.Drawing.Point(393, 30) + Me.LayoutControlItem3.Name = "LayoutControlItem3" + Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem3.Size = New System.Drawing.Size(393, 30) + Me.LayoutControlItem3.Text = "Password" + Me.LayoutControlItem3.TextSize = New System.Drawing.Size(103, 13) + ' + 'RibbonControl1 + ' + 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.RibbonControl1.Location = New System.Drawing.Point(0, 0) + Me.RibbonControl1.MaxItemId = 2 + Me.RibbonControl1.Name = "RibbonControl1" + Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) + Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] + Me.RibbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide + Me.RibbonControl1.Size = New System.Drawing.Size(832, 63) + Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 + ' + 'BarButtonItem1 + ' + Me.BarButtonItem1.Caption = "Speichern" + Me.BarButtonItem1.Id = 1 + Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem1.Name = "BarButtonItem1" + ' + 'RibbonPage1 + ' + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1}) + Me.RibbonPage1.Name = "RibbonPage1" + Me.RibbonPage1.Text = "Start" + ' + 'RibbonPageGroup1 + ' + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1) + Me.RibbonPageGroup1.Name = "RibbonPageGroup1" + Me.RibbonPageGroup1.Text = "RibbonPageGroup1" + ' + 'RibbonStatusBar1 + ' + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 485) + Me.RibbonStatusBar1.Name = "RibbonStatusBar1" + Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 + Me.RibbonStatusBar1.Size = New System.Drawing.Size(832, 24) + ' + 'RibbonPage2 + ' + Me.RibbonPage2.Name = "RibbonPage2" + Me.RibbonPage2.Text = "RibbonPage2" + ' + 'frmConfig + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(832, 509) + Me.Controls.Add(Me.XtraTabControl1) + Me.Controls.Add(Me.RibbonControl1) + Me.Controls.Add(Me.RibbonStatusBar1) + Me.Controls.Add(Me.barDockControlLeft) + Me.Controls.Add(Me.barDockControlRight) + Me.Controls.Add(Me.barDockControlBottom) + Me.Controls.Add(Me.barDockControlTop) + Me.IconOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.bo_unknown1 + Me.Name = "frmConfig" + Me.Ribbon = Me.RibbonControl1 + Me.StatusBar = Me.RibbonStatusBar1 + Me.Text = "Konfiguration" + CType(Me.ToolbarFormManager1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.XtraTabControl1.ResumeLayout(False) + Me.XtraTabPage1.ResumeLayout(False) + CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.LayoutControl1.ResumeLayout(False) + CType(Me.txtBaseURL.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtUsername.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtPassword.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtImportBasePath.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtImportRelativePath.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + Friend WithEvents ToolbarFormManager1 As DevExpress.XtraBars.ToolbarForm.ToolbarFormManager + Friend WithEvents barDockControlTop As DevExpress.XtraBars.BarDockControl + Friend WithEvents barDockControlBottom As DevExpress.XtraBars.BarDockControl + Friend WithEvents barDockControlLeft As DevExpress.XtraBars.BarDockControl + Friend WithEvents barDockControlRight As DevExpress.XtraBars.BarDockControl + Friend WithEvents XtraTabControl1 As XtraTabControl + Friend WithEvents XtraTabPage1 As XtraTabPage + Friend WithEvents LayoutControl1 As LayoutControl + Friend WithEvents Root As LayoutControlGroup + Friend WithEvents txtBaseURL As TextEdit + Friend WithEvents txtUsername As TextEdit + Friend WithEvents txtPassword As TextEdit + Friend WithEvents txtImportBasePath As TextEdit + Friend WithEvents txtImportRelativePath As TextEdit + Friend WithEvents LayoutControlGroup1 As LayoutControlGroup + Friend WithEvents LayoutControlItem6 As LayoutControlItem + Friend WithEvents LayoutControlItem5 As LayoutControlItem + Friend WithEvents LayoutControlItem2 As LayoutControlItem + Friend WithEvents LayoutControlItem1 As LayoutControlItem + Friend WithEvents LayoutControlItem3 As LayoutControlItem + Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl + Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage + 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 +End Class diff --git a/EDIDocumentImport/frmConfig.resx b/EDIDocumentImport/frmConfig.resx new file mode 100644 index 0000000..f35c899 --- /dev/null +++ b/EDIDocumentImport/frmConfig.resx @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAO4BAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iU2F2ZSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMzIg + MzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cjwvc3R5 + bGU+DQogIDxwYXRoIGQ9Ik0yNyw0aC0zdjEwSDhWNEg1QzQuNCw0LDQsNC40LDQsNXYyMmMwLDAuNiww + LjQsMSwxLDFoMjJjMC42LDAsMS0wLjQsMS0xVjVDMjgsNC40LDI3LjYsNCwyNyw0eiBNMjQsMjRIOHYt + NiAgaDE2VjI0eiBNMTAsNHY4aDEwVjRIMTB6IE0xNCwxMGgtMlY2aDJWMTB6IiBjbGFzcz0iQmxhY2si + IC8+DQo8L3N2Zz4L + + + \ No newline at end of file diff --git a/EDIDocumentImport/frmConfig.vb b/EDIDocumentImport/frmConfig.vb new file mode 100644 index 0000000..4be55ed --- /dev/null +++ b/EDIDocumentImport/frmConfig.vb @@ -0,0 +1,28 @@ +Imports DigitalData.Modules.Config + +Public Class frmConfig + Public Property ConfigManager As ConfigManager(Of ImporterShared.Config) + + Private ReadOnly Property Config As ImporterShared.Config + Get + Return ConfigManager?.Config + End Get + End Property + + Private Sub frmConfig_Load(sender As Object, e As EventArgs) Handles MyBase.Load + txtBaseURL.EditValue = Config.Webservice.BaseUrl + txtUsername.EditValue = Config.Webservice.Username + txtPassword.EditValue = Config.Webservice.Password + txtImportBasePath.EditValue = Config.Webservice.ImportBasePath + txtImportRelativePath.EditValue = Config.Webservice.ImportRelativePath + End Sub + + Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick + Config.Webservice.BaseUrl = txtBaseURL.EditValue + Config.Webservice.Username = txtUsername.EditValue + Config.Webservice.Password = txtPassword.EditValue + Config.Webservice.ImportBasePath = txtImportBasePath.EditValue + Config.Webservice.ImportRelativePath = txtImportRelativePath.EditValue + ConfigManager.Save() + End Sub +End Class \ No newline at end of file diff --git a/EDIDocumentImport/frmImportMain.Designer.vb b/EDIDocumentImport/frmImportMain.Designer.vb index 178d30c..91112fa 100644 --- a/EDIDocumentImport/frmImportMain.Designer.vb +++ b/EDIDocumentImport/frmImportMain.Designer.vb @@ -39,6 +39,8 @@ Partial Class frmImportMain Me.btnShowXml = New DevExpress.XtraBars.BarButtonItem() Me.btnOpenLogDirectory = New DevExpress.XtraBars.BarButtonItem() Me.btnOpenConfigDirectory = New DevExpress.XtraBars.BarButtonItem() + Me.txtCurrentFile = New DevExpress.XtraBars.BarStaticItem() + Me.btnConfig = 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() @@ -46,6 +48,7 @@ Partial Class frmImportMain Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup5 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroup6 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RepositoryItemComboBox1 = New DevExpress.XtraEditors.Repository.RepositoryItemComboBox() Me.RibbonStatusBar = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl() @@ -93,9 +96,9 @@ Partial Class frmImportMain 'RibbonControl ' Me.RibbonControl.ExpandCollapseItem.Id = 0 - 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.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.RibbonControl.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl.MaxItemId = 23 + Me.RibbonControl.MaxItemId = 25 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}) @@ -201,6 +204,20 @@ Partial Class frmImportMain Me.btnOpenConfigDirectory.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.parameters Me.btnOpenConfigDirectory.Name = "btnOpenConfigDirectory" ' + 'txtCurrentFile + ' + Me.txtCurrentFile.Caption = "Aktuelle Datei: Keine" + Me.txtCurrentFile.Id = 23 + Me.txtCurrentFile.Name = "txtCurrentFile" + Me.txtCurrentFile.Tag = "Aktuelle Datei: {0}" + ' + 'btnConfig + ' + Me.btnConfig.Caption = "Konfiguration" + Me.btnConfig.Id = 24 + Me.btnConfig.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.bo_unknown + Me.btnConfig.Name = "btnConfig" + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup4, Me.RibbonPageGroup3}) @@ -231,7 +248,7 @@ Partial Class frmImportMain ' 'RibbonPage2 ' - Me.RibbonPage2.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup5, Me.RibbonPageGroup2}) + Me.RibbonPage2.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup5, Me.RibbonPageGroup2, Me.RibbonPageGroup6}) Me.RibbonPage2.Name = "RibbonPage2" Me.RibbonPage2.Text = "Erweitert" ' @@ -251,6 +268,12 @@ Partial Class frmImportMain Me.RibbonPageGroup2.Name = "RibbonPageGroup2" Me.RibbonPageGroup2.Text = "Debugging" ' + 'RibbonPageGroup6 + ' + Me.RibbonPageGroup6.ItemLinks.Add(Me.btnConfig) + Me.RibbonPageGroup6.Name = "RibbonPageGroup6" + Me.RibbonPageGroup6.Text = "Konfiguration" + ' 'RepositoryItemComboBox1 ' Me.RepositoryItemComboBox1.AutoHeight = False @@ -261,6 +284,7 @@ Partial Class frmImportMain ' Me.RibbonStatusBar.ItemLinks.Add(Me.txtVersion) Me.RibbonStatusBar.ItemLinks.Add(Me.txtFilesLoaded) + Me.RibbonStatusBar.ItemLinks.Add(Me.txtCurrentFile) Me.RibbonStatusBar.Location = New System.Drawing.Point(0, 722) Me.RibbonStatusBar.Name = "RibbonStatusBar" Me.RibbonStatusBar.Ribbon = Me.RibbonControl @@ -480,6 +504,7 @@ Partial Class frmImportMain Me.Controls.Add(Me.SplitContainerControl1) Me.Controls.Add(Me.RibbonStatusBar) Me.Controls.Add(Me.RibbonControl) + Me.IconOptions.SvgImage = CType(resources.GetObject("frmImportMain.IconOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.Name = "frmImportMain" Me.Ribbon = Me.RibbonControl Me.StatusBar = Me.RibbonStatusBar @@ -553,4 +578,7 @@ Partial Class frmImportMain Friend WithEvents colId As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents colName As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents BehaviorManager As DevExpress.Utils.Behaviors.BehaviorManager + Friend WithEvents txtCurrentFile As DevExpress.XtraBars.BarStaticItem + Friend WithEvents btnConfig As DevExpress.XtraBars.BarButtonItem + Friend WithEvents RibbonPageGroup6 As DevExpress.XtraBars.Ribbon.RibbonPageGroup End Class diff --git a/EDIDocumentImport/frmImportMain.resx b/EDIDocumentImport/frmImportMain.resx index 3b050d3..b8cbabe 100644 --- a/EDIDocumentImport/frmImportMain.resx +++ b/EDIDocumentImport/frmImportMain.resx @@ -139,4 +139,25 @@ 17, 17 + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAACgDAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkdyZWVue2ZpbGw6IzAzOUMyMzt9Cgku + QmxhY2t7ZmlsbDojNzI3MjcyO30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5ZZWxsb3d7ZmlsbDojRkZC + MTE1O30KCS5CbHVle2ZpbGw6IzExNzdENzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iU3F1YXJpZmll + ZCI+DQogICAgPHJlY3QgeD0iMiIgeT0iMiIgd2lkdGg9IjE4IiBoZWlnaHQ9IjE4IiByeD0iMCIgcnk9 + IjAiIGNsYXNzPSJCbHVlIiAvPg0KICAgIDxyZWN0IHg9IjIyIiB5PSIyIiB3aWR0aD0iOCIgaGVpZ2h0 + PSIxOCIgcng9IjAiIHJ5PSIwIiBjbGFzcz0iR3JlZW4iIC8+DQogICAgPHJlY3QgeD0iMiIgeT0iMjIi + IHdpZHRoPSIxOCIgaGVpZ2h0PSI4IiByeD0iMCIgcnk9IjAiIGNsYXNzPSJSZWQiIC8+DQogICAgPHJl + Y3QgeD0iMjIiIHk9IjIyIiB3aWR0aD0iOCIgaGVpZ2h0PSI4IiByeD0iMCIgcnk9IjAiIGNsYXNzPSJZ + ZWxsb3ciIC8+DQogIDwvZz4NCjwvc3ZnPgs= + + \ No newline at end of file diff --git a/EDIDocumentImport/frmImportMain.vb b/EDIDocumentImport/frmImportMain.vb index e0e5934..d70dedb 100644 --- a/EDIDocumentImport/frmImportMain.vb +++ b/EDIDocumentImport/frmImportMain.vb @@ -319,6 +319,8 @@ Public Class frmImportMain oDataTable.AcceptChanges() Next + txtCurrentFile.Caption = String.Format(txtCurrentFile.Tag.ToString, pDocument.Name) + CurrentDocument = pDocument SetDocumentButtonsEnabled(True) Catch ex As Exception @@ -384,6 +386,14 @@ Public Class frmImportMain End If End Sub + Private Sub TryOpenFile(pPath As String, pDisplayName As String) + If File.Exists(pPath) Then + Process.Start(pPath) + Else + MsgBox($"{pDisplayName} nicht konfiguriert oder nicht gefunden!", MsgBoxStyle.Exclamation, Text) + End If + End Sub + Private Sub btnOpenLogDirectory_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnOpenLogDirectory.ItemClick @@ -409,4 +419,18 @@ Public Class frmImportMain Dim oForm As New frmXmlEditor With {.FileName = CurrentDocument.FullName} oForm.Show() End Sub + + Private Sub txtCurrentFile_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles txtCurrentFile.ItemClick + If CurrentDocument IsNot Nothing Then + TryOpenFile(CurrentDocument.FullName, "Aktuelle Datei") + End If + End Sub + + Private Sub btnConfig_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnConfig.ItemClick + Dim oForm As New frmConfig With { + .ConfigManager = ConfigManager + } + + oForm.ShowDialog() + End Sub End Class \ No newline at end of file diff --git a/EDIDocumentImport/frmRowEditor.vb b/EDIDocumentImport/frmRowEditor.vb index df09710..63571f1 100644 --- a/EDIDocumentImport/frmRowEditor.vb +++ b/EDIDocumentImport/frmRowEditor.vb @@ -20,6 +20,7 @@ Public Class frmRowEditor Private ReadOnly MultilineEditor As New RepositoryItemMemoEdit Private ReadOnly AccountPicker As New RepositoryItemSearchLookUpEdit Private ReadOnly MaskDateEditor As New RepositoryItemTextEdit + Private ReadOnly ReadOnlyEditor As New RepositoryItemTextEdit Private Const COL_KEY = "KEY" Private Const COL_VALUE_ORIGINAL = "VALUE_ORIGINAL" @@ -45,6 +46,8 @@ Public Class frmRowEditor AccountPicker.DisplayMember = "Name" AccountPicker.ValueMember = "Id" + ReadOnlyEditor.ReadOnly = True + 'DatePicker.CalendarTimeEditing = DevExpress.Utils.DefaultBoolean.False 'DatePicker.EditMask = "yyyy-MM-dd" 'DatePicker.Mask.MaskType = DevExpress.XtraEditors.Mask.MaskType.DateTimeAdvancingCaret @@ -181,6 +184,31 @@ Public Class frmRowEditor e.RepositoryItem = AccountPicker End If End If + + If e.Column.FieldName = COL_VALUE_FINAL Then + Dim oReadOnlyFields As New List(Of String) From { + "BELEGKEY" + } + + If oReadOnlyFields.Contains(oDataRow.Item(COL_KEY)) Then + e.RepositoryItem = ReadOnlyEditor + End If + End If + + End Sub + + Private Sub GridView1_CustomDrawCell(sender As Object, e As DevExpress.XtraGrid.Views.Base.RowCellCustomDrawEventArgs) Handles GridView1.CustomDrawCell + Dim oDataRow As DataRow = GridView1.GetDataRow(e.RowHandle) + + If e.Column.FieldName = COL_VALUE_FINAL Then + Dim oReadOnlyFields As New List(Of String) From { + "BELEGKEY" + } + + If oReadOnlyFields.Contains(oDataRow.Item(COL_KEY)) Then + e.Appearance.BackColor = Color.LightGray + End If + End If End Sub End Class