diff --git a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.Designer.vb b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.Designer.vb index c3ada8fd..94069c49 100644 --- a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.Designer.vb +++ b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.Designer.vb @@ -506,10 +506,10 @@ Partial Class frmAdmin_Globix ' Me.RibbonStatusBar1.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.RibbonStatusBar1.ItemLinks.Add(Me.bsiStatus) - Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 752) + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 754) Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 - Me.RibbonStatusBar1.Size = New System.Drawing.Size(1140, 24) + Me.RibbonStatusBar1.Size = New System.Drawing.Size(1140, 22) ' 'RibbonPage2 ' @@ -540,6 +540,7 @@ Partial Class frmAdmin_Globix Me.TableAdapterManager.TBIDB_BUSINESS_ENTITYTableAdapter = Nothing Me.TableAdapterManager.TBIDB_CATALOG_USERTableAdapter = Nothing Me.TableAdapterManager.TBIDB_CATALOGTableAdapter = Nothing + Me.TableAdapterManager.TBIDB_COMMON_SQLTableAdapter = Nothing Me.TableAdapterManager.TBIDB_DOCTYPE_HANDLINGTableAdapter = Nothing Me.TableAdapterManager.TBIDB_DOCTYPETableAdapter = Nothing Me.TableAdapterManager.TBIDB_LANGUAGETableAdapter = Nothing @@ -567,7 +568,7 @@ Partial Class frmAdmin_Globix Me.XtraTabControl1.Location = New System.Drawing.Point(0, 132) Me.XtraTabControl1.Name = "XtraTabControl1" Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPageProfile - Me.XtraTabControl1.Size = New System.Drawing.Size(1140, 620) + Me.XtraTabControl1.Size = New System.Drawing.Size(1140, 622) Me.XtraTabControl1.TabIndex = 5 Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPageProfile, Me.XtraTabPage1}) ' @@ -579,7 +580,7 @@ Partial Class frmAdmin_Globix Me.XtraTabPageProfile.ImageOptions.SvgImage = CType(resources.GetObject("XtraTabPageProfile.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.XtraTabPageProfile.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16) Me.XtraTabPageProfile.Name = "XtraTabPageProfile" - Me.XtraTabPageProfile.Size = New System.Drawing.Size(1138, 592) + Me.XtraTabPageProfile.Size = New System.Drawing.Size(1138, 596) Me.XtraTabPageProfile.Text = "Profil" ' 'LayoutControlProfile @@ -755,7 +756,7 @@ Partial Class frmAdmin_Globix Me.CheckEdit1.MenuManager = Me.RibbonControl1 Me.CheckEdit1.Name = "CheckEdit1" Me.CheckEdit1.Properties.Caption = "Aktiv" - Me.CheckEdit1.Size = New System.Drawing.Size(658, 20) + Me.CheckEdit1.Size = New System.Drawing.Size(658, 18) Me.CheckEdit1.StyleController = Me.LayoutControlProfile Me.CheckEdit1.TabIndex = 62 ' @@ -959,7 +960,7 @@ Partial Class frmAdmin_Globix Me.XtraTabControl2.Location = New System.Drawing.Point(3, 279) Me.XtraTabControl2.Name = "XtraTabControl2" Me.XtraTabControl2.SelectedTabPage = Me.XtraTabPageManIndexe - Me.XtraTabControl2.Size = New System.Drawing.Size(1113, 295) + Me.XtraTabControl2.Size = New System.Drawing.Size(1113, 297) Me.XtraTabControl2.TabIndex = 1 Me.XtraTabControl2.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPageManIndexe, Me.XtraTabPageRework, Me.XtraTabPageAutoIndexe, Me.XtraTabPageDynamicFolder, Me.XtraTabPageAutoSelect}) ' @@ -971,7 +972,7 @@ Partial Class frmAdmin_Globix Me.XtraTabPageManIndexe.ImageOptions.SvgImage = CType(resources.GetObject("XtraTabPageManIndexe.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.XtraTabPageManIndexe.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16) Me.XtraTabPageManIndexe.Name = "XtraTabPageManIndexe" - Me.XtraTabPageManIndexe.Size = New System.Drawing.Size(1111, 267) + Me.XtraTabPageManIndexe.Size = New System.Drawing.Size(1111, 271) Me.XtraTabPageManIndexe.Text = "manuelle Attribute" ' 'LayoutControlManIndexe @@ -998,14 +999,14 @@ Partial Class frmAdmin_Globix Me.LayoutControlManIndexe.Location = New System.Drawing.Point(187, 0) Me.LayoutControlManIndexe.Name = "LayoutControlManIndexe" Me.LayoutControlManIndexe.Root = Me.LayoutControlGroupDoctype - Me.LayoutControlManIndexe.Size = New System.Drawing.Size(924, 267) + Me.LayoutControlManIndexe.Size = New System.Drawing.Size(924, 271) Me.LayoutControlManIndexe.TabIndex = 1 Me.LayoutControlManIndexe.Text = "LayoutControl1" ' 'TextEdit4 ' Me.TextEdit4.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_MANBindingSource, "CHANGED_WHEN", True)) - Me.TextEdit4.Location = New System.Drawing.Point(519, 232) + Me.TextEdit4.Location = New System.Drawing.Point(519, 236) Me.TextEdit4.MenuManager = Me.RibbonControl1 Me.TextEdit4.Name = "TextEdit4" Me.TextEdit4.Size = New System.Drawing.Size(390, 20) @@ -1034,9 +1035,9 @@ Partial Class frmAdmin_Globix Me.WD_INDEXComboBox.DataSource = Me.VWIDB_BE_ATTRIBUTEBindingSource Me.WD_INDEXComboBox.DisplayMember = "ATTR_TITLE" Me.WD_INDEXComboBox.FormattingEnabled = True - Me.WD_INDEXComboBox.Location = New System.Drawing.Point(554, 45) + Me.WD_INDEXComboBox.Location = New System.Drawing.Point(113, 45) Me.WD_INDEXComboBox.Name = "WD_INDEXComboBox" - Me.WD_INDEXComboBox.Size = New System.Drawing.Size(355, 21) + Me.WD_INDEXComboBox.Size = New System.Drawing.Size(344, 21) Me.WD_INDEXComboBox.TabIndex = 28 Me.WD_INDEXComboBox.ValueMember = "ATTR_TITLE" ' @@ -1096,7 +1097,7 @@ Partial Class frmAdmin_Globix ' Me.TextEditAddedWho_ManIndex.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_MANBindingSource, "ADDED_WHO", True)) Me.TextEditAddedWho_ManIndex.Enabled = False - Me.TextEditAddedWho_ManIndex.Location = New System.Drawing.Point(113, 202) + Me.TextEditAddedWho_ManIndex.Location = New System.Drawing.Point(113, 206) Me.TextEditAddedWho_ManIndex.MenuManager = Me.RibbonControl1 Me.TextEditAddedWho_ManIndex.Name = "TextEditAddedWho_ManIndex" Me.TextEditAddedWho_ManIndex.Size = New System.Drawing.Size(298, 20) @@ -1106,7 +1107,7 @@ Partial Class frmAdmin_Globix 'TextEdit2 ' Me.TextEdit2.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_MANBindingSource, "ADDED_WHEN", True)) - Me.TextEdit2.Location = New System.Drawing.Point(113, 232) + Me.TextEdit2.Location = New System.Drawing.Point(113, 236) Me.TextEdit2.MenuManager = Me.RibbonControl1 Me.TextEdit2.Name = "TextEdit2" Me.TextEdit2.Size = New System.Drawing.Size(298, 20) @@ -1116,7 +1117,7 @@ Partial Class frmAdmin_Globix 'TextEditChangedWho_ManIndex ' Me.TextEditChangedWho_ManIndex.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_MANBindingSource, "CHANGED_WHO", True)) - Me.TextEditChangedWho_ManIndex.Location = New System.Drawing.Point(519, 202) + Me.TextEditChangedWho_ManIndex.Location = New System.Drawing.Point(519, 206) Me.TextEditChangedWho_ManIndex.MenuManager = Me.RibbonControl1 Me.TextEditChangedWho_ManIndex.Name = "TextEditChangedWho_ManIndex" Me.TextEditChangedWho_ManIndex.Size = New System.Drawing.Size(390, 20) @@ -1136,10 +1137,11 @@ Partial Class frmAdmin_Globix 'TextEdit10 ' Me.TextEdit10.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_MANBindingSource, "NAME", True)) - Me.TextEdit10.Location = New System.Drawing.Point(113, 45) + Me.TextEdit10.Location = New System.Drawing.Point(565, 45) Me.TextEdit10.MenuManager = Me.RibbonControl1 Me.TextEdit10.Name = "TextEdit10" - Me.TextEdit10.Size = New System.Drawing.Size(333, 20) + Me.TextEdit10.Properties.ReadOnly = True + Me.TextEdit10.Size = New System.Drawing.Size(344, 20) Me.TextEdit10.StyleController = Me.LayoutControlManIndexe Me.TextEdit10.TabIndex = 22 ' @@ -1184,7 +1186,7 @@ Partial Class frmAdmin_Globix Me.ACTIVECheckBox2.MenuManager = Me.RibbonControl1 Me.ACTIVECheckBox2.Name = "ACTIVECheckBox2" Me.ACTIVECheckBox2.Properties.Caption = "Aktiv" - Me.ACTIVECheckBox2.Size = New System.Drawing.Size(333, 20) + Me.ACTIVECheckBox2.Size = New System.Drawing.Size(333, 18) Me.ACTIVECheckBox2.StyleController = Me.LayoutControlManIndexe Me.ACTIVECheckBox2.TabIndex = 33 ' @@ -1195,7 +1197,7 @@ Partial Class frmAdmin_Globix Me.OPTIONALCheckBox2.MenuManager = Me.RibbonControl1 Me.OPTIONALCheckBox2.Name = "OPTIONALCheckBox2" Me.OPTIONALCheckBox2.Properties.Caption = "Optional" - Me.OPTIONALCheckBox2.Size = New System.Drawing.Size(229, 20) + Me.OPTIONALCheckBox2.Size = New System.Drawing.Size(229, 18) Me.OPTIONALCheckBox2.StyleController = Me.LayoutControlManIndexe Me.OPTIONALCheckBox2.TabIndex = 34 ' @@ -1203,9 +1205,9 @@ Partial Class frmAdmin_Globix ' Me.LayoutControlGroupDoctype.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] Me.LayoutControlGroupDoctype.GroupBordersVisible = False - Me.LayoutControlGroupDoctype.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem17, Me.LayoutControlItem19, Me.LayoutControlItem21, Me.LayoutControlItem24, Me.LayoutControlItem2, Me.LayoutControlItem8, Me.LayoutControlItem11, Me.LayoutControlItem13, Me.LayoutControlItem9, Me.LayoutControlItem27, Me.LayoutControlItem29, Me.LayoutControlItem16, Me.LayoutControlItem31, Me.LayoutControlItem18, Me.EmptySpaceItem6, Me.LayoutControlItem46, Me.LayoutControlItem63, Me.LayoutControlItem64, Me.LayoutControlItem6}) + Me.LayoutControlGroupDoctype.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem17, Me.LayoutControlItem19, Me.LayoutControlItem21, Me.LayoutControlItem24, Me.LayoutControlItem2, Me.LayoutControlItem8, Me.LayoutControlItem11, Me.LayoutControlItem13, Me.LayoutControlItem9, Me.LayoutControlItem27, Me.LayoutControlItem29, Me.LayoutControlItem31, Me.LayoutControlItem18, Me.EmptySpaceItem6, Me.LayoutControlItem46, Me.LayoutControlItem63, Me.LayoutControlItem64, Me.LayoutControlItem6, Me.LayoutControlItem16}) Me.LayoutControlGroupDoctype.Name = "LayoutControlGroupDoctype" - Me.LayoutControlGroupDoctype.Size = New System.Drawing.Size(924, 267) + Me.LayoutControlGroupDoctype.Size = New System.Drawing.Size(924, 271) Me.LayoutControlGroupDoctype.TextVisible = False ' 'LayoutControlItem17 @@ -1244,7 +1246,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem24.AppearanceItemCaption.Options.UseFont = True Me.LayoutControlItem24.Control = Me.TextEditAddedWho_ManIndex Me.LayoutControlItem24.Enabled = False - Me.LayoutControlItem24.Location = New System.Drawing.Point(0, 187) + Me.LayoutControlItem24.Location = New System.Drawing.Point(0, 191) Me.LayoutControlItem24.Name = "LayoutControlItem24" Me.LayoutControlItem24.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem24.Size = New System.Drawing.Size(406, 30) @@ -1267,11 +1269,11 @@ Partial Class frmAdmin_Globix 'LayoutControlItem8 ' Me.LayoutControlItem8.Control = Me.TextEdit10 - Me.LayoutControlItem8.Location = New System.Drawing.Point(0, 30) + Me.LayoutControlItem8.Location = New System.Drawing.Point(452, 30) Me.LayoutControlItem8.Name = "LayoutControlItem8" Me.LayoutControlItem8.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem8.Size = New System.Drawing.Size(441, 31) - Me.LayoutControlItem8.Text = "Titel" + Me.LayoutControlItem8.Size = New System.Drawing.Size(452, 31) + Me.LayoutControlItem8.Text = "NameIntern" Me.LayoutControlItem8.TextSize = New System.Drawing.Size(86, 13) ' 'LayoutControlItem11 @@ -1310,7 +1312,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem27.AppearanceItemCaption.Options.UseFont = True Me.LayoutControlItem27.Control = Me.TextEdit2 Me.LayoutControlItem27.Enabled = False - Me.LayoutControlItem27.Location = New System.Drawing.Point(0, 217) + Me.LayoutControlItem27.Location = New System.Drawing.Point(0, 221) Me.LayoutControlItem27.Name = "LayoutControlItem27" Me.LayoutControlItem27.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem27.Size = New System.Drawing.Size(406, 30) @@ -1323,7 +1325,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem29.AppearanceItemCaption.Options.UseFont = True Me.LayoutControlItem29.Control = Me.TextEditChangedWho_ManIndex Me.LayoutControlItem29.Enabled = False - Me.LayoutControlItem29.Location = New System.Drawing.Point(406, 187) + Me.LayoutControlItem29.Location = New System.Drawing.Point(406, 191) Me.LayoutControlItem29.Name = "LayoutControlItem29" Me.LayoutControlItem29.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem29.Size = New System.Drawing.Size(498, 30) @@ -1333,10 +1335,10 @@ Partial Class frmAdmin_Globix 'LayoutControlItem16 ' Me.LayoutControlItem16.Control = Me.WD_INDEXComboBox - Me.LayoutControlItem16.Location = New System.Drawing.Point(441, 30) + Me.LayoutControlItem16.Location = New System.Drawing.Point(0, 30) Me.LayoutControlItem16.Name = "LayoutControlItem16" Me.LayoutControlItem16.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem16.Size = New System.Drawing.Size(463, 31) + Me.LayoutControlItem16.Size = New System.Drawing.Size(452, 31) Me.LayoutControlItem16.Text = "Attribut" Me.LayoutControlItem16.TextSize = New System.Drawing.Size(86, 13) ' @@ -1369,7 +1371,7 @@ Partial Class frmAdmin_Globix Me.EmptySpaceItem6.AllowHotTrack = False Me.EmptySpaceItem6.Location = New System.Drawing.Point(0, 157) Me.EmptySpaceItem6.Name = "EmptySpaceItem6" - Me.EmptySpaceItem6.Size = New System.Drawing.Size(904, 30) + Me.EmptySpaceItem6.Size = New System.Drawing.Size(904, 34) Me.EmptySpaceItem6.TextSize = New System.Drawing.Size(0, 0) ' 'LayoutControlItem46 @@ -1378,7 +1380,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem46.AppearanceItemCaption.Options.UseFont = True Me.LayoutControlItem46.Control = Me.TextEdit4 Me.LayoutControlItem46.Enabled = False - Me.LayoutControlItem46.Location = New System.Drawing.Point(406, 217) + Me.LayoutControlItem46.Location = New System.Drawing.Point(406, 221) Me.LayoutControlItem46.Name = "LayoutControlItem46" Me.LayoutControlItem46.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem46.Size = New System.Drawing.Size(498, 30) @@ -1422,7 +1424,7 @@ Partial Class frmAdmin_Globix Me.ListBoxAutoIndexe.Dock = System.Windows.Forms.DockStyle.Left Me.ListBoxAutoIndexe.Location = New System.Drawing.Point(0, 0) Me.ListBoxAutoIndexe.Name = "ListBoxAutoIndexe" - Me.ListBoxAutoIndexe.Size = New System.Drawing.Size(187, 267) + Me.ListBoxAutoIndexe.Size = New System.Drawing.Size(187, 271) Me.ListBoxAutoIndexe.TabIndex = 2 Me.ListBoxAutoIndexe.ValueMember = "GUID" ' @@ -1432,7 +1434,7 @@ Partial Class frmAdmin_Globix Me.XtraTabPageRework.ImageOptions.SvgImage = CType(resources.GetObject("XtraTabPageRework.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.XtraTabPageRework.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16) Me.XtraTabPageRework.Name = "XtraTabPageRework" - Me.XtraTabPageRework.Size = New System.Drawing.Size(1111, 267) + Me.XtraTabPageRework.Size = New System.Drawing.Size(1111, 269) Me.XtraTabPageRework.Text = "Nachbearbeitungsfunktionen manueller Index" ' 'LayoutControlRework @@ -1458,7 +1460,7 @@ Partial Class frmAdmin_Globix Me.XtraTabPageAutoIndexe.ImageOptions.SvgImage = CType(resources.GetObject("XtraTabPageAutoIndexe.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.XtraTabPageAutoIndexe.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16) Me.XtraTabPageAutoIndexe.Name = "XtraTabPageAutoIndexe" - Me.XtraTabPageAutoIndexe.Size = New System.Drawing.Size(1111, 267) + Me.XtraTabPageAutoIndexe.Size = New System.Drawing.Size(1111, 269) Me.XtraTabPageAutoIndexe.Text = "automatische/Feste Attribute" ' 'LayoutControlAutoIndexe @@ -1483,7 +1485,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlAutoIndexe.Location = New System.Drawing.Point(0, 0) Me.LayoutControlAutoIndexe.Name = "LayoutControlAutoIndexe" Me.LayoutControlAutoIndexe.Root = Me.LayoutControlGroup2 - Me.LayoutControlAutoIndexe.Size = New System.Drawing.Size(1111, 267) + Me.LayoutControlAutoIndexe.Size = New System.Drawing.Size(1111, 269) Me.LayoutControlAutoIndexe.TabIndex = 0 Me.LayoutControlAutoIndexe.Text = "LayoutControl1" ' @@ -1673,7 +1675,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlGroup2.GroupBordersVisible = False Me.LayoutControlGroup2.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem15, Me.LayoutControlItem23, Me.LayoutControlItem33, Me.LayoutControlItem34, Me.LayoutControlItem35, Me.LayoutControlItem14, Me.LayoutControlItem40, Me.LayoutControlItem37, Me.EmptySpaceItem4, Me.ADDED_WHOAutoAttribut, Me.LayoutControlItem41, Me.CHANGED_WHOItemAutoAttribut, Me.LayoutControlItem43, Me.LayoutControlItem44, Me.LayoutControlItem39, Me.LayoutControlItem45, Me.LayoutControlItem42}) Me.LayoutControlGroup2.Name = "LayoutControlGroup2" - Me.LayoutControlGroup2.Size = New System.Drawing.Size(1111, 267) + Me.LayoutControlGroup2.Size = New System.Drawing.Size(1111, 269) Me.LayoutControlGroup2.TextVisible = False ' 'LayoutControlItem15 @@ -1829,7 +1831,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem44.Control = Me.ListBox1 Me.LayoutControlItem44.Location = New System.Drawing.Point(0, 0) Me.LayoutControlItem44.Name = "LayoutControlItem44" - Me.LayoutControlItem44.Size = New System.Drawing.Size(179, 247) + Me.LayoutControlItem44.Size = New System.Drawing.Size(179, 249) Me.LayoutControlItem44.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize Me.LayoutControlItem44.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem44.TextToControlDistance = 0 @@ -1852,7 +1854,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem45.Location = New System.Drawing.Point(179, 191) Me.LayoutControlItem45.Name = "LayoutControlItem45" Me.LayoutControlItem45.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem45.Size = New System.Drawing.Size(456, 56) + Me.LayoutControlItem45.Size = New System.Drawing.Size(456, 58) Me.LayoutControlItem45.Text = "Conn ID:" Me.LayoutControlItem45.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize Me.LayoutControlItem45.TextSize = New System.Drawing.Size(42, 13) @@ -1867,7 +1869,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem42.Location = New System.Drawing.Point(635, 191) Me.LayoutControlItem42.Name = "LayoutControlItem42" Me.LayoutControlItem42.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem42.Size = New System.Drawing.Size(456, 56) + Me.LayoutControlItem42.Size = New System.Drawing.Size(456, 58) Me.LayoutControlItem42.Text = "SQL" Me.LayoutControlItem42.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize Me.LayoutControlItem42.TextSize = New System.Drawing.Size(18, 13) @@ -1880,7 +1882,7 @@ Partial Class frmAdmin_Globix Me.XtraTabPageDynamicFolder.ImageOptions.SvgImage = CType(resources.GetObject("XtraTabPageDynamicFolder.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.XtraTabPageDynamicFolder.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16) Me.XtraTabPageDynamicFolder.Name = "XtraTabPageDynamicFolder" - Me.XtraTabPageDynamicFolder.Size = New System.Drawing.Size(1111, 267) + Me.XtraTabPageDynamicFolder.Size = New System.Drawing.Size(1111, 271) Me.XtraTabPageDynamicFolder.Text = "Dynamischer Ordnerpfad" ' 'LayoutControl1 @@ -1895,7 +1897,7 @@ Partial Class frmAdmin_Globix Me.LayoutControl1.Location = New System.Drawing.Point(0, 0) Me.LayoutControl1.Name = "LayoutControl1" Me.LayoutControl1.Root = Me.LayoutControlGroup4 - Me.LayoutControl1.Size = New System.Drawing.Size(1111, 267) + Me.LayoutControl1.Size = New System.Drawing.Size(1111, 271) Me.LayoutControl1.TabIndex = 15 Me.LayoutControl1.Text = "LayoutControl1" ' @@ -1961,7 +1963,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlGroup4.GroupBordersVisible = False Me.LayoutControlGroup4.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem47, Me.EmptySpaceItem7, Me.LayoutControlItem48, Me.LayoutControlItem50, Me.LayoutControlItem51, Me.EmptySpaceItem8, Me.LayoutControlItem52, Me.LayoutControlItem49}) Me.LayoutControlGroup4.Name = "LayoutControlGroup4" - Me.LayoutControlGroup4.Size = New System.Drawing.Size(1111, 267) + Me.LayoutControlGroup4.Size = New System.Drawing.Size(1111, 271) Me.LayoutControlGroup4.TextVisible = False ' 'LayoutControlItem47 @@ -1981,7 +1983,7 @@ Partial Class frmAdmin_Globix Me.EmptySpaceItem7.AllowHotTrack = False Me.EmptySpaceItem7.Location = New System.Drawing.Point(0, 172) Me.EmptySpaceItem7.Name = "EmptySpaceItem7" - Me.EmptySpaceItem7.Size = New System.Drawing.Size(1091, 75) + Me.EmptySpaceItem7.Size = New System.Drawing.Size(1091, 79) Me.EmptySpaceItem7.TextSize = New System.Drawing.Size(0, 0) ' 'LayoutControlItem48 @@ -2053,7 +2055,7 @@ Partial Class frmAdmin_Globix Me.XtraTabPageAutoSelect.ImageOptions.SvgImage = CType(resources.GetObject("XtraTabPageAutoSelect.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.XtraTabPageAutoSelect.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16) Me.XtraTabPageAutoSelect.Name = "XtraTabPageAutoSelect" - Me.XtraTabPageAutoSelect.Size = New System.Drawing.Size(1111, 267) + Me.XtraTabPageAutoSelect.Size = New System.Drawing.Size(1111, 269) Me.XtraTabPageAutoSelect.Text = "Automatische Profilauswahl" ' 'LayoutControl2 @@ -2070,7 +2072,7 @@ Partial Class frmAdmin_Globix Me.LayoutControl2.Location = New System.Drawing.Point(193, 0) Me.LayoutControl2.Name = "LayoutControl2" Me.LayoutControl2.Root = Me.LayoutControlGroup5 - Me.LayoutControl2.Size = New System.Drawing.Size(918, 267) + Me.LayoutControl2.Size = New System.Drawing.Size(918, 269) Me.LayoutControl2.TabIndex = 1 Me.LayoutControl2.Text = "LayoutControl2" ' @@ -2164,7 +2166,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlGroup5.GroupBordersVisible = False Me.LayoutControlGroup5.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem55, Me.EmptySpaceItem9, Me.EmptySpaceItem10, Me.LayoutControlItem54, Me.LayoutControlItem53, Me.EmptySpaceItem11, Me.LayoutControlItem57, Me.LayoutControlItem59, Me.LayoutControlItem58, Me.LayoutControlItem56, Me.LayoutControlItem60}) Me.LayoutControlGroup5.Name = "LayoutControlGroup5" - Me.LayoutControlGroup5.Size = New System.Drawing.Size(918, 267) + Me.LayoutControlGroup5.Size = New System.Drawing.Size(918, 269) Me.LayoutControlGroup5.TextVisible = False ' 'LayoutControlItem55 @@ -2181,7 +2183,7 @@ Partial Class frmAdmin_Globix Me.EmptySpaceItem9.AllowHotTrack = False Me.EmptySpaceItem9.Location = New System.Drawing.Point(772, 64) Me.EmptySpaceItem9.Name = "EmptySpaceItem9" - Me.EmptySpaceItem9.Size = New System.Drawing.Size(126, 183) + Me.EmptySpaceItem9.Size = New System.Drawing.Size(126, 185) Me.EmptySpaceItem9.TextSize = New System.Drawing.Size(0, 0) ' 'EmptySpaceItem10 @@ -2241,7 +2243,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem59.Location = New System.Drawing.Point(386, 102) Me.LayoutControlItem59.Name = "LayoutControlItem59" Me.LayoutControlItem59.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem59.Size = New System.Drawing.Size(386, 145) + Me.LayoutControlItem59.Size = New System.Drawing.Size(386, 147) Me.LayoutControlItem59.Text = "Geändert wann" Me.LayoutControlItem59.TextSize = New System.Drawing.Size(98, 13) ' @@ -2253,7 +2255,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem58.Location = New System.Drawing.Point(0, 102) Me.LayoutControlItem58.Name = "LayoutControlItem58" Me.LayoutControlItem58.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem58.Size = New System.Drawing.Size(386, 145) + Me.LayoutControlItem58.Size = New System.Drawing.Size(386, 147) Me.LayoutControlItem58.Text = "Erstellt wann" Me.LayoutControlItem58.TextSize = New System.Drawing.Size(98, 13) ' @@ -2284,7 +2286,7 @@ Partial Class frmAdmin_Globix Me.ListBox2.FormattingEnabled = True Me.ListBox2.Location = New System.Drawing.Point(0, 0) Me.ListBox2.Name = "ListBox2" - Me.ListBox2.Size = New System.Drawing.Size(193, 267) + Me.ListBox2.Size = New System.Drawing.Size(193, 269) Me.ListBox2.TabIndex = 0 ' 'XtraTabPage1 @@ -2293,7 +2295,7 @@ Partial Class frmAdmin_Globix Me.XtraTabPage1.ImageOptions.SvgImage = CType(resources.GetObject("XtraTabPage1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.XtraTabPage1.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16) Me.XtraTabPage1.Name = "XtraTabPage1" - Me.XtraTabPage1.Size = New System.Drawing.Size(1138, 592) + Me.XtraTabPage1.Size = New System.Drawing.Size(1138, 594) Me.XtraTabPage1.Text = "Profil-Zuordnung" ' 'XtraTabControl3 @@ -2303,7 +2305,7 @@ Partial Class frmAdmin_Globix Me.XtraTabControl3.Location = New System.Drawing.Point(0, 0) Me.XtraTabControl3.Name = "XtraTabControl3" Me.XtraTabControl3.SelectedTabPage = Me.XtraTabPage2 - Me.XtraTabControl3.Size = New System.Drawing.Size(1138, 592) + Me.XtraTabControl3.Size = New System.Drawing.Size(1138, 594) Me.XtraTabControl3.TabIndex = 0 Me.XtraTabControl3.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage2, Me.XtraTabPage3}) ' @@ -2313,7 +2315,7 @@ Partial Class frmAdmin_Globix Me.XtraTabPage2.ImageOptions.SvgImage = CType(resources.GetObject("XtraTabPage2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.XtraTabPage2.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16) Me.XtraTabPage2.Name = "XtraTabPage2" - Me.XtraTabPage2.Size = New System.Drawing.Size(1136, 564) + Me.XtraTabPage2.Size = New System.Drawing.Size(1136, 568) Me.XtraTabPage2.Text = "User" ' 'SplitContainerControl1 @@ -2334,7 +2336,7 @@ Partial Class frmAdmin_Globix Me.SplitContainerControl1.Panel2.Controls.Add(Me.gridAvailableUsers) Me.SplitContainerControl1.Panel2.Controls.Add(Me.Label35) Me.SplitContainerControl1.Panel2.Text = "Panel2" - Me.SplitContainerControl1.Size = New System.Drawing.Size(1136, 564) + Me.SplitContainerControl1.Size = New System.Drawing.Size(1136, 568) Me.SplitContainerControl1.SplitterPosition = 308 Me.SplitContainerControl1.TabIndex = 0 ' @@ -2422,7 +2424,7 @@ Partial Class frmAdmin_Globix Me.gridAvailableUsers.MainView = Me.viewAvailableUsers Me.gridAvailableUsers.MenuManager = Me.RibbonControl1 Me.gridAvailableUsers.Name = "gridAvailableUsers" - Me.gridAvailableUsers.Size = New System.Drawing.Size(1136, 216) + Me.gridAvailableUsers.Size = New System.Drawing.Size(1136, 220) Me.gridAvailableUsers.TabIndex = 2 Me.gridAvailableUsers.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewAvailableUsers}) ' @@ -2498,7 +2500,7 @@ Partial Class frmAdmin_Globix Me.XtraTabPage3.ImageOptions.SvgImage = CType(resources.GetObject("XtraTabPage3.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.XtraTabPage3.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16) Me.XtraTabPage3.Name = "XtraTabPage3" - Me.XtraTabPage3.Size = New System.Drawing.Size(1136, 564) + Me.XtraTabPage3.Size = New System.Drawing.Size(1136, 568) Me.XtraTabPage3.Text = "Gruppen" ' 'SplitContainerControlGroup @@ -2519,7 +2521,7 @@ Partial Class frmAdmin_Globix Me.SplitContainerControlGroup.Panel2.Controls.Add(Me.gridAvailableGroups) Me.SplitContainerControlGroup.Panel2.Controls.Add(Me.Label14) Me.SplitContainerControlGroup.Panel2.Text = "Panel2" - Me.SplitContainerControlGroup.Size = New System.Drawing.Size(1136, 564) + Me.SplitContainerControlGroup.Size = New System.Drawing.Size(1136, 568) Me.SplitContainerControlGroup.SplitterPosition = 315 Me.SplitContainerControlGroup.TabIndex = 0 ' @@ -2602,7 +2604,7 @@ Partial Class frmAdmin_Globix Me.gridAvailableGroups.MainView = Me.viewAvailableGroups Me.gridAvailableGroups.Name = "gridAvailableGroups" Me.gridAvailableGroups.ShowOnlyPredefinedDetails = True - Me.gridAvailableGroups.Size = New System.Drawing.Size(1136, 209) + Me.gridAvailableGroups.Size = New System.Drawing.Size(1136, 213) Me.gridAvailableGroups.TabIndex = 89 Me.gridAvailableGroups.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewAvailableGroups}) ' diff --git a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.resx b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.resx index 0831b69d..99901a73 100644 --- a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.resx +++ b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.resx @@ -180,6 +180,9 @@ 350, 17 + + 350, 17 + 17, 17 @@ -230,9 +233,6 @@ NHY0aDRMMTQsMjR6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== - - 752, 56 - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 @@ -297,26 +297,6 @@ MC41LTAuMSwwLjctMC4yYzAuMi0wLjEsMC40LTAuMiwwLjYtMC41YzAuMi0wLjIsMC41LTAuNywxLTEu NEwyMSwyNC4zaC0xLjFsMC4zLTEuNCAgYzAuNi0wLjEsMS4yLTAuMywxLjctMC42SDIyLjV6IiBjbGFz cz0iQmx1ZSIgLz4NCjwvc3ZnPgs= - - - - 17, 95 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAEACAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z - ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz - OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp - dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkFycm93MUxlZnQiPg0KICAgIDxwb2x5Z29uIHBvaW50 - cz0iMjgsMTQgMTQsMTQgMTQsMTMuMyAxNCw2IDQsMTYgMTQsMjYgMTQsMTguNyAxNCwxOCAyOCwxOCAg - IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== @@ -378,22 +358,6 @@ MC40QzIuMSwyNS4zLDIuMiwyNS4zLDIuMiwyNS4yeiIgY2xhc3M9IlllbGxvdyIgLz4NCiAgPC9nPg0K ICA8cGF0aCBkPSJNMzEuMywxNEg5LjZMNCwyNmgyMS44YzAuNSwwLDEuMS0wLjMsMS4zLTAuN0wzMiwx NC43QzMyLjEsMTQuMywzMS44LDE0LDMxLjMsMTR6IiBjbGFzcz0iWWVsbG93IiAvPg0KPC9zdmc+Cw== - - - - 511, 95 - - - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAjdEVYdFRpdGxlAEZvcmNlIFRlc3Q7VGVzdDtDaGVj - aztSZXBvcnQ74hwgxgAAAR1JREFUWEfdkrENwjAQRcNmINEzBBtQUFNkB0ago0FswBDMQMEKx32Tiw7r - K0CwD0HxlPjb9/+PlUZEvgoVI6FiJFR8Rtu2G0UyoNHzQ1DxGRaar6sVUOO9C3kVzFA/DxXB5biQ62ml - rw9f+C4NPOBlvjlUBFmB0TdQqsBoPi7QAaMxpPniBdj59W47VQRPdzamgAtPuLNlC6i50X+tezdm5mHz - xQpA1wDgAz0oY+cmNl/0BrDXBdFwYB42X+MG8hJ9ODAPmy9awMNCvW7zxQucl/ODoq/9WjotrSMKIJCR - 9iMKsBJJx361AmaM/SxcpXsxPKsXyMMdabZaAUODBn9Cd7ZOgTf4nwIf8bsFSpL7G1SMhIqRUDESKsYh - zQ3o4jAe74EDiAAAAABJRU5ErkJggg== @@ -447,6 +411,82 @@ bDEuOCwxLjNsMS40LTEuNGwtMS4zLTEuOCAgIGMwLjMtMC41LDAuNi0xLjIsMC44LTEuOEwzMCwyNXog TTIyLDI2Yy0xLjEsMC0yLTAuOS0yLTJzMC45LTIsMi0yczIsMC45LDIsMlMyMy4xLDI2LDIyLDI2eiIg Y2xhc3M9IkJsdWUiIC8+DQogIDwvZz4NCjwvc3ZnPgs= + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAHcDAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku + Qmx1ZXtmaWxsOiMxMTc3RDc7fQoJLnN0MHtvcGFjaXR5OjAuNTt9Cjwvc3R5bGU+DQogIDxnIGlkPSJN + YW5hZ2VfUmVsYXRpb25zIj4NCiAgICA8ZyBjbGFzcz0ic3QwIj4NCiAgICAgIDxwYXRoIGQ9Ik0zMSwz + MmgtOGMtMC41LDAtMS0wLjUtMS0xdi04YzAtMC41LDAuNS0xLDEtMWg4YzAuNSwwLDEsMC41LDEsMXY4 + QzMyLDMxLjUsMzEuNSwzMiwzMSwzMnogTTMyLDlWMSAgICBjMC0wLjYtMC41LTEtMS0xaC04Yy0wLjUs + MC0xLDAuNC0xLDF2OGMwLDAuNiwwLjUsMSwxLDFoOEMzMS41LDEwLDMyLDkuNiwzMiw5eiIgY2xhc3M9 + IkJsYWNrIiAvPg0KICAgIDwvZz4NCiAgICA8cGF0aCBkPSJNMTEsMjJIMWMtMC42LDAtMS0wLjUtMS0x + VjExYzAtMC42LDAuNC0xLDEtMWgxMGMwLjYsMCwxLDAuNCwxLDF2MTBDMTIsMjEuNSwxMS42LDIyLDEx + LDIyeiIgY2xhc3M9IkJsdWUiIC8+DQogICAgPHBhdGggZD0iTTIwLDJ2NmwtMi4zLTIuM2wtNCw0bC0x + LjQtMS40bDQtNEwxNCwySDIweiBNMTcuNywyNi4zbC00LTRsLTEuNCwxLjRsNCw0TDE0LDMwaDZ2LTZM + MTcuNywyNi4zeiIgY2xhc3M9IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L + + + + 17, 134 + + + 246, 56 + + + 1161, 17 + + + 752, 56 + + + 752, 56 + + + 17, 95 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAEACAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z + ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz + OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp + dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkFycm93MUxlZnQiPg0KICAgIDxwb2x5Z29uIHBvaW50 + cz0iMjgsMTQgMTQsMTQgMTQsMTMuMyAxNCw2IDQsMTYgMTQsMjYgMTQsMTguNyAxNCwxOCAyOCwxOCAg + IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== + + + + 17, 95 + + + 511, 95 + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAjdEVYdFRpdGxlAEZvcmNlIFRlc3Q7VGVzdDtDaGVj + aztSZXBvcnQ74hwgxgAAAR1JREFUWEfdkrENwjAQRcNmINEzBBtQUFNkB0ago0FswBDMQMEKx32Tiw7r + K0CwD0HxlPjb9/+PlUZEvgoVI6FiJFR8Rtu2G0UyoNHzQ1DxGRaar6sVUOO9C3kVzFA/DxXB5biQ62ml + rw9f+C4NPOBlvjlUBFmB0TdQqsBoPi7QAaMxpPniBdj59W47VQRPdzamgAtPuLNlC6i50X+tezdm5mHz + xQpA1wDgAz0oY+cmNl/0BrDXBdFwYB42X+MG8hJ9ODAPmy9awMNCvW7zxQucl/ODoq/9WjotrSMKIJCR + 9iMKsBJJx361AmaM/SxcpXsxPKsXyMMdabZaAUODBn9Cd7ZOgTf4nwIf8bsFSpL7G1SMhIqRUDESKsYh + zQ3o4jAe74EDiAAAAABJRU5ErkJggg== @@ -498,28 +538,6 @@ NFYyNHoiIGNsYXNzPSJCbGFjayIgLz4NCiAgICA8L2c+DQogICAgPHJlY3QgeD0iMTgiIHk9IjE4IiB3 aWR0aD0iNCIgaGVpZ2h0PSI0IiByeD0iMCIgcnk9IjAiIGNsYXNzPSJHcmVlbiIgLz4NCiAgPC9nPg0K PC9zdmc+Cw== - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAHcDAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku - Qmx1ZXtmaWxsOiMxMTc3RDc7fQoJLnN0MHtvcGFjaXR5OjAuNTt9Cjwvc3R5bGU+DQogIDxnIGlkPSJN - YW5hZ2VfUmVsYXRpb25zIj4NCiAgICA8ZyBjbGFzcz0ic3QwIj4NCiAgICAgIDxwYXRoIGQ9Ik0zMSwz - MmgtOGMtMC41LDAtMS0wLjUtMS0xdi04YzAtMC41LDAuNS0xLDEtMWg4YzAuNSwwLDEsMC41LDEsMXY4 - QzMyLDMxLjUsMzEuNSwzMiwzMSwzMnogTTMyLDlWMSAgICBjMC0wLjYtMC41LTEtMS0xaC04Yy0wLjUs - MC0xLDAuNC0xLDF2OGMwLDAuNiwwLjUsMSwxLDFoOEMzMS41LDEwLDMyLDkuNiwzMiw5eiIgY2xhc3M9 - IkJsYWNrIiAvPg0KICAgIDwvZz4NCiAgICA8cGF0aCBkPSJNMTEsMjJIMWMtMC42LDAtMS0wLjUtMS0x - VjExYzAtMC42LDAuNC0xLDEtMWgxMGMwLjYsMCwxLDAuNCwxLDF2MTBDMTIsMjEuNSwxMS42LDIyLDEx - LDIyeiIgY2xhc3M9IkJsdWUiIC8+DQogICAgPHBhdGggZD0iTTIwLDJ2NmwtMi4zLTIuM2wtNCw0bC0x - LjQtMS40bDQtNEwxNCwySDIweiBNMTcuNywyNi4zbC00LTRsLTEuNCwxLjRsNCw0TDE0LDMwaDZ2LTZM - MTcuNywyNi4zeiIgY2xhc3M9IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L diff --git a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.vb b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.vb index 3c1b8080..019e8816 100644 --- a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.vb +++ b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.vb @@ -566,12 +566,11 @@ Public Class frmAdmin_Globix str = FOLDER_FOR_INDEXTextEdit.Text & "\" End If If cmbAllAttributes.SelectedIndex <> -1 Then - Dim oPattern As String - If cmbAllAttributes.Text.EndsWith("M") Then - oPattern = clsPatterns.WrapPatternValue(clsPatterns.PATTERN_ATTR_MAN, cmbAllAttributes.Text) - ElseIf cmbAllAttributes.Text.EndsWith("A") Then - oPattern = clsPatterns.WrapPatternValue(clsPatterns.PATTERN_ATTR_AUTO, cmbAllAttributes.Text) + If cmbAllAttributes.Text.EndsWith(" - M") Then + oPattern = clsPatterns.WrapPatternValue(clsPatterns.PATTERN_ATTR_MAN, cmbAllAttributes.Text.Replace(" - M", "")) + ElseIf cmbAllAttributes.Text.EndsWith(" - A") Then + oPattern = clsPatterns.WrapPatternValue(clsPatterns.PATTERN_ATTR_AUTO, cmbAllAttributes.Text.Replace(" - A", "")) End If Me.FOLDER_FOR_INDEXTextEdit.Text = str & oPattern cmbAllAttributes.SelectedIndex = -1 @@ -678,4 +677,19 @@ Public Class frmAdmin_Globix SQL_RESULTTextBox1.Text = String.Empty End If End Sub + + Private Sub WD_INDEXComboBox_SelectedIndexChanged(sender As Object, e As EventArgs) Handles WD_INDEXComboBox.SelectedIndexChanged + If WD_INDEXComboBox.SelectedIndex <> -1 Then + TextEdit10.Text = WD_INDEXComboBox.Text + End If + + End Sub + + Private Sub FOLDER_FOR_INDEXTextEdit_TextChanged(sender As Object, e As EventArgs) Handles FOLDER_FOR_INDEXTextEdit.TextChanged + If FOLDER_FOR_INDEXTextEdit.Text <> String.Empty Then + Dim opath = FOLDER_FOR_INDEXTextEdit.Text + opath = opath.Replace("\\", "\") + FOLDER_FOR_INDEXTextEdit.Text = opath + End If + End Sub End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/My Project/licenses.licx b/GUIs.ZooFlow/My Project/licenses.licx index 1b89e2bd..2f7886ce 100644 --- a/GUIs.ZooFlow/My Project/licenses.licx +++ b/GUIs.ZooFlow/My Project/licenses.licx @@ -1,6 +1,9 @@ +DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.PictureEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/GUIs.ZooFlow/frmTreeViewNavi.resx b/GUIs.ZooFlow/frmTreeViewNavi.resx index 628ed0d9..2cf7ff08 100644 --- a/GUIs.ZooFlow/frmTreeViewNavi.resx +++ b/GUIs.ZooFlow/frmTreeViewNavi.resx @@ -249,4 +249,7 @@ qhUCsCkghKFaBxQwMAAAhULfkC84ZiQAAAAASUVORK5CYIIL + + 164, 17 + \ No newline at end of file diff --git a/GUIs.ZooFlow/frmTreeViewNavi.vb b/GUIs.ZooFlow/frmTreeViewNavi.vb index 512a92cf..96c03371 100644 --- a/GUIs.ZooFlow/frmTreeViewNavi.vb +++ b/GUIs.ZooFlow/frmTreeViewNavi.vb @@ -241,4 +241,12 @@ Public Class frmTreeViewNavi RibbonPageGroupRelationsChange.Enabled = False End If End Sub + + Private Sub XtraTabControlRelationScope_SelectedPageChanged(sender As Object, e As DevExpress.XtraTab.TabPageChangedEventArgs) Handles XtraTabControlRelationScope.SelectedPageChanged + If XtraTabControlRelationScope.SelectedTabPageIndex = 1 Then + Refresh_FreeGroups() + Else + Refresh_FreeUsers() + End If + End Sub End Class \ No newline at end of file diff --git a/Service.EDMIService/IDB/Helpers.vb b/Service.EDMIService/IDB/Helpers.vb index fc384684..b2f1b257 100644 --- a/Service.EDMIService/IDB/Helpers.vb +++ b/Service.EDMIService/IDB/Helpers.vb @@ -190,11 +190,13 @@ Namespace IDB End Sub Public Function NewDynamicFolderForObject(pObjectId As Long, pFolder As String, pWho As String, pLangID As Integer, pLangCode As String) As Boolean - Logger.Info("Setting Dynamic Folder [{0}]", pFolder) + Dim oSql = $" DECLARE @NEW_OBJ_MD_ID BIGINT - EXEC PRIDB_NEW_OBJ_DATA {pObjectId}, 'VIRTUAL_FOLDER', '{pWho}', 'pFolder', '{pLangCode}', 0, @OMD_ID = @NEW_OBJ_MD_ID OUTPUT" - Database.ExecuteNonQuery(oSql) + EXEC PRIDB_NEW_OBJ_DATA {pObjectId}, 'VIRTUAL_FOLDER', '{pWho}', '{pFolder}', '{pLangCode}', 0, @OMD_ID = @NEW_OBJ_MD_ID OUTPUT" + If Database.ExecuteNonQuery(oSql) = True Then + Logger.Debug("...Dynamic Folder [{0}] successfully saved!", pFolder) + End If oSql = $" DECLARE @LAST_SN_ID BIGINT EXEC PRIDB_NEW_DYNAMIC_FOLDER '{pFolder}','{pWho}',1,@LAST_SN_ID OUTPUT @@ -202,11 +204,14 @@ Namespace IDB Dim oNodeID As Integer oNodeID = Database.GetScalarValue(oSql) If IsNothing(oNodeID) = False Then + Logger.Debug("...Nodes successffully created!") oSql = $"DECLARE @LAST_SN_ID BIGINT EXEC PRIDB_NEW_STUCTURE_NODE_FOR_OBJECT {pObjectId},{oNodeID},'{pWho}',{pLangID}, @LAST_SN_ID OUTPUT" If Database.ExecuteNonQuery(oSql) = False Then Logger.Warn("Error while setting Dynamic Folder.") Return False + Else + Logger.Info("DynamicFolder and Nodes successffully created!") End If End If Return True diff --git a/Service.EDMIService/Methods/GlobalIndexer/ImportFile/ImportFileMethod.vb b/Service.EDMIService/Methods/GlobalIndexer/ImportFile/ImportFileMethod.vb index 2f4dfae9..9b9be45f 100644 --- a/Service.EDMIService/Methods/GlobalIndexer/ImportFile/ImportFileMethod.vb +++ b/Service.EDMIService/Methods/GlobalIndexer/ImportFile/ImportFileMethod.vb @@ -110,9 +110,9 @@ Namespace Methods.GlobalIndexer.ImportFile Dim oDynamicFilePath = GetVirtualPath( pData.File.FileInfoRaw, oProfile.DynamicPath, User, oUserAttributes, oAutoAttributes) - If oProfile.DynamicPath <> String.Empty Then - Logger.Info("Generating DynamicPath for ObjectId [{0}]", oResponse.ObjectId) - Helpers.NewDynamicFolderForObject(oResponse.ObjectId, oProfile.DynamicPath, User.UserName, User.LanguageId, User.Language) + If oDynamicFilePath <> String.Empty Then + Logger.Info("Saving DynamicPath for ObjectId [{0}]", oResponse.ObjectId) + Helpers.NewDynamicFolderForObject(oResponse.ObjectId, oDynamicFilePath, User.UserName, User.LanguageId, User.Language) End If