diff --git a/EDMI_ClientSuite/frmFileTest.Designer.vb b/EDMI_ClientSuite/frmFileTest.Designer.vb index 823a97d1..416fbc87 100644 --- a/EDMI_ClientSuite/frmFileTest.Designer.vb +++ b/EDMI_ClientSuite/frmFileTest.Designer.vb @@ -23,6 +23,7 @@ Partial Class frmFileTest _ Private Sub InitializeComponent() Me.Button1 = New System.Windows.Forms.Button() + Me.ListBox1 = New System.Windows.Forms.ListBox() Me.SuspendLayout() ' 'Button1 @@ -34,11 +35,20 @@ Partial Class frmFileTest Me.Button1.Text = "Upload file" Me.Button1.UseVisualStyleBackColor = True ' + 'ListBox1 + ' + Me.ListBox1.FormattingEnabled = True + Me.ListBox1.Location = New System.Drawing.Point(12, 45) + Me.ListBox1.Name = "ListBox1" + Me.ListBox1.Size = New System.Drawing.Size(256, 95) + Me.ListBox1.TabIndex = 1 + ' 'frmFileTest ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(800, 450) + Me.Controls.Add(Me.ListBox1) Me.Controls.Add(Me.Button1) Me.Name = "frmFileTest" Me.Text = "frmFileTest" @@ -47,4 +57,5 @@ Partial Class frmFileTest End Sub Friend WithEvents Button1 As Button + Friend WithEvents ListBox1 As ListBox End Class diff --git a/EDMI_ClientSuite/frmFileTest.vb b/EDMI_ClientSuite/frmFileTest.vb index 841c9af1..bbeaad8e 100644 --- a/EDMI_ClientSuite/frmFileTest.vb +++ b/EDMI_ClientSuite/frmFileTest.vb @@ -20,8 +20,8 @@ Public Class frmFileTest End If Dim oFileID = _fileOp.New_EDMI_File(oDialog.FileName, Environment.UserName) - - + MsgBox(oFileID) + ListBox1.Items.Add(oFileID) End Sub End Class \ No newline at end of file diff --git a/EDMI_ClientSuite/frmMain.Designer.vb b/EDMI_ClientSuite/frmMain.Designer.vb index 127c3431..2c2e6fce 100644 --- a/EDMI_ClientSuite/frmMain.Designer.vb +++ b/EDMI_ClientSuite/frmMain.Designer.vb @@ -39,6 +39,7 @@ Partial Class frmMain Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageAdmin = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() Me.StatusStrip1.SuspendLayout() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.MenueUser, System.ComponentModel.ISupportInitialize).BeginInit() @@ -82,9 +83,9 @@ Partial Class frmMain ' Me.RibbonControl1.ApplicationButtonDropDownControl = Me.MenueUser Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.BarButtonItemBasicUser, Me.BarButtonItemApplicationExit}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.BarButtonItemBasicUser, Me.BarButtonItemApplicationExit, Me.BarButtonItem1}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl1.MaxItemId = 1 + Me.RibbonControl1.MaxItemId = 2 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPageUser, Me.RibbonPageAdmin}) Me.RibbonControl1.Size = New System.Drawing.Size(1393, 116) @@ -118,6 +119,7 @@ Partial Class frmMain ' 'RibbonPageGroup1 ' + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1) Me.RibbonPageGroup1.ItemsLayout = DevExpress.XtraBars.Ribbon.RibbonPageGroupItemsLayout.TwoRows Me.RibbonPageGroup1.Name = "RibbonPageGroup1" Me.RibbonPageGroup1.Text = "UserConfig" @@ -145,6 +147,12 @@ Partial Class frmMain Me.RibbonPageGroup3.Name = "RibbonPageGroup3" Me.RibbonPageGroup3.Text = "RibbonPageGroup3" ' + 'BarButtonItem1 + ' + Me.BarButtonItem1.Caption = "BarButtonItem1" + Me.BarButtonItem1.Id = 1 + Me.BarButtonItem1.Name = "BarButtonItem1" + ' 'frmMain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -154,6 +162,7 @@ Partial Class frmMain Me.Controls.Add(Me.StatusStrip1) Me.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) + Me.IsMdiContainer = True Me.Name = "frmMain" Me.Text = "EDMI-ClientSuite" Me.StatusStrip1.ResumeLayout(False) @@ -181,4 +190,5 @@ Partial Class frmMain Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents RibbonPageAdmin As DevExpress.XtraBars.Ribbon.RibbonPage Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem End Class diff --git a/EDMI_ClientSuite/frmMain.vb b/EDMI_ClientSuite/frmMain.vb index 790e1df1..216c5f60 100644 --- a/EDMI_ClientSuite/frmMain.vb +++ b/EDMI_ClientSuite/frmMain.vb @@ -26,4 +26,10 @@ Private Sub BarButtonItemBasicUser_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItemBasicUser.ItemClick frmUserBasics.ShowDialog() End Sub + + Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick + Dim frm As New frmFileTest + frm.MdiParent = Me + frm.Show() + End Sub End Class diff --git a/EDMI_FILE_OPs/FileOp.vb b/EDMI_FILE_OPs/FileOp.vb index 0de70e41..5dd30eac 100644 --- a/EDMI_FILE_OPs/FileOp.vb +++ b/EDMI_FILE_OPs/FileOp.vb @@ -23,7 +23,7 @@ Public Class FileOp binding.ReaderQuotas.MaxStringContentLength = 2147483647 Dim endpointAddress = New EndpointAddress(EDMI_ServiceAdress) _channelFactory = New ChannelFactory(Of EDMIServiceReference.IEDMServiceChannel)(binding, endpointAddress) - + Connect2NetService() Catch ex As Exception _logger.Error(ex) End Try