diff --git a/GUIs.ZooFlow/App.config b/GUIs.ZooFlow/App.config index 9eaa7262..f1cb9634 100644 --- a/GUIs.ZooFlow/App.config +++ b/GUIs.ZooFlow/App.config @@ -22,10 +22,10 @@ - Skin/Office 2019 White + - + Custom/Digital Data @@ -83,6 +83,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/GUIs.ZooFlow/ClassConstants.vb b/GUIs.ZooFlow/ClassConstants.vb index 1f53d983..2504c04d 100644 --- a/GUIs.ZooFlow/ClassConstants.vb +++ b/GUIs.ZooFlow/ClassConstants.vb @@ -6,6 +6,10 @@ Public Const SERVICE_MAX_CONNECTIONS = 10000 Public Const SERVICE_OPEN_TIMEOUT = 3 + Public Const USER_CATALOG_APPLICATION_THEME = "APPLICATION_THEME" + Public Const USER_CATALOG_QUICKSEARCH1_TITLE = "QUICKSEARCH1_TITLE" + Public Const USER_CATALOG_QUICKSEARCH1_POS = "QUICKSEARCH1_POS" + Public Const FOLDER_NAME_LAYOUT = "Layout" Public Const MODULE_CLIPBOARDWATCHER = "CW" diff --git a/GUIs.ZooFlow/ClassInit.vb b/GUIs.ZooFlow/ClassInit.vb index 9613f5b0..69cb533f 100644 --- a/GUIs.ZooFlow/ClassInit.vb +++ b/GUIs.ZooFlow/ClassInit.vb @@ -11,6 +11,8 @@ Imports DigitalData.GUIs.ZooFlow.ClassInitLoader Imports DigitalData.Controls.SQLConfig Imports System.Data.SqlClient Imports DigitalData.Modules +Imports DevExpress.LookAndFeel +Imports DigitalData.Modules.Language Public Class ClassInit Inherits Base.BaseClass @@ -208,13 +210,10 @@ Public Class ClassInit End Sub Private Sub InitBasicConfig(MyApplication As My.MyApplication) Try - Dim oSQL = "Select * FROM TBIDB_COMMON_SQL WHERE ACTIVE = 1" - My.Tables.DTIDB_COMMON_SQL = My.Database.GetDatatable("TBIDB_COMMON_SQL", oSQL, EDMI.API.Constants.DatabaseType.IDB) + Dim oSql As String - oSQL = $"SELECT * FROM TBIDB_CATALOG_USER WHERE USR_ID = {My.Application.User.UserId}" - My.Tables.DTIDB_CATALOG_USER = My.Database.GetDatatable("TBIDB_CATALOG_USER", oSQL, EDMI.API.Constants.DatabaseType.IDB, $"USR_ID = {My.Application.User.UserId}") - oSQL = $"Select * From VWIDB_BE_ATTRIBUTE Where LANG_CODE = '{MyApplication.User.Language}'" - My.Tables.DTIDB_ATTRIBUTE = My.Database.GetDatatable("VWIDB_BE_ATTRIBUTE", oSQL, EDMI.API.Constants.DatabaseType.IDB, $"LANG_CODE = '{MyApplication.User.Language}'") + oSql = "Select * FROM TBIDB_COMMON_SQL WHERE ACTIVE = 1" + My.Tables.DTIDB_COMMON_SQL = My.Database.GetDatatable("TBIDB_COMMON_SQL", oSql, EDMI.API.Constants.DatabaseType.IDB) For Each oRow As DataRow In My.Tables.DTIDB_COMMON_SQL.Rows If oRow.Item("TITLE") = SQLCMD_FLOW_SEARCH_BASE Then @@ -223,6 +222,21 @@ Public Class ClassInit DocResultBaseSearch = DocResultBaseSearch.Replace("@LANG_CODE", My.Application.User.Language) End If Next + + oSql = $"SELECT * FROM TBIDB_CATALOG_USER WHERE USR_ID = {My.Application.User.UserId}" + My.Tables.DTIDB_CATALOG_USER = My.Database.GetDatatable("TBIDB_CATALOG_USER", oSql, EDMI.API.Constants.DatabaseType.IDB, $"USR_ID = {My.Application.User.UserId}") + + For Each oRow As DataRow In My.Tables.DTIDB_CATALOG_USER.Rows + If oRow.Item("CAT_TITLE") = ClassConstants.USER_CATALOG_APPLICATION_THEME Then + Dim oPaletteName As String = oRow.ItemEx("CAT_STRING", "Digital Data") + UserLookAndFeel.Default.SetSkinStyle(SkinStyle.Basic, oPaletteName) + End If + Next + + oSql = $"Select * From VWIDB_BE_ATTRIBUTE Where LANG_CODE = '{MyApplication.User.Language}'" + My.Tables.DTIDB_ATTRIBUTE = My.Database.GetDatatable("VWIDB_BE_ATTRIBUTE", oSql, EDMI.API.Constants.DatabaseType.IDB, $"LANG_CODE = '{MyApplication.User.Language}'") + + If DocResultBaseSearch = "" Then Logger.Warn($"ATTENTION: NO DocResultBaseSearch - Check if entry {SQLCMD_FLOW_SEARCH_BASE} exists in TBIDB_COMMON_SQL") End If diff --git a/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.Designer.vb b/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.Designer.vb index 15b55ff5..a7f3994b 100644 --- a/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.Designer.vb +++ b/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.Designer.vb @@ -46,6 +46,7 @@ Partial Class frmGlobix_Index Me.chkMultiindexing = New DevExpress.XtraBars.BarCheckItem() Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() Me.BarHeaderItem1 = New DevExpress.XtraBars.BarHeaderItem() + Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() @@ -60,9 +61,7 @@ Partial Class frmGlobix_Index Me.cmbDocType = New DevExpress.XtraEditors.ComboBoxEdit() Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DocumentViewer() Me.GlobixDataset = New DigitalData.GUIs.ZooFlow.GlobixDataset() - Me.SplashScreenManager = New DevExpress.XtraSplashScreen.SplashScreenManager(Me, GetType(Global.DigitalData.GUIs.ZooFlow.frmWaitForm), True, True) Me.SvgImageCollection1 = New DevExpress.Utils.SvgImageCollection(Me.components) - Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -88,7 +87,7 @@ Partial Class frmGlobix_Index Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] Me.RibbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide - Me.RibbonControl1.Size = New System.Drawing.Size(1005, 67) + Me.RibbonControl1.Size = New System.Drawing.Size(1005, 63) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 ' 'BarButtonItem2 @@ -200,6 +199,12 @@ Partial Class frmGlobix_Index Me.BarHeaderItem1.Name = "BarHeaderItem1" Me.BarHeaderItem1.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large ' + 'BarButtonItem4 + ' + Me.BarButtonItem4.Caption = "BarButtonItem4" + Me.BarButtonItem4.Id = 16 + Me.BarButtonItem4.Name = "BarButtonItem4" + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2}) @@ -229,10 +234,10 @@ Partial Class frmGlobix_Index Me.RibbonStatusBar1.ItemLinks.Add(Me.labelFilePath) Me.RibbonStatusBar1.ItemLinks.Add(Me.labelError) Me.RibbonStatusBar1.ItemLinks.Add(Me.labelNotice) - Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 574) + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 572) Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 - Me.RibbonStatusBar1.Size = New System.Drawing.Size(1005, 22) + Me.RibbonStatusBar1.Size = New System.Drawing.Size(1005, 24) ' 'RibbonPage2 ' @@ -250,7 +255,7 @@ Partial Class frmGlobix_Index ' Me.SplitContainerControl1.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel2 Me.SplitContainerControl1.Dock = System.Windows.Forms.DockStyle.Fill - Me.SplitContainerControl1.Location = New System.Drawing.Point(0, 67) + Me.SplitContainerControl1.Location = New System.Drawing.Point(0, 63) Me.SplitContainerControl1.Name = "SplitContainerControl1" ' 'SplitContainerControl1.Panel1 @@ -264,7 +269,7 @@ Partial Class frmGlobix_Index ' Me.SplitContainerControl1.Panel2.Controls.Add(Me.DocumentViewer1) Me.SplitContainerControl1.Panel2.Text = "Panel2" - Me.SplitContainerControl1.Size = New System.Drawing.Size(1005, 507) + Me.SplitContainerControl1.Size = New System.Drawing.Size(1005, 509) Me.SplitContainerControl1.SplitterPosition = 522 Me.SplitContainerControl1.TabIndex = 2 ' @@ -276,14 +281,14 @@ Partial Class frmGlobix_Index Me.pnlIndex.ForeColor = System.Drawing.SystemColors.ControlText Me.pnlIndex.Location = New System.Drawing.Point(0, 33) Me.pnlIndex.Name = "pnlIndex" - Me.pnlIndex.Size = New System.Drawing.Size(522, 399) + Me.pnlIndex.Size = New System.Drawing.Size(522, 401) Me.pnlIndex.TabIndex = 3 ' 'Panel3 ' Me.Panel3.Controls.Add(Me.SimpleButton1) Me.Panel3.Dock = System.Windows.Forms.DockStyle.Bottom - Me.Panel3.Location = New System.Drawing.Point(0, 432) + Me.Panel3.Location = New System.Drawing.Point(0, 434) Me.Panel3.Name = "Panel3" Me.Panel3.Size = New System.Drawing.Size(522, 75) Me.Panel3.TabIndex = 2 @@ -332,7 +337,7 @@ Partial Class frmGlobix_Index Me.DocumentViewer1.FileLoaded = False Me.DocumentViewer1.Location = New System.Drawing.Point(0, 0) Me.DocumentViewer1.Name = "DocumentViewer1" - Me.DocumentViewer1.Size = New System.Drawing.Size(473, 507) + Me.DocumentViewer1.Size = New System.Drawing.Size(473, 509) Me.DocumentViewer1.TabIndex = 0 ' 'GlobixDataset @@ -340,20 +345,10 @@ Partial Class frmGlobix_Index Me.GlobixDataset.DataSetName = "GlobixDataset" Me.GlobixDataset.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema ' - 'SplashScreenManager - ' - Me.SplashScreenManager.ClosingDelay = 500 - ' 'SvgImageCollection1 ' Me.SvgImageCollection1.Add("check", "image://svgimages/icon builder/actions_checkcircled.svg") ' - 'BarButtonItem4 - ' - Me.BarButtonItem4.Caption = "BarButtonItem4" - Me.BarButtonItem4.Id = 16 - Me.BarButtonItem4.Name = "BarButtonItem4" - ' 'frmGlobix_Index ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -414,7 +409,6 @@ Partial Class frmGlobix_Index Friend WithEvents GlobixDataset As GlobixDataset Friend WithEvents cmbDocType As DevExpress.XtraEditors.ComboBoxEdit Friend WithEvents SimpleButton1 As SimpleButton - Friend WithEvents SplashScreenManager As DevExpress.XtraSplashScreen.SplashScreenManager Friend WithEvents SvgImageCollection1 As DevExpress.Utils.SvgImageCollection Friend WithEvents BarButtonItem4 As DevExpress.XtraBars.BarButtonItem End Class diff --git a/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.vb b/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.vb index f75d77cd..11b22c7e 100644 --- a/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.vb +++ b/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.vb @@ -15,6 +15,7 @@ Imports DigitalData.Modules.Language.Utils Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Patterns Imports DevExpress.XtraEditors +Imports DevExpress.XtraSplashScreen Public Class frmGlobix_Index #Region "+++++ Variablen ++++++" @@ -39,6 +40,8 @@ Public Class frmGlobix_Index Private Property Database As DatabaseWithFallback Private Property Patterns2 As Patterns2 + Private Property OverlayHandle As IOverlaySplashScreenHandle + 'Public Class ControlMeta ' Public Property IndexName As String ' Public Property IndexType As String @@ -67,14 +70,15 @@ Public Class frmGlobix_Index ' Abbruchzähler zurücksetzen CancelAttempts = 0 + ' Show Loading Overlay + OverlayHandle = SplashScreenManager.ShowOverlayForm(Me) + My.Application.Globix.INDEXING_ACTIVE = True End Sub Private Async Sub frmGlobix_Index_Shown(sender As Object, e As EventArgs) Handles Me.Shown Cursor = Cursors.Default - SplashScreenManager.ShowWaitForm() - checkItemTopMost.Checked = My.UIConfig.Globix.TopMost TopMost = My.UIConfig.Globix.TopMost BringToFront() @@ -176,7 +180,7 @@ Public Class frmGlobix_Index Catch ex As Exception Logger.Warn("Unexpected error DTTBGI_REGEX_DOCTYPE - ErrorMessage: " & vbNewLine & ex.Message) Finally - SplashScreenManager.CloseWaitForm() + SplashScreenManager.CloseOverlayForm(OverlayHandle) FormLoaded = True End Try End Sub diff --git a/GUIs.ZooFlow/My Project/Resources.Designer.vb b/GUIs.ZooFlow/My Project/Resources.Designer.vb index 2d33b4f1..14343c96 100644 --- a/GUIs.ZooFlow/My Project/Resources.Designer.vb +++ b/GUIs.ZooFlow/My Project/Resources.Designer.vb @@ -500,6 +500,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property actions_refresh() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("actions_refresh", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -590,6 +600,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property cancel() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("cancel", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -960,6 +980,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property managedatasource2() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("managedatasource2", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -1000,6 +1030,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property properties() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("properties", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -1110,6 +1150,26 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property scatterchartlabeloptions() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("scatterchartlabeloptions", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property servermode() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("servermode", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' diff --git a/GUIs.ZooFlow/My Project/Resources.resx b/GUIs.ZooFlow/My Project/Resources.resx index 7012f885..c87da5a9 100644 --- a/GUIs.ZooFlow/My Project/Resources.resx +++ b/GUIs.ZooFlow/My Project/Resources.resx @@ -148,8 +148,8 @@ ..\Resources\save.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\editquery.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\servermode.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\Checked-outforEdit_Color_13297.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -181,12 +181,18 @@ ..\Resources\about2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\2_ZOO_FLOW_Abo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\del.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\StatusAnnotations_Stop_16xLG_color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\cancel.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\actions_addcircled4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -196,9 +202,6 @@ ..\Resources\editdatasource1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\refresh_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\actions_window.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -217,15 +220,21 @@ ..\Resources\CW_GEFUNDEN_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\definednameuseinformula1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\Close_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\markcomplete.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\definednameuseinformula1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\actions_check3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_deletecircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\1_LOGO_ZOO_FLOW_DROP3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -259,12 +268,15 @@ ..\Resources\doublenext.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\2_LUPE_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\del1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\scatterchartlabeloptions.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\properties.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\Checked-outforEdit_13297.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -277,6 +289,9 @@ ..\Resources\2_LUPE_INAKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\actions_check1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\editnames.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -292,8 +307,8 @@ ..\Resources\save3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\save7.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\pagesetup1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\deletetable.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -316,8 +331,8 @@ ..\Resources\ZooFlow_CW_DevExpress.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_deletecircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\refresh_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\ZooFlow-25.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -328,6 +343,9 @@ ..\Resources\actions_addcircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\3_PERSON_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\actions_edit2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -352,26 +370,26 @@ ..\Resources\actions_add1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\3_PERSON_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\save7.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\del3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\Compare_RefreshScriptPreview.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\actions_check6.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_deletecircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\Hamburger_icon.svg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\del4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\2_ZOO_FLOW_Abo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Compare_RefreshScriptPreview.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\bo_document.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -379,8 +397,8 @@ ..\Resources\save4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\pagesetup1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_refresh.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\singlepageview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -406,8 +424,8 @@ ..\Resources\actions_deletecircled1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_check1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\editquery.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\CW_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -421,8 +439,8 @@ ..\Resources\actions_addcircled1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\crossdatasourcefiltering.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\GLOBIX_short.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\4_GLOBIX_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -445,8 +463,8 @@ ..\Resources\renamedatasource.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_deletecircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\2_LUPE_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\actions_addcircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -460,13 +478,13 @@ ..\Resources\1_LOGO_ZOO_FLOW_DROP2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\crossdatasourcefiltering.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\1_LOGO_ZOO_FLOW.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\GLOBIX_short.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Close_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\managedatasource2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a \ No newline at end of file diff --git a/GUIs.ZooFlow/My Project/licenses.licx b/GUIs.ZooFlow/My Project/licenses.licx index c76e4041..ee5f50a7 100644 --- a/GUIs.ZooFlow/My Project/licenses.licx +++ b/GUIs.ZooFlow/My Project/licenses.licx @@ -1,17 +1,20 @@ -DevExpress.XtraBars.BarManager, DevExpress.XtraBars.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.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.TileControl, 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.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.LookUpEdit, 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.Docking.DockManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.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.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.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.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.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.TileControl, DevExpress.XtraEditors.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.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.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.XtraBars.Docking.DockManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.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/Resources/actions_refresh.svg b/GUIs.ZooFlow/Resources/actions_refresh.svg new file mode 100644 index 00000000..86a9ccb8 --- /dev/null +++ b/GUIs.ZooFlow/Resources/actions_refresh.svg @@ -0,0 +1,16 @@ + + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/cancel.svg b/GUIs.ZooFlow/Resources/cancel.svg new file mode 100644 index 00000000..8bd80aaf --- /dev/null +++ b/GUIs.ZooFlow/Resources/cancel.svg @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/managedatasource2.svg b/GUIs.ZooFlow/Resources/managedatasource2.svg new file mode 100644 index 00000000..d08be544 --- /dev/null +++ b/GUIs.ZooFlow/Resources/managedatasource2.svg @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/properties.svg b/GUIs.ZooFlow/Resources/properties.svg new file mode 100644 index 00000000..aea76a69 --- /dev/null +++ b/GUIs.ZooFlow/Resources/properties.svg @@ -0,0 +1,17 @@ + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/scatterchartlabeloptions.svg b/GUIs.ZooFlow/Resources/scatterchartlabeloptions.svg new file mode 100644 index 00000000..6a587d1f --- /dev/null +++ b/GUIs.ZooFlow/Resources/scatterchartlabeloptions.svg @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/servermode.svg b/GUIs.ZooFlow/Resources/servermode.svg new file mode 100644 index 00000000..ea5d3ac2 --- /dev/null +++ b/GUIs.ZooFlow/Resources/servermode.svg @@ -0,0 +1,19 @@ + + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Search/frmFlowSearch.Designer.vb b/GUIs.ZooFlow/Search/frmFlowSearch.Designer.vb index 3dce7ede..f48db85c 100644 --- a/GUIs.ZooFlow/Search/frmFlowSearch.Designer.vb +++ b/GUIs.ZooFlow/Search/frmFlowSearch.Designer.vb @@ -24,8 +24,8 @@ Partial Class frmFlowSearch Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmFlowSearch)) - Dim TileItemElement7 As DevExpress.XtraEditors.TileItemElement = New DevExpress.XtraEditors.TileItemElement() - Dim TileItemElement8 As DevExpress.XtraEditors.TileItemElement = New DevExpress.XtraEditors.TileItemElement() + Dim TileItemElement1 As DevExpress.XtraEditors.TileItemElement = New DevExpress.XtraEditors.TileItemElement() + Dim TileItemElement2 As DevExpress.XtraEditors.TileItemElement = New DevExpress.XtraEditors.TileItemElement() Me.CheckButton1 = New DevExpress.XtraEditors.CheckButton() Me.txtSearchTerm = New System.Windows.Forms.TextBox() Me.lblFoundResult = New System.Windows.Forms.Label() @@ -124,7 +124,7 @@ Partial Class frmFlowSearch 'Panel2 ' Me.Panel2.Dock = System.Windows.Forms.DockStyle.Bottom - Me.Panel2.Location = New System.Drawing.Point(202, 627) + Me.Panel2.Location = New System.Drawing.Point(202, 625) Me.Panel2.Name = "Panel2" Me.Panel2.Size = New System.Drawing.Size(1035, 18) Me.Panel2.TabIndex = 1 @@ -144,7 +144,7 @@ Partial Class frmFlowSearch Me.TileControlMatch.Name = "TileControlMatch" Me.TileControlMatch.ScrollMode = DevExpress.XtraEditors.TileControlScrollMode.ScrollBar Me.TileControlMatch.ShowGroupText = True - Me.TileControlMatch.Size = New System.Drawing.Size(1035, 413) + Me.TileControlMatch.Size = New System.Drawing.Size(1035, 418) Me.TileControlMatch.TabIndex = 2 Me.TileControlMatch.TabStop = False Me.TileControlMatch.Text = "TileControl1" @@ -161,8 +161,8 @@ Partial Class frmFlowSearch ' Me.TileItem1.AppearanceItem.Normal.BackColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer)) Me.TileItem1.AppearanceItem.Normal.Options.UseBackColor = True - TileItemElement7.Text = "TileItem1" - Me.TileItem1.Elements.Add(TileItemElement7) + TileItemElement1.Text = "TileItem1" + Me.TileItem1.Elements.Add(TileItemElement1) Me.TileItem1.Id = 0 Me.TileItem1.ItemSize = DevExpress.XtraEditors.TileItemSize.Wide Me.TileItem1.Name = "TileItem1" @@ -171,8 +171,8 @@ Partial Class frmFlowSearch ' Me.TileItem2.AppearanceItem.Normal.BackColor = System.Drawing.Color.White Me.TileItem2.AppearanceItem.Normal.Options.UseBackColor = True - TileItemElement8.Text = "TileItem2" - Me.TileItem2.Elements.Add(TileItemElement8) + TileItemElement2.Text = "TileItem2" + Me.TileItem2.Elements.Add(TileItemElement2) Me.TileItem2.Id = 1 Me.TileItem2.ItemSize = DevExpress.XtraEditors.TileItemSize.Medium Me.TileItem2.Name = "TileItem2" @@ -198,7 +198,7 @@ Partial Class frmFlowSearch Me.RibbonControl1.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonControlStyle.MacOffice Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] Me.RibbonControl1.ShowToolbarCustomizeItem = False - Me.RibbonControl1.Size = New System.Drawing.Size(1237, 148) + Me.RibbonControl1.Size = New System.Drawing.Size(1237, 141) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 Me.RibbonControl1.Toolbar.ShowCustomizeItem = False ' @@ -215,10 +215,10 @@ Partial Class frmFlowSearch 'RibbonStatusBar1 ' Me.RibbonStatusBar1.ItemLinks.Add(Me.BarStaticInfoItem) - Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 645) + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 643) Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 - Me.RibbonStatusBar1.Size = New System.Drawing.Size(1237, 22) + Me.RibbonStatusBar1.Size = New System.Drawing.Size(1237, 24) ' 'RibbonPage2 ' @@ -238,10 +238,10 @@ Partial Class frmFlowSearch Me.panelContainer1.Controls.Add(Me.DockPanel3) Me.panelContainer1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Left Me.panelContainer1.ID = New System.Guid("2c41e5f4-f976-4b22-a22e-afe12cfdaa3d") - Me.panelContainer1.Location = New System.Drawing.Point(0, 148) + Me.panelContainer1.Location = New System.Drawing.Point(0, 141) Me.panelContainer1.Name = "panelContainer1" Me.panelContainer1.OriginalSize = New System.Drawing.Size(202, 200) - Me.panelContainer1.Size = New System.Drawing.Size(202, 497) + Me.panelContainer1.Size = New System.Drawing.Size(202, 502) Me.panelContainer1.Tabbed = True Me.panelContainer1.Text = "panelContainer1" ' @@ -253,13 +253,13 @@ Partial Class frmFlowSearch Me.DockPanel1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Fill Me.DockPanel1.Font = New System.Drawing.Font("Calibri", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.DockPanel1.ID = New System.Guid("1ff5d42b-085b-405c-85c0-e49f75099dd0") - Me.DockPanel1.Location = New System.Drawing.Point(3, 46) + Me.DockPanel1.Location = New System.Drawing.Point(3, 26) Me.DockPanel1.Name = "DockPanel1" Me.DockPanel1.Options.AllowFloating = False Me.DockPanel1.Options.ShowCloseButton = False Me.DockPanel1.Options.ShowMaximizeButton = False - Me.DockPanel1.OriginalSize = New System.Drawing.Size(195, 421) - Me.DockPanel1.Size = New System.Drawing.Size(195, 419) + Me.DockPanel1.OriginalSize = New System.Drawing.Size(195, 419) + Me.DockPanel1.Size = New System.Drawing.Size(195, 447) Me.DockPanel1.Text = "Einschränkungen" ' 'DockPanel1_Container @@ -276,7 +276,7 @@ Partial Class frmFlowSearch Me.DockPanel1_Container.Controls.Add(Me.ToggleSwitchToday) Me.DockPanel1_Container.Location = New System.Drawing.Point(0, 0) Me.DockPanel1_Container.Name = "DockPanel1_Container" - Me.DockPanel1_Container.Size = New System.Drawing.Size(195, 419) + Me.DockPanel1_Container.Size = New System.Drawing.Size(195, 447) Me.DockPanel1_Container.TabIndex = 0 ' 'Label3 @@ -299,7 +299,7 @@ Partial Class frmFlowSearch Me.CheckedListBoxCategories.CheckOnClick = True Me.CheckedListBoxCategories.Location = New System.Drawing.Point(12, 217) Me.CheckedListBoxCategories.Name = "CheckedListBoxCategories" - Me.CheckedListBoxCategories.Size = New System.Drawing.Size(174, 199) + Me.CheckedListBoxCategories.Size = New System.Drawing.Size(174, 227) Me.CheckedListBoxCategories.TabIndex = 15 ' 'ToggleSwitchLastMonth @@ -412,18 +412,18 @@ Partial Class frmFlowSearch Me.DockPanel3.Controls.Add(Me.DockPanel3_Container) Me.DockPanel3.Dock = DevExpress.XtraBars.Docking.DockingStyle.Fill Me.DockPanel3.ID = New System.Guid("08fbe6c7-4310-499d-bd16-beeb37a1d906") - Me.DockPanel3.Location = New System.Drawing.Point(3, 46) + Me.DockPanel3.Location = New System.Drawing.Point(3, 26) Me.DockPanel3.Name = "DockPanel3" Me.DockPanel3.Options.AllowFloating = False - Me.DockPanel3.OriginalSize = New System.Drawing.Size(195, 421) - Me.DockPanel3.Size = New System.Drawing.Size(195, 419) + Me.DockPanel3.OriginalSize = New System.Drawing.Size(195, 419) + Me.DockPanel3.Size = New System.Drawing.Size(195, 447) Me.DockPanel3.Text = "Attribute" ' 'DockPanel3_Container ' Me.DockPanel3_Container.Location = New System.Drawing.Point(0, 0) Me.DockPanel3_Container.Name = "DockPanel3_Container" - Me.DockPanel3_Container.Size = New System.Drawing.Size(195, 419) + Me.DockPanel3_Container.Size = New System.Drawing.Size(195, 447) Me.DockPanel3_Container.TabIndex = 0 ' 'Panel1 @@ -434,7 +434,7 @@ Partial Class frmFlowSearch Me.Panel1.Controls.Add(Me.lblFoundResult) Me.Panel1.Controls.Add(Me.Label1) Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top - Me.Panel1.Location = New System.Drawing.Point(202, 148) + Me.Panel1.Location = New System.Drawing.Point(202, 141) Me.Panel1.Name = "Panel1" Me.Panel1.Size = New System.Drawing.Size(1035, 66) Me.Panel1.TabIndex = 0 @@ -444,9 +444,9 @@ Partial Class frmFlowSearch Me.Panel3.BackColor = System.Drawing.Color.Transparent Me.Panel3.Controls.Add(Me.TileControlMatch) Me.Panel3.Dock = System.Windows.Forms.DockStyle.Fill - Me.Panel3.Location = New System.Drawing.Point(202, 214) + Me.Panel3.Location = New System.Drawing.Point(202, 207) Me.Panel3.Name = "Panel3" - Me.Panel3.Size = New System.Drawing.Size(1035, 413) + Me.Panel3.Size = New System.Drawing.Size(1035, 418) Me.Panel3.TabIndex = 9 ' 'frmFlowSearch diff --git a/GUIs.ZooFlow/Search/frmFlowSearch1.vb b/GUIs.ZooFlow/Search/frmFlowSearch1.vb index e8f27b49..bee9e676 100644 --- a/GUIs.ZooFlow/Search/frmFlowSearch1.vb +++ b/GUIs.ZooFlow/Search/frmFlowSearch1.vb @@ -1,11 +1,11 @@ Imports DevExpress.XtraEditors +Imports DevExpress.XtraSplashScreen Imports DigitalData.GUIs.Common Imports DigitalData.GUIs.ZooFlow.ClassConstants Imports DigitalData.Modules.Logging Imports DigitalData.Modules.ZooFlow Public Class frmFlowSearch1 - Private _Params As ClipboardWatcherParams Private _Environment As Environment Private Logger As Logger @@ -222,24 +222,27 @@ Public Class frmFlowSearch1 End Sub - Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick - Search_GO() - End Sub - Private Sub Search_GO() - Dim owTITLE + Private Async Function BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) As Threading.Tasks.Task Handles BarButtonItem1.ItemClick + Dim oHandle = SplashScreenManager.ShowOverlayForm(Me) + + Try + Await Search_GO() + Catch ex As Exception + Logger.Error(ex) + Finally + SplashScreenManager.CloseOverlayForm(oHandle) + End Try + End Function + Private Async Function Search_GO() As Threading.Tasks.Task + Dim oWindowTitle Dim oSearchTerm = txtSearchInput.Text - If My.Application.User.Language = "de-DE" Then - owTITLE = $"Suche nach ""{oSearchTerm}""" - End If - _Params = New ClipboardWatcherParams() - _Params.ClipboardContents = oSearchTerm Dim oParams = New DocumentResultList.Params() With { .WindowGuid = "FlowSearch", .WindowTitle = GetResultWindowString(oSearchTerm), .OperationModeOverride = Modules.ZooFlow.Constants.OperationMode.ZooFlow, .ProfileGuid = 354522 - } + } Dim oP3 = $"{SEARCH_FACT_DATE_ATTRIBUTE}~{SEARCH_PARAM3}" If ExplizitDate Then @@ -250,44 +253,38 @@ Public Class frmFlowSearch1 oDate2 = CDate(DateEditFrom.EditValue) End If Dim oProc = $"EXEC PRIDB_SEARCH_ADD_USR_DATE {My.Application.User.UserId},'{CDate(DateEditFrom.EditValue)}','{oDate2}'" - If My.DatabaseIDB.ExecuteNonQuery(oProc) = True Then + If Await My.Database.ExecuteNonQueryIDBAsync(oProc) = True Then oP3 = $"{SEARCH_FACT_DATE_ATTRIBUTE}~DATEPART" End If End If - Dim oSQL = $"EXEC PRIDB_SEARCH_TEXT_GET_RESULTS {My.Application.User.UserId},'{oSearchTerm}','{oP3}'" - If My.DatabaseIDB.ExecuteNonQuery(oSQL) = True Then - Dim oDTDocResult = My.DatabaseIDB.GetDatatable(oBASESEARCH) + Dim oSQL = $"EXEC PRIDB_SEARCH_TEXT_GET_RESULTS {My.Application.User.UserId},'{oSearchTerm}','{oP3}'" + + If Await My.Database.ExecuteNonQueryIDBAsync(oSQL) = True Then + Dim oDTDocResult = Await My.Database.GetDatatableIDBAsync(oBASESEARCH) If oDTDocResult.Rows.Count > 0 Then oParams.Results.Add(New DocumentResultList.DocumentResult() With { - .Title = "FlowSearchXYZ", - .Datatable = oDTDocResult}) + .Title = "FlowSearchXYZ", + .Datatable = oDTDocResult + }) Dim oForm As New frmDocumentResultList(My.LogConfig, _Environment, oParams) - 'AddHandler oForm.FormClosed, AddressOf ProfileResultForm_Closed - 'AddHandler oForm.NeedsRefresh, AddressOf ProfileResultForm_NeedsRefresh - - 'OpenForms.Add(oForm) oForm.Show() Else bsiStatus.Caption = "No Results" End If - - Else - bsiStatus.Caption = "Error oin FlowSearch - Check Your log" + bsiStatus.Caption = "Error in FlowSearch - Check Your log" End If - ' + End Function - End Sub - - Private Sub txtSearchInput_KeyUp(sender As Object, e As KeyEventArgs) Handles txtSearchInput.KeyUp + Private Async Function txtSearchInput_KeyUp(sender As Object, e As KeyEventArgs) As Threading.Tasks.Task Handles txtSearchInput.KeyUp If e.KeyCode = Keys.Return Then If txtSearchInput.Text = String.Empty Then - Exit Sub + Return End If - Search_GO() + Await Search_GO() End If - End Sub + End Function Private Function GetResultWindowString(SearchContent As String) As String If SearchContent <> String.Empty Then If My.Application.User.Language = State.UserState.LANG_DE_DE Then @@ -308,7 +305,7 @@ Public Class frmFlowSearch1 End Function Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick - Me.txtSearchInput.Text = "" + txtSearchInput.Text = "" ResetTogglesDate() ToggleSwitchDateto.IsOn = False ExplizitDate = False diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj index 8f36aa58..a7b0784a 100644 --- a/GUIs.ZooFlow/ZooFlow.vbproj +++ b/GUIs.ZooFlow/ZooFlow.vbproj @@ -266,12 +266,6 @@ - - frmWaitForm.vb - - - Form - @@ -452,9 +446,6 @@ frmGlobixNameconvention.vb - - frmWaitForm.vb - frmFlowSearch.vb @@ -463,6 +454,7 @@ frmFlowForm.vb + Designer frmGlobix_IndexFileList.vb @@ -988,6 +980,12 @@ + + + + + + diff --git a/GUIs.ZooFlow/frmConfigBasic.Designer.vb b/GUIs.ZooFlow/frmConfigBasic.Designer.vb index 8c2ab845..edd8228b 100644 --- a/GUIs.ZooFlow/frmConfigBasic.Designer.vb +++ b/GUIs.ZooFlow/frmConfigBasic.Designer.vb @@ -28,8 +28,10 @@ Partial Class frmConfigBasic Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() Me.bsiInfo = New DevExpress.XtraBars.BarStaticItem() + Me.SkinPaletteRibbonGalleryBarItem1 = New DevExpress.XtraBars.SkinPaletteRibbonGalleryBarItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl() @@ -54,13 +56,13 @@ Partial Class frmConfigBasic 'RibbonControl1 ' Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.bsiInfo}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.bsiInfo, Me.SkinPaletteRibbonGalleryBarItem1}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl1.MaxItemId = 5 + Me.RibbonControl1.MaxItemId = 10 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] - Me.RibbonControl1.Size = New System.Drawing.Size(800, 160) + Me.RibbonControl1.Size = New System.Drawing.Size(800, 158) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 ' 'BarButtonItem1 @@ -91,9 +93,15 @@ Partial Class frmConfigBasic Me.bsiInfo.Name = "bsiInfo" Me.bsiInfo.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph ' + 'SkinPaletteRibbonGalleryBarItem1 + ' + Me.SkinPaletteRibbonGalleryBarItem1.Caption = "SkinPaletteRibbonGalleryBarItem1" + Me.SkinPaletteRibbonGalleryBarItem1.Id = 9 + Me.SkinPaletteRibbonGalleryBarItem1.Name = "SkinPaletteRibbonGalleryBarItem1" + ' 'RibbonPage1 ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1}) + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2}) Me.RibbonPage1.Name = "RibbonPage1" Me.RibbonPage1.Text = "Start" ' @@ -104,13 +112,20 @@ Partial Class frmConfigBasic Me.RibbonPageGroup1.Name = "RibbonPageGroup1" Me.RibbonPageGroup1.Text = "Schnellzugriffe" ' + 'RibbonPageGroup2 + ' + Me.RibbonPageGroup2.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far + Me.RibbonPageGroup2.ItemLinks.Add(Me.SkinPaletteRibbonGalleryBarItem1) + Me.RibbonPageGroup2.Name = "RibbonPageGroup2" + Me.RibbonPageGroup2.Text = "Oberflächen Design" + ' 'RibbonStatusBar1 ' Me.RibbonStatusBar1.ItemLinks.Add(Me.bsiInfo) - Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 428) + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 426) Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 - Me.RibbonStatusBar1.Size = New System.Drawing.Size(800, 22) + Me.RibbonStatusBar1.Size = New System.Drawing.Size(800, 24) ' 'RibbonPage2 ' @@ -123,7 +138,7 @@ Partial Class frmConfigBasic Me.LayoutControl1.Controls.Add(Me.Quicksearch1TitleTextBox) Me.LayoutControl1.Controls.Add(Me.CheckButtonDEBUG) Me.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Fill - Me.LayoutControl1.Location = New System.Drawing.Point(0, 160) + Me.LayoutControl1.Location = New System.Drawing.Point(0, 158) Me.LayoutControl1.Name = "LayoutControl1" Me.LayoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = New System.Drawing.Rectangle(848, 135, 650, 400) Me.LayoutControl1.Root = Me.Root @@ -234,11 +249,13 @@ Partial Class frmConfigBasic Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem Friend WithEvents CheckButtonDEBUG As DevExpress.XtraEditors.CheckButton - Friend WithEvents LayoutControlItem2 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents Quicksearch1CB_Pos As DevExpress.XtraEditors.ComboBoxEdit Friend WithEvents Quicksearch1TitleTextBox As DevExpress.XtraEditors.TextEdit Friend WithEvents LayoutControlItem1 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem3 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem Friend WithEvents bsiInfo As DevExpress.XtraBars.BarStaticItem + Friend WithEvents LayoutControlItem2 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents SkinPaletteRibbonGalleryBarItem1 As DevExpress.XtraBars.SkinPaletteRibbonGalleryBarItem + Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup End Class diff --git a/GUIs.ZooFlow/frmConfigBasic.vb b/GUIs.ZooFlow/frmConfigBasic.vb index 84328694..f7437795 100644 --- a/GUIs.ZooFlow/frmConfigBasic.vb +++ b/GUIs.ZooFlow/frmConfigBasic.vb @@ -1,20 +1,29 @@ -Imports DigitalData.Modules +Imports DigitalData.Modules.Language +Imports DigitalData.Modules.Logging Public Class frmConfigBasic Private FormLoaded As Boolean = False + Private Logger As Logger + Private Sub frmConfigBasic_Load(sender As Object, e As EventArgs) Handles MyBase.Load LoadScreens() CheckButtonDEBUG.Checked = My.LogConfig.Debug For Each orow As DataRow In My.Tables.DTIDB_CATALOG_USER.Rows - If orow.Item("CAT_TITLE") = "QUICKSEARCH1_TITLE" Then - Quicksearch1TitleTextBox.Text = orow.Item("CAT_STRING") - Quicksearch1TitleTextBox.Tag = orow.Item("GUID") - ElseIf orow.Item("CAT_TITLE") = "QUICKSEARCH1_POS" Then - Quicksearch1CB_Pos.EditValue = orow.Item("CAT_STRING") - Quicksearch1CB_Pos.Tag = orow.Item("GUID") - End If - Next + Select Case orow.Item("CAT_TITLE") + Case ClassConstants.USER_CATALOG_QUICKSEARCH1_TITLE + Quicksearch1TitleTextBox.Text = orow.Item("CAT_STRING") + Quicksearch1TitleTextBox.Tag = orow.Item("GUID") + Case ClassConstants.USER_CATALOG_QUICKSEARCH1_POS + Quicksearch1CB_Pos.EditValue = orow.Item("CAT_STRING") + Quicksearch1CB_Pos.Tag = orow.Item("GUID") + Case ClassConstants.USER_CATALOG_APPLICATION_THEME + Dim oItem = SkinPaletteRibbonGalleryBarItem1.Gallery.GetAllItems(). + Where(Function(item) item.Value = orow.ItemEx("CAT_STRING", String.Empty)). + FirstOrDefault() + SkinPaletteRibbonGalleryBarItem1.Gallery.SetItemCheck(oItem, True) + End Select + Next End Sub Private Sub LoadScreens() @@ -37,10 +46,6 @@ Public Class frmConfigBasic Process.Start(System.Windows.Forms.Application.LocalUserAppDataPath) End Sub - Private Sub CheckButtonDEBUG_Click(sender As Object, e As EventArgs) Handles CheckButtonDEBUG.Click - - End Sub - Private Sub CheckButtonDEBUG_CheckedChanged(sender As Object, e As EventArgs) Handles CheckButtonDEBUG.CheckedChanged If CheckButtonDEBUG.Checked Then CheckButtonDEBUG.Text = "DEBUG is active" @@ -60,8 +65,6 @@ Public Class frmConfigBasic End Try End Sub - - Private Sub frmConfigBasic_Shown(sender As Object, e As EventArgs) Handles Me.Shown FormLoaded = True End Sub @@ -73,7 +76,7 @@ Public Class frmConfigBasic Try Dim oUpd = $"UPDATE TBIDB_CATALOG_USER SET CHANGED_WHO = '{My.Application.User.UserName}', CAT_STRING = '{Quicksearch1CB_Pos.EditValue}' WHERE GUID = {Quicksearch1CB_Pos.Tag}" - If My.Database.ExecuteNonQuery(oUpd, EDMI.API.Constants.DatabaseType.IDB) = True Then + If My.Database.ExecuteNonQuery(oUpd, DigitalData.Modules.EDMI.API.Constants.DatabaseType.IDB) = True Then bsiInfo.Caption = "Position Quicksearch1 saved!" End If Catch ex As Exception @@ -88,11 +91,25 @@ Public Class frmConfigBasic Try Dim oUpd = $"UPDATE TBIDB_CATALOG_USER SET CHANGED_WHO = '{My.Application.User.UserName}', CAT_STRING = '{Quicksearch1TitleTextBox.Text}' WHERE GUID = {Quicksearch1TitleTextBox.Tag}" - If My.Database.ExecuteNonQuery(oUpd, EDMI.API.Constants.DatabaseType.IDB) = True Then + If My.Database.ExecuteNonQuery(oUpd, DigitalData.Modules.EDMI.API.Constants.DatabaseType.IDB) = True Then bsiInfo.Caption = "Title Quicksearch1 saved!" End If Catch ex As Exception MsgBox(ex.Message, MsgBoxStyle.Critical) End Try End Sub + + Private Sub SkinPaletteRibbonGalleryBarItem1_GalleryItemClick(sender As Object, e As DevExpress.XtraBars.Ribbon.GalleryItemClickEventArgs) Handles SkinPaletteRibbonGalleryBarItem1.GalleryItemClick + Dim oName = e.Item.Value + + Try + Dim oUpd = $"UPDATE TBIDB_CATALOG_USER SET CHANGED_WHO = '{My.Application.User.UserName}', CAT_STRING = '{oName}' + WHERE CAT_TITLE = '{ClassConstants.USER_CATALOG_APPLICATION_THEME}'" + If My.Database.ExecuteNonQuery(oUpd, DigitalData.Modules.EDMI.API.Constants.DatabaseType.IDB) = True Then + bsiInfo.Caption = "Application Theme saved!" + End If + Catch ex As Exception + MsgBox(ex.Message, MsgBoxStyle.Critical, Text) + End Try + 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 f2d2a6f6..6e0d2d8d 100644 --- a/GUIs.ZooFlow/frmFlowForm.Designer.vb +++ b/GUIs.ZooFlow/frmFlowForm.Designer.vb @@ -26,9 +26,8 @@ Partial Class frmFlowForm Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim SplashScreenManager As DevExpress.XtraSplashScreen.SplashScreenManager = New DevExpress.XtraSplashScreen.SplashScreenManager(Me, Nothing, True, True) + Dim SplashScreenManager As DevExpress.XtraSplashScreen.SplashScreenManager = New DevExpress.XtraSplashScreen.SplashScreenManager(Me, GetType(Global.DigitalData.GUIs.ZooFlow.frmSplash), True, True) Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmFlowForm)) - Dim SnapOptions1 As DevExpress.Utils.Controls.SnapOptions = New DevExpress.Utils.Controls.SnapOptions() 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() @@ -47,39 +46,43 @@ Partial Class frmFlowForm Me.PictureBoxAbo = New System.Windows.Forms.PictureBox() Me.PictureBoxPM1 = New DevExpress.XtraEditors.SvgImageBox() Me.PictureBoxDragDrop = New System.Windows.Forms.PictureBox() - Me.TimerCheckActiveForms = 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.BehaviorManager1 = New DevExpress.Utils.Behaviors.BehaviorManager(Me.components) Me.pnlQuicksearch1 = New System.Windows.Forms.Panel() Me.PictureEdit1 = New DevExpress.XtraEditors.PictureEdit() Me.TextEdit1 = New DevExpress.XtraEditors.TextEdit() Me.lblQuicksearch1 = New DevExpress.XtraEditors.LabelControl() - Me.MenuStrip1 = New System.Windows.Forms.MenuStrip() - Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem() - Me.ZooflowBeendenToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() - Me.NeustartZooflowToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.AppServiceToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.DatenbankverbindungToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() - Me.GrundeinstellungenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.PictureBoxGlobix1 = New DevExpress.XtraEditors.SvgImageBox() Me.PictureBoxSearch1 = New DevExpress.XtraEditors.SvgImageBox() Me.Panel1 = New System.Windows.Forms.Panel() Me.PopupMenu1 = New DevExpress.XtraBars.PopupMenu(Me.components) + Me.BarManager1 = New DevExpress.XtraBars.BarManager(Me.components) + Me.Bar3 = New DevExpress.XtraBars.Bar() + Me.BarSubItem1 = New DevExpress.XtraBars.BarSubItem() + Me.BarButtonItem6 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem7 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem8 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() + Me.buttonExitZooflow = New DevExpress.XtraBars.BarButtonItem() + Me.barDockControlTop = New DevExpress.XtraBars.BarDockControl() + Me.barDockControlBottom = New DevExpress.XtraBars.BarDockControl() + Me.barDockControlLeft = New DevExpress.XtraBars.BarDockControl() + Me.barDockControlRight = New DevExpress.XtraBars.BarDockControl() + Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem5 = New DevExpress.XtraBars.BarButtonItem() Me.ContextMenuSystray.SuspendLayout() CType(Me.PictureBoxAbo, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBoxPM1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBoxDragDrop, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.ToastNotificationsManager1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.BehaviorManager1, System.ComponentModel.ISupportInitialize).BeginInit() Me.pnlQuicksearch1.SuspendLayout() CType(Me.PictureEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - Me.MenuStrip1.SuspendLayout() CType(Me.PictureBoxGlobix1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBoxSearch1, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel1.SuspendLayout() CType(Me.PopupMenu1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'SplashScreenManager @@ -171,7 +174,7 @@ Partial Class frmFlowForm ' 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(100, 84) + Me.PictureBoxAbo.Location = New System.Drawing.Point(121, 84) Me.PictureBoxAbo.Name = "PictureBoxAbo" Me.PictureBoxAbo.Size = New System.Drawing.Size(40, 36) Me.PictureBoxAbo.TabIndex = 11 @@ -207,30 +210,19 @@ Partial Class frmFlowForm Me.PictureBoxDragDrop.TabStop = False Me.ToolTip1.SetToolTip(Me.PictureBoxDragDrop, "Drag and Drop files here") ' - 'TimerCheckActiveForms - ' - Me.TimerCheckActiveForms.Interval = 2000 - ' 'TimerFolderwatch ' Me.TimerFolderwatch.Interval = 2000 ' - 'ToastNotificationsManager1 - ' - Me.ToastNotificationsManager1.ApplicationId = "0cfaceb0-ea10-45cd-9d70-675bd0dbeaad" - Me.ToastNotificationsManager1.Notifications.AddRange(New DevExpress.XtraBars.ToastNotifications.IToastNotificationProperties() {New DevExpress.XtraBars.ToastNotifications.ToastNotification("4df76a4c-3895-4fd4-b255-87c7ff115cad", Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.Flow, "Header - Pellentesque lacinia tellus eget volutpat", "Body - Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod t" & - "empor incididunt ut labore et dolore magna aliqua.", "Body2 - Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod " & - "tempor incididunt ut labore et dolore magna aliqua.", DevExpress.XtraBars.ToastNotifications.ToastNotificationSound.Looping_Alarm4, DevExpress.XtraBars.ToastNotifications.ToastNotificationDuration.[Default], DevExpress.XtraBars.ToastNotifications.ToastNotificationTemplate.Text01)}) - ' 'pnlQuicksearch1 ' - Me.pnlQuicksearch1.BackColor = System.Drawing.Color.Azure + Me.pnlQuicksearch1.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(214, Byte), Integer), CType(CType(49, Byte), Integer)) Me.pnlQuicksearch1.Controls.Add(Me.PictureEdit1) Me.pnlQuicksearch1.Controls.Add(Me.TextEdit1) Me.pnlQuicksearch1.Controls.Add(Me.lblQuicksearch1) - Me.pnlQuicksearch1.Location = New System.Drawing.Point(3, 6) + Me.pnlQuicksearch1.Location = New System.Drawing.Point(0, 0) Me.pnlQuicksearch1.Name = "pnlQuicksearch1" - Me.pnlQuicksearch1.Size = New System.Drawing.Size(196, 67) + Me.pnlQuicksearch1.Size = New System.Drawing.Size(202, 73) Me.pnlQuicksearch1.TabIndex = 16 Me.pnlQuicksearch1.Visible = False ' @@ -238,7 +230,7 @@ Partial Class frmFlowForm ' Me.PictureEdit1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.PictureEdit1.EditValue = CType(resources.GetObject("PictureEdit1.EditValue"), Object) - Me.PictureEdit1.Location = New System.Drawing.Point(164, 29) + Me.PictureEdit1.Location = New System.Drawing.Point(161, 33) Me.PictureEdit1.Name = "PictureEdit1" Me.PictureEdit1.Properties.ShowCameraMenuItem = DevExpress.XtraEditors.Controls.CameraMenuItemVisibility.[Auto] Me.PictureEdit1.Properties.SizeMode = DevExpress.XtraEditors.Controls.PictureSizeMode.Zoom @@ -249,76 +241,25 @@ Partial Class frmFlowForm ' Me.TextEdit1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.TextEdit1.Location = New System.Drawing.Point(3, 29) + Me.TextEdit1.Location = New System.Drawing.Point(12, 33) Me.TextEdit1.Name = "TextEdit1" - Me.TextEdit1.Properties.Appearance.BackColor = System.Drawing.Color.PowderBlue + Me.TextEdit1.Properties.Appearance.BackColor = System.Drawing.Color.White Me.TextEdit1.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.TextEdit1.Properties.Appearance.Options.UseBackColor = True Me.TextEdit1.Properties.Appearance.Options.UseFont = True - Me.TextEdit1.Size = New System.Drawing.Size(190, 28) + Me.TextEdit1.Size = New System.Drawing.Size(149, 28) Me.TextEdit1.TabIndex = 1 ' 'lblQuicksearch1 ' Me.lblQuicksearch1.Appearance.Font = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblQuicksearch1.Appearance.Options.UseFont = True - Me.lblQuicksearch1.Location = New System.Drawing.Point(3, 3) + Me.lblQuicksearch1.Location = New System.Drawing.Point(12, 6) Me.lblQuicksearch1.Name = "lblQuicksearch1" Me.lblQuicksearch1.Size = New System.Drawing.Size(90, 21) Me.lblQuicksearch1.TabIndex = 0 Me.lblQuicksearch1.Text = "Schnellsuche" ' - 'MenuStrip1 - ' - Me.MenuStrip1.Dock = System.Windows.Forms.DockStyle.Bottom - Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem2}) - Me.MenuStrip1.Location = New System.Drawing.Point(0, 614) - Me.MenuStrip1.Name = "MenuStrip1" - Me.MenuStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional - Me.MenuStrip1.Size = New System.Drawing.Size(202, 24) - Me.MenuStrip1.TabIndex = 17 - Me.MenuStrip1.Text = "MenuStrip1" - ' - 'ToolStripMenuItem2 - ' - Me.ToolStripMenuItem2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right - Me.ToolStripMenuItem2.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ZooflowBeendenToolStripMenuItem1, Me.NeustartZooflowToolStripMenuItem, Me.AppServiceToolStripMenuItem, Me.DatenbankverbindungToolStripMenuItem1, Me.GrundeinstellungenToolStripMenuItem}) - Me.ToolStripMenuItem2.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.Hamburger_icon_svg - Me.ToolStripMenuItem2.Name = "ToolStripMenuItem2" - Me.ToolStripMenuItem2.Size = New System.Drawing.Size(28, 20) - ' - 'ZooflowBeendenToolStripMenuItem1 - ' - Me.ZooflowBeendenToolStripMenuItem1.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.Close_16xLG - Me.ZooflowBeendenToolStripMenuItem1.Name = "ZooflowBeendenToolStripMenuItem1" - Me.ZooflowBeendenToolStripMenuItem1.Size = New System.Drawing.Size(192, 22) - Me.ZooflowBeendenToolStripMenuItem1.Text = "Zooflow beenden" - ' - 'NeustartZooflowToolStripMenuItem - ' - Me.NeustartZooflowToolStripMenuItem.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.refresh_16xMD - Me.NeustartZooflowToolStripMenuItem.Name = "NeustartZooflowToolStripMenuItem" - Me.NeustartZooflowToolStripMenuItem.Size = New System.Drawing.Size(192, 22) - Me.NeustartZooflowToolStripMenuItem.Text = "Neustart Zooflow" - ' - 'AppServiceToolStripMenuItem - ' - Me.AppServiceToolStripMenuItem.Name = "AppServiceToolStripMenuItem" - Me.AppServiceToolStripMenuItem.Size = New System.Drawing.Size(192, 22) - Me.AppServiceToolStripMenuItem.Text = "AppService" - ' - 'DatenbankverbindungToolStripMenuItem1 - ' - Me.DatenbankverbindungToolStripMenuItem1.Name = "DatenbankverbindungToolStripMenuItem1" - Me.DatenbankverbindungToolStripMenuItem1.Size = New System.Drawing.Size(192, 22) - Me.DatenbankverbindungToolStripMenuItem1.Text = "Datenbankverbindung" - ' - 'GrundeinstellungenToolStripMenuItem - ' - Me.GrundeinstellungenToolStripMenuItem.Name = "GrundeinstellungenToolStripMenuItem" - Me.GrundeinstellungenToolStripMenuItem.Size = New System.Drawing.Size(192, 22) - Me.GrundeinstellungenToolStripMenuItem.Text = "Grundeinstellungen" - ' 'PictureBoxGlobix1 ' Me.PictureBoxGlobix1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -359,13 +300,145 @@ Partial Class frmFlowForm Me.Panel1.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel1.Location = New System.Drawing.Point(0, 150) Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(202, 464) + Me.Panel1.Size = New System.Drawing.Size(202, 462) Me.Panel1.TabIndex = 18 ' 'PopupMenu1 ' + Me.PopupMenu1.Manager = Me.BarManager1 Me.PopupMenu1.Name = "PopupMenu1" ' + 'BarManager1 + ' + Me.BarManager1.Bars.AddRange(New DevExpress.XtraBars.Bar() {Me.Bar3}) + Me.BarManager1.DockControls.Add(Me.barDockControlTop) + Me.BarManager1.DockControls.Add(Me.barDockControlBottom) + Me.BarManager1.DockControls.Add(Me.barDockControlLeft) + Me.BarManager1.DockControls.Add(Me.barDockControlRight) + Me.BarManager1.Form = Me + Me.BarManager1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.BarSubItem1, Me.buttonExitZooflow, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem1, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8}) + Me.BarManager1.MaxItemId = 10 + Me.BarManager1.StatusBar = Me.Bar3 + ' + 'Bar3 + ' + Me.Bar3.BarAppearance.Normal.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(214, Byte), Integer), CType(CType(49, Byte), Integer)) + Me.Bar3.BarAppearance.Normal.Options.UseBackColor = True + Me.Bar3.BarName = "Statusleiste" + Me.Bar3.CanDockStyle = DevExpress.XtraBars.BarCanDockStyle.Bottom + Me.Bar3.DockCol = 0 + Me.Bar3.DockRow = 0 + Me.Bar3.DockStyle = DevExpress.XtraBars.BarDockStyle.Bottom + Me.Bar3.LinksPersistInfo.AddRange(New DevExpress.XtraBars.LinkPersistInfo() {New DevExpress.XtraBars.LinkPersistInfo(Me.BarSubItem1)}) + Me.Bar3.OptionsBar.AllowQuickCustomization = False + Me.Bar3.OptionsBar.DrawBorder = False + Me.Bar3.OptionsBar.DrawDragBorder = False + Me.Bar3.OptionsBar.UseWholeRow = True + Me.Bar3.Text = "Statusleiste" + ' + 'BarSubItem1 + ' + Me.BarSubItem1.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right + Me.BarSubItem1.Caption = "Menu" + Me.BarSubItem1.Id = 0 + Me.BarSubItem1.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.scatterchartlabeloptions + Me.BarSubItem1.LinksPersistInfo.AddRange(New DevExpress.XtraBars.LinkPersistInfo() {New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem6), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem7), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem8), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonExitZooflow)}) + Me.BarSubItem1.Name = "BarSubItem1" + Me.BarSubItem1.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph + ' + 'BarButtonItem6 + ' + Me.BarButtonItem6.Caption = "Dienstkonfiguration" + Me.BarButtonItem6.Id = 7 + Me.BarButtonItem6.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.servermode + Me.BarButtonItem6.Name = "BarButtonItem6" + ' + 'BarButtonItem7 + ' + Me.BarButtonItem7.Caption = "Datenbankkonfiguration" + Me.BarButtonItem7.Id = 8 + Me.BarButtonItem7.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.managedatasource2 + Me.BarButtonItem7.Name = "BarButtonItem7" + ' + 'BarButtonItem8 + ' + Me.BarButtonItem8.Caption = "Grundeinstellungen" + Me.BarButtonItem8.Id = 9 + Me.BarButtonItem8.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.properties + Me.BarButtonItem8.Name = "BarButtonItem8" + ' + 'BarButtonItem1 + ' + Me.BarButtonItem1.Caption = "Zooflow neustarten" + Me.BarButtonItem1.Id = 6 + Me.BarButtonItem1.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.actions_refresh + Me.BarButtonItem1.Name = "BarButtonItem1" + ' + 'buttonExitZooflow + ' + Me.buttonExitZooflow.Caption = "Zooflow beenden" + Me.buttonExitZooflow.Id = 1 + Me.buttonExitZooflow.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.cancel + Me.buttonExitZooflow.Name = "buttonExitZooflow" + ' + 'barDockControlTop + ' + Me.barDockControlTop.CausesValidation = False + Me.barDockControlTop.Dock = System.Windows.Forms.DockStyle.Top + Me.barDockControlTop.Location = New System.Drawing.Point(0, 0) + Me.barDockControlTop.Manager = Me.BarManager1 + Me.barDockControlTop.Size = New System.Drawing.Size(202, 0) + ' + 'barDockControlBottom + ' + Me.barDockControlBottom.Appearance.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(214, Byte), Integer), CType(CType(49, Byte), Integer)) + Me.barDockControlBottom.Appearance.Options.UseBackColor = True + Me.barDockControlBottom.CausesValidation = False + Me.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom + Me.barDockControlBottom.Location = New System.Drawing.Point(0, 612) + Me.barDockControlBottom.Manager = Me.BarManager1 + Me.barDockControlBottom.Size = New System.Drawing.Size(202, 26) + ' + 'barDockControlLeft + ' + Me.barDockControlLeft.CausesValidation = False + Me.barDockControlLeft.Dock = System.Windows.Forms.DockStyle.Left + Me.barDockControlLeft.Location = New System.Drawing.Point(0, 0) + Me.barDockControlLeft.Manager = Me.BarManager1 + Me.barDockControlLeft.Size = New System.Drawing.Size(0, 612) + ' + 'barDockControlRight + ' + Me.barDockControlRight.CausesValidation = False + Me.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right + Me.barDockControlRight.Location = New System.Drawing.Point(202, 0) + Me.barDockControlRight.Manager = Me.BarManager1 + Me.barDockControlRight.Size = New System.Drawing.Size(0, 612) + ' + 'BarButtonItem2 + ' + Me.BarButtonItem2.Caption = "BarButtonItem2" + Me.BarButtonItem2.Id = 2 + Me.BarButtonItem2.Name = "BarButtonItem2" + ' + 'BarButtonItem3 + ' + Me.BarButtonItem3.Caption = "BarButtonItem3" + Me.BarButtonItem3.Id = 3 + Me.BarButtonItem3.Name = "BarButtonItem3" + ' + 'BarButtonItem4 + ' + Me.BarButtonItem4.Caption = "BarButtonItem4" + Me.BarButtonItem4.Id = 4 + Me.BarButtonItem4.Name = "BarButtonItem4" + ' + 'BarButtonItem5 + ' + Me.BarButtonItem5.Caption = "BarButtonItem5" + Me.BarButtonItem5.Id = 5 + Me.BarButtonItem5.Name = "BarButtonItem5" + ' 'frmFlowForm ' Me.AllowDrop = True @@ -376,15 +449,16 @@ Partial Class frmFlowForm Me.Appearance.Options.UseForeColor = True Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.BehaviorManager1.SetBehaviors(Me, New DevExpress.Utils.Behaviors.Behavior() {CType(DevExpress.Utils.Behaviors.Common.SnapWindowBehavior.Create(GetType(DevExpress.Utils.BehaviorSource.SnapWindowBehaviorSourceForForm), SnapOptions1), DevExpress.Utils.Behaviors.Behavior)}) Me.ClientSize = New System.Drawing.Size(202, 638) Me.Controls.Add(Me.Panel1) - Me.Controls.Add(Me.MenuStrip1) Me.Controls.Add(Me.PictureBoxDragDrop) + Me.Controls.Add(Me.barDockControlLeft) + Me.Controls.Add(Me.barDockControlRight) + Me.Controls.Add(Me.barDockControlBottom) + Me.Controls.Add(Me.barDockControlTop) 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.MainMenuStrip = Me.MenuStrip1 Me.Name = "frmFlowForm" Me.Text = "ZooFlow" Me.TopMost = True @@ -392,18 +466,15 @@ Partial Class frmFlowForm CType(Me.PictureBoxAbo, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBoxPM1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBoxDragDrop, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.ToastNotificationsManager1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.BehaviorManager1, System.ComponentModel.ISupportInitialize).EndInit() Me.pnlQuicksearch1.ResumeLayout(False) Me.pnlQuicksearch1.PerformLayout() CType(Me.PictureEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() - Me.MenuStrip1.ResumeLayout(False) - Me.MenuStrip1.PerformLayout() CType(Me.PictureBoxGlobix1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBoxSearch1, System.ComponentModel.ISupportInitialize).EndInit() Me.Panel1.ResumeLayout(False) CType(Me.PopupMenu1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -419,30 +490,36 @@ Partial Class frmFlowForm Friend WithEvents UserKonfigurationToolStripMenuItem As ToolStripMenuItem Friend WithEvents ToolStripSeparator1 As ToolStripSeparator Friend WithEvents DatenbankverbindungToolStripMenuItem As ToolStripMenuItem - Friend WithEvents TimerCheckActiveForms As Timer Friend WithEvents TimerFolderwatch As Timer Friend WithEvents GlobixToolStripMenuItem As ToolStripMenuItem Friend WithEvents TsiGlobixConfig As ToolStripMenuItem - Friend WithEvents ToastNotificationsManager1 As DevExpress.XtraBars.ToastNotifications.ToastNotificationsManager Friend WithEvents TestToolStripMenuItem As ToolStripMenuItem Friend WithEvents PictureBoxSearch1 As DevExpress.XtraEditors.SvgImageBox Friend WithEvents PictureBoxPM1 As DevExpress.XtraEditors.SvgImageBox Friend WithEvents PictureBoxGlobix1 As DevExpress.XtraEditors.SvgImageBox Friend WithEvents ToolStripSeparator2 As ToolStripSeparator Friend WithEvents ToolStripSeparator3 As ToolStripSeparator - Friend WithEvents BehaviorManager1 As DevExpress.Utils.Behaviors.BehaviorManager Friend WithEvents BasisKonfigurationToolStripMenuItem As ToolStripMenuItem Friend WithEvents pnlQuicksearch1 As Panel Friend WithEvents PictureEdit1 As PictureEdit Friend WithEvents TextEdit1 As TextEdit Friend WithEvents lblQuicksearch1 As LabelControl - Friend WithEvents MenuStrip1 As MenuStrip - Friend WithEvents ToolStripMenuItem2 As ToolStripMenuItem - Friend WithEvents DatenbankverbindungToolStripMenuItem1 As ToolStripMenuItem - Friend WithEvents GrundeinstellungenToolStripMenuItem As ToolStripMenuItem - Friend WithEvents ZooflowBeendenToolStripMenuItem1 As ToolStripMenuItem - Friend WithEvents NeustartZooflowToolStripMenuItem As ToolStripMenuItem - Friend WithEvents AppServiceToolStripMenuItem As ToolStripMenuItem Friend WithEvents Panel1 As Panel Friend WithEvents PopupMenu1 As DevExpress.XtraBars.PopupMenu + Friend WithEvents BarManager1 As DevExpress.XtraBars.BarManager + Friend WithEvents Bar3 As DevExpress.XtraBars.Bar + Friend WithEvents BarSubItem1 As DevExpress.XtraBars.BarSubItem + Friend WithEvents buttonExitZooflow As DevExpress.XtraBars.BarButtonItem + Friend WithEvents barDockControlTop As DevExpress.XtraBars.BarDockControl + Friend WithEvents barDockControlBottom As DevExpress.XtraBars.BarDockControl + Friend WithEvents barDockControlLeft As DevExpress.XtraBars.BarDockControl + Friend WithEvents barDockControlRight As DevExpress.XtraBars.BarDockControl + Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem4 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem5 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem6 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem7 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem8 As DevExpress.XtraBars.BarButtonItem End Class diff --git a/GUIs.ZooFlow/frmFlowForm.resx b/GUIs.ZooFlow/frmFlowForm.resx index 754ec1ef..ea541636 100644 --- a/GUIs.ZooFlow/frmFlowForm.resx +++ b/GUIs.ZooFlow/frmFlowForm.resx @@ -1962,17 +1962,8 @@ 610, 17 - - 709, 17 - - 891, 17 - - - 1040, 17 - - - 17, 56 + 709, 17 @@ -2001,10 +1992,10 @@ QmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs= - - 171, 56 - - 286, 56 + 858, 17 + + + 983, 17 \ No newline at end of file diff --git a/GUIs.ZooFlow/frmFlowForm.vb b/GUIs.ZooFlow/frmFlowForm.vb index c4e2053f..1642891e 100644 --- a/GUIs.ZooFlow/frmFlowForm.vb +++ b/GUIs.ZooFlow/frmFlowForm.vb @@ -14,6 +14,9 @@ Imports DigitalData.Modules.Windows Imports DigitalData.Modules.ZooFlow Imports DigitalData.GUIs.Common.Base Imports DigitalData.GUIs.Common +Imports DigitalData.Controls.SQLConfig +Imports DigitalData.Modules.Language +Imports DevExpress.LookAndFeel Public Class frmFlowForm #Region "Sidebar DllImport" @@ -492,15 +495,10 @@ Public Class frmFlowForm End Sub Private Sub VerwaltungToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles VerwaltungToolStripMenuItem.Click - Me.Cursor = Cursors.WaitCursor + Cursor = Cursors.WaitCursor AdminForm = New frmAdmin_Start() - - frmAdmin_Start.Show() - If TimerCheckActiveForms.Enabled = False Then - TimerCheckActiveForms.Enabled = True - End If - - Me.Cursor = Cursors.Default + AdminForm.Show() + Cursor = Cursors.Default End Sub Private Sub frmFlowForm_DragEnter(sender As Object, e As DragEventArgs) Handles MyBase.DragEnter @@ -559,7 +557,29 @@ Public Class frmFlowForm End Function Private Sub DatenbankverbindungToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DatenbankverbindungToolStripMenuItem.Click - frmConfigDatabase.ShowDialog() + Dim oForm As New frmSQLConfig(My.LogConfig) With { + .ConnectionString = My.SystemConfig.ConnectionString, + .FormTitle = "ECM Datenbank" + } + Dim oResult = oForm.ShowDialog() + + If oResult = DialogResult.OK Then + My.SystemConfig.ConnectionString = oForm.ConnectionString + My.SystemConfigManager.Save() + End If + End Sub + + Private Sub DatenbankverbindungToolStripMenuItem1_Click(sender As Object, e As EventArgs) + Dim oForm As New frmSQLConfig(My.LogConfig) With { + .ConnectionString = My.SystemConfig.ConnectionString, + .FormTitle = "ECM Datenbank" + } + Dim oResult = oForm.ShowDialog() + + If oResult = DialogResult.OK Then + My.SystemConfig.ConnectionString = oForm.ConnectionString + My.SystemConfigManager.Save() + End If End Sub Private Sub NotifyIcon_DoubleClick(sender As Object, e As EventArgs) Handles NotifyIcon.DoubleClick @@ -1075,29 +1095,20 @@ Public Class frmFlowForm } End Function).ToList() - 'RaiseEvent ResultsRefreshed(Me, Nothing) oThisForm.RefreshResults(oResults) End If End Sub - Private Sub PictureBoxPM1_Click(sender As Object, e As EventArgs) Handles PictureBoxPM1.Click - ToastNotificationsManager1.ShowNotification(ToastNotificationsManager1.Notifications(1)) - End Sub - Private Sub TestToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles TestToolStripMenuItem.Click frmtest.Show() End Sub - - Private Sub BasisKonfigurationToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles BasisKonfigurationToolStripMenuItem.Click frmConfigBasic.ShowDialog() Quicksearch1(True) End Sub - - Private Sub ShowErrorMessage(pEx As Exception) Dim oCallingClass = LogConfig.GetClassFullName(IncludeMethodNames:=True, Parts:=2) ErrorHandler.ShowErrorMessage(pEx, oCallingClass) @@ -1111,35 +1122,35 @@ Public Class frmFlowForm Else Return $"Search For '{SearchContent}'" End If + Else + Return String.Empty End If - - End Function - Sub RunQuickSearch1() + + Async Function RunQuickSearch1(pSearchText As String) As Threading.Tasks.Task + Dim oHandle = SplashScreenManager.ShowOverlayForm(Me) + Try - Dim oSQL = $"EXEC PRIDB_SEARCH_TEXT_GET_RESULTS {My.Application.User.UserId},'{TextEdit1.Text}',''" - + Dim oSQL = $"EXEC PRIDB_SEARCH_TEXT_GET_RESULTS {My.Application.User.UserId},'{pSearchText}',''" Dim oParams = New DocumentResultList.Params() With { - .WindowGuid = "QuickFlowSearch1", - .WindowTitle = GetResultWindowString(TextEdit1.Text), - .OperationModeOverride = Modules.ZooFlow.Constants.OperationMode.ZooFlow, - .ProfileGuid = 354521 - } + .WindowGuid = "QuickFlowSearch1", + .WindowTitle = GetResultWindowString(pSearchText), + .OperationModeOverride = Modules.ZooFlow.Constants.OperationMode.ZooFlow, + .ProfileGuid = 354521 + } + If Await My.Database.ExecuteNonQueryIDBAsync(oSQL) = True Then + Dim oDTDocResult = Await My.Database.GetDatatableIDBAsync(DocResultBaseSearch) - If My.DatabaseIDB.ExecuteNonQuery(oSQL) = True Then - Dim oDTDocResult = My.DatabaseIDB.GetDatatable(DocResultBaseSearch) If oDTDocResult.Rows.Count > 0 Then Logger.Debug($"Quicksearch1 got {oDTDocResult.Rows.Count} results") oParams.Results.Add(New DocumentResultList.DocumentResult() With { - .Title = GetResultWindowString(TextEdit1.Text), - .Datatable = oDTDocResult}) + .Title = GetResultWindowString(pSearchText), + .Datatable = oDTDocResult + }) Dim oForm As New frmDocumentResultList(My.LogConfig, _Environment, oParams) - 'AddHandler oForm.FormClosed, AddressOf ProfileResultForm_Closed - 'AddHandler oForm.NeedsRefresh, AddressOf ProfileResultForm_NeedsRefresh - - 'OpenForms.Add(oForm) oForm.Show() + Else Dim oMessage As String If My.Application.User.Language = "de-DE" Then @@ -1148,64 +1159,76 @@ Public Class frmFlowForm oMessage = "No results" End If NotifyIcon.ShowBalloonTip(20000, $"Info", oMessage, ToolTipIcon.Info) + End If End If Catch ex As Exception Logger.Error(ex) MsgBox("Unhandled exception in RunQuickSearch1: " & ex.Message, MsgBoxStyle.Critical) + Finally + SplashScreenManager.CloseOverlayForm(oHandle) End Try + End Function - End Sub - - Private Sub TextEdit1_KeyUp(sender As Object, e As KeyEventArgs) Handles TextEdit1.KeyUp + Private Async Sub TextEdit1_KeyUp(sender As Object, e As KeyEventArgs) Handles TextEdit1.KeyUp If e.KeyCode = Keys.Return Then - CheckRunSearch1() + Await CheckRunSearch1() End If End Sub - Sub CheckRunSearch1() - If TextEdit1.Text <> String.Empty Then - If TextEdit1.Text = "porn" Then - NotifyIcon.ShowBalloonTip(20000, $"Info", "Think about Your search term an search again..", ToolTipIcon.Info) - Exit Sub - End If - RunQuickSearch1() + Async Function CheckRunSearch1() As Threading.Tasks.Task + Dim oSearchText = TextEdit1.Text + + If oSearchText <> String.Empty Then + 'If TextEdit1.Text = "porn" Then + ' NotifyIcon.ShowBalloonTip(20000, $"Info", "Think about Your search term an search again..", ToolTipIcon.Info) + ' Exit Sub + 'End If + Await RunQuickSearch1(oSearchText) End If - End Sub - Private Sub PictureEdit1_Click(sender As Object, e As EventArgs) Handles PictureEdit1.Click + End Function + Private Async Function PictureEdit1_Click(sender As Object, e As EventArgs) As Threading.Tasks.Task Handles PictureEdit1.Click If TextEdit1.Text = String.Empty Then Open_FlowSearch() - Exit Sub + Return + + Else + Await CheckRunSearch1() + End If - CheckRunSearch1() - End Sub + End Function - Private Sub frmFlowForm_Shown(sender As Object, e As EventArgs) Handles Me.Shown - - End Sub - - Private Sub GrundeinstellungenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GrundeinstellungenToolStripMenuItem.Click - frmConfigBasic.ShowDialog() - Quicksearch1(True) - End Sub - - Private Sub DatenbankverbindungToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles DatenbankverbindungToolStripMenuItem1.Click - frmConfigDatabase.ShowDialog() - End Sub - - Private Sub NeustartZooflowToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles NeustartZooflowToolStripMenuItem.Click - Application.Restart() - End Sub - - Private Sub ZooflowBeendenToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles ZooflowBeendenToolStripMenuItem1.Click + Private Sub buttonExitZooflow_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles buttonExitZooflow.ItemClick ExitZooflow() End Sub - Private Sub AppServiceToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AppServiceToolStripMenuItem.Click + Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick + Application.Restart() + End Sub + + Private Sub BarButtonItem6_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem6.ItemClick frmServiceConfig.ShowDialog() End Sub + + Private Sub BarButtonItem7_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem7.ItemClick + Dim oForm As New frmSQLConfig(My.LogConfig) With { + .ConnectionString = My.SystemConfig.ConnectionString, + .FormTitle = "ECM Datenbank" + } + Dim oResult = oForm.ShowDialog() + + If oResult = DialogResult.OK Then + My.SystemConfig.ConnectionString = oForm.ConnectionString + My.SystemConfigManager.Save() + End If + End Sub + + Private Sub BarButtonItem8_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem8.ItemClick + frmConfigBasic.ShowDialog() + Quicksearch1(True) + End Sub End Class diff --git a/GUIs.ZooFlow/frmWaitForm.Designer.vb b/GUIs.ZooFlow/frmWaitForm.Designer.vb deleted file mode 100644 index 1a20c4c9..00000000 --- a/GUIs.ZooFlow/frmWaitForm.Designer.vb +++ /dev/null @@ -1,83 +0,0 @@ - _ -Partial Class frmWaitForm - Inherits DevExpress.XtraWaitForm.WaitForm - - 'Form overrides dispose to clean up the component list. - _ - Protected Overrides Sub Dispose(ByVal disposing As Boolean) - Try - If disposing AndAlso components IsNot Nothing Then - components.Dispose() - End If - Finally - MyBase.Dispose(disposing) - End Try - End Sub - - 'Required by the Windows Form Designer - Private components As System.ComponentModel.IContainer - - 'NOTE: The following procedure is required by the Windows Form Designer - 'It can be modified using the Windows Form Designer. - 'Do not modify it using the code editor. - _ - Private Sub InitializeComponent() - Me.progressPanel1 = New DevExpress.XtraWaitForm.ProgressPanel() - Me.tableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel() - Me.tableLayoutPanel1.SuspendLayout() - Me.SuspendLayout() - ' - 'progressPanel1 - ' - Me.progressPanel1.Appearance.BackColor = System.Drawing.Color.Transparent - Me.progressPanel1.Appearance.Options.UseBackColor = True - Me.progressPanel1.AppearanceCaption.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!) - Me.progressPanel1.AppearanceCaption.Options.UseFont = True - Me.progressPanel1.AppearanceDescription.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.progressPanel1.AppearanceDescription.Options.UseFont = True - Me.progressPanel1.Dock = System.Windows.Forms.DockStyle.Fill - Me.progressPanel1.ImageHorzOffset = 20 - Me.progressPanel1.Location = New System.Drawing.Point(0, 17) - Me.progressPanel1.Margin = New System.Windows.Forms.Padding(0, 3, 0, 3) - Me.progressPanel1.Name = "progressPanel1" - Me.progressPanel1.Size = New System.Drawing.Size(246, 39) - Me.progressPanel1.TabIndex = 0 - Me.progressPanel1.Text = "progressPanel1" - ' - 'tableLayoutPanel1 - ' - Me.tableLayoutPanel1.AutoSize = True - Me.tableLayoutPanel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.tableLayoutPanel1.BackColor = System.Drawing.Color.Transparent - Me.tableLayoutPanel1.ColumnCount = 1 - Me.tableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100.0!)) - Me.tableLayoutPanel1.Controls.Add(Me.progressPanel1, 0, 0) - Me.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill - Me.tableLayoutPanel1.Location = New System.Drawing.Point(0, 0) - Me.tableLayoutPanel1.Name = "tableLayoutPanel1" - Me.tableLayoutPanel1.Padding = New System.Windows.Forms.Padding(0, 14, 0, 14) - Me.tableLayoutPanel1.RowCount = 1 - Me.tableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100.0!)) - Me.tableLayoutPanel1.Size = New System.Drawing.Size(246, 73) - Me.tableLayoutPanel1.TabIndex = 1 - ' - 'Form1 - ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.AutoSize = True - Me.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ClientSize = New System.Drawing.Size(246, 73) - Me.Controls.Add(Me.tableLayoutPanel1) - Me.DoubleBuffered = True - Me.Name = "Form1" - Me.StartPosition = FormStartPosition.Manual - Me.Text = "Form1" - Me.tableLayoutPanel1.ResumeLayout(false) - Me.ResumeLayout(False) - Me.PerformLayout() - End Sub - - Private WithEvents progressPanel1 As DevExpress.XtraWaitForm.ProgressPanel - Private WithEvents tableLayoutPanel1 As System.Windows.Forms.TableLayoutPanel -End Class diff --git a/GUIs.ZooFlow/frmWaitForm.resx b/GUIs.ZooFlow/frmWaitForm.resx deleted file mode 100644 index 9d1fc387..00000000 --- a/GUIs.ZooFlow/frmWaitForm.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/GUIs.ZooFlow/frmWaitForm.vb b/GUIs.ZooFlow/frmWaitForm.vb deleted file mode 100644 index 04b65efe..00000000 --- a/GUIs.ZooFlow/frmWaitForm.vb +++ /dev/null @@ -1,24 +0,0 @@ -Public Class frmWaitForm - Sub New - InitializeComponent() - Me.progressPanel1.AutoHeight = True - End Sub - - Public Overrides Sub SetCaption(ByVal caption As String) - MyBase.SetCaption(caption) - Me.progressPanel1.Caption = caption - End Sub - - Public Overrides Sub SetDescription(ByVal description As String) - MyBase.SetDescription(description) - Me.progressPanel1.Description = description - End Sub - - Public Overrides Sub ProcessCommand(ByVal cmd As System.Enum, ByVal arg As Object) - MyBase.ProcessCommand(cmd, arg) - End Sub - - Public Enum WaitFormCommand - SomeCommandId - End Enum -End Class