diff --git a/GUIs.Common/DocumentResultList/frmDocumentResultList.Designer.vb b/GUIs.Common/DocumentResultList/frmDocumentResultList.Designer.vb index ce4fc7c8..97aefa6b 100644 --- a/GUIs.Common/DocumentResultList/frmDocumentResultList.Designer.vb +++ b/GUIs.Common/DocumentResultList/frmDocumentResultList.Designer.vb @@ -86,7 +86,7 @@ Partial Class frmDocumentResultList Me.RibbonControl.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] Me.RibbonControl.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide Me.RibbonControl.ShowToolbarCustomizeItem = False - Me.RibbonControl.Size = New System.Drawing.Size(1189, 131) + Me.RibbonControl.Size = New System.Drawing.Size(1189, 132) Me.RibbonControl.StatusBar = Me.RibbonStatusBar Me.RibbonControl.Toolbar.ShowCustomizeItem = False ' @@ -213,6 +213,7 @@ Partial Class frmDocumentResultList Me.labelWarning.ItemAppearance.Normal.BackColor = System.Drawing.Color.White Me.labelWarning.ItemAppearance.Normal.Options.UseBackColor = True Me.labelWarning.Name = "labelWarning" + Me.labelWarning.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph Me.labelWarning.Visibility = DevExpress.XtraBars.BarItemVisibility.OnlyInCustomizing ' 'RibbonPage1 @@ -249,10 +250,10 @@ Partial Class frmDocumentResultList Me.RibbonStatusBar.ItemLinks.Add(Me.labelResultCount) Me.RibbonStatusBar.ItemLinks.Add(Me.labelCriticalError) Me.RibbonStatusBar.ItemLinks.Add(Me.labelWarning) - Me.RibbonStatusBar.Location = New System.Drawing.Point(0, 649) + Me.RibbonStatusBar.Location = New System.Drawing.Point(0, 647) Me.RibbonStatusBar.Name = "RibbonStatusBar" Me.RibbonStatusBar.Ribbon = Me.RibbonControl - Me.RibbonStatusBar.Size = New System.Drawing.Size(1189, 22) + Me.RibbonStatusBar.Size = New System.Drawing.Size(1189, 24) ' 'SplitContainerControl1 ' @@ -264,7 +265,7 @@ Partial Class frmDocumentResultList Me.SplitContainerControl1.Panel1.Text = "Panel1" Me.SplitContainerControl1.Panel2.Controls.Add(Me.SplitContainerControl2) Me.SplitContainerControl1.Panel2.Text = "Panel2" - Me.SplitContainerControl1.Size = New System.Drawing.Size(762, 518) + Me.SplitContainerControl1.Size = New System.Drawing.Size(762, 515) Me.SplitContainerControl1.SplitterPosition = 382 Me.SplitContainerControl1.TabIndex = 2 Me.SplitContainerControl1.Text = "SplitContainerControl1" @@ -276,7 +277,7 @@ Partial Class frmDocumentResultList Me.GridControl1.MainView = Me.GridView1 Me.GridControl1.MenuManager = Me.RibbonControl Me.GridControl1.Name = "GridControl1" - Me.GridControl1.Size = New System.Drawing.Size(382, 518) + Me.GridControl1.Size = New System.Drawing.Size(382, 515) Me.GridControl1.TabIndex = 0 Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) ' @@ -317,7 +318,7 @@ Partial Class frmDocumentResultList Me.SplitContainerControl2.Panel1.Text = "Panel1" Me.SplitContainerControl2.Panel2.Controls.Add(Me.GridControl3) Me.SplitContainerControl2.Panel2.Text = "Panel2" - Me.SplitContainerControl2.Size = New System.Drawing.Size(370, 518) + Me.SplitContainerControl2.Size = New System.Drawing.Size(370, 515) Me.SplitContainerControl2.SplitterPosition = 223 Me.SplitContainerControl2.TabIndex = 0 Me.SplitContainerControl2.Text = "SplitContainerControl2" @@ -362,7 +363,7 @@ Partial Class frmDocumentResultList Me.GridControl3.MainView = Me.GridView3 Me.GridControl3.MenuManager = Me.RibbonControl Me.GridControl3.Name = "GridControl3" - Me.GridControl3.Size = New System.Drawing.Size(370, 285) + Me.GridControl3.Size = New System.Drawing.Size(370, 282) Me.GridControl3.TabIndex = 0 Me.GridControl3.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView3}) ' @@ -391,13 +392,13 @@ Partial Class frmDocumentResultList 'SplitContainerControl3 ' Me.SplitContainerControl3.Dock = System.Windows.Forms.DockStyle.Fill - Me.SplitContainerControl3.Location = New System.Drawing.Point(0, 131) + Me.SplitContainerControl3.Location = New System.Drawing.Point(0, 132) Me.SplitContainerControl3.Name = "SplitContainerControl3" Me.SplitContainerControl3.Panel1.Controls.Add(Me.SplitContainerControl1) Me.SplitContainerControl3.Panel1.Text = "Panel1" Me.SplitContainerControl3.Panel2.Controls.Add(Me.DocumentViewer1) Me.SplitContainerControl3.Panel2.Text = "Panel2" - Me.SplitContainerControl3.Size = New System.Drawing.Size(1189, 518) + Me.SplitContainerControl3.Size = New System.Drawing.Size(1189, 515) Me.SplitContainerControl3.SplitterPosition = 762 Me.SplitContainerControl3.TabIndex = 5 Me.SplitContainerControl3.Text = "SplitContainerControl3" @@ -408,7 +409,7 @@ Partial Class frmDocumentResultList Me.DocumentViewer1.FileLoaded = False Me.DocumentViewer1.Location = New System.Drawing.Point(0, 0) Me.DocumentViewer1.Name = "DocumentViewer1" - Me.DocumentViewer1.Size = New System.Drawing.Size(417, 518) + Me.DocumentViewer1.Size = New System.Drawing.Size(417, 515) Me.DocumentViewer1.TabIndex = 0 ' 'XtraSaveFileDialog diff --git a/GUIs.Common/DocumentResultList/frmDocumentResultList.vb b/GUIs.Common/DocumentResultList/frmDocumentResultList.vb index 38f93e0e..cb1b138c 100644 --- a/GUIs.Common/DocumentResultList/frmDocumentResultList.vb +++ b/GUIs.Common/DocumentResultList/frmDocumentResultList.vb @@ -101,7 +101,7 @@ Public Class frmDocumentResultList End If DocumentViewer1.Init(_LogConfig, _Environment.Settings.GdPictureKey) - ' Load config + 'Load config SplitContainerControl1.SplitterPosition = _Config.Config.SplitContainer1Distance SwitchMainContainerHorizontal.Checked = _Config.Config.SplitContainer1Horizontal SplitContainerControl2.SplitterPosition = _Config.Config.SplitContainer2Distance diff --git a/GUIs.ZooFlow/Administration/frmAdministrationZooFlow.Designer.vb b/GUIs.ZooFlow/Administration/frmAdministrationZooFlow.Designer.vb index 77018c32..26ed5e80 100644 --- a/GUIs.ZooFlow/Administration/frmAdministrationZooFlow.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdministrationZooFlow.Designer.vb @@ -40,6 +40,9 @@ Partial Class frmAdministrationZooFlow Me.BarButtonItem5 = New DevExpress.XtraBars.BarButtonItem() Me.labelStatus = New DevExpress.XtraBars.BarStaticItem() Me.labelError = New DevExpress.XtraBars.BarStaticItem() + Me.BarButtonItemSaveAttribute = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItemAddAttribute = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItemRefreshAttribute = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPage_ClipboardWatcher = New DevExpress.XtraBars.Ribbon.RibbonPage() @@ -51,6 +54,8 @@ Partial Class frmAdministrationZooFlow Me.RibbonGroup_ClipboardWatcher_Control = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPage_GlobalIndexer = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPage_IDB = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.RibbonPageGroupAttributes = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.TreeList1 = New DevExpress.XtraTreeList.TreeList() @@ -68,8 +73,14 @@ Partial Class frmAdministrationZooFlow Me.XtraTabControlIDB = New DevExpress.XtraTab.XtraTabControl() Me.XtraTabPage1 = New DevExpress.XtraTab.XtraTabPage() Me.XtraTabPageIDB_Attributes = New DevExpress.XtraTab.XtraTabPage() + Me.ComboBox1 = New System.Windows.Forms.ComboBox() + Me.GridControl1 = New DevExpress.XtraGrid.GridControl() Me.TBIDB_ATTRIBUTEBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.DSIDB_Stammdaten = New DigitalData.GUIs.ZooFlow.DSIDB_Stammdaten() + Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.colGUID = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colTITLE = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colATTR_TYPE = New DevExpress.XtraGrid.Columns.GridColumn() Me.GUIDTextBox = New System.Windows.Forms.TextBox() Me.TITLETextBox = New System.Windows.Forms.TextBox() Me.TYP_IDTextBox = New System.Windows.Forms.TextBox() @@ -83,19 +94,8 @@ Partial Class frmAdministrationZooFlow Me.CHANGED_WHENTextBox = New System.Windows.Forms.TextBox() Me.TBIDB_ATTRIBUTETableAdapter = New DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.TBIDB_ATTRIBUTETableAdapter() Me.TableAdapterManager = New DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.TableAdapterManager() - Me.GridControl1 = New DevExpress.XtraGrid.GridControl() - Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView() - Me.colGUID = New DevExpress.XtraGrid.Columns.GridColumn() - Me.colTITLE = New DevExpress.XtraGrid.Columns.GridColumn() - Me.colATTR_TYPE = New DevExpress.XtraGrid.Columns.GridColumn() Me.TBIDB_ATTRIBUTE_TYPEBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBIDB_ATTRIBUTE_TYPETableAdapter = New DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.TBIDB_ATTRIBUTE_TYPETableAdapter() - Me.ComboBox1 = New System.Windows.Forms.ComboBox() - Me.RibbonPage_IDB = New DevExpress.XtraBars.Ribbon.RibbonPage() - Me.RibbonPageGroupAttributes = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.BarButtonItemSaveAttribute = New DevExpress.XtraBars.BarButtonItem() - Me.BarButtonItemAddAttribute = New DevExpress.XtraBars.BarButtonItem() - Me.BarButtonItemRefreshAttribute = New DevExpress.XtraBars.BarButtonItem() GUIDLabel = New System.Windows.Forms.Label() TITLELabel = New System.Windows.Forms.Label() VIEW_SEQUENCELabel = New System.Windows.Forms.Label() @@ -118,9 +118,9 @@ Partial Class frmAdministrationZooFlow CType(Me.XtraTabControlIDB, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabControlIDB.SuspendLayout() Me.XtraTabPageIDB_Attributes.SuspendLayout() + CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBIDB_ATTRIBUTEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DSIDB_Stammdaten, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBIDB_ATTRIBUTE_TYPEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() @@ -262,6 +262,27 @@ Partial Class frmAdministrationZooFlow Me.labelError.Name = "labelError" Me.labelError.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph ' + 'BarButtonItemSaveAttribute + ' + Me.BarButtonItemSaveAttribute.Caption = "Speichern" + Me.BarButtonItemSaveAttribute.Id = 8 + Me.BarButtonItemSaveAttribute.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItemSaveAttribute.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItemSaveAttribute.Name = "BarButtonItemSaveAttribute" + ' + 'BarButtonItemAddAttribute + ' + Me.BarButtonItemAddAttribute.Caption = "Hinzufügen" + Me.BarButtonItemAddAttribute.Id = 9 + Me.BarButtonItemAddAttribute.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItemAddAttribute.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItemAddAttribute.Name = "BarButtonItemAddAttribute" + ' + 'BarButtonItemRefreshAttribute + ' + Me.BarButtonItemRefreshAttribute.Caption = "Aktualisieren" + Me.BarButtonItemRefreshAttribute.Id = 10 + Me.BarButtonItemRefreshAttribute.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItemRefreshAttribute.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItemRefreshAttribute.Name = "BarButtonItemRefreshAttribute" + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2}) @@ -327,6 +348,20 @@ Partial Class frmAdministrationZooFlow Me.RibbonPageGroup1.Name = "RibbonPageGroup1" Me.RibbonPageGroup1.Text = "RibbonPageGroup1" ' + 'RibbonPage_IDB + ' + Me.RibbonPage_IDB.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroupAttributes}) + Me.RibbonPage_IDB.Name = "RibbonPage_IDB" + Me.RibbonPage_IDB.Text = "IDB Administration" + ' + 'RibbonPageGroupAttributes + ' + Me.RibbonPageGroupAttributes.ItemLinks.Add(Me.BarButtonItemSaveAttribute) + Me.RibbonPageGroupAttributes.ItemLinks.Add(Me.BarButtonItemAddAttribute) + Me.RibbonPageGroupAttributes.ItemLinks.Add(Me.BarButtonItemRefreshAttribute) + Me.RibbonPageGroupAttributes.Name = "RibbonPageGroupAttributes" + Me.RibbonPageGroupAttributes.Text = "Attribute" + ' 'RibbonStatusBar1 ' Me.RibbonStatusBar1.ItemLinks.Add(Me.labelStatus) @@ -407,12 +442,11 @@ Partial Class frmAdministrationZooFlow ' 'XtraTabControl ' - Me.XtraTabControl.Dock = System.Windows.Forms.DockStyle.Fill - Me.XtraTabControl.Location = New System.Drawing.Point(200, 158) + Me.XtraTabControl.Location = New System.Drawing.Point(406, 164) Me.XtraTabControl.Name = "XtraTabControl" Me.XtraTabControl.SelectedTabPage = Me.XtraTabPage_ClipboardWatcher Me.XtraTabControl.ShowTabHeader = DevExpress.Utils.DefaultBoolean.[True] - Me.XtraTabControl.Size = New System.Drawing.Size(1128, 569) + Me.XtraTabControl.Size = New System.Drawing.Size(745, 543) Me.XtraTabControl.TabIndex = 4 Me.XtraTabControl.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage_ClipboardWatcher, Me.XtraTabPage_GlobalIndexer, Me.XtraTabPage_IDB}) ' @@ -451,7 +485,7 @@ Partial Class frmAdministrationZooFlow ' 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(743, 518) Me.XtraTabPage_IDB.Text = "IDB" ' 'XtraTabControlIDB @@ -460,14 +494,14 @@ Partial Class frmAdministrationZooFlow Me.XtraTabControlIDB.Location = New System.Drawing.Point(0, 0) Me.XtraTabControlIDB.Name = "XtraTabControlIDB" Me.XtraTabControlIDB.SelectedTabPage = Me.XtraTabPage1 - Me.XtraTabControlIDB.Size = New System.Drawing.Size(1126, 544) + Me.XtraTabControlIDB.Size = New System.Drawing.Size(743, 518) Me.XtraTabControlIDB.TabIndex = 0 Me.XtraTabControlIDB.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage1, Me.XtraTabPageIDB_Attributes}) ' 'XtraTabPage1 ' Me.XtraTabPage1.Name = "XtraTabPage1" - Me.XtraTabPage1.Size = New System.Drawing.Size(1124, 519) + Me.XtraTabPage1.Size = New System.Drawing.Size(741, 493) Me.XtraTabPage1.Text = "XtraTabPage1" ' 'XtraTabPageIDB_Attributes @@ -498,6 +532,26 @@ Partial Class frmAdministrationZooFlow Me.XtraTabPageIDB_Attributes.Size = New System.Drawing.Size(1124, 519) Me.XtraTabPageIDB_Attributes.Text = "Attributverwaltung" ' + 'ComboBox1 + ' + Me.ComboBox1.FormattingEnabled = True + Me.ComboBox1.Location = New System.Drawing.Point(650, 28) + Me.ComboBox1.Name = "ComboBox1" + Me.ComboBox1.Size = New System.Drawing.Size(121, 21) + Me.ComboBox1.TabIndex = 29 + ' + 'GridControl1 + ' + Me.GridControl1.DataSource = Me.TBIDB_ATTRIBUTEBindingSource + Me.GridControl1.Dock = System.Windows.Forms.DockStyle.Left + Me.GridControl1.Location = New System.Drawing.Point(0, 0) + Me.GridControl1.MainView = Me.GridView1 + Me.GridControl1.MenuManager = Me.RibbonControl1 + Me.GridControl1.Name = "GridControl1" + Me.GridControl1.Size = New System.Drawing.Size(282, 519) + Me.GridControl1.TabIndex = 28 + Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) + ' 'TBIDB_ATTRIBUTEBindingSource ' Me.TBIDB_ATTRIBUTEBindingSource.DataMember = "TBIDB_ATTRIBUTE" @@ -508,6 +562,42 @@ Partial Class frmAdministrationZooFlow Me.DSIDB_Stammdaten.DataSetName = "DSIDB_Stammdaten" Me.DSIDB_Stammdaten.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema ' + 'GridView1 + ' + Me.GridView1.Appearance.EvenRow.BackColor = System.Drawing.Color.Gainsboro + Me.GridView1.Appearance.EvenRow.Options.UseBackColor = True + Me.GridView1.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colGUID, Me.colTITLE, Me.colATTR_TYPE}) + Me.GridView1.GridControl = Me.GridControl1 + Me.GridView1.Name = "GridView1" + Me.GridView1.OptionsView.EnableAppearanceEvenRow = True + ' + 'colGUID + ' + Me.colGUID.Caption = "ID" + Me.colGUID.FieldName = "GUID" + Me.colGUID.Name = "colGUID" + Me.colGUID.Visible = True + Me.colGUID.VisibleIndex = 0 + Me.colGUID.Width = 49 + ' + 'colTITLE + ' + Me.colTITLE.Caption = "Title" + Me.colTITLE.FieldName = "TITLE" + Me.colTITLE.Name = "colTITLE" + Me.colTITLE.Visible = True + Me.colTITLE.VisibleIndex = 1 + Me.colTITLE.Width = 135 + ' + 'colATTR_TYPE + ' + Me.colATTR_TYPE.Caption = "Typ" + Me.colATTR_TYPE.FieldName = "ATTR_TYPE" + Me.colATTR_TYPE.Name = "colATTR_TYPE" + Me.colATTR_TYPE.Visible = True + Me.colATTR_TYPE.VisibleIndex = 2 + Me.colATTR_TYPE.Width = 73 + ' 'GUIDTextBox ' Me.GUIDTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBIDB_ATTRIBUTEBindingSource, "GUID", True)) @@ -617,54 +707,6 @@ Partial Class frmAdministrationZooFlow Me.TableAdapterManager.TBIDB_BUSINESS_ENTITYTableAdapter = Nothing Me.TableAdapterManager.UpdateOrder = DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete ' - 'GridControl1 - ' - Me.GridControl1.DataSource = Me.TBIDB_ATTRIBUTEBindingSource - Me.GridControl1.Dock = System.Windows.Forms.DockStyle.Left - Me.GridControl1.Location = New System.Drawing.Point(0, 0) - Me.GridControl1.MainView = Me.GridView1 - Me.GridControl1.MenuManager = Me.RibbonControl1 - Me.GridControl1.Name = "GridControl1" - Me.GridControl1.Size = New System.Drawing.Size(282, 519) - Me.GridControl1.TabIndex = 28 - Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) - ' - 'GridView1 - ' - Me.GridView1.Appearance.EvenRow.BackColor = System.Drawing.Color.Gainsboro - Me.GridView1.Appearance.EvenRow.Options.UseBackColor = True - Me.GridView1.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colGUID, Me.colTITLE, Me.colATTR_TYPE}) - Me.GridView1.GridControl = Me.GridControl1 - Me.GridView1.Name = "GridView1" - Me.GridView1.OptionsView.EnableAppearanceEvenRow = True - ' - 'colGUID - ' - Me.colGUID.Caption = "ID" - Me.colGUID.FieldName = "GUID" - Me.colGUID.Name = "colGUID" - Me.colGUID.Visible = True - Me.colGUID.VisibleIndex = 0 - Me.colGUID.Width = 49 - ' - 'colTITLE - ' - Me.colTITLE.Caption = "Title" - Me.colTITLE.FieldName = "TITLE" - Me.colTITLE.Name = "colTITLE" - Me.colTITLE.Visible = True - Me.colTITLE.VisibleIndex = 1 - Me.colTITLE.Width = 135 - ' - 'colATTR_TYPE - ' - Me.colATTR_TYPE.Caption = "Typ" - Me.colATTR_TYPE.FieldName = "ATTR_TYPE" - Me.colATTR_TYPE.Name = "colATTR_TYPE" - Me.colATTR_TYPE.Visible = True - Me.colATTR_TYPE.VisibleIndex = 2 - Me.colATTR_TYPE.Width = 73 - ' 'TBIDB_ATTRIBUTE_TYPEBindingSource ' Me.TBIDB_ATTRIBUTE_TYPEBindingSource.DataMember = "TBIDB_ATTRIBUTE_TYPE" @@ -674,49 +716,6 @@ Partial Class frmAdministrationZooFlow ' Me.TBIDB_ATTRIBUTE_TYPETableAdapter.ClearBeforeFill = True ' - 'ComboBox1 - ' - Me.ComboBox1.FormattingEnabled = True - Me.ComboBox1.Location = New System.Drawing.Point(650, 28) - Me.ComboBox1.Name = "ComboBox1" - Me.ComboBox1.Size = New System.Drawing.Size(121, 21) - Me.ComboBox1.TabIndex = 29 - ' - 'RibbonPage_IDB - ' - Me.RibbonPage_IDB.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroupAttributes}) - Me.RibbonPage_IDB.Name = "RibbonPage_IDB" - Me.RibbonPage_IDB.Text = "IDB Administration" - ' - 'RibbonPageGroupAttributes - ' - Me.RibbonPageGroupAttributes.ItemLinks.Add(Me.BarButtonItemSaveAttribute) - Me.RibbonPageGroupAttributes.ItemLinks.Add(Me.BarButtonItemAddAttribute) - Me.RibbonPageGroupAttributes.ItemLinks.Add(Me.BarButtonItemRefreshAttribute) - Me.RibbonPageGroupAttributes.Name = "RibbonPageGroupAttributes" - Me.RibbonPageGroupAttributes.Text = "Attribute" - ' - 'BarButtonItemSaveAttribute - ' - Me.BarButtonItemSaveAttribute.Caption = "Speichern" - Me.BarButtonItemSaveAttribute.Id = 8 - Me.BarButtonItemSaveAttribute.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem6.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.BarButtonItemSaveAttribute.Name = "BarButtonItemSaveAttribute" - ' - 'BarButtonItemAddAttribute - ' - Me.BarButtonItemAddAttribute.Caption = "Hinzufügen" - Me.BarButtonItemAddAttribute.Id = 9 - Me.BarButtonItemAddAttribute.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem7.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.BarButtonItemAddAttribute.Name = "BarButtonItemAddAttribute" - ' - 'BarButtonItemRefreshAttribute - ' - Me.BarButtonItemRefreshAttribute.Caption = "Aktualisieren" - Me.BarButtonItemRefreshAttribute.Id = 10 - Me.BarButtonItemRefreshAttribute.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem8.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.BarButtonItemRefreshAttribute.Name = "BarButtonItemRefreshAttribute" - ' 'frmAdministrationZooFlow ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -727,6 +726,7 @@ Partial Class frmAdministrationZooFlow Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.RibbonControl1) Me.IconOptions.SvgImage = CType(resources.GetObject("frmAdministrationZooFlow.IconOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.IsMdiContainer = True Me.Name = "frmAdministrationZooFlow" Me.Ribbon = Me.RibbonControl1 Me.StatusBar = Me.RibbonStatusBar1 @@ -746,9 +746,9 @@ Partial Class frmAdministrationZooFlow Me.XtraTabControlIDB.ResumeLayout(False) Me.XtraTabPageIDB_Attributes.ResumeLayout(False) Me.XtraTabPageIDB_Attributes.PerformLayout() + CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBIDB_ATTRIBUTEBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.DSIDB_Stammdaten, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBIDB_ATTRIBUTE_TYPEBindingSource, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) diff --git a/GUIs.ZooFlow/Administration/frmAdministrationZooFlow.resx b/GUIs.ZooFlow/Administration/frmAdministrationZooFlow.resx index 6de9a315..a59be638 100644 --- a/GUIs.ZooFlow/Administration/frmAdministrationZooFlow.resx +++ b/GUIs.ZooFlow/Administration/frmAdministrationZooFlow.resx @@ -270,7 +270,7 @@ c3ZnPgs= - + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl @@ -286,7 +286,7 @@ IC8+DQo8L3N2Zz4L - + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl @@ -305,7 +305,7 @@ DQogIDwvZz4NCjwvc3ZnPgs= - + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl @@ -329,15 +329,12 @@ 22, 21 + + 22, 21 + 352, 21 - - 647, 21 - - - 487, 21 - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z @@ -361,6 +358,12 @@ LjEsMjguMSwyNy42LDI3LjZ6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== + + 647, 21 + + + 487, 21 + 487, 21 diff --git a/GUIs.ZooFlow/ClassConstants.vb b/GUIs.ZooFlow/ClassConstants.vb index d97c2fa6..0c4b4034 100644 --- a/GUIs.ZooFlow/ClassConstants.vb +++ b/GUIs.ZooFlow/ClassConstants.vb @@ -37,4 +37,7 @@ Public Const IDB_VECTOR_TYPE_INTEGER = 9 Public Const IDB_VECTOR_TYPE_STRING = 8 + + Public Const IDB_ADDED_WHEN_String_German = "Erstellt Wann" + Public Const IDB_ADDED_WHEN_String_Englisch = "Added when" End Class diff --git a/GUIs.ZooFlow/ClassDataASorDB.vb b/GUIs.ZooFlow/ClassDataASorDB.vb index e637fbc7..15265687 100644 --- a/GUIs.ZooFlow/ClassDataASorDB.vb +++ b/GUIs.ZooFlow/ClassDataASorDB.vb @@ -56,6 +56,7 @@ Public Class ClassDataASorDB My.Application.User.ShortName = IIf(IsDBNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_SHORTNAME")), "", DT_CHECKUSER_MODULE.Rows(0).Item("USER_SHORTNAME")) My.Application.User.Email = IIf(IsDBNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_EMAIL")), "", DT_CHECKUSER_MODULE.Rows(0).Item("USER_EMAIL")) My.Application.User.Language = DT_CHECKUSER_MODULE.Rows(0).Item("USER_LANGUAGE") + My.Application.User.LanguageID = DT_CHECKUSER_MODULE.Rows(0).Item("USER_LANGUAGE_ID") My.Application.User.DateFormat = DT_CHECKUSER_MODULE.Rows(0).Item("USER_DATE_FORMAT") My.Application.User.IsAdmin = DT_CHECKUSER_MODULE.Rows(0).Item("IS_ADMIN") diff --git a/GUIs.ZooFlow/ClassInit.vb b/GUIs.ZooFlow/ClassInit.vb index 7d173bb1..9e033105 100644 --- a/GUIs.ZooFlow/ClassInit.vb +++ b/GUIs.ZooFlow/ClassInit.vb @@ -276,6 +276,8 @@ Public Class ClassInit MyApplication.User.DateFormat = NotNull(oValue.ToString, "dd.MM.yyyy") Case "USER_LANGUAGE" MyApplication.User.Language = NotNull(oValue.ToString, "de-DE") + Case "USER_LANGUAGEID" + MyApplication.User.LanguageID = CShort(oValue) End Select End Sub Private Sub HandleModuleInfo(MyApplication As My.MyApplication, ModuleName As String, Row As DataRow) diff --git a/GUIs.ZooFlow/Search/frmFlowSearch.Designer.vb b/GUIs.ZooFlow/Search/frmFlowSearch.Designer.vb index 798a5dfd..05b50e61 100644 --- a/GUIs.ZooFlow/Search/frmFlowSearch.Designer.vb +++ b/GUIs.ZooFlow/Search/frmFlowSearch.Designer.vb @@ -262,7 +262,7 @@ Partial Class frmFlowSearch ' 'BarEditItemDate ' - Me.BarEditItemDate.Caption = "Attribut " + Me.BarEditItemDate.Caption = "Attribut Datum" Me.BarEditItemDate.Edit = Me.RepositoryItemComboBox1 Me.BarEditItemDate.EditWidth = 120 Me.BarEditItemDate.Id = 12 diff --git a/GUIs.ZooFlow/Search/frmFlowSearch.vb b/GUIs.ZooFlow/Search/frmFlowSearch.vb index cd2e5ed8..589705f0 100644 --- a/GUIs.ZooFlow/Search/frmFlowSearch.vb +++ b/GUIs.ZooFlow/Search/frmFlowSearch.vb @@ -3,6 +3,7 @@ Imports DevExpress.XtraEditors Imports DigitalData.GUIs.Common Imports DevExpress.XtraSplashScreen Imports DevExpress.XtraBars +Imports DigitalData.GUIs.ZooFlow.ClassConstants Public Class frmFlowSearch Private Logger As Logger @@ -37,7 +38,12 @@ Public Class frmFlowSearch Try TileControlMatch.Groups.Clear() Dim oDT As DataTable = ASorDB.GetDatatable("IDB", $"SELECT * FROM VWIDB_BE_ATTRIBUTE", "VWIDB_BE_ATTRIBUTE", "", "ATTR_TITLE") - RepositoryItemComboBox1.Items.Add("Erstellt Wann") + If My.Application.User.Language = "de-DE" Then + RepositoryItemComboBox1.Items.Add(IDB_ADDED_WHEN_String_German) + Else + RepositoryItemComboBox1.Items.Add(IDB_ADDED_WHEN_String_Englisch) + End If + For Each oRow As DataRow In oDT.Rows If oRow.Item("TYPE_ID") = 5 Then RepositoryItemComboBox1.Items.Add(oRow.Item("ATTR_TITLE")) @@ -64,7 +70,7 @@ Public Class frmFlowSearch oEditor = TryCast(RibbonControl1.Manager.ActiveEditor, ComboBoxEdit) oEditValue = oEditor.EditValue - If oEditValue = "Erstellt Wann" Or oEditValue = "Added when" Then + If oEditValue = IDB_ADDED_WHEN_String_German Or oEditValue = IDB_ADDED_WHEN_String_Englisch Then SEARCH_FACT_DATE_ATTRIBUTE = "ADDED_WHEN" Else SEARCH_FACT_DATE_ATTRIBUTE = oEditValue @@ -104,10 +110,13 @@ Public Class frmFlowSearch If SEARCH_FACT_DATE_ATTRIBUTE = "ADDED_WHEN" Then oSQL = oSQL.Replace("MONTH(OBJ.ADDED_WHEN) <> 13", SEARCH_FACT_DATE) Else - oSQL = oSQL.Replace("AND MONTH(OBJ.ADDED_WHEN) <> 13", "") - oSQL = oSQL.Replace("--@INNERJOIN_DATE", "INNER JOIN VWIDB_GROUP_DATA_DATE GRP_DATE ON MD.IDB_OBJ_ID = GRP_DATE.IDB_OBJ_ID") + If SEARCH_FACT_DATE = "MONTH(OBJ.ADDED_WHEN) <> 13" Then + SEARCH_FACT_DATE = $"MONTH(GRPDATE.[{SEARCH_FACT_DATE_ATTRIBUTE}]) <> 13" + End If + oSQL = oSQL.Replace("MONTH(OBJ.ADDED_WHEN) <> 13", SEARCH_FACT_DATE) + oSQL = oSQL.Replace("--INNER JOIN VWIDB_GROUP_DATA_DATE", "INNER JOIN VWIDB_GROUP_DATA_DATE") + End If End If - End If Dim oResultCountAttributes As Integer = 0 TileControlMatch.Groups.Clear() @@ -480,4 +489,8 @@ Public Class frmFlowSearch StartSearch_Full("") CheckButton1.Checked = True End Sub + + Private Sub BarEditItemDate_ItemClick(sender As Object, e As ItemClickEventArgs) Handles BarEditItemDate.ItemClick + + End Sub End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/frmFlowForm.Designer.vb b/GUIs.ZooFlow/frmFlowForm.Designer.vb index 51c67cb4..3d523a42 100644 --- a/GUIs.ZooFlow/frmFlowForm.Designer.vb +++ b/GUIs.ZooFlow/frmFlowForm.Designer.vb @@ -27,6 +27,8 @@ Partial Class frmFlowForm Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmFlowForm)) Me.NotifyIcon = New System.Windows.Forms.NotifyIcon(Me.components) Me.ContextMenuSystray = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.GlobixToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.TsiGlobixConfig = New System.Windows.Forms.ToolStripMenuItem() Me.UserKonfigurationToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DatenbankverbindungToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator() @@ -34,26 +36,24 @@ Partial Class frmFlowForm Me.ZooFlowBeendenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.TimerRefreshData = New System.Windows.Forms.Timer(Me.components) Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components) + Me.PictureBoxAbo = New System.Windows.Forms.PictureBox() + Me.PictureBoxDragDrop = New System.Windows.Forms.PictureBox() + Me.PictureBoxPM = New System.Windows.Forms.PictureBox() + Me.PictureBoxSearch = New System.Windows.Forms.PictureBox() Me.TimerCheckActiveForms = New System.Windows.Forms.Timer(Me.components) Me.TimerCheckDroppedFiles = New System.Windows.Forms.Timer(Me.components) Me.TimerFolderwatch = New System.Windows.Forms.Timer(Me.components) Me.ToastNotificationsManager1 = New DevExpress.XtraBars.ToastNotifications.ToastNotificationsManager(Me.components) Me.PictureBox1 = New System.Windows.Forms.PictureBox() - Me.PictureBoxAbo = New System.Windows.Forms.PictureBox() - Me.PictureBoxDragDrop = New System.Windows.Forms.PictureBox() Me.PictureBoxGlobix = New System.Windows.Forms.PictureBox() - Me.PictureBoxPM = New System.Windows.Forms.PictureBox() - Me.PictureBoxSearch = New System.Windows.Forms.PictureBox() - Me.GlobixToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.TsiGlobixConfig = New System.Windows.Forms.ToolStripMenuItem() Me.ContextMenuSystray.SuspendLayout() - CType(Me.ToastNotificationsManager1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBoxAbo, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBoxDragDrop, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.PictureBoxGlobix, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBoxPM, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBoxSearch, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ToastNotificationsManager1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.PictureBoxGlobix, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'SplashScreenManager @@ -73,6 +73,21 @@ Partial Class frmFlowForm Me.ContextMenuSystray.Name = "ContextMenuSystray" Me.ContextMenuSystray.Size = New System.Drawing.Size(174, 98) ' + 'GlobixToolStripMenuItem + ' + Me.GlobixToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.TsiGlobixConfig}) + Me.GlobixToolStripMenuItem.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.GLOBIX_short + Me.GlobixToolStripMenuItem.Name = "GlobixToolStripMenuItem" + Me.GlobixToolStripMenuItem.Size = New System.Drawing.Size(173, 22) + Me.GlobixToolStripMenuItem.Text = "Globix" + Me.GlobixToolStripMenuItem.Visible = False + ' + 'TsiGlobixConfig + ' + Me.TsiGlobixConfig.Name = "TsiGlobixConfig" + Me.TsiGlobixConfig.Size = New System.Drawing.Size(178, 22) + Me.TsiGlobixConfig.Text = "Grundeinstellungen" + ' 'UserKonfigurationToolStripMenuItem ' Me.UserKonfigurationToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DatenbankverbindungToolStripMenuItem}) @@ -103,6 +118,55 @@ Partial Class frmFlowForm Me.ZooFlowBeendenToolStripMenuItem.Size = New System.Drawing.Size(173, 22) Me.ZooFlowBeendenToolStripMenuItem.Text = "ZooFlow beenden" ' + 'PictureBoxAbo + ' + Me.PictureBoxAbo.Cursor = System.Windows.Forms.Cursors.Hand + Me.PictureBoxAbo.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources._2_ZOO_FLOW_Abo + Me.PictureBoxAbo.Location = New System.Drawing.Point(209, 75) + Me.PictureBoxAbo.Name = "PictureBoxAbo" + Me.PictureBoxAbo.Size = New System.Drawing.Size(40, 36) + Me.PictureBoxAbo.TabIndex = 11 + Me.PictureBoxAbo.TabStop = False + Me.ToolTip1.SetToolTip(Me.PictureBoxAbo, "Abonnierte Suchen") + ' + 'PictureBoxDragDrop + ' + Me.PictureBoxDragDrop.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.PictureBoxDragDrop.Dock = System.Windows.Forms.DockStyle.Left + Me.PictureBoxDragDrop.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources._1_LOGO_ZOO_FLOW + Me.PictureBoxDragDrop.Location = New System.Drawing.Point(0, 0) + Me.PictureBoxDragDrop.Name = "PictureBoxDragDrop" + Me.PictureBoxDragDrop.Size = New System.Drawing.Size(197, 150) + Me.PictureBoxDragDrop.TabIndex = 10 + Me.PictureBoxDragDrop.TabStop = False + Me.ToolTip1.SetToolTip(Me.PictureBoxDragDrop, "Drag and Drop files here") + ' + 'PictureBoxPM + ' + Me.PictureBoxPM.BackColor = System.Drawing.Color.Transparent + Me.PictureBoxPM.Cursor = System.Windows.Forms.Cursors.Hand + Me.PictureBoxPM.Image = CType(resources.GetObject("PictureBoxPM.Image"), System.Drawing.Image) + Me.PictureBoxPM.Location = New System.Drawing.Point(335, 23) + Me.PictureBoxPM.Name = "PictureBoxPM" + Me.PictureBoxPM.Size = New System.Drawing.Size(90, 101) + Me.PictureBoxPM.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom + Me.PictureBoxPM.TabIndex = 4 + Me.PictureBoxPM.TabStop = False + Me.ToolTip1.SetToolTip(Me.PictureBoxPM, "ProcessManager starten") + ' + 'PictureBoxSearch + ' + Me.PictureBoxSearch.BackColor = System.Drawing.Color.Transparent + Me.PictureBoxSearch.Cursor = System.Windows.Forms.Cursors.Hand + Me.PictureBoxSearch.Image = CType(resources.GetObject("PictureBoxSearch.Image"), System.Drawing.Image) + Me.PictureBoxSearch.Location = New System.Drawing.Point(220, 23) + Me.PictureBoxSearch.Name = "PictureBoxSearch" + Me.PictureBoxSearch.Size = New System.Drawing.Size(90, 101) + Me.PictureBoxSearch.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom + Me.PictureBoxSearch.TabIndex = 3 + Me.PictureBoxSearch.TabStop = False + Me.ToolTip1.SetToolTip(Me.PictureBoxSearch, "ZooFlow Suche") + ' 'TimerCheckActiveForms ' Me.TimerCheckActiveForms.Interval = 2000 @@ -132,29 +196,6 @@ Partial Class frmFlowForm Me.PictureBox1.TabIndex = 12 Me.PictureBox1.TabStop = False ' - 'PictureBoxAbo - ' - Me.PictureBoxAbo.Cursor = System.Windows.Forms.Cursors.Hand - Me.PictureBoxAbo.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources._2_ZOO_FLOW_Abo - Me.PictureBoxAbo.Location = New System.Drawing.Point(209, 75) - Me.PictureBoxAbo.Name = "PictureBoxAbo" - Me.PictureBoxAbo.Size = New System.Drawing.Size(40, 36) - Me.PictureBoxAbo.TabIndex = 11 - Me.PictureBoxAbo.TabStop = False - Me.ToolTip1.SetToolTip(Me.PictureBoxAbo, "Abonnierte Suchen") - ' - 'PictureBoxDragDrop - ' - Me.PictureBoxDragDrop.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.PictureBoxDragDrop.Dock = System.Windows.Forms.DockStyle.Left - Me.PictureBoxDragDrop.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources._1_LOGO_ZOO_FLOW - Me.PictureBoxDragDrop.Location = New System.Drawing.Point(0, 0) - Me.PictureBoxDragDrop.Name = "PictureBoxDragDrop" - Me.PictureBoxDragDrop.Size = New System.Drawing.Size(197, 150) - Me.PictureBoxDragDrop.TabIndex = 10 - Me.PictureBoxDragDrop.TabStop = False - Me.ToolTip1.SetToolTip(Me.PictureBoxDragDrop, "Drag and Drop files here") - ' 'PictureBoxGlobix ' Me.PictureBoxGlobix.BackColor = System.Drawing.Color.Transparent @@ -167,47 +208,6 @@ Partial Class frmFlowForm Me.PictureBoxGlobix.TabIndex = 9 Me.PictureBoxGlobix.TabStop = False ' - 'PictureBoxPM - ' - Me.PictureBoxPM.BackColor = System.Drawing.Color.Transparent - Me.PictureBoxPM.Cursor = System.Windows.Forms.Cursors.Hand - Me.PictureBoxPM.Image = CType(resources.GetObject("PictureBoxPM.Image"), System.Drawing.Image) - Me.PictureBoxPM.Location = New System.Drawing.Point(335, 23) - Me.PictureBoxPM.Name = "PictureBoxPM" - Me.PictureBoxPM.Size = New System.Drawing.Size(90, 101) - Me.PictureBoxPM.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom - Me.PictureBoxPM.TabIndex = 4 - Me.PictureBoxPM.TabStop = False - Me.ToolTip1.SetToolTip(Me.PictureBoxPM, "ProcessManager starten") - ' - 'PictureBoxSearch - ' - Me.PictureBoxSearch.BackColor = System.Drawing.Color.Transparent - Me.PictureBoxSearch.Cursor = System.Windows.Forms.Cursors.Hand - Me.PictureBoxSearch.Image = CType(resources.GetObject("PictureBoxSearch.Image"), System.Drawing.Image) - Me.PictureBoxSearch.Location = New System.Drawing.Point(220, 23) - Me.PictureBoxSearch.Name = "PictureBoxSearch" - Me.PictureBoxSearch.Size = New System.Drawing.Size(90, 101) - Me.PictureBoxSearch.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom - Me.PictureBoxSearch.TabIndex = 3 - Me.PictureBoxSearch.TabStop = False - Me.ToolTip1.SetToolTip(Me.PictureBoxSearch, "ZooFlow Suche") - ' - 'GlobixToolStripMenuItem - ' - Me.GlobixToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.TsiGlobixConfig}) - Me.GlobixToolStripMenuItem.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.GLOBIX_short - Me.GlobixToolStripMenuItem.Name = "GlobixToolStripMenuItem" - Me.GlobixToolStripMenuItem.Size = New System.Drawing.Size(173, 22) - Me.GlobixToolStripMenuItem.Text = "Globix" - Me.GlobixToolStripMenuItem.Visible = False - ' - 'TsiGlobixConfig - ' - Me.TsiGlobixConfig.Name = "TsiGlobixConfig" - Me.TsiGlobixConfig.Size = New System.Drawing.Size(178, 22) - Me.TsiGlobixConfig.Text = "Grundeinstellungen" - ' 'frmFlowForm ' Me.AllowDrop = True @@ -227,17 +227,18 @@ Partial Class frmFlowForm Me.Controls.Add(Me.PictureBoxSearch) Me.DoubleBuffered = True Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None + Me.IconOptions.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.ZOO_FLOW__sysicon_256 Me.Name = "frmFlowForm" - Me.Text = "frmFlowForm_Test1" + Me.Text = "ZooFlow" Me.TopMost = True Me.ContextMenuSystray.ResumeLayout(False) - CType(Me.ToastNotificationsManager1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBoxAbo, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBoxDragDrop, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.PictureBoxGlobix, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBoxPM, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBoxSearch, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ToastNotificationsManager1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.PictureBoxGlobix, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) End Sub diff --git a/GUIs.ZooFlow/frmFlowForm.resx b/GUIs.ZooFlow/frmFlowForm.resx index 0aeb419d..94dd094a 100644 --- a/GUIs.ZooFlow/frmFlowForm.resx +++ b/GUIs.ZooFlow/frmFlowForm.resx @@ -1962,49 +1962,6 @@ 610, 17 - - 709, 17 - - - 891, 17 - - - 1079, 17 - - - 1228, 17 - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAALdEVYdFRpdGxlAFpvb207zwn+vAAAAKdJREFUOE+1 - ktERREAQRElHLjIQhAgcYrgs1PkWjp+Txuh3hdpadu+c8vHU1HRPzy4SM7vE55G3wxGpKEQnpgVqemjR - AAy1sABoaSyALRjf4iGyBWp6aEUsgKNiYsDX6KF1sQDui4mtvkYPbbo14PIVXgLTGsJWoP76EiuxDocI - fkZ/uBc//0j+cCPc8B1uwFOcGgY3YBSnhsENKAUhnGRnDLEF/I8lMzpgJH6ZZgx9AAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL - EgAACxIB0t1+/AAAA8pJREFUeF7t3D1uFEEQhmEfwUdwBAIhZG7gI/goPoKP4CP4FAQEyCIgRIgAiQRZ - IiAhcERAstQnjaX26t3dmu7qnlm5giepWXf9aH9me2Z9stlsUgMMJj8MJj8MJj8MJj8MJj8MJj8MJj8M - Jj8MJj8MjvTj/Ytzc2VuzZ3ZHKDH6LH6m3NacyQM9maNX05DeDA0pDm0hta6pFy9YbAHa/DUXJt7Q4OI - oLWV45Rq6AGD0aamIp5tXsp1TbVEw2AUa+LC9HzGHaLcF1RbFAy2sqL1cr2ZmlgD1dLlZY3BFlbomfk6 - Fb4mqumMam6BwVpWoE5JRr7XzaXaQk99MFhDhU0FUuFrEjpEDM6lgqbCqOA1ChsiBuewQvSed0zDe6Sa - m98TMehlBejTdo0fGF6qvenTGYNelnxNpyq1bqg3Lwx6WGKdJFNBx6j6ZBuDHpa06hvGn89vuvr18RXm - PeCeevTA4CGWUN9tqZCDNt/fdaUhUl6Hqu/OGNzHEumDo/pTl5qO1DBA9TT7AwWD+1iS6mefbDe7z79v - dqpWPN5Df0d5nWY/CzG4jyVp2l0pm6Xjpb9f3j55vEfjAGe/F2JwF0ugnWRK7FY2S8dLCwxQZu1sY3AX - W1xb55TUrWyWjpcWGuAt9b4LBnexxZu/spXN0vHSQgN8oN53wSCxhbVhQAlnKZul46WFBijujQYMEltU - lxEp2Sxls3S8tOAAr2gGBIPEFm1+/5OyWTpeWnCA7vdBDBJb1HPR+6CyWTpeWnCAdzQDgkECSaqUzdLx - 0u9Pr5883iNogNYyz2EbBgklqVE2S8draGg5wAarH6AtqA0ETDTXsQzQuDYWMLhNi20tXu1ZDlAgQZVj - GeB2/7tgkFCSGjnARs95gMNPpL06DLDLifTwr3JeHQbY5avc8M0Erw4D7LKZMHw7y6vDAOO3s8QWHrqh - 6hU8wD4bqmKLD93S9woeYNct/aEXlbyCB9jvopJYgmGXNb0CB9j3sqZYkrAL63S8RuAAh1xYD7u1g47X - CBrgmFs7xBKF3FykLfsI5S0gDQMcc3PRI0tY9V5YDrCHygGOvb1NLGnVDZbUdKTKAY6/wVIs8exbfHUD - ZE8/P7zEvHssc4uvWPK8yZyCc1gB+TOHVlZI/tCmlQqaCqOC1yRseILBWipsKpAKX4PQ4QkGW1iB+XPX - VlaoPp3zB9etrOj8yX8EayL/6UQra0gvaw2y5zNSaytHl5crwWBv1mD+450o1rhOffJfPz1XGEx+GEx+ - GEx+GEx+GEx+GEx+GEx+GEx+GExem5P/BhegvGcbWY4AAAAASUVORK5CYII= - - iVBORw0KGgoAAAANSUhEUgAAAGsAAABQCAYAAAAeAotiAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL @@ -2056,6 +2013,49 @@ 8QC4gxK2VytoAolXhEidab60xEEC2OuANEEi9N6rsWGCmj4fDjIzC5Ag9go7TZAw9nJIbZBIYzeL9trV NpBY9kJjbZB49qpwbZCY9hJ+jZDAMM5+3kI1CenCgZklo8gs+7EzRT92ZsiYWYowsxRhZilidLPs59rD iTozEYp40EgT8aCRIsXWP0j108YYpYdeAAAAAElFTkSuQmCC + + + + 709, 17 + + + 891, 17 + + + 1079, 17 + + + 1228, 17 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAALdEVYdFRpdGxlAFpvb207zwn+vAAAAKdJREFUOE+1 + ktERREAQRElHLjIQhAgcYrgs1PkWjp+Txuh3hdpadu+c8vHU1HRPzy4SM7vE55G3wxGpKEQnpgVqemjR + AAy1sABoaSyALRjf4iGyBWp6aEUsgKNiYsDX6KF1sQDui4mtvkYPbbo14PIVXgLTGsJWoP76EiuxDocI + fkZ/uBc//0j+cCPc8B1uwFOcGgY3YBSnhsENKAUhnGRnDLEF/I8lMzpgJH6ZZgx9AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL + EgAACxIB0t1+/AAAA8pJREFUeF7t3D1uFEEQhmEfwUdwBAIhZG7gI/goPoKP4CP4FAQEyCIgRIgAiQRZ + IiAhcERAstQnjaX26t3dmu7qnlm5giepWXf9aH9me2Z9stlsUgMMJj8MJj8MJj8MJj8MJj8MJj8MJj8M + Jj8MJj8MjvTj/Ytzc2VuzZ3ZHKDH6LH6m3NacyQM9maNX05DeDA0pDm0hta6pFy9YbAHa/DUXJt7Q4OI + oLWV45Rq6AGD0aamIp5tXsp1TbVEw2AUa+LC9HzGHaLcF1RbFAy2sqL1cr2ZmlgD1dLlZY3BFlbomfk6 + Fb4mqumMam6BwVpWoE5JRr7XzaXaQk99MFhDhU0FUuFrEjpEDM6lgqbCqOA1ChsiBuewQvSed0zDe6Sa + m98TMehlBejTdo0fGF6qvenTGYNelnxNpyq1bqg3Lwx6WGKdJFNBx6j6ZBuDHpa06hvGn89vuvr18RXm + PeCeevTA4CGWUN9tqZCDNt/fdaUhUl6Hqu/OGNzHEumDo/pTl5qO1DBA9TT7AwWD+1iS6mefbDe7z79v + dqpWPN5Df0d5nWY/CzG4jyVp2l0pm6Xjpb9f3j55vEfjAGe/F2JwF0ugnWRK7FY2S8dLCwxQZu1sY3AX + W1xb55TUrWyWjpcWGuAt9b4LBnexxZu/spXN0vHSQgN8oN53wSCxhbVhQAlnKZul46WFBijujQYMEltU + lxEp2Sxls3S8tOAAr2gGBIPEFm1+/5OyWTpeWnCA7vdBDBJb1HPR+6CyWTpeWnCAdzQDgkECSaqUzdLx + 0u9Pr5883iNogNYyz2EbBgklqVE2S8draGg5wAarH6AtqA0ETDTXsQzQuDYWMLhNi20tXu1ZDlAgQZVj + GeB2/7tgkFCSGjnARs95gMNPpL06DLDLifTwr3JeHQbY5avc8M0Erw4D7LKZMHw7y6vDAOO3s8QWHrqh + 6hU8wD4bqmKLD93S9woeYNct/aEXlbyCB9jvopJYgmGXNb0CB9j3sqZYkrAL63S8RuAAh1xYD7u1g47X + CBrgmFs7xBKF3FykLfsI5S0gDQMcc3PRI0tY9V5YDrCHygGOvb1NLGnVDZbUdKTKAY6/wVIs8exbfHUD + ZE8/P7zEvHssc4uvWPK8yZyCc1gB+TOHVlZI/tCmlQqaCqOC1yRseILBWipsKpAKX4PQ4QkGW1iB+XPX + VlaoPp3zB9etrOj8yX8EayL/6UQra0gvaw2y5zNSaytHl5crwWBv1mD+450o1rhOffJfPz1XGEx+GEx+ + GEx+GEx+GEx+GEx+GEx+GEx+GExem5P/BhegvGcbWY4AAAAASUVORK5CYII= \ No newline at end of file diff --git a/GUIs.ZooFlow/frmFlowForm.vb b/GUIs.ZooFlow/frmFlowForm.vb index 8fbfdadb..1e260a78 100644 --- a/GUIs.ZooFlow/frmFlowForm.vb +++ b/GUIs.ZooFlow/frmFlowForm.vb @@ -395,6 +395,10 @@ Public Class frmFlowForm Logger.Debug("OnEvent called!") End Sub Private Sub PictureBox1_Click(sender As Object, e As EventArgs) Handles PictureBox1.Click + + Open_FlowSearch() + End Sub + Sub Open_FlowSearch() Cursor = Cursors.WaitCursor If TheFormIsAlreadyLoaded("frmFlowSearch") Then Cursor = Cursors.Default @@ -408,29 +412,31 @@ Public Class frmFlowForm Next If oSQLFlowSearch <> String.Empty Then oSQLFlowSearch = oSQLFlowSearch.Replace("@USER_ID", My.Application.User.UserId) + oSQLFlowSearch = oSQLFlowSearch.Replace("@LANGUAGE_ID", My.Application.User.LanguageID) + oSQLFlowSearch = oSQLFlowSearch.Replace("@LANGUAGE", My.Application.User.Language) Dim oForm As New frmFlowSearch(oSQLFlowSearch) oForm.Show() oForm.BringToFront() End If Cursor = Cursors.Default - End Sub Private Sub PictureBoxSearch_Click(sender As Object, e As EventArgs) Handles PictureBoxSearch.Click - Cursor = Cursors.WaitCursor - If TheFormIsAlreadyLoaded("frmSearchStart") Then - Cursor = Cursors.Default - Exit Sub - End If + Open_FlowSearch() + 'Cursor = Cursors.WaitCursor + 'If TheFormIsAlreadyLoaded("frmSearchStart") Then + ' Cursor = Cursors.Default + ' Exit Sub + 'End If - Dim oForm As New frmSearchStart(DTIDB_SEARCHES) 'frmFlowSearch(osql) - oForm.Show() - Cursor = Cursors.Default - If TimerCheckActiveForms.Enabled = False Then - TimerCheckActiveForms.Enabled = True - End If + 'Dim oForm As New frmSearchStart(DTIDB_SEARCHES) 'frmFlowSearch(osql) + 'oForm.Show() + 'Cursor = Cursors.Default + 'If TimerCheckActiveForms.Enabled = False Then + ' TimerCheckActiveForms.Enabled = True + 'End If End Sub Private Sub PictureBoxSearch_MouseEnter(sender As Object, e As EventArgs) Handles PictureBoxSearch.MouseEnter PictureBoxSearch.Image = My.Resources._2_LUPE_AKTIV_ZOO diff --git a/Modules.ZooFlow/State/UserState.vb b/Modules.ZooFlow/State/UserState.vb index e92f1ae0..55a7cd6b 100644 --- a/Modules.ZooFlow/State/UserState.vb +++ b/Modules.ZooFlow/State/UserState.vb @@ -14,6 +14,7 @@ Namespace State Public Property MachineName As String Public Property DateFormat As String Public Property Language As String + Public Property LanguageID As Int16 Public Property IsAdmin As Boolean = False Public Property HideBasicConfig As Boolean = False