diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb index fa365fa9..b932730e 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb @@ -97,11 +97,11 @@ Partial Class frmAdmin_Start Me.CHANGED_WHOTextBox = New System.Windows.Forms.TextBox() Me.CHANGED_WHENTextBox = New System.Windows.Forms.TextBox() Me.XtraTabPageIDB_SourceSQL = New DevExpress.XtraTab.XtraTabPage() + Me.GridSourceSQL = New DevExpress.XtraGrid.GridControl() + Me.ViewSourceSQL = New DevExpress.XtraGrid.Views.Grid.GridView() Me.XtraTabPage_GlobalIndexer = New DevExpress.XtraTab.XtraTabPage() Me.XtraTabPage_ClipboardWatcher = New DevExpress.XtraTab.XtraTabPage() Me.XtraTabControl = New DevExpress.XtraTab.XtraTabControl() - Me.GridSourceSQL = New DevExpress.XtraGrid.GridControl() - Me.ViewSourceSQL = New DevExpress.XtraGrid.Views.Grid.GridView() CHANGED_WHENLabel = New System.Windows.Forms.Label() CHANGED_WHOLabel = New System.Windows.Forms.Label() ADDED_WHENLabel = New System.Windows.Forms.Label() @@ -129,10 +129,10 @@ Partial Class frmAdmin_Start CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabPageIDB_SourceSQL.SuspendLayout() - CType(Me.XtraTabControl, System.ComponentModel.ISupportInitialize).BeginInit() - Me.XtraTabControl.SuspendLayout() CType(Me.GridSourceSQL, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ViewSourceSQL, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.XtraTabControl, System.ComponentModel.ISupportInitialize).BeginInit() + Me.XtraTabControl.SuspendLayout() Me.SuspendLayout() ' 'CHANGED_WHENLabel @@ -140,7 +140,7 @@ Partial Class frmAdmin_Start CHANGED_WHENLabel.AutoSize = True CHANGED_WHENLabel.Location = New System.Drawing.Point(472, 188) CHANGED_WHENLabel.Name = "CHANGED_WHENLabel" - CHANGED_WHENLabel.Size = New System.Drawing.Size(85, 13) + CHANGED_WHENLabel.Size = New System.Drawing.Size(90, 13) CHANGED_WHENLabel.TabIndex = 20 CHANGED_WHENLabel.Text = "Geändert wann:" ' @@ -149,7 +149,7 @@ Partial Class frmAdmin_Start CHANGED_WHOLabel.AutoSize = True CHANGED_WHOLabel.Location = New System.Drawing.Point(351, 188) CHANGED_WHOLabel.Name = "CHANGED_WHOLabel" - CHANGED_WHOLabel.Size = New System.Drawing.Size(77, 13) + CHANGED_WHOLabel.Size = New System.Drawing.Size(80, 13) CHANGED_WHOLabel.TabIndex = 18 CHANGED_WHOLabel.Text = "Geändert wer:" ' @@ -158,7 +158,7 @@ Partial Class frmAdmin_Start ADDED_WHENLabel.AutoSize = True ADDED_WHENLabel.Location = New System.Drawing.Point(472, 146) ADDED_WHENLabel.Name = "ADDED_WHENLabel" - ADDED_WHENLabel.Size = New System.Drawing.Size(73, 13) + ADDED_WHENLabel.Size = New System.Drawing.Size(77, 13) ADDED_WHENLabel.TabIndex = 16 ADDED_WHENLabel.Text = "Erstellt wann:" ' @@ -167,7 +167,7 @@ Partial Class frmAdmin_Start ADDED_WHOLabel.AutoSize = True ADDED_WHOLabel.Location = New System.Drawing.Point(351, 146) ADDED_WHOLabel.Name = "ADDED_WHOLabel" - ADDED_WHOLabel.Size = New System.Drawing.Size(65, 13) + ADDED_WHOLabel.Size = New System.Drawing.Size(67, 13) ADDED_WHOLabel.TabIndex = 14 ADDED_WHOLabel.Text = "Erstellt wer:" ' @@ -176,7 +176,7 @@ Partial Class frmAdmin_Start COMMENTLabel.AutoSize = True COMMENTLabel.Location = New System.Drawing.Point(351, 106) COMMENTLabel.Name = "COMMENTLabel" - COMMENTLabel.Size = New System.Drawing.Size(65, 13) + COMMENTLabel.Size = New System.Drawing.Size(68, 13) COMMENTLabel.TabIndex = 12 COMMENTLabel.Text = "Kommentar:" ' @@ -185,7 +185,7 @@ Partial Class frmAdmin_Start VIEW_SEQUENCELabel.AutoSize = True VIEW_SEQUENCELabel.Location = New System.Drawing.Point(351, 82) VIEW_SEQUENCELabel.Name = "VIEW_SEQUENCELabel" - VIEW_SEQUENCELabel.Size = New System.Drawing.Size(93, 13) + VIEW_SEQUENCELabel.Size = New System.Drawing.Size(101, 13) VIEW_SEQUENCELabel.TabIndex = 8 VIEW_SEQUENCELabel.Text = "View Reihenfolge:" ' @@ -194,7 +194,7 @@ Partial Class frmAdmin_Start TITLELabel.AutoSize = True TITLELabel.Location = New System.Drawing.Point(351, 12) TITLELabel.Name = "TITLELabel" - TITLELabel.Size = New System.Drawing.Size(71, 13) + TITLELabel.Size = New System.Drawing.Size(76, 13) TITLELabel.TabIndex = 2 TITLELabel.Text = "Bezeichnung:" ' @@ -203,7 +203,7 @@ Partial Class frmAdmin_Start GUIDLabel.AutoSize = True GUIDLabel.Location = New System.Drawing.Point(297, 12) GUIDLabel.Name = "GUIDLabel" - GUIDLabel.Size = New System.Drawing.Size(36, 13) + GUIDLabel.Size = New System.Drawing.Size(37, 13) GUIDLabel.TabIndex = 0 GUIDLabel.Text = "GUID:" ' @@ -215,8 +215,11 @@ Partial Class frmAdmin_Start Me.RibbonControl1.MaxItemId = 15 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage_ClipboardWatcher, Me.RibbonPage_GlobalIndexer, Me.RibbonPage_IDB}) - Me.RibbonControl1.Size = New System.Drawing.Size(1328, 158) + Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] + Me.RibbonControl1.ShowToolbarCustomizeItem = False + Me.RibbonControl1.Size = New System.Drawing.Size(1328, 159) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 + Me.RibbonControl1.Toolbar.ShowCustomizeItem = False ' 'BarButtonItem1 ' @@ -401,10 +404,10 @@ Partial Class frmAdmin_Start ' Me.RibbonStatusBar1.ItemLinks.Add(Me.labelStatus) Me.RibbonStatusBar1.ItemLinks.Add(Me.labelError) - Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 727) + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 729) Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 - Me.RibbonStatusBar1.Size = New System.Drawing.Size(1328, 24) + Me.RibbonStatusBar1.Size = New System.Drawing.Size(1328, 22) ' 'RibbonPage2 ' @@ -422,11 +425,13 @@ Partial Class frmAdmin_Start Me.TreeListMenu.Name = "TreeListMenu" Me.TreeListMenu.BeginUnboundLoad() Me.TreeListMenu.AppendNode(New Object() {"IDB"}, -1) - Me.TreeListMenu.AppendNode(New Object() {"Attributes"}, 0, 2, 2, -1, "IDB_ATTRIBUTES") + Me.TreeListMenu.AppendNode(New Object() {"Attribute"}, 0, 2, 2, -1, "IDB_ATTRIBUTES") Me.TreeListMenu.AppendNode(New Object() {"Business Entities"}, 0, 1, 1, -1, "IDB_ENTITIES") Me.TreeListMenu.AppendNode(New Object() {"Source SQL"}, 0, 3, 3, -1, "SOURCE_SQL") Me.TreeListMenu.AppendNode(New Object() {"Global Indexer"}, -1, "GLOBIX") + Me.TreeListMenu.AppendNode(New Object() {"Profiles"}, 4, 4, 4, -1) Me.TreeListMenu.AppendNode(New Object() {"Clipboard Watcher"}, -1, "CLIPBOARD_WATCHER") + Me.TreeListMenu.AppendNode(New Object() {"Profiles"}, 6, 4, 4, -1) Me.TreeListMenu.EndUnboundLoad() Me.TreeListMenu.OptionsBehavior.Editable = False Me.TreeListMenu.OptionsView.ShowColumns = False @@ -434,7 +439,7 @@ Partial Class frmAdmin_Start Me.TreeListMenu.OptionsView.ShowIndicator = False Me.TreeListMenu.OptionsView.ShowVertLines = False Me.TreeListMenu.SelectImageList = Me.SvgImageCollection1 - Me.TreeListMenu.Size = New System.Drawing.Size(193, 540) + Me.TreeListMenu.Size = New System.Drawing.Size(193, 521) Me.TreeListMenu.TabIndex = 8 ' 'TreeListColumn1 @@ -451,6 +456,8 @@ Partial Class frmAdmin_Start Me.SvgImageCollection1.Add("bo_organization", "image://svgimages/business objects/bo_organization.svg") Me.SvgImageCollection1.Add("bo_appearance", "image://svgimages/business objects/bo_appearance.svg") Me.SvgImageCollection1.Add("managedatasource", "image://svgimages/spreadsheet/managedatasource.svg") + Me.SvgImageCollection1.Add("grandtotals", "image://svgimages/dashboards/grandtotals.svg") + Me.SvgImageCollection1.Add("allowuserstoeditranges", "image://svgimages/spreadsheet/allowuserstoeditranges.svg") ' 'DockManager1 ' @@ -463,18 +470,18 @@ Partial Class frmAdmin_Start Me.DockPanel1.Controls.Add(Me.DockPanel1_Container) Me.DockPanel1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Left Me.DockPanel1.ID = New System.Guid("ce81b5b5-eff5-4006-8018-548aa8413799") - Me.DockPanel1.Location = New System.Drawing.Point(0, 158) + Me.DockPanel1.Location = New System.Drawing.Point(0, 159) Me.DockPanel1.Name = "DockPanel1" Me.DockPanel1.OriginalSize = New System.Drawing.Size(200, 200) - Me.DockPanel1.Size = New System.Drawing.Size(200, 569) + Me.DockPanel1.Size = New System.Drawing.Size(200, 570) Me.DockPanel1.Text = "Übersicht" ' 'DockPanel1_Container ' Me.DockPanel1_Container.Controls.Add(Me.TreeListMenu) - Me.DockPanel1_Container.Location = New System.Drawing.Point(3, 26) + Me.DockPanel1_Container.Location = New System.Drawing.Point(3, 46) Me.DockPanel1_Container.Name = "DockPanel1_Container" - Me.DockPanel1_Container.Size = New System.Drawing.Size(193, 540) + Me.DockPanel1_Container.Size = New System.Drawing.Size(193, 521) Me.DockPanel1_Container.TabIndex = 0 ' 'TBIDB_ATTRIBUTEBindingSource @@ -498,6 +505,7 @@ Partial Class frmAdmin_Start Me.TableAdapterManager.TBIDB_ATTRIBUTE_TYPETableAdapter = Nothing Me.TableAdapterManager.TBIDB_ATTRIBUTETableAdapter = Nothing Me.TableAdapterManager.TBIDB_BUSINESS_ENTITYTableAdapter = Nothing + Me.TableAdapterManager.TBZF_ADMIN_SOURCE_SQLTableAdapter = Nothing Me.TableAdapterManager.UpdateOrder = DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete ' 'TBIDB_ATTRIBUTE_TYPEBindingSource @@ -513,7 +521,7 @@ Partial Class frmAdmin_Start ' Me.XtraTabPage_IDB.Controls.Add(Me.XtraTabControlIDB) Me.XtraTabPage_IDB.Name = "XtraTabPage_IDB" - Me.XtraTabPage_IDB.Size = New System.Drawing.Size(1126, 544) + Me.XtraTabPage_IDB.Size = New System.Drawing.Size(1126, 547) Me.XtraTabPage_IDB.Text = "IDB" ' 'XtraTabControlIDB @@ -522,7 +530,7 @@ Partial Class frmAdmin_Start Me.XtraTabControlIDB.Location = New System.Drawing.Point(0, 0) Me.XtraTabControlIDB.Name = "XtraTabControlIDB" Me.XtraTabControlIDB.SelectedTabPage = Me.XtraTabPageIDB_Attributes_New - Me.XtraTabControlIDB.Size = New System.Drawing.Size(1126, 544) + Me.XtraTabControlIDB.Size = New System.Drawing.Size(1126, 547) Me.XtraTabControlIDB.TabIndex = 0 Me.XtraTabControlIDB.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPageIDB_Attributes_New, Me.XtraTabPageIDB_Attributes, Me.XtraTabPageIDB_SourceSQL}) ' @@ -530,7 +538,7 @@ Partial Class frmAdmin_Start ' Me.XtraTabPageIDB_Attributes_New.Controls.Add(Me.GridAttributes) Me.XtraTabPageIDB_Attributes_New.Name = "XtraTabPageIDB_Attributes_New" - Me.XtraTabPageIDB_Attributes_New.Size = New System.Drawing.Size(1124, 519) + Me.XtraTabPageIDB_Attributes_New.Size = New System.Drawing.Size(1124, 524) Me.XtraTabPageIDB_Attributes_New.Text = "Attribute" ' 'GridAttributes @@ -540,7 +548,7 @@ Partial Class frmAdmin_Start Me.GridAttributes.MainView = Me.ViewAttributes Me.GridAttributes.MenuManager = Me.RibbonControl1 Me.GridAttributes.Name = "GridAttributes" - Me.GridAttributes.Size = New System.Drawing.Size(1124, 519) + Me.GridAttributes.Size = New System.Drawing.Size(1124, 524) Me.GridAttributes.TabIndex = 0 Me.GridAttributes.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.ViewAttributes}) ' @@ -574,7 +582,7 @@ Partial Class frmAdmin_Start Me.XtraTabPageIDB_Attributes.Controls.Add(CHANGED_WHENLabel) Me.XtraTabPageIDB_Attributes.Controls.Add(Me.CHANGED_WHENTextBox) Me.XtraTabPageIDB_Attributes.Name = "XtraTabPageIDB_Attributes" - Me.XtraTabPageIDB_Attributes.Size = New System.Drawing.Size(1124, 519) + Me.XtraTabPageIDB_Attributes.Size = New System.Drawing.Size(1124, 521) Me.XtraTabPageIDB_Attributes.Text = "Attributverwaltung" ' 'ComboBox1 @@ -593,7 +601,7 @@ Partial Class frmAdmin_Start Me.GridControl1.MainView = Me.GridView1 Me.GridControl1.MenuManager = Me.RibbonControl1 Me.GridControl1.Name = "GridControl1" - Me.GridControl1.Size = New System.Drawing.Size(282, 519) + Me.GridControl1.Size = New System.Drawing.Size(282, 521) Me.GridControl1.TabIndex = 28 Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) ' @@ -639,7 +647,7 @@ Partial Class frmAdmin_Start Me.GUIDTextBox.Location = New System.Drawing.Point(300, 28) Me.GUIDTextBox.Name = "GUIDTextBox" Me.GUIDTextBox.ReadOnly = True - Me.GUIDTextBox.Size = New System.Drawing.Size(33, 21) + Me.GUIDTextBox.Size = New System.Drawing.Size(33, 22) Me.GUIDTextBox.TabIndex = 1 ' 'TITLETextBox @@ -647,7 +655,7 @@ Partial Class frmAdmin_Start Me.TITLETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBIDB_ATTRIBUTEBindingSource, "TITLE", True)) Me.TITLETextBox.Location = New System.Drawing.Point(354, 28) Me.TITLETextBox.Name = "TITLETextBox" - Me.TITLETextBox.Size = New System.Drawing.Size(290, 21) + Me.TITLETextBox.Size = New System.Drawing.Size(290, 22) Me.TITLETextBox.TabIndex = 3 ' 'TYP_IDTextBox @@ -655,7 +663,7 @@ Partial Class frmAdmin_Start Me.TYP_IDTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBIDB_ATTRIBUTEBindingSource, "TYP_ID", True)) Me.TYP_IDTextBox.Location = New System.Drawing.Point(777, 28) Me.TYP_IDTextBox.Name = "TYP_IDTextBox" - Me.TYP_IDTextBox.Size = New System.Drawing.Size(104, 21) + Me.TYP_IDTextBox.Size = New System.Drawing.Size(104, 22) Me.TYP_IDTextBox.TabIndex = 5 ' 'MULTI_CONTEXTCheckBox @@ -673,7 +681,7 @@ Partial Class frmAdmin_Start Me.VIEW_SEQUENCETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBIDB_ATTRIBUTEBindingSource, "VIEW_SEQUENCE", True)) Me.VIEW_SEQUENCETextBox.Location = New System.Drawing.Point(450, 79) Me.VIEW_SEQUENCETextBox.Name = "VIEW_SEQUENCETextBox" - Me.VIEW_SEQUENCETextBox.Size = New System.Drawing.Size(33, 21) + Me.VIEW_SEQUENCETextBox.Size = New System.Drawing.Size(33, 22) Me.VIEW_SEQUENCETextBox.TabIndex = 9 ' 'VIEW_VISIBLECheckBox @@ -691,7 +699,7 @@ Partial Class frmAdmin_Start Me.COMMENTTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBIDB_ATTRIBUTEBindingSource, "COMMENT", True)) Me.COMMENTTextBox.Location = New System.Drawing.Point(354, 122) Me.COMMENTTextBox.Name = "COMMENTTextBox" - Me.COMMENTTextBox.Size = New System.Drawing.Size(417, 21) + Me.COMMENTTextBox.Size = New System.Drawing.Size(417, 22) Me.COMMENTTextBox.TabIndex = 13 ' 'ADDED_WHOTextBox @@ -700,7 +708,7 @@ Partial Class frmAdmin_Start Me.ADDED_WHOTextBox.Location = New System.Drawing.Point(354, 164) Me.ADDED_WHOTextBox.Name = "ADDED_WHOTextBox" Me.ADDED_WHOTextBox.ReadOnly = True - Me.ADDED_WHOTextBox.Size = New System.Drawing.Size(104, 21) + Me.ADDED_WHOTextBox.Size = New System.Drawing.Size(104, 22) Me.ADDED_WHOTextBox.TabIndex = 15 ' 'ADDED_WHENTextBox @@ -709,7 +717,7 @@ Partial Class frmAdmin_Start Me.ADDED_WHENTextBox.Location = New System.Drawing.Point(475, 164) Me.ADDED_WHENTextBox.Name = "ADDED_WHENTextBox" Me.ADDED_WHENTextBox.ReadOnly = True - Me.ADDED_WHENTextBox.Size = New System.Drawing.Size(131, 21) + Me.ADDED_WHENTextBox.Size = New System.Drawing.Size(131, 22) Me.ADDED_WHENTextBox.TabIndex = 17 ' 'CHANGED_WHOTextBox @@ -718,7 +726,7 @@ Partial Class frmAdmin_Start Me.CHANGED_WHOTextBox.Location = New System.Drawing.Point(354, 204) Me.CHANGED_WHOTextBox.Name = "CHANGED_WHOTextBox" Me.CHANGED_WHOTextBox.ReadOnly = True - Me.CHANGED_WHOTextBox.Size = New System.Drawing.Size(104, 21) + Me.CHANGED_WHOTextBox.Size = New System.Drawing.Size(104, 22) Me.CHANGED_WHOTextBox.TabIndex = 19 ' 'CHANGED_WHENTextBox @@ -727,41 +735,16 @@ Partial Class frmAdmin_Start Me.CHANGED_WHENTextBox.Location = New System.Drawing.Point(475, 204) Me.CHANGED_WHENTextBox.Name = "CHANGED_WHENTextBox" Me.CHANGED_WHENTextBox.ReadOnly = True - Me.CHANGED_WHENTextBox.Size = New System.Drawing.Size(131, 21) + Me.CHANGED_WHENTextBox.Size = New System.Drawing.Size(131, 22) Me.CHANGED_WHENTextBox.TabIndex = 21 ' 'XtraTabPageIDB_SourceSQL ' Me.XtraTabPageIDB_SourceSQL.Controls.Add(Me.GridSourceSQL) Me.XtraTabPageIDB_SourceSQL.Name = "XtraTabPageIDB_SourceSQL" - Me.XtraTabPageIDB_SourceSQL.Size = New System.Drawing.Size(1124, 519) + Me.XtraTabPageIDB_SourceSQL.Size = New System.Drawing.Size(1124, 521) Me.XtraTabPageIDB_SourceSQL.Text = "Source SQL" ' - 'XtraTabPage_GlobalIndexer - ' - Me.XtraTabPage_GlobalIndexer.Name = "XtraTabPage_GlobalIndexer" - Me.XtraTabPage_GlobalIndexer.PageVisible = False - Me.XtraTabPage_GlobalIndexer.Size = New System.Drawing.Size(1126, 544) - Me.XtraTabPage_GlobalIndexer.Text = "Global Indexer" - ' - 'XtraTabPage_ClipboardWatcher - ' - Me.XtraTabPage_ClipboardWatcher.Name = "XtraTabPage_ClipboardWatcher" - Me.XtraTabPage_ClipboardWatcher.PageVisible = False - Me.XtraTabPage_ClipboardWatcher.Size = New System.Drawing.Size(1126, 544) - Me.XtraTabPage_ClipboardWatcher.Text = "Clipboard Watcher" - ' - 'XtraTabControl - ' - Me.XtraTabControl.Dock = System.Windows.Forms.DockStyle.Fill - Me.XtraTabControl.Location = New System.Drawing.Point(200, 158) - Me.XtraTabControl.Name = "XtraTabControl" - Me.XtraTabControl.SelectedTabPage = Me.XtraTabPage_IDB - Me.XtraTabControl.ShowTabHeader = DevExpress.Utils.DefaultBoolean.[True] - Me.XtraTabControl.Size = New System.Drawing.Size(1128, 569) - Me.XtraTabControl.TabIndex = 4 - Me.XtraTabControl.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage_ClipboardWatcher, Me.XtraTabPage_GlobalIndexer, Me.XtraTabPage_IDB}) - ' 'GridSourceSQL ' Me.GridSourceSQL.Dock = System.Windows.Forms.DockStyle.Fill @@ -769,7 +752,7 @@ Partial Class frmAdmin_Start Me.GridSourceSQL.MainView = Me.ViewSourceSQL Me.GridSourceSQL.MenuManager = Me.RibbonControl1 Me.GridSourceSQL.Name = "GridSourceSQL" - Me.GridSourceSQL.Size = New System.Drawing.Size(1124, 519) + Me.GridSourceSQL.Size = New System.Drawing.Size(1124, 521) Me.GridSourceSQL.TabIndex = 0 Me.GridSourceSQL.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.ViewSourceSQL}) ' @@ -778,6 +761,31 @@ Partial Class frmAdmin_Start Me.ViewSourceSQL.GridControl = Me.GridSourceSQL Me.ViewSourceSQL.Name = "ViewSourceSQL" ' + 'XtraTabPage_GlobalIndexer + ' + Me.XtraTabPage_GlobalIndexer.Name = "XtraTabPage_GlobalIndexer" + Me.XtraTabPage_GlobalIndexer.PageVisible = False + Me.XtraTabPage_GlobalIndexer.Size = New System.Drawing.Size(1126, 546) + Me.XtraTabPage_GlobalIndexer.Text = "Global Indexer" + ' + 'XtraTabPage_ClipboardWatcher + ' + Me.XtraTabPage_ClipboardWatcher.Name = "XtraTabPage_ClipboardWatcher" + Me.XtraTabPage_ClipboardWatcher.PageVisible = False + Me.XtraTabPage_ClipboardWatcher.Size = New System.Drawing.Size(1126, 546) + Me.XtraTabPage_ClipboardWatcher.Text = "Clipboard Watcher" + ' + 'XtraTabControl + ' + Me.XtraTabControl.Dock = System.Windows.Forms.DockStyle.Fill + Me.XtraTabControl.Location = New System.Drawing.Point(200, 159) + Me.XtraTabControl.Name = "XtraTabControl" + Me.XtraTabControl.SelectedTabPage = Me.XtraTabPage_IDB + Me.XtraTabControl.ShowTabHeader = DevExpress.Utils.DefaultBoolean.[True] + Me.XtraTabControl.Size = New System.Drawing.Size(1128, 570) + Me.XtraTabControl.TabIndex = 4 + Me.XtraTabControl.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage_ClipboardWatcher, Me.XtraTabPage_GlobalIndexer, Me.XtraTabPage_IDB}) + ' 'frmAdmin_Start ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -812,10 +820,10 @@ Partial Class frmAdmin_Start CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() Me.XtraTabPageIDB_SourceSQL.ResumeLayout(False) - CType(Me.XtraTabControl, System.ComponentModel.ISupportInitialize).EndInit() - Me.XtraTabControl.ResumeLayout(False) CType(Me.GridSourceSQL, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ViewSourceSQL, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.XtraTabControl, System.ComponentModel.ISupportInitialize).EndInit() + Me.XtraTabControl.ResumeLayout(False) Me.ResumeLayout(False) Me.PerformLayout() diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.resx b/GUIs.ZooFlow/Administration/frmAdmin_Start.resx index 3e790c20..d72b3efc 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.resx +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.resx @@ -294,11 +294,14 @@ 22, 21 - - 22, 21 - - 352, 21 + 188, 21 + + + 483, 21 + + + 323, 21 @@ -323,25 +326,16 @@ LjEsMjguMSwyNy42LDI3LjZ6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== - - 647, 21 - - - 487, 21 - - - 487, 21 - - 875, 21 + 711, 21 - 1097, 21 + 933, 21 - 1270, 21 + 1106, 21 - 1530, 21 + 1366, 21 \ No newline at end of file diff --git a/GUIs.ZooFlow/Search/frmFlowSearch.Designer.vb b/GUIs.ZooFlow/Search/frmFlowSearch.Designer.vb index b33f2c18..3a08ed0b 100644 --- a/GUIs.ZooFlow/Search/frmFlowSearch.Designer.vb +++ b/GUIs.ZooFlow/Search/frmFlowSearch.Designer.vb @@ -22,12 +22,13 @@ Partial Class frmFlowSearch 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmFlowSearch)) Dim TileItemElement3 As DevExpress.XtraEditors.TileItemElement = New DevExpress.XtraEditors.TileItemElement() Dim TileItemElement4 As DevExpress.XtraEditors.TileItemElement = New DevExpress.XtraEditors.TileItemElement() Me.Panel1 = New System.Windows.Forms.Panel() Me.CheckButton1 = New DevExpress.XtraEditors.CheckButton() - Me.txtSearch = New System.Windows.Forms.TextBox() + Me.txtSearchTerm = New System.Windows.Forms.TextBox() Me.lblFoundResult = New System.Windows.Forms.Label() Me.Label1 = New System.Windows.Forms.Label() Me.Panel2 = New System.Windows.Forms.Panel() @@ -36,6 +37,7 @@ Partial Class frmFlowSearch Me.TileItem1 = New DevExpress.XtraEditors.TileItem() Me.TileItem2 = New DevExpress.XtraEditors.TileItem() Me.TileGroup3 = New DevExpress.XtraEditors.TileGroup() + Me.ToolTipController1 = New DevExpress.Utils.ToolTipController(Me.components) Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() Me.BarToggleSwitchItemDateALL = New DevExpress.XtraBars.BarToggleSwitchItem() Me.BarToggleSwitchItemCURRENTYEAR = New DevExpress.XtraBars.BarToggleSwitchItem() @@ -64,7 +66,7 @@ Partial Class frmFlowSearch ' Me.Panel1.BackColor = System.Drawing.Color.DimGray Me.Panel1.Controls.Add(Me.CheckButton1) - Me.Panel1.Controls.Add(Me.txtSearch) + Me.Panel1.Controls.Add(Me.txtSearchTerm) Me.Panel1.Controls.Add(Me.lblFoundResult) Me.Panel1.Controls.Add(Me.Label1) Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top @@ -84,14 +86,14 @@ Partial Class frmFlowSearch Me.CheckButton1.TabIndex = 5 Me.CheckButton1.Text = "Zeige Alles" ' - 'txtSearch + 'txtSearchTerm ' - Me.txtSearch.BackColor = System.Drawing.Color.White - Me.txtSearch.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtSearch.Location = New System.Drawing.Point(148, 11) - Me.txtSearch.Name = "txtSearch" - Me.txtSearch.Size = New System.Drawing.Size(167, 23) - Me.txtSearch.TabIndex = 0 + Me.txtSearchTerm.BackColor = System.Drawing.Color.White + Me.txtSearchTerm.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtSearchTerm.Location = New System.Drawing.Point(148, 11) + Me.txtSearchTerm.Name = "txtSearchTerm" + Me.txtSearchTerm.Size = New System.Drawing.Size(167, 23) + Me.txtSearchTerm.TabIndex = 0 ' 'lblFoundResult ' @@ -143,6 +145,7 @@ Partial Class frmFlowSearch Me.TileControlMatch.Size = New System.Drawing.Size(1237, 407) Me.TileControlMatch.TabIndex = 2 Me.TileControlMatch.Text = "TileControl1" + Me.TileControlMatch.ToolTipController = Me.ToolTipController1 ' 'TileGroup2 ' @@ -176,6 +179,11 @@ Partial Class frmFlowSearch Me.TileGroup3.Name = "TileGroup3" Me.TileGroup3.Text = "Attribut2" ' + 'ToolTipController1 + ' + Me.ToolTipController1.Appearance.BorderColor = System.Drawing.Color.Red + Me.ToolTipController1.Appearance.Options.UseBorderColor = True + ' 'RibbonControl1 ' Me.RibbonControl1.ExpandCollapseItem.Id = 0 @@ -339,7 +347,7 @@ Partial Class frmFlowSearch End Sub Friend WithEvents Panel1 As Panel - Friend WithEvents txtSearch As TextBox + Friend WithEvents txtSearchTerm As TextBox Friend WithEvents Label1 As Label Friend WithEvents lblFoundResult As Label Friend WithEvents Panel2 As Panel @@ -368,4 +376,5 @@ Partial Class frmFlowSearch Friend WithEvents CheckButton1 As DevExpress.XtraEditors.CheckButton Friend WithEvents BarEditItemDate As DevExpress.XtraBars.BarEditItem Friend WithEvents RepositoryItemComboBox1 As DevExpress.XtraEditors.Repository.RepositoryItemComboBox + Friend WithEvents ToolTipController1 As DevExpress.Utils.ToolTipController End Class diff --git a/GUIs.ZooFlow/Search/frmFlowSearch.resx b/GUIs.ZooFlow/Search/frmFlowSearch.resx index 7d5ecb9e..6376c2b5 100644 --- a/GUIs.ZooFlow/Search/frmFlowSearch.resx +++ b/GUIs.ZooFlow/Search/frmFlowSearch.resx @@ -138,6 +138,9 @@ MlYyNHoiIGNsYXNzPSJCbGFjayIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== + + 17, 17 + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z diff --git a/GUIs.ZooFlow/Search/frmFlowSearch.vb b/GUIs.ZooFlow/Search/frmFlowSearch.vb index 88ff38b7..1002f810 100644 --- a/GUIs.ZooFlow/Search/frmFlowSearch.vb +++ b/GUIs.ZooFlow/Search/frmFlowSearch.vb @@ -4,6 +4,7 @@ Imports DigitalData.GUIs.Common Imports DevExpress.XtraSplashScreen Imports DevExpress.XtraBars Imports DigitalData.GUIs.ZooFlow.ClassConstants +Imports DevExpress.Utils Public Class frmFlowSearch Private Logger As Logger @@ -82,10 +83,10 @@ Public Class frmFlowSearch End Try End Sub - Private Sub txtSearch_TextChanged(sender As Object, e As EventArgs) Handles txtSearch.TextChanged + Private Sub txtSearch_TextChanged(sender As Object, e As EventArgs) Handles txtSearchTerm.TextChanged Try - If txtSearch.Text = String.Empty Then + If txtSearchTerm.Text = String.Empty Then Reset_Form() Exit Sub End If @@ -104,10 +105,10 @@ Public Class frmFlowSearch End Sub Sub SearchContent() Try - If txtSearch.Text = String.Empty Then + If txtSearchTerm.Text = String.Empty Then Exit Sub End If - Dim oSearchValue = Trim(txtSearch.Text) + Dim oSearchValue = Trim(txtSearchTerm.Text) oLastAttribute = "" Dim oSQL = BASE_SEARCHCommand.Replace("@SEARCH_STRING", oSearchValue) @@ -147,10 +148,11 @@ Public Class frmFlowSearch oNewTable.DefaultView.Sort = "COUNT ASC" oNewTable = oNewTable.DefaultView.ToTable + '#### CREATE THE GROUPS FOR EACH ATTRIBUTE #### For Each oGroupRow As DataRow In oNewTable.Rows Dim oGroup As New TileGroup - oGroup.Text = $"{oGroupRow.Item(0).ToString} ({oGroupRow.Item(1).ToString} {Language_Term_Object})" + oGroup.Tag = oGroupRow.Item(0) oGroup.Visible = True For Each oitemRow As DataRow In oResultsfromSearchDT.Rows If oitemRow.Item("ATTRIBUTE") = oGroupRow.Item(0) Then @@ -166,7 +168,7 @@ Public Class frmFlowSearch 'Wenn weniger als 45 Belege gefunden wurden wird direkt die Suche ausgeführt If oResultCountAttributes > 0 And oResultCountAttributes <= 45 Then - StartSearch_Full(oSearchValue) + StartSearch_Full(oSearchValue, "") Else If oResultsfromSearchDT.Rows.Count = 0 Then Reset_Form() @@ -185,7 +187,7 @@ Public Class frmFlowSearch End Sub - Private Function StartSearch_Full(pSearchValue As String) As Boolean + Private Function StartSearch_Full(pSearchValue As String, pOptAttribute As String) As Boolean Dim oHandle As IOverlaySplashScreenHandle = Nothing Dim oItemsFound As Boolean = False Dim oSearchData = My.Application.Search @@ -193,7 +195,7 @@ Public Class frmFlowSearch Try oHandle = SplashScreenManager.ShowOverlayForm(Me) - Dim oEXECSQL = $"EXEC PRFLOW_SEARCH_GET_RESULT '{pSearchValue}','{SEARCH_FACT_DATE}', {My.Application.User.UserId},'{oSearchData.SelectInStringAttributeIds}','{oSearchData.SelectInIntegerAttributeIds}'" + Dim oEXECSQL = $"EXEC PRFLOW_SEARCH_GET_RESULT '{pSearchValue}','{SEARCH_FACT_DATE}', {My.Application.User.UserId},'{oSearchData.SelectInStringAttributeIds}','{oSearchData.SelectInIntegerAttributeIds}',{My.Application.User.LanguageID},'{pOptAttribute}'" Dim oDTOBJECT_RESULT As DataTable = My.DatabaseIDB.GetDatatable(oEXECSQL) If Not IsNothing(oDTOBJECT_RESULT) Then If oDTOBJECT_RESULT.Rows.Count = 0 Then @@ -333,10 +335,15 @@ Public Class frmFlowSearch End Function - Private Sub txtSearch_Enter(sender As Object, e As EventArgs) Handles txtSearch.GotFocus + Private Sub txtSearch_Enter(sender As Object, e As EventArgs) Handles txtSearchTerm.GotFocus Label1.Visible = True + Dim oTEXTBOX As TextBox = CType(sender, TextBox) + oTEXTBOX.BackColor = Color.FromArgb(255, 214, 47) + End Sub + Private Sub txtSearchTerm_Leave(sender As Object, e As EventArgs) Handles txtSearchTerm.Leave + Dim oTEXTBOX As TextBox = CType(sender, TextBox) + oTEXTBOX.BackColor = Color.White End Sub - Private Sub TileControlMatch_ItemClick(sender As Object, e As TileItemEventArgs) Handles TileControlMatch.ItemClick @@ -467,7 +474,7 @@ Public Class frmFlowSearch End Sub Sub Start_FlowSearch(Optional AllOver As Boolean = False) - If txtSearch.Text <> String.Empty Or AllOver = True Then + If txtSearchTerm.Text <> String.Empty Or AllOver = True Then SearchContent() End If End Sub @@ -488,11 +495,18 @@ Public Class frmFlowSearch Exit Sub End If End If - StartSearch_Full("") + StartSearch_Full("", "") CheckButton1.Checked = True End Sub - Private Sub BarEditItemDate_ItemClick(sender As Object, e As ItemClickEventArgs) Handles BarEditItemDate.ItemClick - + Private Sub TileControlMatch_Click(sender As Object, ByVal e As MouseEventArgs) Handles TileControlMatch.Click + Dim tc As TileControl = TryCast(sender, TileControl) + Dim hi = tc.CalcHitInfo(e.Location) + If hi.HitTest = DevExpress.XtraEditors.TileControlHitTest.GroupCaption Then + Console.WriteLine(hi.GroupInfo.Group.Tag) + StartSearch_Full(RTrim(LTrim(txtSearchTerm.Text)), hi.GroupInfo.Group.Tag) + End If End Sub + + End Class \ No newline at end of file