diff --git a/GUIs.ClipboardWatcher/ProfileSearches.vb b/GUIs.ClipboardWatcher/ProfileSearches.vb index 4a4357c5..1931470b 100644 --- a/GUIs.ClipboardWatcher/ProfileSearches.vb +++ b/GUIs.ClipboardWatcher/ProfileSearches.vb @@ -29,7 +29,7 @@ Public Class ProfileSearches Try If _Environment.Service.IsActive = True Then Try - Dim oSplit() As String = _Environment.Service.Address.Split(";") + Dim oSplit() As String = _Environment.Service.Address.Split(":") Dim oAppServerAddress As String = oSplit(0) Dim oAppServerPort As Integer = 9000 If oSplit.Length = 2 Then diff --git a/GUIs.Common/DocumentResultList/frmDocumentResultList.Designer.vb b/GUIs.Common/DocumentResultList/frmDocumentResultList.Designer.vb index fe70ab1f..6178daf0 100644 --- a/GUIs.Common/DocumentResultList/frmDocumentResultList.Designer.vb +++ b/GUIs.Common/DocumentResultList/frmDocumentResultList.Designer.vb @@ -75,7 +75,7 @@ Partial Class frmDocumentResultList Me.RibbonControl.Name = "RibbonControl" Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] - Me.RibbonControl.Size = New System.Drawing.Size(1189, 158) + Me.RibbonControl.Size = New System.Drawing.Size(1189, 159) Me.RibbonControl.StatusBar = Me.RibbonStatusBar ' 'SwitchMainContainerHorizontal @@ -183,10 +183,10 @@ Partial Class frmDocumentResultList 'RibbonStatusBar ' Me.RibbonStatusBar.ItemLinks.Add(Me.labelResultCount) - Me.RibbonStatusBar.Location = New System.Drawing.Point(0, 647) + Me.RibbonStatusBar.Location = New System.Drawing.Point(0, 649) Me.RibbonStatusBar.Name = "RibbonStatusBar" Me.RibbonStatusBar.Ribbon = Me.RibbonControl - Me.RibbonStatusBar.Size = New System.Drawing.Size(1189, 24) + Me.RibbonStatusBar.Size = New System.Drawing.Size(1189, 22) ' 'SplitContainerControl1 ' @@ -198,7 +198,7 @@ Partial Class frmDocumentResultList Me.SplitContainerControl1.Panel1.Text = "Panel1" Me.SplitContainerControl1.Panel2.Controls.Add(Me.SplitContainerControl2) Me.SplitContainerControl1.Panel2.Text = "Panel2" - Me.SplitContainerControl1.Size = New System.Drawing.Size(762, 489) + Me.SplitContainerControl1.Size = New System.Drawing.Size(762, 490) Me.SplitContainerControl1.SplitterPosition = 382 Me.SplitContainerControl1.TabIndex = 2 Me.SplitContainerControl1.Text = "SplitContainerControl1" @@ -210,13 +210,13 @@ Partial Class frmDocumentResultList Me.GridControl1.MainView = Me.GridView1 Me.GridControl1.MenuManager = Me.RibbonControl Me.GridControl1.Name = "GridControl1" - Me.GridControl1.Size = New System.Drawing.Size(382, 489) + Me.GridControl1.Size = New System.Drawing.Size(382, 490) Me.GridControl1.TabIndex = 0 Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) ' 'GridView1 ' - Me.GridView1.Appearance.EvenRow.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(214, Byte), Integer), CType(CType(49, Byte), Integer)) + Me.GridView1.Appearance.EvenRow.BackColor = System.Drawing.Color.WhiteSmoke Me.GridView1.Appearance.EvenRow.Options.UseBackColor = True Me.GridView1.Appearance.FocusedRow.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) Me.GridView1.Appearance.FocusedRow.Options.UseBackColor = True @@ -250,7 +250,7 @@ Partial Class frmDocumentResultList Me.SplitContainerControl2.Panel1.Text = "Panel1" Me.SplitContainerControl2.Panel2.Controls.Add(Me.GridControl3) Me.SplitContainerControl2.Panel2.Text = "Panel2" - Me.SplitContainerControl2.Size = New System.Drawing.Size(370, 489) + Me.SplitContainerControl2.Size = New System.Drawing.Size(370, 490) Me.SplitContainerControl2.SplitterPosition = 223 Me.SplitContainerControl2.TabIndex = 0 Me.SplitContainerControl2.Text = "SplitContainerControl2" @@ -268,7 +268,7 @@ Partial Class frmDocumentResultList ' 'GridView2 ' - Me.GridView2.Appearance.EvenRow.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(214, Byte), Integer), CType(CType(49, Byte), Integer)) + Me.GridView2.Appearance.EvenRow.BackColor = System.Drawing.Color.WhiteSmoke Me.GridView2.Appearance.EvenRow.Options.UseBackColor = True Me.GridView2.Bands.AddRange(New DevExpress.XtraGrid.Views.BandedGrid.GridBand() {Me.GridBand2}) Me.GridView2.GridControl = Me.GridControl2 @@ -295,13 +295,13 @@ Partial Class frmDocumentResultList Me.GridControl3.MainView = Me.GridView3 Me.GridControl3.MenuManager = Me.RibbonControl Me.GridControl3.Name = "GridControl3" - Me.GridControl3.Size = New System.Drawing.Size(370, 256) + Me.GridControl3.Size = New System.Drawing.Size(370, 257) Me.GridControl3.TabIndex = 0 Me.GridControl3.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView3}) ' 'GridView3 ' - Me.GridView3.Appearance.EvenRow.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(214, Byte), Integer), CType(CType(49, Byte), Integer)) + Me.GridView3.Appearance.EvenRow.BackColor = System.Drawing.Color.WhiteSmoke Me.GridView3.Appearance.EvenRow.Options.UseBackColor = True Me.GridView3.Bands.AddRange(New DevExpress.XtraGrid.Views.BandedGrid.GridBand() {Me.GridBand3}) Me.GridView3.GridControl = Me.GridControl3 @@ -324,13 +324,13 @@ Partial Class frmDocumentResultList 'SplitContainerControl3 ' Me.SplitContainerControl3.Dock = System.Windows.Forms.DockStyle.Fill - Me.SplitContainerControl3.Location = New System.Drawing.Point(0, 158) + Me.SplitContainerControl3.Location = New System.Drawing.Point(0, 159) Me.SplitContainerControl3.Name = "SplitContainerControl3" Me.SplitContainerControl3.Panel1.Controls.Add(Me.SplitContainerControl1) Me.SplitContainerControl3.Panel1.Text = "Panel1" Me.SplitContainerControl3.Panel2.Controls.Add(Me.DocumentViewer1) Me.SplitContainerControl3.Panel2.Text = "Panel2" - Me.SplitContainerControl3.Size = New System.Drawing.Size(1189, 489) + Me.SplitContainerControl3.Size = New System.Drawing.Size(1189, 490) Me.SplitContainerControl3.SplitterPosition = 762 Me.SplitContainerControl3.TabIndex = 5 Me.SplitContainerControl3.Text = "SplitContainerControl3" @@ -340,7 +340,7 @@ Partial Class frmDocumentResultList Me.DocumentViewer1.Dock = System.Windows.Forms.DockStyle.Fill Me.DocumentViewer1.Location = New System.Drawing.Point(0, 0) Me.DocumentViewer1.Name = "DocumentViewer1" - Me.DocumentViewer1.Size = New System.Drawing.Size(417, 489) + Me.DocumentViewer1.Size = New System.Drawing.Size(417, 490) Me.DocumentViewer1.TabIndex = 0 ' 'XtraSaveFileDialog diff --git a/GUIs.Common/DocumentResultList/frmDocumentResultList.vb b/GUIs.Common/DocumentResultList/frmDocumentResultList.vb index 94345a22..a53fbaff 100644 --- a/GUIs.Common/DocumentResultList/frmDocumentResultList.vb +++ b/GUIs.Common/DocumentResultList/frmDocumentResultList.vb @@ -15,6 +15,8 @@ Imports DigitalData.Modules.EDMI.API.Client Imports DevExpress.XtraGrid.Views.Base Imports DevExpress.XtraGrid.Views.BandedGrid Imports System.ComponentModel +Imports System.Globalization +Imports System.Threading Public Class frmDocumentResultList Implements IResultForm @@ -56,7 +58,20 @@ Public Class frmDocumentResultList _Environment = Environment _Params = Params _ResultLists = Params.Results - + Try + Dim Culture = CultureInfo.CreateSpecificCulture(_Environment.User.Language) + ' The following line provides localization for the application's user interface. + Thread.CurrentThread.CurrentUICulture = Culture + ' The following line provides localization for data formats. + Thread.CurrentThread.CurrentCulture = Culture + ' Set this culture as the default culture for all threads in this application. + ' Note: The following properties are supported in the .NET Framework 4.5+ + CultureInfo.DefaultThreadCurrentCulture = Culture + CultureInfo.DefaultThreadCurrentUICulture = Culture + Culture.DateTimeFormat.ShortDatePattern = _Environment.User.DateFormat + Catch ex As Exception + _Logger.Warn($"Error loading CultureInfo: {ex.Message}") + End Try MaybeInitIDB() End Sub @@ -77,6 +92,8 @@ Public Class frmDocumentResultList Private Sub frmDocumentResultList_Load(sender As Object, e As EventArgs) Handles MyBase.Load Try + + ' Load config SplitContainerControl1.SplitterPosition = _Config.Config.SplitContainer1Distance SwitchMainContainerHorizontal.Checked = _Config.Config.SplitContainer1Horizontal @@ -147,6 +164,7 @@ Public Class frmDocumentResultList Private Async Function LoadFile_IDB(GridRow As DataRow) As Task Try Dim oObjectId = GridRow.Item(COLUMN_DOCID) + _Logger.Debug($"Gettin' Infor for oObjectId: {oObjectId}") _DocumentInfo = Await _IDBClient.GetDocumentInfo(_Environment.User.UserId, oObjectId) DocumentViewer1.LoadFile(_DocumentInfo.FullPath) diff --git a/GUIs.Test.EDMIBenchmark/Form1.Designer.vb b/GUIs.Test.EDMIBenchmark/Form1.Designer.vb index 44be144f..0b04b3e1 100644 --- a/GUIs.Test.EDMIBenchmark/Form1.Designer.vb +++ b/GUIs.Test.EDMIBenchmark/Form1.Designer.vb @@ -24,9 +24,6 @@ Partial Class Form1 Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(Form1)) - Dim DockingContainer2 As DevExpress.XtraBars.Docking2010.Views.Tabbed.DockingContainer = New DevExpress.XtraBars.Docking2010.Views.Tabbed.DockingContainer() - Me.DocumentGroup1 = New DevExpress.XtraBars.Docking2010.Views.Tabbed.DocumentGroup(Me.components) - Me.Document1 = New DevExpress.XtraBars.Docking2010.Views.Tabbed.Document(Me.components) Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() Me.ButtonSelectFiles = New DevExpress.XtraBars.BarButtonItem() Me.ButtonImportFiles = New DevExpress.XtraBars.BarButtonItem() @@ -62,24 +59,20 @@ Partial Class Form1 Me.DockPanel3 = New DevExpress.XtraBars.Docking.DockPanel() Me.DockPanel3_Container = New DevExpress.XtraBars.Docking.ControlContainer() Me.listboxLog = New DevExpress.XtraEditors.ListBoxControl() - Me.panelContainer1 = New DevExpress.XtraBars.Docking.DockPanel() - Me.DockPanel4 = New DevExpress.XtraBars.Docking.DockPanel() - Me.DockPanel4_Container = New DevExpress.XtraBars.Docking.ControlContainer() - Me.GridControl1 = New DevExpress.XtraGrid.GridControl() - Me.BindingSource1 = New System.Windows.Forms.BindingSource(Me.components) - Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView() - Me.GridColumn1 = New DevExpress.XtraGrid.Columns.GridColumn() - Me.GridColumn2 = New DevExpress.XtraGrid.Columns.GridColumn() Me.DockPanel1 = New DevExpress.XtraBars.Docking.DockPanel() Me.DockPanel1_Container = New DevExpress.XtraBars.Docking.ControlContainer() Me.listboxFiles = New DevExpress.XtraEditors.ListBoxControl() Me.DockPanel2 = New DevExpress.XtraBars.Docking.DockPanel() Me.DockPanel2_Container = New DevExpress.XtraBars.Docking.ControlContainer() Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DocumentViewer() + Me.BindingSource1 = New System.Windows.Forms.BindingSource(Me.components) Me.Timer1 = New System.Windows.Forms.Timer(Me.components) Me.BarEditItem1 = New DevExpress.XtraBars.BarEditItem() - CType(Me.DocumentGroup1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.Document1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.panelContainer1 = New DevExpress.XtraBars.Docking.DockPanel() + Me.GridControl1 = New DevExpress.XtraGrid.GridControl() + Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.DockPanel4 = New DevExpress.XtraBars.Docking.DockPanel() + Me.DockPanel4_Container = New DevExpress.XtraBars.Docking.ControlContainer() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RepositoryItemTextEdit1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RepositoryItemTextEdit2, System.ComponentModel.ISupportInitialize).BeginInit() @@ -92,33 +85,18 @@ Partial Class Form1 Me.DockPanel3.SuspendLayout() Me.DockPanel3_Container.SuspendLayout() CType(Me.listboxLog, System.ComponentModel.ISupportInitialize).BeginInit() - Me.panelContainer1.SuspendLayout() - Me.DockPanel4.SuspendLayout() - Me.DockPanel4_Container.SuspendLayout() - CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.BindingSource1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() Me.DockPanel1.SuspendLayout() Me.DockPanel1_Container.SuspendLayout() CType(Me.listboxFiles, System.ComponentModel.ISupportInitialize).BeginInit() Me.DockPanel2.SuspendLayout() Me.DockPanel2_Container.SuspendLayout() + CType(Me.BindingSource1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.DockPanel4.SuspendLayout() + Me.DockPanel4_Container.SuspendLayout() Me.SuspendLayout() ' - 'DocumentGroup1 - ' - Me.DocumentGroup1.Items.AddRange(New DevExpress.XtraBars.Docking2010.Views.Tabbed.Document() {Me.Document1}) - ' - 'Document1 - ' - Me.Document1.Caption = "Document Viewer" - Me.Document1.ControlName = "DockPanel2" - Me.Document1.FloatLocation = New System.Drawing.Point(0, 0) - Me.Document1.FloatSize = New System.Drawing.Size(200, 200) - Me.Document1.Properties.AllowClose = DevExpress.Utils.DefaultBoolean.[False] - Me.Document1.Properties.AllowFloat = DevExpress.Utils.DefaultBoolean.[True] - Me.Document1.Properties.AllowFloatOnDoubleClick = DevExpress.Utils.DefaultBoolean.[True] - ' 'RibbonControl1 ' Me.RibbonControl1.ExpandCollapseItem.Id = 0 @@ -130,7 +108,7 @@ Partial Class Form1 Me.RibbonControl1.PageHeaderItemLinks.Add(Me.BarMdiChildrenListItem1) Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemTextEdit1, Me.RepositoryItemTextEdit2, Me.RepositoryItemTextEdit3, Me.RepositoryItemTextEdit4}) - Me.RibbonControl1.Size = New System.Drawing.Size(1310, 158) + Me.RibbonControl1.Size = New System.Drawing.Size(1093, 158) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 ' 'ButtonSelectFiles @@ -312,7 +290,7 @@ Partial Class Form1 Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 640) Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 - Me.RibbonStatusBar1.Size = New System.Drawing.Size(1310, 24) + Me.RibbonStatusBar1.Size = New System.Drawing.Size(1093, 24) ' 'RibbonPage2 ' @@ -326,18 +304,11 @@ Partial Class Form1 Me.DocumentManager1.View = Me.TabbedView1 Me.DocumentManager1.ViewCollection.AddRange(New DevExpress.XtraBars.Docking2010.Views.BaseView() {Me.TabbedView1}) ' - 'TabbedView1 - ' - Me.TabbedView1.DocumentGroups.AddRange(New DevExpress.XtraBars.Docking2010.Views.Tabbed.DocumentGroup() {Me.DocumentGroup1}) - Me.TabbedView1.Documents.AddRange(New DevExpress.XtraBars.Docking2010.Views.BaseDocument() {Me.Document1}) - DockingContainer2.Element = Me.DocumentGroup1 - Me.TabbedView1.RootContainer.Nodes.AddRange(New DevExpress.XtraBars.Docking2010.Views.Tabbed.DockingContainer() {DockingContainer2}) - ' 'DockManager1 ' Me.DockManager1.AutoHideContainers.AddRange(New DevExpress.XtraBars.Docking.AutoHideContainer() {Me.hideContainerBottom}) Me.DockManager1.Form = Me - Me.DockManager1.RootPanels.AddRange(New DevExpress.XtraBars.Docking.DockPanel() {Me.panelContainer1, Me.DockPanel2}) + Me.DockManager1.RootPanels.AddRange(New DevExpress.XtraBars.Docking.DockPanel() {Me.DockPanel1, Me.DockPanel2, Me.DockPanel4}) Me.DockManager1.TopZIndexControls.AddRange(New String() {"DevExpress.XtraBars.BarDockControl", "DevExpress.XtraBars.StandaloneBarDockControl", "System.Windows.Forms.StatusBar", "System.Windows.Forms.MenuStrip", "System.Windows.Forms.StatusStrip", "DevExpress.XtraBars.Ribbon.RibbonStatusBar", "DevExpress.XtraBars.Ribbon.RibbonControl", "DevExpress.XtraBars.Navigation.OfficeNavigationBar", "DevExpress.XtraBars.Navigation.TileNavPane", "DevExpress.XtraBars.TabFormControl", "DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormControl", "DevExpress.XtraBars.ToolbarForm.ToolbarFormControl"}) ' 'hideContainerBottom @@ -347,7 +318,7 @@ Partial Class Form1 Me.hideContainerBottom.Dock = System.Windows.Forms.DockStyle.Bottom Me.hideContainerBottom.Location = New System.Drawing.Point(0, 619) Me.hideContainerBottom.Name = "hideContainerBottom" - Me.hideContainerBottom.Size = New System.Drawing.Size(1310, 21) + Me.hideContainerBottom.Size = New System.Drawing.Size(1093, 21) ' 'DockPanel3 ' @@ -381,102 +352,24 @@ Partial Class Form1 Me.listboxLog.Size = New System.Drawing.Size(1304, 89) Me.listboxLog.TabIndex = 0 ' - 'panelContainer1 - ' - Me.panelContainer1.ActiveChild = Me.DockPanel4 - Me.panelContainer1.Controls.Add(Me.DockPanel4) - Me.panelContainer1.Controls.Add(Me.DockPanel1) - Me.panelContainer1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Left - Me.panelContainer1.ID = New System.Guid("17067a8c-1b48-4d4a-b383-b7f8d5a8be59") - Me.panelContainer1.Location = New System.Drawing.Point(0, 158) - Me.panelContainer1.Name = "panelContainer1" - Me.panelContainer1.Options.ShowCloseButton = False - Me.panelContainer1.OriginalSize = New System.Drawing.Size(451, 200) - Me.panelContainer1.Size = New System.Drawing.Size(451, 461) - Me.panelContainer1.Tabbed = True - Me.panelContainer1.Text = "panelContainer1" - ' - 'DockPanel4 - ' - Me.DockPanel4.Controls.Add(Me.DockPanel4_Container) - Me.DockPanel4.Dock = DevExpress.XtraBars.Docking.DockingStyle.Fill - Me.DockPanel4.ID = New System.Guid("bddc849b-1066-4d2f-8fd3-9bc377a2bd74") - Me.DockPanel4.Location = New System.Drawing.Point(3, 26) - Me.DockPanel4.Name = "DockPanel4" - Me.DockPanel4.Options.ShowCloseButton = False - Me.DockPanel4.OriginalSize = New System.Drawing.Size(200, 200) - Me.DockPanel4.Size = New System.Drawing.Size(444, 406) - Me.DockPanel4.Text = "List Files" - ' - 'DockPanel4_Container - ' - Me.DockPanel4_Container.Controls.Add(Me.GridControl1) - Me.DockPanel4_Container.Location = New System.Drawing.Point(0, 0) - Me.DockPanel4_Container.Name = "DockPanel4_Container" - Me.DockPanel4_Container.Size = New System.Drawing.Size(444, 406) - Me.DockPanel4_Container.TabIndex = 0 - ' - 'GridControl1 - ' - Me.GridControl1.DataSource = Me.BindingSource1 - Me.GridControl1.Dock = System.Windows.Forms.DockStyle.Fill - Me.GridControl1.Location = New System.Drawing.Point(0, 0) - Me.GridControl1.MainView = Me.GridView1 - Me.GridControl1.MenuManager = Me.RibbonControl1 - Me.GridControl1.Name = "GridControl1" - Me.GridControl1.Size = New System.Drawing.Size(444, 406) - Me.GridControl1.TabIndex = 0 - Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) - ' - 'BindingSource1 - ' - ' - 'GridView1 - ' - Me.GridView1.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.GridColumn1, Me.GridColumn2}) - Me.GridView1.GridControl = Me.GridControl1 - Me.GridView1.Name = "GridView1" - Me.GridView1.OptionsBehavior.Editable = False - Me.GridView1.OptionsBehavior.ReadOnly = True - ' - 'GridColumn1 - ' - Me.GridColumn1.Caption = "Object Id" - Me.GridColumn1.FieldName = "IDB_OBJ_ID" - Me.GridColumn1.MaxWidth = 100 - Me.GridColumn1.MinWidth = 100 - Me.GridColumn1.Name = "GridColumn1" - Me.GridColumn1.Visible = True - Me.GridColumn1.VisibleIndex = 0 - Me.GridColumn1.Width = 100 - ' - 'GridColumn2 - ' - Me.GridColumn2.Caption = "Document Name" - Me.GridColumn2.FieldName = "DocName" - Me.GridColumn2.Name = "GridColumn2" - Me.GridColumn2.Visible = True - Me.GridColumn2.VisibleIndex = 1 - Me.GridColumn2.Width = 409 - ' 'DockPanel1 ' Me.DockPanel1.Controls.Add(Me.DockPanel1_Container) - Me.DockPanel1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Fill + Me.DockPanel1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Left Me.DockPanel1.ID = New System.Guid("12b5eead-07cc-48c6-93a4-85cd0b4b82ce") - Me.DockPanel1.Location = New System.Drawing.Point(3, 26) + Me.DockPanel1.Location = New System.Drawing.Point(0, 158) Me.DockPanel1.Name = "DockPanel1" Me.DockPanel1.Options.ShowCloseButton = False - Me.DockPanel1.OriginalSize = New System.Drawing.Size(200, 200) - Me.DockPanel1.Size = New System.Drawing.Size(444, 406) + Me.DockPanel1.OriginalSize = New System.Drawing.Size(297, 200) + Me.DockPanel1.Size = New System.Drawing.Size(297, 461) Me.DockPanel1.Text = "Files to Upload" ' 'DockPanel1_Container ' Me.DockPanel1_Container.Controls.Add(Me.listboxFiles) - Me.DockPanel1_Container.Location = New System.Drawing.Point(0, 0) + Me.DockPanel1_Container.Location = New System.Drawing.Point(3, 26) Me.DockPanel1_Container.Name = "DockPanel1_Container" - Me.DockPanel1_Container.Size = New System.Drawing.Size(444, 406) + Me.DockPanel1_Container.Size = New System.Drawing.Size(290, 432) Me.DockPanel1_Container.TabIndex = 0 ' 'listboxFiles @@ -484,25 +377,27 @@ Partial Class Form1 Me.listboxFiles.Dock = System.Windows.Forms.DockStyle.Fill Me.listboxFiles.Location = New System.Drawing.Point(0, 0) Me.listboxFiles.Name = "listboxFiles" - Me.listboxFiles.Size = New System.Drawing.Size(444, 406) + Me.listboxFiles.Size = New System.Drawing.Size(290, 432) Me.listboxFiles.TabIndex = 1 ' 'DockPanel2 ' Me.DockPanel2.Controls.Add(Me.DockPanel2_Container) - Me.DockPanel2.DockedAsTabbedDocument = True + Me.DockPanel2.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right Me.DockPanel2.ID = New System.Guid("e82850af-b594-49e9-ae83-36d4bf007da5") + Me.DockPanel2.Location = New System.Drawing.Point(893, 158) Me.DockPanel2.Name = "DockPanel2" Me.DockPanel2.Options.ShowCloseButton = False Me.DockPanel2.OriginalSize = New System.Drawing.Size(200, 200) + Me.DockPanel2.Size = New System.Drawing.Size(200, 461) Me.DockPanel2.Text = "Document Viewer" ' 'DockPanel2_Container ' Me.DockPanel2_Container.Controls.Add(Me.DocumentViewer1) - Me.DockPanel2_Container.Location = New System.Drawing.Point(0, 0) + Me.DockPanel2_Container.Location = New System.Drawing.Point(4, 26) Me.DockPanel2_Container.Name = "DockPanel2_Container" - Me.DockPanel2_Container.Size = New System.Drawing.Size(853, 432) + Me.DockPanel2_Container.Size = New System.Drawing.Size(193, 432) Me.DockPanel2_Container.TabIndex = 0 ' 'DocumentViewer1 @@ -510,9 +405,12 @@ Partial Class Form1 Me.DocumentViewer1.Dock = System.Windows.Forms.DockStyle.Fill Me.DocumentViewer1.Location = New System.Drawing.Point(0, 0) Me.DocumentViewer1.Name = "DocumentViewer1" - Me.DocumentViewer1.Size = New System.Drawing.Size(853, 432) + Me.DocumentViewer1.Size = New System.Drawing.Size(193, 432) Me.DocumentViewer1.TabIndex = 0 ' + 'BindingSource1 + ' + ' 'Timer1 ' Me.Timer1.Interval = 3000 @@ -526,12 +424,64 @@ Partial Class Form1 Me.BarEditItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarEditItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.BarEditItem1.Name = "BarEditItem1" ' + 'panelContainer1 + ' + Me.panelContainer1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Fill + Me.panelContainer1.ID = New System.Guid("17067a8c-1b48-4d4a-b383-b7f8d5a8be59") + Me.panelContainer1.Location = New System.Drawing.Point(4, 26) + Me.panelContainer1.Name = "panelContainer1" + Me.panelContainer1.Options.ShowCloseButton = False + Me.panelContainer1.OriginalSize = New System.Drawing.Size(444, 406) + Me.panelContainer1.Size = New System.Drawing.Size(192, 145) + Me.panelContainer1.Text = "panelContainer1" + ' + 'GridControl1 + ' + Me.GridControl1.Dock = System.Windows.Forms.DockStyle.Fill + Me.GridControl1.Location = New System.Drawing.Point(0, 0) + Me.GridControl1.MainView = Me.GridView1 + Me.GridControl1.MenuManager = Me.RibbonControl1 + Me.GridControl1.Name = "GridControl1" + Me.GridControl1.Size = New System.Drawing.Size(530, 171) + Me.GridControl1.TabIndex = 5 + Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) + ' + 'GridView1 + ' + Me.GridView1.GridControl = Me.GridControl1 + Me.GridView1.Name = "GridView1" + ' + 'DockPanel4 + ' + Me.DockPanel4.Controls.Add(Me.DockPanel4_Container) + Me.DockPanel4.Dock = DevExpress.XtraBars.Docking.DockingStyle.Float + Me.DockPanel4.FloatLocation = New System.Drawing.Point(2475, 322) + Me.DockPanel4.FloatSize = New System.Drawing.Size(538, 200) + Me.DockPanel4.FloatVertical = True + Me.DockPanel4.ID = New System.Guid("d8d91c41-bf1b-4f30-b72e-66f2da18db8e") + Me.DockPanel4.Location = New System.Drawing.Point(0, 0) + Me.DockPanel4.Name = "DockPanel4" + Me.DockPanel4.OriginalSize = New System.Drawing.Size(200, 200) + Me.DockPanel4.SavedDock = DevExpress.XtraBars.Docking.DockingStyle.Top + Me.DockPanel4.SavedIndex = 2 + Me.DockPanel4.Size = New System.Drawing.Size(538, 200) + Me.DockPanel4.Text = "DockPanelGrid" + ' + 'DockPanel4_Container + ' + Me.DockPanel4_Container.Controls.Add(Me.GridControl1) + Me.DockPanel4_Container.Location = New System.Drawing.Point(4, 26) + Me.DockPanel4_Container.Name = "DockPanel4_Container" + Me.DockPanel4_Container.Size = New System.Drawing.Size(530, 171) + Me.DockPanel4_Container.TabIndex = 0 + ' 'Form1 ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(1310, 664) - Me.Controls.Add(Me.panelContainer1) + Me.ClientSize = New System.Drawing.Size(1093, 664) + Me.Controls.Add(Me.DockPanel2) + Me.Controls.Add(Me.DockPanel1) Me.Controls.Add(Me.hideContainerBottom) Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.RibbonControl1) @@ -539,8 +489,6 @@ Partial Class Form1 Me.Ribbon = Me.RibbonControl1 Me.StatusBar = Me.RibbonStatusBar1 Me.Text = "Form1" - CType(Me.DocumentGroup1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.Document1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RepositoryItemTextEdit1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RepositoryItemTextEdit2, System.ComponentModel.ISupportInitialize).EndInit() @@ -553,17 +501,16 @@ Partial Class Form1 Me.DockPanel3.ResumeLayout(False) Me.DockPanel3_Container.ResumeLayout(False) CType(Me.listboxLog, System.ComponentModel.ISupportInitialize).EndInit() - Me.panelContainer1.ResumeLayout(False) - Me.DockPanel4.ResumeLayout(False) - Me.DockPanel4_Container.ResumeLayout(False) - CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.BindingSource1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() Me.DockPanel1.ResumeLayout(False) Me.DockPanel1_Container.ResumeLayout(False) CType(Me.listboxFiles, System.ComponentModel.ISupportInitialize).EndInit() Me.DockPanel2.ResumeLayout(False) Me.DockPanel2_Container.ResumeLayout(False) + CType(Me.BindingSource1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() + Me.DockPanel4.ResumeLayout(False) + Me.DockPanel4_Container.ResumeLayout(False) Me.ResumeLayout(False) Me.PerformLayout() @@ -592,20 +539,11 @@ Partial Class Form1 Friend WithEvents DockManager1 As DevExpress.XtraBars.Docking.DockManager Friend WithEvents DockPanel3 As DevExpress.XtraBars.Docking.DockPanel Friend WithEvents DockPanel3_Container As DevExpress.XtraBars.Docking.ControlContainer - Friend WithEvents DocumentGroup1 As DevExpress.XtraBars.Docking2010.Views.Tabbed.DocumentGroup - Friend WithEvents Document1 As DevExpress.XtraBars.Docking2010.Views.Tabbed.Document Friend WithEvents DockPanel2 As DevExpress.XtraBars.Docking.DockPanel Friend WithEvents DockPanel2_Container As DevExpress.XtraBars.Docking.ControlContainer Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar - Friend WithEvents panelContainer1 As DevExpress.XtraBars.Docking.DockPanel - Friend WithEvents DockPanel4 As DevExpress.XtraBars.Docking.DockPanel - Friend WithEvents DockPanel4_Container As DevExpress.XtraBars.Docking.ControlContainer - Friend WithEvents GridControl1 As DevExpress.XtraGrid.GridControl - Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView Friend WithEvents hideContainerBottom As DevExpress.XtraBars.Docking.AutoHideContainer Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem - Friend WithEvents GridColumn1 As DevExpress.XtraGrid.Columns.GridColumn - Friend WithEvents GridColumn2 As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents BindingSource1 As BindingSource Friend WithEvents BarToggleSwitchItem1 As DevExpress.XtraBars.BarToggleSwitchItem Friend WithEvents Timer1 As Timer @@ -621,4 +559,9 @@ Partial Class Form1 Friend WithEvents TextboxDatatableSort As DevExpress.XtraBars.BarEditItem Friend WithEvents RepositoryItemTextEdit4 As DevExpress.XtraEditors.Repository.RepositoryItemTextEdit Friend WithEvents BarEditItem1 As DevExpress.XtraBars.BarEditItem + Friend WithEvents panelContainer1 As DevExpress.XtraBars.Docking.DockPanel + Friend WithEvents GridControl1 As DevExpress.XtraGrid.GridControl + Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView + Friend WithEvents DockPanel4 As DevExpress.XtraBars.Docking.DockPanel + Friend WithEvents DockPanel4_Container As DevExpress.XtraBars.Docking.ControlContainer End Class diff --git a/GUIs.Test.EDMIBenchmark/Form1.resx b/GUIs.Test.EDMIBenchmark/Form1.resx index 2e27b38a..7d14a195 100644 --- a/GUIs.Test.EDMIBenchmark/Form1.resx +++ b/GUIs.Test.EDMIBenchmark/Form1.resx @@ -336,7 +336,7 @@ 159 - 181, 17 + 176, 18 316, 17 diff --git a/GUIs.Test.EDMIBenchmark/Form1.vb b/GUIs.Test.EDMIBenchmark/Form1.vb index 8f152fb7..f04a0428 100644 --- a/GUIs.Test.EDMIBenchmark/Form1.vb +++ b/GUIs.Test.EDMIBenchmark/Form1.vb @@ -13,7 +13,7 @@ Public Class Form1 Private Sub Form1_Load(sender As Object, e As EventArgs) Handles MyBase.Load Try - _LogConfig = New LogConfig(LogConfig.PathType.Temp, Nothing, "EDMIBenschmark") + _LogConfig = New LogConfig(LogConfig.PathType.Temp, Nothing, "EDMIBenchmark") _Logger = _LogConfig.GetLogger() _Client = New Client(_LogConfig, "172.24.12.39", 9000) _Client.Connect() @@ -227,13 +227,14 @@ Public Class Form1 Dim oSortExpression As String = TextboxDatatableSort.EditValue Dim oFilterExpression As String = TextboxDatatableFilter.EditValue Dim oResponse As TableResult = Await _Client.GetDatatableByNameAsync(oDatatableName, oFilterExpression, oSortExpression) - + Dim oDt As DataTable = oResponse.Table + GridControl1.DataSource = oDt oSWTotal.Stop() If oResponse.OK Then - AddLogMessage($"DataTable [{oDatatableName}] loaded: [{FormatTime(oSWTotal.ElapsedMilliseconds)}]") + AddLogMessage(Now.ToLongTimeString + $"DataTable [{oDatatableName}] loaded: [{FormatTime(oSWTotal.ElapsedMilliseconds)}]") Else - AddLogMessage($"DataTable [{oDatatableName}] could not be loaded. Error: {oResponse.ErrorMessage}") + AddLogMessage(Now.ToLongTimeString + $"DataTable [{oDatatableName}] could not be loaded. Error: {oResponse.ErrorMessage}") End If Catch ex As FaultException MsgBox(ex.Reason.ToString, MsgBoxStyle.Critical, "Error from Service") diff --git a/GUIs.ZooFlow/App.config b/GUIs.ZooFlow/App.config index ec6c5bdd..a502f322 100644 --- a/GUIs.ZooFlow/App.config +++ b/GUIs.ZooFlow/App.config @@ -2,6 +2,7 @@ +
@@ -11,6 +12,11 @@ providerName="System.Data.SqlClient" /> + + + True + + Skin/Office 2019 Colorful diff --git a/GUIs.ZooFlow/ApplicationEvents.vb b/GUIs.ZooFlow/ApplicationEvents.vb index bf1c2b0e..0bea039f 100644 --- a/GUIs.ZooFlow/ApplicationEvents.vb +++ b/GUIs.ZooFlow/ApplicationEvents.vb @@ -1,4 +1,5 @@ Imports DigitalData.Modules.Config +Imports DigitalData.Modules.EDMI.API Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Logging.LogConfig @@ -12,33 +13,63 @@ Namespace My Partial Friend Class MyApplication Private _Logger As Logger - Private _BaseUserConfigPath As String = Windows.Forms.Application.UserAppDataPath + Private oUserAppDataPath As String = Windows.Forms.Application.UserAppDataPath Private _BaseLocalUserConfigPath As String = Windows.Forms.Application.LocalUserAppDataPath - Private _BaseMachineConfigPath As String = Windows.Forms.Application.CommonAppDataPath - Private _BaseStartupPath As String = Windows.Forms.Application.StartupPath + Private oCommonAppDataPath As String = Windows.Forms.Application.CommonAppDataPath + Private oStartupPath As String = Windows.Forms.Application.StartupPath Public Sub App_Startup() Handles Me.Startup Dim oLogConfig As New LogConfig(LogPath:=PathType.AppData, CompanyName:="Digital Data", ProductName:="ZooFlow") With {.Debug = True} - + If My.Settings.UseAppConfigConString = True Then + ' UserAppDataPath = StartupPath + oCommonAppDataPath = oStartupPath + End If ' System Config files like Service Url will be saved in %LocalAppdata% so they will remain on the machine - Dim oSystemConfigManager As New ConfigManager(Of ClassConfig)(oLogConfig, - _BaseLocalUserConfigPath, - _BaseMachineConfigPath, - _BaseStartupPath) + Dim oConfigManager As New ConfigManager(Of ClassConfig)(oLogConfig, + oUserAppDataPath, + oCommonAppDataPath, + oStartupPath) ' Layout files will be saved in %Appdata% (Roaming) so they will be syncronized with the user profile - Dim oUIConfigPath = IO.Path.Combine(_BaseUserConfigPath, ClassConstants.FOLDER_NAME_LAYOUT) - Dim oUIConfigAlternatePath = IO.Path.Combine(_BaseStartupPath, ClassConstants.FOLDER_NAME_LAYOUT) + Dim oUIConfigPath = IO.Path.Combine(oUserAppDataPath, ClassConstants.FOLDER_NAME_LAYOUT) + Dim oUIConfigAlternatePath = IO.Path.Combine(oUserAppDataPath, ClassConstants.FOLDER_NAME_LAYOUT) Dim oUIConfigManager As New ConfigManager(Of ClassUIConfig)(oLogConfig, oUIConfigPath, oUIConfigPath, oUIConfigAlternatePath) + 'If oConfigManager.Config.ConnectionStringAppServer <> String.Empty Then + ' MyConStringAppserv = DecryptConnectionString(oConfigManager.Config.ConnectionStringAppServer) + ' If InitAppDatabase() Then + ' Logger.Debug("ConnectionStringAppServer will be used") + ' End If + 'End If + + LogConfig = oLogConfig LogConfig.Debug = True - SystemConfigManager = oSystemConfigManager + SystemConfigManager = oConfigManager UIConfigManager = oUIConfigManager _Logger = LogConfig.GetLogger() - _Logger.Debug("Starting Client Suite..") + _Logger.Debug("Starting ZooFlow...") + + If oConfigManager.Config.AppServerConfig <> String.Empty Then + Try + Dim oSplit() As String = oConfigManager.Config.AppServerConfig.ToString.Split(":") + Dim oAppServerAddress As String = oSplit(0) + Dim oAppServerPort As Integer = 9000 + If oSplit.Length = 2 Then + oAppServerPort = oSplit(1) + End If + _Client = New Client(LogConfig, oAppServerAddress, oAppServerPort) + If Not IsNothing(_Client) Then + If _Client.Connect() Then + APPSERVER_ACTIVE = True + End If + End If + Catch ex As Exception + _Logger.Warn($"Could not initialize the AppServer: {ex.Message}") + End Try + End If Dim oCommandLineArgs As New ClassCommandlineArgs(LogConfig) Dim oArgs = Environment.GetCommandLineArgs().Skip(1).ToList() diff --git a/GUIs.ZooFlow/Config/ClassConfig.vb b/GUIs.ZooFlow/Config/ClassConfig.vb index cab7f720..8dbda2aa 100644 --- a/GUIs.ZooFlow/Config/ClassConfig.vb +++ b/GUIs.ZooFlow/Config/ClassConfig.vb @@ -42,7 +42,8 @@ Public Class ClassConfig Public Property AppServerConfig As String = String.Empty - + + Public Property ConnectionStringAppServer As String = "" ' === Logging Configuration Public Property LogDebug As Boolean = False diff --git a/GUIs.ZooFlow/My Project/Settings.Designer.vb b/GUIs.ZooFlow/My Project/Settings.Designer.vb index a5ed3526..a17c9c4c 100644 --- a/GUIs.ZooFlow/My Project/Settings.Designer.vb +++ b/GUIs.ZooFlow/My Project/Settings.Designer.vb @@ -63,6 +63,15 @@ Partial Friend NotInheritable Class Settings Return CType(Me("IDBConnectionStringDEFAULT"),String) End Get End Property + + _ + Public ReadOnly Property UseAppConfigConString() As Boolean + Get + Return CType(Me("UseAppConfigConString"),Boolean) + End Get + End Property End Class Namespace My diff --git a/GUIs.ZooFlow/My Project/Settings.settings b/GUIs.ZooFlow/My Project/Settings.settings index 84da969f..e20ae7d1 100644 --- a/GUIs.ZooFlow/My Project/Settings.settings +++ b/GUIs.ZooFlow/My Project/Settings.settings @@ -10,5 +10,8 @@ </SerializableConnectionString> Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=IDB_TEST;Persist Security Info=True;User ID=sa;Password=dd + + True + \ No newline at end of file diff --git a/GUIs.ZooFlow/Search/ClassControlCreator.vb b/GUIs.ZooFlow/Search/ClassControlCreator.vb index de8be390..21d7f3c6 100644 --- a/GUIs.ZooFlow/Search/ClassControlCreator.vb +++ b/GUIs.ZooFlow/Search/ClassControlCreator.vb @@ -184,7 +184,7 @@ Public Class ClassControlCreator 'oMyNewGridControl.Size = New Size(CInt(pAttributeRow.Item("WIDTH")), CInt(pAttributeRow.Item("HEIGHT"))) oView = CType(oMyNewGridControl.MainView, GridView) - oView.Appearance.EvenRow.BackColor = Color.FromArgb(255, 214, 49) + oView.Appearance.EvenRow.BackColor = Color.WhiteSmoke ' Color.FromArgb(255, 214, 49) oView.OptionsBehavior.Editable = False oView.OptionsBehavior.ReadOnly = True oView.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False diff --git a/GUIs.ZooFlow/Search/frmSearchStart.Designer.vb b/GUIs.ZooFlow/Search/frmSearchStart.Designer.vb index 496b911b..18ae93b8 100644 --- a/GUIs.ZooFlow/Search/frmSearchStart.Designer.vb +++ b/GUIs.ZooFlow/Search/frmSearchStart.Designer.vb @@ -52,6 +52,7 @@ Partial Class frmSearchStart Me.RibbonPageGroupProfiles = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroupFilter = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroupSettings = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RepositoryItemTextEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemTextEdit() Me.RepositoryItemTimeSpanEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemTimeSpanEdit() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() @@ -75,7 +76,6 @@ Partial Class frmSearchStart Me.KlammerRechtsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.KlammerEntfernenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.SplitContainerControlSearch = New DevExpress.XtraEditors.SplitContainerControl() - Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RepositoryItemRadioGroup1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -188,7 +188,7 @@ Partial Class frmSearchStart ' 'BarButtonStartSearch ' - Me.BarButtonStartSearch.Caption = "Finden (F2)" + Me.BarButtonStartSearch.Caption = "Finden (F5)" Me.BarButtonStartSearch.Id = 9 Me.BarButtonStartSearch.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonStartSearch.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.BarButtonStartSearch.Name = "BarButtonStartSearch" @@ -295,6 +295,13 @@ Partial Class frmSearchStart Me.RibbonPageGroupSettings.Name = "RibbonPageGroupSettings" Me.RibbonPageGroupSettings.Text = "Sucheinstellungen" ' + 'RibbonPageGroup1 + ' + Me.RibbonPageGroup1.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonStartSearch) + Me.RibbonPageGroup1.Name = "RibbonPageGroup1" + Me.RibbonPageGroup1.Text = "RibbonPageGroup1" + ' 'RepositoryItemTextEdit1 ' Me.RepositoryItemTextEdit1.AutoHeight = False @@ -467,13 +474,6 @@ Partial Class frmSearchStart Me.SplitContainerControlSearch.SplitterPosition = 310 Me.SplitContainerControlSearch.TabIndex = 16 ' - 'RibbonPageGroup1 - ' - Me.RibbonPageGroup1.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far - Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonStartSearch) - Me.RibbonPageGroup1.Name = "RibbonPageGroup1" - Me.RibbonPageGroup1.Text = "RibbonPageGroup1" - ' 'frmSearchStart ' Me.AllowFormGlass = DevExpress.Utils.DefaultBoolean.[True] diff --git a/GUIs.ZooFlow/Search/frmSearchStart.resx b/GUIs.ZooFlow/Search/frmSearchStart.resx index 93f0658e..5813d7a2 100644 --- a/GUIs.ZooFlow/Search/frmSearchStart.resx +++ b/GUIs.ZooFlow/Search/frmSearchStart.resx @@ -188,36 +188,15 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAKgGAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgdmlld0JveD0iMCAwIDgx - LjIyNjUgNDguOTI1IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGlkPSJFYmVuZV8x - Ij4NCiAgPGRlZnM+DQogICAgPHN0eWxlPi5jbHMtMXtmaWxsOiMxZDFkMWI7fS5jbHMtMntmaWxsOiNh - NTI0MzE7fS5jbHMtM3tmaWxsOm5vbmU7c3Ryb2tlOiMxZDFkMWI7c3Ryb2tlLXdpZHRoOjIuMTY4cHg7 - fTwvc3R5bGU+DQogIDwvZGVmcz4NCiAgPHBhdGggZD0iTTMzLjc0NCwyNy4yMDY4SDMxLjE4NWwtMS40 - NDksNC45OTVoLS4wMjVsLTEuMzI3LTQuOTk1SDI2LjY3OGwtMS4zMjgsNC45OTVoLS4wMjRsLTEuNDUt - NC45OTVIMjEuMzE4bDIuODAyLDguNzcxaDIuMzE0bDEuMDg1LTQuNjI5aC4wMjRsMS4wODQsNC42Mjlo - Mi4zMTVabS0xNC44NjIsNC4zODZhMi4yMDQ3LDIuMjA0NywwLDEsMS00LjM4NSwwLDIuMjA0OCwyLjIw - NDgsMCwxLDEsNC4zODUsMG0yLjQzNiwwYTQuNjI5LDQuNjI5LDAsMSwwLTQuNjI5LDQuNjI5LDQuNTUx - MSw0LjU1MTEsMCwwLDAsNC42MjktNC42MjltLTkuNjIzLDIuMTkzSDguODkzdi02LjU3OUg2LjQ1N3Y4 - Ljc3MWg0Ljk5NFpNNS40ODIsMjkuNGwtLjI0NC0yLjE5M0gwdjguNzcxSDIuNDM2di0zLjQxMUg1LjEx - N3YtMi4wNzFIMi40MzZWMjkuNFoiIGNsYXNzPSJjbHMtMSIgLz4NCiAgPHBhdGggZD0iTTMwLjk0MjEs - MjEuNDQxMWMwLDEuODI3LTEuNDYyLDIuMTkyLTIuODAyLDIuMTkydi00LjM4NWMxLjM0LDAsMi44MDIu - MzY1LDIuODAyLDIuMTkzbTIuNDM2LDBhNC4yNTMzLDQuMjUzMywwLDAsMC00LjI2NC00LjM4NmgtMy40 - MTF2OC43NzFoMy40MTFhNC40MTcsNC40MTcsMCwwLDAsNC4yNjQtNC4zODVtLTkuMTM2LDQuMzg1di04 - Ljc3MWgtMi40Mzd2NC4xNDJoLS4wMjRsLTIuNzc4LTQuMTQyaC0yLjE5MnY4Ljc3MWgyLjQzNnYtNC4x - NDJoLjAyNGwyLjc3OCw0LjE0MlptLTguODkzLTguNzcxaC0yLjQzNnY4Ljc3MWgyLjQzNlptLTMuNDEx - LDIuMTkzLS4yNDQtMi4xOTNINi40NTYxdjguNzcxaDIuNDM2di0zLjQxMWgyLjY4MXYtMi4wNzFIOC44 - OTIxdi0xLjA5NloiIGNsYXNzPSJjbHMtMiIgLz4NCiAgPHBvbHlnb24gcG9pbnRzPSIzOS40NjEgMCAz - OS40NiA0OC45MjUgODEuMjI2IDI0LjQ2MyAzOS40NjEgMCIgY2xhc3M9ImNscy0yIiAvPg0KICA8cGF0 - aCBkPSJNNTQuOTYzNiwzMS45MTU5YTEwLjQxODUsMTAuNDE4NSwwLDEsMC0xMC40MTgtMTAuNDE4QTEw - LjQxNzYsMTAuNDE3NiwwLDAsMCw1NC45NjM2LDMxLjkxNTlaIiBjbGFzcz0iY2xzLTMiIC8+DQogIDxw - YXRoIGQ9Ik02MS41NTE2LDIxLjMwMzdhNi41Nzg1LDYuNTc4NSwwLDAsMC0xMC4wNTQtNS41OTUsMy4w - NDU3LDMuMDQ1NywwLDAsMSwuNjczLDEuODk5LDMuMDc3NywzLjA3NzcsMCwwLDEtMy4wNzgsMy4wNzcs - My4wNCwzLjA0LDAsMCwxLS42NzktLjA4MSw2Ljc0ODUsNi43NDg1LDAsMCwwLS4wMzguNyw2LjU4OCw2 - LjU4OCwwLDEsMCwxMy4xNzYsMCIgY2xhc3M9ImNscy0xIiAvPg0KICA8cGF0aCBkPSJNNjkuNTYxNSwx - Ni4zNTQzYTE4LjY0NDYsMTguNjQ0NiwwLDAsMC0yNC45MTYtNi44NzcsMTA0LjAzMTIsMTA0LjAzMTIs - MCwwLDEsMTEuMjA4LDEuMjQxYzUuOTgyLDEuMjQ0LDkuMDc0LDMuMjA0LDEzLjcwOCw1LjYzNiIgY2xh - c3M9ImNscy0xIiAvPg0KPC9zdmc+Cw== + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALcBAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTmV4dCIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMzIg + MzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KPC9zdHls + ZT4NCiAgPHBhdGggZD0iTTguOSw0LjFDOC40LDMuOCw4LDQuMSw4LDQuNnYyMC43YzAsMC42LDAuNCww + LjgsMC45LDAuNWwxNi44LTEwLjNjMC41LTAuMywwLjUtMC44LDAtMS4xTDguOSw0LjF6IiBjbGFzcz0i + Qmx1ZSIgLz4NCjwvc3ZnPgs= diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj index 2f3dd5bc..49f7127f 100644 --- a/GUIs.ZooFlow/ZooFlow.vbproj +++ b/GUIs.ZooFlow/ZooFlow.vbproj @@ -114,6 +114,7 @@ + @@ -284,6 +285,10 @@ {EAF0EA75-5FA7-485D-89C7-B2D843B03A96} Database + + {25017513-0d97-49d3-98d7-ba76d9b251b0} + EDMI.API + {991d0231-4623-496d-8bd0-9ca906029cbc} Filesystem diff --git a/GUIs.ZooFlow/frmFlowForm.Designer.vb b/GUIs.ZooFlow/frmFlowForm.Designer.vb index c9b0afa5..1d964ab8 100644 --- a/GUIs.ZooFlow/frmFlowForm.Designer.vb +++ b/GUIs.ZooFlow/frmFlowForm.Designer.vb @@ -33,8 +33,6 @@ Partial Class frmFlowForm Me.VerwaltungToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.UserVerwaltungToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ZooFlowBeendenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.ContextMenuForm = New System.Windows.Forms.ContextMenuStrip(Me.components) - Me.AlleAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.TimerRefreshData = New System.Windows.Forms.Timer(Me.components) Me.PictureBoxAbo = New System.Windows.Forms.PictureBox() Me.PictureBoxDragDrop = New System.Windows.Forms.PictureBox() @@ -45,7 +43,6 @@ Partial Class frmFlowForm Me.TimerCheckActiveForms = New System.Windows.Forms.Timer(Me.components) Me.TimerCheckDroppedFiles = New System.Windows.Forms.Timer(Me.components) Me.ContextMenuSystray.SuspendLayout() - Me.ContextMenuForm.SuspendLayout() CType(Me.PictureBoxAbo, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBoxDragDrop, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBoxGlobix, System.ComponentModel.ISupportInitialize).BeginInit() @@ -107,18 +104,6 @@ Partial Class frmFlowForm Me.ZooFlowBeendenToolStripMenuItem.Size = New System.Drawing.Size(173, 22) Me.ZooFlowBeendenToolStripMenuItem.Text = "ZooFlow beenden" ' - 'ContextMenuForm - ' - Me.ContextMenuForm.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.AlleAnzeigenToolStripMenuItem}) - Me.ContextMenuForm.Name = "ContextMenuStrip1" - Me.ContextMenuForm.Size = New System.Drawing.Size(145, 26) - ' - 'AlleAnzeigenToolStripMenuItem - ' - Me.AlleAnzeigenToolStripMenuItem.Name = "AlleAnzeigenToolStripMenuItem" - Me.AlleAnzeigenToolStripMenuItem.Size = New System.Drawing.Size(144, 22) - Me.AlleAnzeigenToolStripMenuItem.Text = "Alle anzeigen" - ' 'PictureBoxAbo ' Me.PictureBoxAbo.Cursor = System.Windows.Forms.Cursors.Hand @@ -132,6 +117,7 @@ Partial Class frmFlowForm ' 'PictureBoxDragDrop ' + Me.PictureBoxDragDrop.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.PictureBoxDragDrop.Dock = System.Windows.Forms.DockStyle.Left Me.PictureBoxDragDrop.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources._1_LOGO_ZOO_FLOW Me.PictureBoxDragDrop.Location = New System.Drawing.Point(0, 0) @@ -152,7 +138,6 @@ Partial Class frmFlowForm Me.PictureBoxGlobix.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom Me.PictureBoxGlobix.TabIndex = 9 Me.PictureBoxGlobix.TabStop = False - Me.PictureBoxGlobix.Visible = False ' 'PictureBoxPM ' @@ -166,7 +151,6 @@ Partial Class frmFlowForm Me.PictureBoxPM.TabIndex = 4 Me.PictureBoxPM.TabStop = False Me.ToolTip1.SetToolTip(Me.PictureBoxPM, "ProcessManager starten") - Me.PictureBoxPM.Visible = False ' 'PictureBoxSearch ' @@ -200,7 +184,6 @@ Partial Class frmFlowForm Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(563, 150) - Me.ContextMenuStrip = Me.ContextMenuForm Me.Controls.Add(Me.PictureBoxAbo) Me.Controls.Add(Me.PictureBoxDragDrop) Me.Controls.Add(Me.PictureBoxGlobix) @@ -212,7 +195,6 @@ Partial Class frmFlowForm Me.Text = "frmFlowForm_Test1" Me.TopMost = True Me.ContextMenuSystray.ResumeLayout(False) - Me.ContextMenuForm.ResumeLayout(False) CType(Me.PictureBoxAbo, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBoxDragDrop, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBoxGlobix, System.ComponentModel.ISupportInitialize).EndInit() @@ -228,8 +210,6 @@ Partial Class frmFlowForm Friend WithEvents ContextMenuSystray As ContextMenuStrip Friend WithEvents VerwaltungToolStripMenuItem As ToolStripMenuItem Friend WithEvents ZooFlowBeendenToolStripMenuItem As ToolStripMenuItem - Friend WithEvents ContextMenuForm As ContextMenuStrip - Friend WithEvents AlleAnzeigenToolStripMenuItem As ToolStripMenuItem Friend WithEvents PictureBoxDragDrop As PictureBox Friend WithEvents TimerRefreshData As Timer Friend WithEvents PictureBoxAbo As PictureBox diff --git a/GUIs.ZooFlow/frmFlowForm.resx b/GUIs.ZooFlow/frmFlowForm.resx index 118ec9e7..79cf9f14 100644 --- a/GUIs.ZooFlow/frmFlowForm.resx +++ b/GUIs.ZooFlow/frmFlowForm.resx @@ -1956,14 +1956,11 @@ AMADAADwDwAA - + 461, 17 - - 615, 17 - - 764, 17 + 610, 17 @@ -2041,9 +2038,9 @@ - 863, 17 + 709, 17 - 1045, 17 + 891, 17 \ No newline at end of file diff --git a/GUIs.ZooFlow/frmFlowForm.vb b/GUIs.ZooFlow/frmFlowForm.vb index b12dd1c8..3832be35 100644 --- a/GUIs.ZooFlow/frmFlowForm.vb +++ b/GUIs.ZooFlow/frmFlowForm.vb @@ -203,11 +203,7 @@ Public Class frmFlowForm Private Sub ZooFlowBeendenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ZooFlowBeendenToolStripMenuItem.Click ExitZooflow() End Sub - Private Sub AlleAnzeigenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AlleAnzeigenToolStripMenuItem.Click - For Each oControl As Control In Me.Controls - oControl.Visible = True - Next - End Sub + Private Sub VerwaltungToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles VerwaltungToolStripMenuItem.Click frmAdministrationZooFlow.Show() End Sub diff --git a/GUIs.ZooFlow/frmSplash.Designer.vb b/GUIs.ZooFlow/frmSplash.Designer.vb index 5fb4b9c6..9cb62023 100644 --- a/GUIs.ZooFlow/frmSplash.Designer.vb +++ b/GUIs.ZooFlow/frmSplash.Designer.vb @@ -27,7 +27,6 @@ Partial Class frmSplash Me.txtActionName = New DevExpress.XtraEditors.LabelControl() Me.Version = New DevExpress.XtraEditors.LabelControl() Me.ProgressBarControl1 = New DevExpress.XtraEditors.ProgressBarControl() - Me.Button1 = New System.Windows.Forms.Button() Me.PictureEdit1 = New DevExpress.XtraEditors.PictureEdit() Me.pictureEdit2 = New DevExpress.XtraEditors.PictureEdit() CType(Me.ProgressBarControl1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() @@ -73,20 +72,12 @@ Partial Class frmSplash Me.ProgressBarControl1.Size = New System.Drawing.Size(509, 18) Me.ProgressBarControl1.TabIndex = 15 ' - 'Button1 - ' - Me.Button1.Location = New System.Drawing.Point(446, 141) - Me.Button1.Name = "Button1" - Me.Button1.Size = New System.Drawing.Size(75, 23) - Me.Button1.TabIndex = 16 - Me.Button1.Text = "Stop" - Me.Button1.UseVisualStyleBackColor = True - ' 'PictureEdit1 ' Me.PictureEdit1.EditValue = CType(resources.GetObject("PictureEdit1.EditValue"), Object) Me.PictureEdit1.Location = New System.Drawing.Point(247, 255) Me.PictureEdit1.Name = "PictureEdit1" + Me.PictureEdit1.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder Me.PictureEdit1.Properties.ShowCameraMenuItem = DevExpress.XtraEditors.Controls.CameraMenuItemVisibility.[Auto] Me.PictureEdit1.Properties.SizeMode = DevExpress.XtraEditors.Controls.PictureSizeMode.Zoom Me.PictureEdit1.Size = New System.Drawing.Size(274, 53) @@ -116,7 +107,6 @@ Partial Class frmSplash Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(533, 320) Me.Controls.Add(Me.PictureEdit1) - Me.Controls.Add(Me.Button1) Me.Controls.Add(Me.ProgressBarControl1) Me.Controls.Add(Me.pictureEdit2) Me.Controls.Add(Me.Version) @@ -136,6 +126,5 @@ End Sub Private WithEvents Version As DevExpress.XtraEditors.LabelControl Friend WithEvents ProgressBarControl1 As DevExpress.XtraEditors.ProgressBarControl Private WithEvents pictureEdit2 As DevExpress.XtraEditors.PictureEdit - Friend WithEvents Button1 As Button Friend WithEvents PictureEdit1 As DevExpress.XtraEditors.PictureEdit End Class diff --git a/GUIs.ZooFlow/frmSplash.vb b/GUIs.ZooFlow/frmSplash.vb index e869672a..901a809a 100644 --- a/GUIs.ZooFlow/frmSplash.vb +++ b/GUIs.ZooFlow/frmSplash.vb @@ -27,7 +27,5 @@ Public Class frmSplash SetActionName End Enum - Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click - MsgBox("Stop") - End Sub + End Class diff --git a/GUIs.ZooFlow/modCurrent.vb b/GUIs.ZooFlow/modCurrent.vb new file mode 100644 index 00000000..58b3d3e0 --- /dev/null +++ b/GUIs.ZooFlow/modCurrent.vb @@ -0,0 +1,6 @@ +Imports DigitalData.Modules.EDMI.API + +Module modCurrent + Public _Client As Client + Public APPSERVER_ACTIVE As Boolean = False +End Module