diff --git a/GUIs.ZooFlow/Globix/frmGlobixAdministration.Designer.vb b/GUIs.ZooFlow/Globix/frmGlobixAdministration.Designer.vb index e9792a5a..5d7a2493 100644 --- a/GUIs.ZooFlow/Globix/frmGlobixAdministration.Designer.vb +++ b/GUIs.ZooFlow/Globix/frmGlobixAdministration.Designer.vb @@ -77,6 +77,8 @@ Partial Class frmGlobixAdministration Me.LayoutControlItem23 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem24 = New DevExpress.XtraLayout.LayoutControlItem() Me.EmptySpaceItem9 = New DevExpress.XtraLayout.EmptySpaceItem() + Me.EmptySpaceItem15 = New DevExpress.XtraLayout.EmptySpaceItem() + Me.EmptySpaceItem16 = New DevExpress.XtraLayout.EmptySpaceItem() Me.XtraTabControl2 = New DevExpress.XtraTab.XtraTabControl() Me.XtraTabPageManIndexe = New DevExpress.XtraTab.XtraTabPage() Me.LayoutControl2 = New DevExpress.XtraLayout.LayoutControl() @@ -113,7 +115,6 @@ Partial Class frmGlobixAdministration Me.EmptySpaceItem3 = New DevExpress.XtraLayout.EmptySpaceItem() Me.LayoutControlItem27 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem29 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlItem30 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem20 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem22 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem21 = New DevExpress.XtraLayout.LayoutControlItem() @@ -123,6 +124,9 @@ Partial Class frmGlobixAdministration Me.LayoutControlItem39 = New DevExpress.XtraLayout.LayoutControlItem() Me.EmptySpaceItem11 = New DevExpress.XtraLayout.EmptySpaceItem() Me.LayoutControlItem28 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem30 = New DevExpress.XtraLayout.LayoutControlItem() + Me.EmptySpaceItem17 = New DevExpress.XtraLayout.EmptySpaceItem() + Me.EmptySpaceItem18 = New DevExpress.XtraLayout.EmptySpaceItem() Me.ListBoxControlmanIndex = New DevExpress.XtraEditors.ListBoxControl() Me.XtraTabPageRework = New DevExpress.XtraTab.XtraTabPage() Me.XtraTabPageAutoIndexe = New DevExpress.XtraTab.XtraTabPage() @@ -160,10 +164,6 @@ Partial Class frmGlobixAdministration Me.EmptySpaceItem12 = New DevExpress.XtraLayout.EmptySpaceItem() Me.EmptySpaceItem13 = New DevExpress.XtraLayout.EmptySpaceItem() Me.EmptySpaceItem14 = New DevExpress.XtraLayout.EmptySpaceItem() - Me.EmptySpaceItem15 = New DevExpress.XtraLayout.EmptySpaceItem() - Me.EmptySpaceItem16 = New DevExpress.XtraLayout.EmptySpaceItem() - Me.EmptySpaceItem17 = New DevExpress.XtraLayout.EmptySpaceItem() - Me.EmptySpaceItem18 = New DevExpress.XtraLayout.EmptySpaceItem() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabControl1.SuspendLayout() @@ -190,6 +190,8 @@ Partial Class frmGlobixAdministration CType(Me.LayoutControlItem23, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem24, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.EmptySpaceItem9, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.EmptySpaceItem15, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.EmptySpaceItem16, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.XtraTabControl2, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabControl2.SuspendLayout() Me.XtraTabPageManIndexe.SuspendLayout() @@ -211,7 +213,6 @@ Partial Class frmGlobixAdministration CType(Me.EmptySpaceItem3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem27, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem29, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem30, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem20, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem22, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem21, System.ComponentModel.ISupportInitialize).BeginInit() @@ -221,6 +222,9 @@ Partial Class frmGlobixAdministration CType(Me.LayoutControlItem39, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.EmptySpaceItem11, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem28, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem30, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.EmptySpaceItem17, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.EmptySpaceItem18, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ListBoxControlmanIndex, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabPageAutoIndexe.SuspendLayout() CType(Me.LayoutControlAutoIndexe, System.ComponentModel.ISupportInitialize).BeginInit() @@ -244,10 +248,6 @@ Partial Class frmGlobixAdministration CType(Me.EmptySpaceItem12, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.EmptySpaceItem13, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.EmptySpaceItem14, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.EmptySpaceItem15, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.EmptySpaceItem16, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.EmptySpaceItem17, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.EmptySpaceItem18, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'RibbonControl1 @@ -414,6 +414,7 @@ Partial Class frmGlobixAdministration ' 'GEAENDERTWANNTextBox ' + Me.GEAENDERTWANNTextBox.BackColor = System.Drawing.SystemColors.ControlLight Me.GEAENDERTWANNTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_DOKUMENTARTBindingSource, "GEAENDERTWANN", True)) Me.GEAENDERTWANNTextBox.Location = New System.Drawing.Point(457, 149) Me.GEAENDERTWANNTextBox.Name = "GEAENDERTWANNTextBox" @@ -433,6 +434,7 @@ Partial Class frmGlobixAdministration ' 'GEANDERTWERTextBox ' + Me.GEANDERTWERTextBox.BackColor = System.Drawing.SystemColors.ControlLight Me.GEANDERTWERTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_DOKUMENTARTBindingSource, "GEANDERTWER", True)) Me.GEANDERTWERTextBox.Location = New System.Drawing.Point(457, 125) Me.GEANDERTWERTextBox.Name = "GEANDERTWERTextBox" @@ -442,6 +444,7 @@ Partial Class frmGlobixAdministration ' 'ERSTELLTWANNTextBox ' + Me.ERSTELLTWANNTextBox.BackColor = System.Drawing.SystemColors.ControlLight Me.ERSTELLTWANNTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_DOKUMENTARTBindingSource, "ERSTELLTWANN", True)) Me.ERSTELLTWANNTextBox.Location = New System.Drawing.Point(143, 149) Me.ERSTELLTWANNTextBox.Name = "ERSTELLTWANNTextBox" @@ -451,6 +454,7 @@ Partial Class frmGlobixAdministration ' 'ERSTELLTWERTextBox ' + Me.ERSTELLTWERTextBox.BackColor = System.Drawing.SystemColors.ControlLight Me.ERSTELLTWERTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_DOKUMENTARTBindingSource, "ERSTELLTWER", True)) Me.ERSTELLTWERTextBox.Location = New System.Drawing.Point(143, 125) Me.ERSTELLTWERTextBox.Name = "ERSTELLTWERTextBox" @@ -471,9 +475,9 @@ Partial Class frmGlobixAdministration 'AKTIVCheckBox ' Me.AKTIVCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBDD_DOKUMENTARTBindingSource, "AKTIV", True)) - Me.AKTIVCheckBox.Location = New System.Drawing.Point(405, 12) + Me.AKTIVCheckBox.Location = New System.Drawing.Point(390, 12) Me.AKTIVCheckBox.Name = "AKTIVCheckBox" - Me.AKTIVCheckBox.Size = New System.Drawing.Size(97, 20) + Me.AKTIVCheckBox.Size = New System.Drawing.Size(98, 20) Me.AKTIVCheckBox.TabIndex = 1 Me.AKTIVCheckBox.Text = "Aktiv" Me.AKTIVCheckBox.UseVisualStyleBackColor = True @@ -492,9 +496,9 @@ Partial Class frmGlobixAdministration Me.ComboBox3.DisplayMember = "DISPLAY_TEXT" Me.ComboBox3.FormattingEnabled = True Me.ComboBox3.Items.AddRange(New Object() {"New version", "Default", "Question"}) - Me.ComboBox3.Location = New System.Drawing.Point(637, 12) + Me.ComboBox3.Location = New System.Drawing.Point(623, 12) Me.ComboBox3.Name = "ComboBox3" - Me.ComboBox3.Size = New System.Drawing.Size(200, 21) + Me.ComboBox3.Size = New System.Drawing.Size(274, 21) Me.ComboBox3.TabIndex = 97 Me.ComboBox3.ValueMember = "VALUE_TEXT" ' @@ -527,11 +531,12 @@ Partial Class frmGlobixAdministration Me.SEQUENCENumericUpDown.DataBindings.Add(New System.Windows.Forms.Binding("Value", Me.TBDD_DOKUMENTARTBindingSource, "SEQUENCE", True)) Me.SEQUENCENumericUpDown.Location = New System.Drawing.Point(340, 12) Me.SEQUENCENumericUpDown.Name = "SEQUENCENumericUpDown" - Me.SEQUENCENumericUpDown.Size = New System.Drawing.Size(61, 22) + Me.SEQUENCENumericUpDown.Size = New System.Drawing.Size(46, 22) Me.SEQUENCENumericUpDown.TabIndex = 7 ' 'DokartGUIDTextBox ' + Me.DokartGUIDTextBox.BackColor = System.Drawing.SystemColors.ControlLight Me.DokartGUIDTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_DOKUMENTARTBindingSource, "GUID", True)) Me.DokartGUIDTextBox.Location = New System.Drawing.Point(143, 12) Me.DokartGUIDTextBox.Name = "DokartGUIDTextBox" @@ -598,34 +603,34 @@ Partial Class frmGlobixAdministration Me.LayoutControlItem4.Control = Me.SEQUENCENumericUpDown Me.LayoutControlItem4.Location = New System.Drawing.Point(197, 0) Me.LayoutControlItem4.Name = "LayoutControlItem4" - Me.LayoutControlItem4.Size = New System.Drawing.Size(196, 25) + Me.LayoutControlItem4.Size = New System.Drawing.Size(181, 25) Me.LayoutControlItem4.Text = "Reihenfolge:" Me.LayoutControlItem4.TextSize = New System.Drawing.Size(128, 13) ' 'LayoutControlItem2 ' Me.LayoutControlItem2.Control = Me.ComboBox3 - Me.LayoutControlItem2.Location = New System.Drawing.Point(494, 0) + Me.LayoutControlItem2.Location = New System.Drawing.Point(480, 0) Me.LayoutControlItem2.Name = "LayoutControlItem2" - Me.LayoutControlItem2.Size = New System.Drawing.Size(335, 25) + Me.LayoutControlItem2.Size = New System.Drawing.Size(409, 25) Me.LayoutControlItem2.Text = "Wenn Datei vorhanden:" Me.LayoutControlItem2.TextSize = New System.Drawing.Size(128, 13) ' 'LayoutControlItem1 ' Me.LayoutControlItem1.Control = Me.AKTIVCheckBox - Me.LayoutControlItem1.Location = New System.Drawing.Point(393, 0) + Me.LayoutControlItem1.Location = New System.Drawing.Point(378, 0) Me.LayoutControlItem1.Name = "LayoutControlItem1" - Me.LayoutControlItem1.Size = New System.Drawing.Size(101, 25) + Me.LayoutControlItem1.Size = New System.Drawing.Size(102, 25) Me.LayoutControlItem1.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem1.TextVisible = False ' 'EmptySpaceItem7 ' Me.EmptySpaceItem7.AllowHotTrack = False - Me.EmptySpaceItem7.Location = New System.Drawing.Point(829, 0) + Me.EmptySpaceItem7.Location = New System.Drawing.Point(889, 0) Me.EmptySpaceItem7.Name = "EmptySpaceItem7" - Me.EmptySpaceItem7.Size = New System.Drawing.Size(335, 25) + Me.EmptySpaceItem7.Size = New System.Drawing.Size(275, 25) Me.EmptySpaceItem7.TextSize = New System.Drawing.Size(0, 0) ' 'LayoutControlItem9 @@ -691,6 +696,22 @@ Partial Class frmGlobixAdministration Me.EmptySpaceItem9.Size = New System.Drawing.Size(537, 63) Me.EmptySpaceItem9.TextSize = New System.Drawing.Size(0, 0) ' + 'EmptySpaceItem15 + ' + Me.EmptySpaceItem15.AllowHotTrack = False + Me.EmptySpaceItem15.Location = New System.Drawing.Point(889, 25) + Me.EmptySpaceItem15.Name = "EmptySpaceItem15" + Me.EmptySpaceItem15.Size = New System.Drawing.Size(275, 24) + Me.EmptySpaceItem15.TextSize = New System.Drawing.Size(0, 0) + ' + 'EmptySpaceItem16 + ' + Me.EmptySpaceItem16.AllowHotTrack = False + Me.EmptySpaceItem16.Location = New System.Drawing.Point(889, 49) + Me.EmptySpaceItem16.Name = "EmptySpaceItem16" + Me.EmptySpaceItem16.Size = New System.Drawing.Size(275, 24) + Me.EmptySpaceItem16.TextSize = New System.Drawing.Size(0, 0) + ' 'XtraTabControl2 ' Me.XtraTabControl2.Dock = System.Windows.Forms.DockStyle.Bottom @@ -759,6 +780,7 @@ Partial Class frmGlobixAdministration ' 'CHANGED_WHENTextBox ' + Me.CHANGED_WHENTextBox.BackColor = System.Drawing.SystemColors.ControlLight Me.CHANGED_WHENTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_MANBindingSource, "CHANGED_WHEN", True)) Me.CHANGED_WHENTextBox.Location = New System.Drawing.Point(339, 227) Me.CHANGED_WHENTextBox.Name = "CHANGED_WHENTextBox" @@ -773,6 +795,7 @@ Partial Class frmGlobixAdministration ' 'CHANGED_WHOTextBox ' + Me.CHANGED_WHOTextBox.BackColor = System.Drawing.SystemColors.ControlLight Me.CHANGED_WHOTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_MANBindingSource, "CHANGED_WHO", True)) Me.CHANGED_WHOTextBox.Location = New System.Drawing.Point(339, 203) Me.CHANGED_WHOTextBox.Name = "CHANGED_WHOTextBox" @@ -782,6 +805,7 @@ Partial Class frmGlobixAdministration ' 'ADDED_WHENTextBox ' + Me.ADDED_WHENTextBox.BackColor = System.Drawing.SystemColors.ControlLight Me.ADDED_WHENTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_MANBindingSource, "ADDED_WHEN", True)) Me.ADDED_WHENTextBox.Location = New System.Drawing.Point(100, 227) Me.ADDED_WHENTextBox.Name = "ADDED_WHENTextBox" @@ -791,6 +815,7 @@ Partial Class frmGlobixAdministration ' 'ADDED_WHOTextBox ' + Me.ADDED_WHOTextBox.BackColor = System.Drawing.SystemColors.ControlLight Me.ADDED_WHOTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_MANBindingSource, "ADDED_WHO", True)) Me.ADDED_WHOTextBox.Location = New System.Drawing.Point(100, 203) Me.ADDED_WHOTextBox.Name = "ADDED_WHOTextBox" @@ -820,11 +845,10 @@ Partial Class frmGlobixAdministration ' 'Button1 ' - Me.Button1.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.Datasource_16x16 Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button1.Location = New System.Drawing.Point(12, 85) + Me.Button1.Location = New System.Drawing.Point(559, 60) Me.Button1.Name = "Button1" - Me.Button1.Size = New System.Drawing.Size(543, 40) + Me.Button1.Size = New System.Drawing.Size(266, 21) Me.Button1.TabIndex = 16 Me.Button1.Text = "Connector bearbeiten" Me.Button1.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -892,6 +916,7 @@ Partial Class frmGlobixAdministration ' 'GUIDTextBox1 ' + Me.GUIDTextBox1.BackColor = System.Drawing.SystemColors.ControlLight Me.GUIDTextBox1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_MANBindingSource, "GUID", True)) Me.GUIDTextBox1.Location = New System.Drawing.Point(100, 12) Me.GUIDTextBox1.Name = "GUIDTextBox1" @@ -913,7 +938,7 @@ Partial Class frmGlobixAdministration ' Me.ControlGroupIndexeMan.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] Me.ControlGroupIndexeMan.GroupBordersVisible = False - Me.ControlGroupIndexeMan.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem11, Me.LayoutControlItem14, Me.LayoutControlItem15, Me.LayoutControlItem18, Me.LayoutControlItem12, Me.LayoutControlItem13, Me.LayoutControlItem10, Me.EmptySpaceItem1, Me.LayoutControlItem16, Me.EmptySpaceItem2, Me.EmptySpaceItem3, Me.LayoutControlItem27, Me.LayoutControlItem29, Me.LayoutControlItem20, Me.LayoutControlItem22, Me.LayoutControlItem21, Me.LayoutControlItem31, Me.EmptySpaceItem10, Me.LayoutControlItem17, Me.LayoutControlItem39, Me.EmptySpaceItem11, Me.LayoutControlItem28, Me.LayoutControlItem30, Me.EmptySpaceItem17, Me.EmptySpaceItem18}) + Me.ControlGroupIndexeMan.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem11, Me.LayoutControlItem14, Me.LayoutControlItem15, Me.LayoutControlItem18, Me.LayoutControlItem12, Me.LayoutControlItem13, Me.EmptySpaceItem1, Me.LayoutControlItem16, Me.EmptySpaceItem2, Me.EmptySpaceItem3, Me.LayoutControlItem27, Me.LayoutControlItem29, Me.LayoutControlItem20, Me.LayoutControlItem22, Me.LayoutControlItem21, Me.LayoutControlItem31, Me.EmptySpaceItem10, Me.LayoutControlItem17, Me.LayoutControlItem39, Me.EmptySpaceItem11, Me.LayoutControlItem28, Me.LayoutControlItem30, Me.EmptySpaceItem17, Me.EmptySpaceItem18, Me.LayoutControlItem10}) Me.ControlGroupIndexeMan.Name = "ControlGroupIndexeMan" Me.ControlGroupIndexeMan.Size = New System.Drawing.Size(1019, 259) Me.ControlGroupIndexeMan.TextVisible = False @@ -976,10 +1001,10 @@ Partial Class frmGlobixAdministration 'LayoutControlItem10 ' Me.LayoutControlItem10.Control = Me.Button1 - Me.LayoutControlItem10.Location = New System.Drawing.Point(0, 73) + Me.LayoutControlItem10.Location = New System.Drawing.Point(547, 48) Me.LayoutControlItem10.MinSize = New System.Drawing.Size(24, 24) Me.LayoutControlItem10.Name = "LayoutControlItem10" - Me.LayoutControlItem10.Size = New System.Drawing.Size(547, 44) + Me.LayoutControlItem10.Size = New System.Drawing.Size(270, 25) Me.LayoutControlItem10.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom Me.LayoutControlItem10.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem10.TextVisible = False @@ -1004,9 +1029,9 @@ Partial Class frmGlobixAdministration 'EmptySpaceItem2 ' Me.EmptySpaceItem2.AllowHotTrack = False - Me.EmptySpaceItem2.Location = New System.Drawing.Point(547, 73) + Me.EmptySpaceItem2.Location = New System.Drawing.Point(0, 73) Me.EmptySpaceItem2.Name = "EmptySpaceItem2" - Me.EmptySpaceItem2.Size = New System.Drawing.Size(452, 44) + Me.EmptySpaceItem2.Size = New System.Drawing.Size(999, 44) Me.EmptySpaceItem2.TextSize = New System.Drawing.Size(0, 0) ' 'EmptySpaceItem3 @@ -1035,15 +1060,6 @@ Partial Class frmGlobixAdministration Me.LayoutControlItem29.Text = "Geändert wer:" Me.LayoutControlItem29.TextSize = New System.Drawing.Size(85, 13) ' - 'LayoutControlItem30 - ' - Me.LayoutControlItem30.Control = Me.CHANGED_WHENTextBox - Me.LayoutControlItem30.Location = New System.Drawing.Point(239, 215) - Me.LayoutControlItem30.Name = "LayoutControlItem30" - Me.LayoutControlItem30.Size = New System.Drawing.Size(273, 24) - Me.LayoutControlItem30.Text = "Geändert wann:" - Me.LayoutControlItem30.TextSize = New System.Drawing.Size(85, 13) - ' 'LayoutControlItem20 ' Me.LayoutControlItem20.Control = Me.MULTISELECTCheckBox @@ -1086,9 +1102,9 @@ Partial Class frmGlobixAdministration 'EmptySpaceItem10 ' Me.EmptySpaceItem10.AllowHotTrack = False - Me.EmptySpaceItem10.Location = New System.Drawing.Point(547, 48) + Me.EmptySpaceItem10.Location = New System.Drawing.Point(817, 48) Me.EmptySpaceItem10.Name = "EmptySpaceItem10" - Me.EmptySpaceItem10.Size = New System.Drawing.Size(452, 25) + Me.EmptySpaceItem10.Size = New System.Drawing.Size(182, 25) Me.EmptySpaceItem10.TextSize = New System.Drawing.Size(0, 0) ' 'LayoutControlItem17 @@ -1126,6 +1142,31 @@ Partial Class frmGlobixAdministration Me.LayoutControlItem28.Text = "Erstellt wann:" Me.LayoutControlItem28.TextSize = New System.Drawing.Size(85, 13) ' + 'LayoutControlItem30 + ' + Me.LayoutControlItem30.Control = Me.CHANGED_WHENTextBox + Me.LayoutControlItem30.Location = New System.Drawing.Point(239, 215) + Me.LayoutControlItem30.Name = "LayoutControlItem30" + Me.LayoutControlItem30.Size = New System.Drawing.Size(273, 24) + Me.LayoutControlItem30.Text = "Geändert wann:" + Me.LayoutControlItem30.TextSize = New System.Drawing.Size(85, 13) + ' + 'EmptySpaceItem17 + ' + Me.EmptySpaceItem17.AllowHotTrack = False + Me.EmptySpaceItem17.Location = New System.Drawing.Point(512, 191) + Me.EmptySpaceItem17.Name = "EmptySpaceItem17" + Me.EmptySpaceItem17.Size = New System.Drawing.Size(487, 24) + Me.EmptySpaceItem17.TextSize = New System.Drawing.Size(0, 0) + ' + 'EmptySpaceItem18 + ' + Me.EmptySpaceItem18.AllowHotTrack = False + Me.EmptySpaceItem18.Location = New System.Drawing.Point(512, 215) + Me.EmptySpaceItem18.Name = "EmptySpaceItem18" + Me.EmptySpaceItem18.Size = New System.Drawing.Size(487, 24) + Me.EmptySpaceItem18.TextSize = New System.Drawing.Size(0, 0) + ' 'ListBoxControlmanIndex ' Me.ListBoxControlmanIndex.DataSource = Me.TBDD_INDEX_MANBindingSource @@ -1140,7 +1181,7 @@ Partial Class frmGlobixAdministration ' Me.XtraTabPageRework.ImageOptions.SvgImage = CType(resources.GetObject("XtraTabPageRework.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.XtraTabPageRework.Name = "XtraTabPageRework" - Me.XtraTabPageRework.Size = New System.Drawing.Size(1182, 248) + Me.XtraTabPageRework.Size = New System.Drawing.Size(1182, 259) Me.XtraTabPageRework.Text = "XtraTabPage4" ' 'XtraTabPageAutoIndexe @@ -1149,7 +1190,7 @@ Partial Class frmGlobixAdministration Me.XtraTabPageAutoIndexe.Controls.Add(Me.ListBoxControl2) Me.XtraTabPageAutoIndexe.ImageOptions.SvgImage = CType(resources.GetObject("XtraTabPageAutoIndexe.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.XtraTabPageAutoIndexe.Name = "XtraTabPageAutoIndexe" - Me.XtraTabPageAutoIndexe.Size = New System.Drawing.Size(1182, 248) + Me.XtraTabPageAutoIndexe.Size = New System.Drawing.Size(1182, 259) Me.XtraTabPageAutoIndexe.Text = "Automatische Metadaten" ' 'LayoutControlAutoIndexe @@ -1165,7 +1206,7 @@ Partial Class frmGlobixAdministration Me.LayoutControlAutoIndexe.Location = New System.Drawing.Point(166, 0) Me.LayoutControlAutoIndexe.Name = "LayoutControlAutoIndexe" Me.LayoutControlAutoIndexe.Root = Me.ControlGroupIndexeAuto - Me.LayoutControlAutoIndexe.Size = New System.Drawing.Size(1016, 248) + Me.LayoutControlAutoIndexe.Size = New System.Drawing.Size(1016, 259) Me.LayoutControlAutoIndexe.TabIndex = 1 Me.LayoutControlAutoIndexe.Text = "LayoutControl3" ' @@ -1241,7 +1282,7 @@ Partial Class frmGlobixAdministration Me.ControlGroupIndexeAuto.GroupBordersVisible = False Me.ControlGroupIndexeAuto.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem33, Me.LayoutControlItem36, Me.LayoutControlItem34, Me.LayoutControlItem35, Me.EmptySpaceItem5, Me.EmptySpaceItem6, Me.LayoutControlItem37, Me.LayoutControlItem32, Me.LayoutControlItem38}) Me.ControlGroupIndexeAuto.Name = "ControlGroupIndexeAuto" - Me.ControlGroupIndexeAuto.Size = New System.Drawing.Size(1016, 248) + Me.ControlGroupIndexeAuto.Size = New System.Drawing.Size(1016, 259) Me.ControlGroupIndexeAuto.TextVisible = False ' 'LayoutControlItem33 @@ -1294,7 +1335,7 @@ Partial Class frmGlobixAdministration Me.EmptySpaceItem6.AllowHotTrack = False Me.EmptySpaceItem6.Location = New System.Drawing.Point(0, 75) Me.EmptySpaceItem6.Name = "EmptySpaceItem6" - Me.EmptySpaceItem6.Size = New System.Drawing.Size(996, 153) + Me.EmptySpaceItem6.Size = New System.Drawing.Size(996, 164) Me.EmptySpaceItem6.TextSize = New System.Drawing.Size(0, 0) ' 'LayoutControlItem37 @@ -1329,7 +1370,7 @@ Partial Class frmGlobixAdministration Me.ListBoxControl2.Dock = System.Windows.Forms.DockStyle.Left Me.ListBoxControl2.Location = New System.Drawing.Point(0, 0) Me.ListBoxControl2.Name = "ListBoxControl2" - Me.ListBoxControl2.Size = New System.Drawing.Size(166, 248) + Me.ListBoxControl2.Size = New System.Drawing.Size(166, 259) Me.ListBoxControl2.TabIndex = 0 ' 'XtraTabPage2 @@ -1434,38 +1475,6 @@ Partial Class frmGlobixAdministration Me.EmptySpaceItem14.Size = New System.Drawing.Size(255, 24) Me.EmptySpaceItem14.TextSize = New System.Drawing.Size(0, 0) ' - 'EmptySpaceItem15 - ' - Me.EmptySpaceItem15.AllowHotTrack = False - Me.EmptySpaceItem15.Location = New System.Drawing.Point(889, 25) - Me.EmptySpaceItem15.Name = "EmptySpaceItem15" - Me.EmptySpaceItem15.Size = New System.Drawing.Size(275, 24) - Me.EmptySpaceItem15.TextSize = New System.Drawing.Size(0, 0) - ' - 'EmptySpaceItem16 - ' - Me.EmptySpaceItem16.AllowHotTrack = False - Me.EmptySpaceItem16.Location = New System.Drawing.Point(889, 49) - Me.EmptySpaceItem16.Name = "EmptySpaceItem16" - Me.EmptySpaceItem16.Size = New System.Drawing.Size(275, 24) - Me.EmptySpaceItem16.TextSize = New System.Drawing.Size(0, 0) - ' - 'EmptySpaceItem17 - ' - Me.EmptySpaceItem17.AllowHotTrack = False - Me.EmptySpaceItem17.Location = New System.Drawing.Point(512, 191) - Me.EmptySpaceItem17.Name = "EmptySpaceItem17" - Me.EmptySpaceItem17.Size = New System.Drawing.Size(487, 24) - Me.EmptySpaceItem17.TextSize = New System.Drawing.Size(0, 0) - ' - 'EmptySpaceItem18 - ' - Me.EmptySpaceItem18.AllowHotTrack = False - Me.EmptySpaceItem18.Location = New System.Drawing.Point(512, 215) - Me.EmptySpaceItem18.Name = "EmptySpaceItem18" - Me.EmptySpaceItem18.Size = New System.Drawing.Size(487, 24) - Me.EmptySpaceItem18.TextSize = New System.Drawing.Size(0, 0) - ' 'frmGlobixAdministration ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -1505,6 +1514,8 @@ Partial Class frmGlobixAdministration CType(Me.LayoutControlItem23, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem24, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.EmptySpaceItem9, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.EmptySpaceItem15, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.EmptySpaceItem16, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.XtraTabControl2, System.ComponentModel.ISupportInitialize).EndInit() Me.XtraTabControl2.ResumeLayout(False) Me.XtraTabPageManIndexe.ResumeLayout(False) @@ -1526,7 +1537,6 @@ Partial Class frmGlobixAdministration CType(Me.EmptySpaceItem3, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem27, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem29, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem30, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem20, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem22, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem21, System.ComponentModel.ISupportInitialize).EndInit() @@ -1536,6 +1546,9 @@ Partial Class frmGlobixAdministration CType(Me.LayoutControlItem39, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.EmptySpaceItem11, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem28, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem30, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.EmptySpaceItem17, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.EmptySpaceItem18, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ListBoxControlmanIndex, System.ComponentModel.ISupportInitialize).EndInit() Me.XtraTabPageAutoIndexe.ResumeLayout(False) CType(Me.LayoutControlAutoIndexe, System.ComponentModel.ISupportInitialize).EndInit() @@ -1559,10 +1572,6 @@ Partial Class frmGlobixAdministration CType(Me.EmptySpaceItem12, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.EmptySpaceItem13, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.EmptySpaceItem14, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.EmptySpaceItem15, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.EmptySpaceItem16, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.EmptySpaceItem17, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.EmptySpaceItem18, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() diff --git a/GUIs.ZooFlow/Globix/frmGlobixAdministration.resx b/GUIs.ZooFlow/Globix/frmGlobixAdministration.resx index 91715575..ec42651a 100644 --- a/GUIs.ZooFlow/Globix/frmGlobixAdministration.resx +++ b/GUIs.ZooFlow/Globix/frmGlobixAdministration.resx @@ -193,9 +193,6 @@ 144, 17 - - 17, 17 - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z @@ -225,26 +222,6 @@ NHY0aDRMMTQsMjR6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFMCAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAxMyAxMyIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MTMgMTMiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJs - YWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAzOUMy - Mzt9CgkuWWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh - Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iQXBwb2ludG1l - bnRFbmRDb250aW51ZUFycm93XzFfIj4NCiAgICA8cG9seWdvbiBwb2ludHM9IjIsNyA3LDIgNyw1IDEx - LDUgMTEsOSA3LDkgNywxMiAgIiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs= - - - - 821, 17 - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z @@ -374,6 +351,41 @@ LjEsMjguMSwyNy42LDI3LjZ6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== + + 144, 17 + + + 17, 17 + + + 17, 17 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFMCAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAxMyAxMyIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MTMgMTMiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJs + YWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAzOUMy + Mzt9CgkuWWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iQXBwb2ludG1l + bnRFbmRDb250aW51ZUFycm93XzFfIj4NCiAgICA8cG9seWdvbiBwb2ludHM9IjIsNyA3LDIgNyw1IDEx + LDUgMTEsOSA3LDkgNywxMiAgIiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs= + + + + 821, 17 + + + 821, 17 + + + 17, 56 + 399, 17 diff --git a/GUIs.ZooFlow/Globix/frmGlobixAdministration.vb b/GUIs.ZooFlow/Globix/frmGlobixAdministration.vb index 5cc8ea6c..26e8ec63 100644 --- a/GUIs.ZooFlow/Globix/frmGlobixAdministration.vb +++ b/GUIs.ZooFlow/Globix/frmGlobixAdministration.vb @@ -204,4 +204,16 @@ Public Class frmGlobixAdministration RibbonPageGroup1.Text = "Auto Values" End Select End Sub + + Private Sub XtraTabPageManIndexe_Validating(sender As Object, e As System.ComponentModel.CancelEventArgs) Handles XtraTabPageManIndexe.Validating + + End Sub + + Private Sub XtraTabPageAutoIndexe_Enter(sender As Object, e As EventArgs) Handles XtraTabPageAutoIndexe.Enter + + End Sub + + Private Sub XtraTabPageManIndexe_Enter(sender As Object, e As EventArgs) Handles XtraTabPageManIndexe.Enter + + End Sub End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/Search/frmFlowSearch.Designer.vb b/GUIs.ZooFlow/Search/frmFlowSearch.Designer.vb index 025300ae..ec1b1507 100644 --- a/GUIs.ZooFlow/Search/frmFlowSearch.Designer.vb +++ b/GUIs.ZooFlow/Search/frmFlowSearch.Designer.vb @@ -38,6 +38,7 @@ Partial Class frmFlowSearch Me.TileGroup3 = New DevExpress.XtraEditors.TileGroup() Me.ToolTipController1 = New DevExpress.Utils.ToolTipController(Me.components) Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() + Me.BarStaticInfoItem = New DevExpress.XtraBars.BarStaticItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() @@ -134,7 +135,7 @@ Partial Class frmFlowSearch Me.TileControlMatch.AppearanceGroupText.Options.UseForeColor = True Me.TileControlMatch.AppearanceText.ForeColor = System.Drawing.Color.Yellow Me.TileControlMatch.AppearanceText.Options.UseForeColor = True - Me.TileControlMatch.BackColor = System.Drawing.Color.DarkGray + Me.TileControlMatch.BackColor = System.Drawing.Color.WhiteSmoke Me.TileControlMatch.Dock = System.Windows.Forms.DockStyle.Fill Me.TileControlMatch.Groups.Add(Me.TileGroup2) Me.TileControlMatch.Groups.Add(Me.TileGroup3) @@ -189,9 +190,9 @@ Partial Class frmFlowSearch 'RibbonControl1 ' Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarStaticInfoItem}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl1.MaxItemId = 13 + Me.RibbonControl1.MaxItemId = 14 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonControlStyle.MacOffice @@ -201,6 +202,11 @@ Partial Class frmFlowSearch Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 Me.RibbonControl1.Toolbar.ShowCustomizeItem = False ' + 'BarStaticInfoItem + ' + Me.BarStaticInfoItem.Id = 13 + Me.BarStaticInfoItem.Name = "BarStaticInfoItem" + ' 'RibbonPage1 ' Me.RibbonPage1.Name = "RibbonPage1" @@ -208,6 +214,7 @@ Partial Class frmFlowSearch ' 'RibbonStatusBar1 ' + Me.RibbonStatusBar1.ItemLinks.Add(Me.BarStaticInfoItem) Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 645) Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 @@ -253,7 +260,7 @@ Partial Class frmFlowSearch Me.DockPanel1.Options.ShowMaximizeButton = False Me.DockPanel1.OriginalSize = New System.Drawing.Size(220, 421) Me.DockPanel1.Size = New System.Drawing.Size(195, 421) - Me.DockPanel1.Text = "Datum" + Me.DockPanel1.Text = "Einschränkungen" ' 'DockPanel1_Container ' @@ -421,7 +428,7 @@ Partial Class frmFlowSearch ' 'Panel1 ' - Me.Panel1.BackColor = System.Drawing.Color.DarkGray + Me.Panel1.BackColor = System.Drawing.Color.WhiteSmoke Me.Panel1.Controls.Add(Me.CheckButton1) Me.Panel1.Controls.Add(Me.txtSearchTerm) Me.Panel1.Controls.Add(Me.lblFoundResult) @@ -455,7 +462,7 @@ Partial Class frmFlowSearch Me.Controls.Add(Me.panelContainer1) Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.RibbonControl1) - Me.IconOptions.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.Flow + Me.IconOptions.SvgImage = CType(resources.GetObject("frmFlowSearch.IconOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.KeyPreview = True Me.Name = "frmFlowSearch" Me.Ribbon = Me.RibbonControl1 @@ -515,4 +522,5 @@ Partial Class frmFlowSearch Friend WithEvents ToggleSwitchCurrentMonth As DevExpress.XtraEditors.ToggleSwitch Friend WithEvents CheckedListBoxCategories As DevExpress.XtraEditors.CheckedListBoxControl Friend WithEvents Label3 As Label + Friend WithEvents BarStaticInfoItem As DevExpress.XtraBars.BarStaticItem End Class diff --git a/GUIs.ZooFlow/Search/frmFlowSearch.resx b/GUIs.ZooFlow/Search/frmFlowSearch.resx index 20caa60e..06b8dec2 100644 --- a/GUIs.ZooFlow/Search/frmFlowSearch.resx +++ b/GUIs.ZooFlow/Search/frmFlowSearch.resx @@ -150,4 +150,30 @@ True + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFsEAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z + ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5HcmVlbntmaWxsOiMwMzlD + MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntkaXNwbGF5Om5vbmU7fQoJLnN0M3tk + aXNwbGF5OmlubGluZTtmaWxsOiNGRkIxMTU7fQoJLnN0NHtkaXNwbGF5OmlubGluZTt9Cgkuc3Q1e2Rp + c3BsYXk6aW5saW5lO29wYWNpdHk6MC43NTt9Cgkuc3Q2e2Rpc3BsYXk6aW5saW5lO29wYWNpdHk6MC41 + O30KCS5zdDd7ZGlzcGxheTppbmxpbmU7ZmlsbDojMDM5QzIzO30KCS5zdDh7ZGlzcGxheTppbmxpbmU7 + ZmlsbDojRDExQzFDO30KCS5zdDl7ZGlzcGxheTppbmxpbmU7ZmlsbDojMTE3N0Q3O30KCS5zdDEwe2Rp + c3BsYXk6aW5saW5lO2ZpbGw6I0ZGRkZGRjt9Cjwvc3R5bGU+DQogIDxnIGlkPSJTdGF0ZU1hY2hpbmUi + Pg0KICAgIDxwYXRoIGQ9Ik0xNiw2aC0yTDQsMjJsMiwyaDE4bDItMkwxNiw2eiBNMjMuMiwyMkg2Ljhs + LTAuMy0wLjNMMTUsOC4ybDguNSwxMy41TDIzLjIsMjJ6IiBjbGFzcz0iQmxhY2siIC8+DQogICAgPHBh + dGggZD0iTTUsMjhjLTIuOCwwLTUtMi4yLTUtNXMyLjItNSw1LTVzNSwyLjIsNSw1UzcuOCwyOCw1LDI4 + eiBNMzAsMjNjMC0yLjgtMi4yLTUtNS01cy01LDIuMi01LDVzMi4yLDUsNSw1ICAgUzMwLDI1LjgsMzAs + MjN6IE0yMCw3YzAtMi44LTIuMi01LTUtNXMtNSwyLjItNSw1czIuMiw1LDUsNVMyMCw5LjgsMjAsN3oi + IGNsYXNzPSJCbHVlIiAvPg0KICA8L2c+DQo8L3N2Zz4L + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Search/frmFlowSearch.vb b/GUIs.ZooFlow/Search/frmFlowSearch.vb index ac7679de..27fccc65 100644 --- a/GUIs.ZooFlow/Search/frmFlowSearch.vb +++ b/GUIs.ZooFlow/Search/frmFlowSearch.vb @@ -100,7 +100,7 @@ Public Class frmFlowSearch oSQL = oSQL.Replace("--INNER JOIN VWIDB_GROUP_DATA_DATE", "INNER JOIN VWIDB_GROUP_DATA_DATE") End If If CATEGORIES_SELECTED <> String.Empty Then - oSQL = oSQL.Replace("--AND ATTR.TITLE IN ('')", $"AND ATTR.TITLE IN ({CATEGORIES_SELECTED})") + oSQL = oSQL.Replace("--AND ATTR_TERM.TERM_VALUE IN ('')", $"AND ATTR_TERM.TERM_VALUE IN ({CATEGORIES_SELECTED})") End If Dim oResultCountAttributes As Integer = 0 @@ -193,6 +193,10 @@ Public Class frmFlowSearch End If oItemsFound = True OpenResultForm(oDTOBJECT_RESULT) + Else + BarStaticInfoItem.Caption = "Check PRFLOW_SEARCH_GET_RESULT: Nothing" + BarStaticInfoItem.ItemAppearance.Normal.BackColor = Color.Orange + Return False End If diff --git a/GUIs.ZooFlow/frmtest.Designer.vb b/GUIs.ZooFlow/frmtest.Designer.vb index 093de79b..240511aa 100644 --- a/GUIs.ZooFlow/frmtest.Designer.vb +++ b/GUIs.ZooFlow/frmtest.Designer.vb @@ -134,18 +134,18 @@ Partial Class frmtest ' Me.Button4.Location = New System.Drawing.Point(19, 234) Me.Button4.Name = "Button4" - Me.Button4.Size = New System.Drawing.Size(75, 23) + Me.Button4.Size = New System.Drawing.Size(172, 23) Me.Button4.TabIndex = 13 - Me.Button4.Text = "Button4" + Me.Button4.Text = "4. Reopen from AppServ" Me.Button4.UseVisualStyleBackColor = True ' 'Button5 ' - Me.Button5.Location = New System.Drawing.Point(332, 218) + Me.Button5.Location = New System.Drawing.Point(232, 234) Me.Button5.Name = "Button5" - Me.Button5.Size = New System.Drawing.Size(75, 23) + Me.Button5.Size = New System.Drawing.Size(286, 23) Me.Button5.TabIndex = 14 - Me.Button5.Text = "Button5" + Me.Button5.Text = "Alternative stream/append" Me.Button5.UseVisualStyleBackColor = True ' 'CheckBoxKeepExtension diff --git a/GUIs.ZooFlow/frmtest.vb b/GUIs.ZooFlow/frmtest.vb index a6dad3e6..3f453a8d 100644 --- a/GUIs.ZooFlow/frmtest.vb +++ b/GUIs.ZooFlow/frmtest.vb @@ -34,7 +34,8 @@ Public Class frmtest Using oStream As New FileStream(txtFile2Import.Text, FileMode.Open, FileAccess.Read) Dim oContents(oStream.Length) As Byte - oStream.Read(oContents, 0, System.Convert.ToInt32(oStream.Length)) + + oStream.Read(oContents, 0, oStream.Length) oResult = Await _Client.ImportIDBFOAsync(oContents, My.Application.User.UserName, txtIDB_OBJ_ID.Text, 1, txtIDBFOPath.Text) End Using @@ -51,23 +52,37 @@ Public Class frmtest Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click Try + Dim oextension = Path.GetExtension(txtFile2Import.Text) + Dim oFile = $"E:\file{oextension}" Using oInputStream As New FileStream(txtIDBFOPath.Text, FileMode.Open) - Dim oextension = Path.GetExtension(txtFile2Import.Text) - Dim oContents(oInputStream.Length) As Byte oInputStream.Read(oContents, 0, oInputStream.Length) - ' convert string to stream Using oMemoryStream As New MemoryStream(oContents) - Using oFileStream As New FileStream($"E:\file{oextension}", FileMode.Create, FileAccess.Write) + Using oFileStream As New FileStream(oFile, FileMode.Create, FileAccess.Write) oMemoryStream.WriteTo(oFileStream) End Using End Using End Using - + Dim oPAth = Path.GetDirectoryName(oFile) + MsgBox($"File [{oFile}] created!", MsgBoxStyle.Information) + Process.Start(oPAth) Catch ex As Exception MsgBox(ex.Message, MsgBoxStyle.Critical) End Try + End Sub + Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click + Try + Dim wFile As System.IO.FileStream + Dim byteData() As Byte + Dim oextension = Path.GetExtension(txtFile2Import.Text) + byteData = Encoding.ASCII.GetBytes(txtFile2Import.Text) + wFile = New FileStream($"E:\file{oextension}", FileMode.Append) + wFile.Write(byteData, 0, byteData.Length) + wFile.Close() + Catch ex As IOException + MsgBox(ex.ToString) + End Try End Sub End Class \ No newline at end of file