Merge branch 'master' of http://dd-vmp07-com04:3000/AppStd/Monorepo
This commit is contained in:
commit
dce92babd6
@ -0,0 +1,8 @@
|
||||
DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, 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.XtraLayout.LayoutControl, DevExpress.XtraLayout.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.XtraBars.Docking.DockManager, DevExpress.XtraBars.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
|
||||
@ -11,7 +11,7 @@ Imports System.Runtime.InteropServices
|
||||
<Assembly: AssemblyCompany("Digital Data")>
|
||||
<Assembly: AssemblyProduct("ZooFlow")>
|
||||
<Assembly: AssemblyCopyright("Copyright © 2022")>
|
||||
<Assembly: AssemblyTrademark("1.3.0.0")>
|
||||
<Assembly: AssemblyTrademark("1.3.0.2")>
|
||||
<Assembly: AssemblyCulture("")>
|
||||
|
||||
' Setting ComVisible to false makes the types in this assembly not visible
|
||||
@ -32,5 +32,5 @@ Imports System.Runtime.InteropServices
|
||||
' You can specify all the values or you can default the Build and Revision Numbers
|
||||
' by using the '*' as shown below:
|
||||
' [assembly: AssemblyVersion("1.0.*")]
|
||||
<Assembly: AssemblyVersion("1.3.0.0")>
|
||||
<Assembly: AssemblyVersion("1.3.0.2")>
|
||||
<Assembly: AssemblyFileVersion("1.0.0.0")>
|
||||
|
||||
10
GUIs.ZooFlow/My Project/Resources.Designer.vb
generated
10
GUIs.ZooFlow/My Project/Resources.Designer.vb
generated
@ -800,6 +800,16 @@ Namespace My.Resources
|
||||
End Get
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
|
||||
'''</summary>
|
||||
Friend ReadOnly Property columnheaders() As DevExpress.Utils.Svg.SvgImage
|
||||
Get
|
||||
Dim obj As Object = ResourceManager.GetObject("columnheaders", resourceCulture)
|
||||
Return CType(obj,DevExpress.Utils.Svg.SvgImage)
|
||||
End Get
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
|
||||
'''</summary>
|
||||
|
||||
@ -148,6 +148,9 @@
|
||||
<data name="action_add_16xMD" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\action_add_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="StatusAnnotations_Stop_32xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\StatusAnnotations_Stop_32xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="allowuserstoeditranges" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\allowuserstoeditranges.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
@ -199,6 +202,9 @@
|
||||
<data name="2_ZOO_FLOW_Abo" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\2_ZOO_FLOW_Abo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="ZooFlow_Sidebar_individuelle_suche" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\ZooFlow_Sidebar_individuelle_suche.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="editquery" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\editquery.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
@ -241,8 +247,8 @@
|
||||
<data name="Flow" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Flow.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Checked-outforEdit_13297" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Checked-outforEdit_13297.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="action_add_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\action_add_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="nextview" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\nextview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
@ -310,15 +316,9 @@
|
||||
<data name="actions_check3" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\actions_check3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="definednameuseinformula2" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\definednameuseinformula2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="save5" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\save5.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="alignverticalcenter" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\alignverticalcenter.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="updatedataextract" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\updatedataextract.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
@ -349,11 +349,11 @@
|
||||
<data name="ZooFlow_g-64 - Kopie" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\ZooFlow_g-64 - Kopie.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="actions_addcircled1" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\actions_addcircled1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
<data name="singlepageview" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\singlepageview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="ZooFlow_G_DevExpress" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\ZooFlow_G_DevExpress.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
<data name="documentproperties" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\documentproperties.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="1_LOGO_ZOO_FLOW" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\1_LOGO_ZOO_FLOW.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
@ -367,8 +367,8 @@
|
||||
<data name="pagesetup1" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\pagesetup1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="singlepageview" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\singlepageview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
<data name="2_LUPE_INAKTIV_ZOO" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\2_LUPE_INAKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="markcomplete" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\markcomplete.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
@ -376,6 +376,9 @@
|
||||
<data name="new4" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\new4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="ZooFlow_G_DevExpress" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\ZooFlow_G_DevExpress.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="save6" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\save6.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
@ -394,6 +397,9 @@
|
||||
<data name="doublenext1" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\doublenext1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="ZooFlow_drop" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\ZooFlow_drop.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="GLOBIX_short" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\GLOBIX_short.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
@ -421,12 +427,12 @@
|
||||
<data name="managedatasource1" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\managedatasource1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="Checked-outforEdit_Color_13297" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Checked-outforEdit_Color_13297.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="pagesetup" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\pagesetup.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="cancel" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\cancel.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="refresh_16xMD" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\refresh_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
@ -442,15 +448,12 @@
|
||||
<data name="Editdatasetwithdesigner_8449" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Editdatasetwithdesigner_8449.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="1_LOGO_ZOO_FLOW_DROP2" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\1_LOGO_ZOO_FLOW_DROP2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="definednameuseinformula1" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\definednameuseinformula1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="unlink" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\unlink.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="2_LUPE_INAKTIV_ZOO" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\2_LUPE_INAKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="CW_GEFUNDEN_klein" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\CW_GEFUNDEN_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
@ -469,12 +472,18 @@
|
||||
<data name="del5" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\del5.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="actions_edit1" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\actions_edit1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="new1" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\new1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="ZooFlow_Sidebar_TOP_Drop" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\ZooFlow_Sidebar_TOP_Drop.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="alignhorizontalcenter" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\alignhorizontalcenter.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="FLOW_Sidebar_Search_aktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\FLOW_Sidebar_Search_aktiv.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
@ -496,8 +505,8 @@
|
||||
<data name="managedatasource2" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\managedatasource2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="cancel" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\cancel.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
<data name="alignverticalcenter" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\alignverticalcenter.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="actions_check1" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\actions_check1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
@ -511,9 +520,6 @@
|
||||
<data name="new3" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\new3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="actions_deletecircled3" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\actions_deletecircled3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="actions_check" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\actions_check.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
@ -526,8 +532,8 @@
|
||||
<data name="actions_calendar1" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\actions_calendar1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="switchrowcolumns" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\switchrowcolumns.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
<data name="bo_category" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\bo_category.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="actions_deletecircled5" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\actions_deletecircled5.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
@ -538,12 +544,6 @@
|
||||
<data name="ZOOFLOW_DRAG_PROGRESSIVE" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\ZOOFLOW_DRAG_PROGRESSIVE.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="documentproperties" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\documentproperties.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="StatusAnnotations_Information_16xLG_color" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\StatusAnnotations_Information_16xLG_color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Compare_RefreshScriptPreview" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Compare_RefreshScriptPreview.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
@ -553,15 +553,12 @@
|
||||
<data name="actions_addcircled4" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\actions_addcircled4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="StatusAnnotations_Stop_32xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\StatusAnnotations_Stop_32xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="Checked-outforEdit_13297" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Checked-outforEdit_13297.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="bell_delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\bell_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="save8" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\save8.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="save9" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\save9.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
@ -571,14 +568,14 @@
|
||||
<data name="bo_validation1" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\bo_validation1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="action_add_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\action_add_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="actions_deletecircled3" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\actions_deletecircled3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="ZooFlow_Sidebar_TOP" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\ZooFlow_Sidebar_TOP.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="ZooFlow_Sidebar_individuelle_suche" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\ZooFlow_Sidebar_individuelle_suche.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
<data name="definednameuseinformula2" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\definednameuseinformula2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="actions_calendar" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\actions_calendar.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
@ -595,11 +592,14 @@
|
||||
<data name="FLOW_Sidebar_Task_inaktiv1" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\FLOW_Sidebar_Task_inaktiv1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="actions_addcircled1" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\actions_addcircled1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="ZooFlow_PM_DevExpress" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\ZooFlow_PM_DevExpress.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="actions_edit1" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\actions_edit1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
<data name="StatusAnnotations_Information_16xLG_color" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\StatusAnnotations_Information_16xLG_color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="del" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\del.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
@ -613,8 +613,8 @@
|
||||
<data name="2_ZOO_FLOW_Abo_MouseOver" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\2_ZOO_FLOW_Abo_MouseOver.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="ZooFlow_drop" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\ZooFlow_drop.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="Checked-outforEdit_Color_13297" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Checked-outforEdit_Color_13297.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="about4" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\about4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
@ -622,14 +622,17 @@
|
||||
<data name="undo" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\undo.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="1_LOGO_ZOO_FLOW_DROP2" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\1_LOGO_ZOO_FLOW_DROP2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="switchrowcolumns" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\switchrowcolumns.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="bo_document" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\bo_document.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="bo_category" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\bo_category.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
<data name="actions_addcircled3" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\actions_addcircled3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="save8" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\save8.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="servermode" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\servermode.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
@ -643,8 +646,8 @@
|
||||
<data name="definednameuseinformula3" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\definednameuseinformula3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="actions_addcircled3" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\actions_addcircled3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
<data name="unlink" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\unlink.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="1_LOGO_ZOO_FLOW1" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\1_LOGO_ZOO_FLOW1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
@ -658,7 +661,7 @@
|
||||
<data name="del3" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\del3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="alignhorizontalcenter" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\alignhorizontalcenter.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
<data name="columnheaders" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\columnheaders.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
</root>
|
||||
@ -1,9 +1,10 @@
|
||||
DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
DevExpress.XtraEditors.PictureEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
DevExpress.XtraEditors.TextEdit, 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.XtraBars.BarManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
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.DateEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
|
||||
22
GUIs.ZooFlow/Resources/columnheaders.svg
Normal file
22
GUIs.ZooFlow/Resources/columnheaders.svg
Normal file
@ -0,0 +1,22 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
|
||||
<style type="text/css">
|
||||
.Yellow{fill:#FFB115;}
|
||||
.Red{fill:#D11C1C;}
|
||||
.Black{fill:#727272;}
|
||||
.Blue{fill:#1177D7;}
|
||||
.White{fill:#FFFFFF;}
|
||||
.Green{fill:#039C23;}
|
||||
.st0{opacity:0.75;}
|
||||
.st1{opacity:0.5;}
|
||||
.st2{opacity:0.25;}
|
||||
.st3{fill:#FFB115;}
|
||||
</style>
|
||||
<g />
|
||||
<g id="ColumnHeaders">
|
||||
<path d="M12,4h8v6h-8V4z M22,4h8v6h-8V4z M2,4h8v6H2V4z" class="Yellow" />
|
||||
<g class="st1">
|
||||
<path d="M12,12h8v16h-8V12z M2,12h8v16H2V12z M22,28h8V12h-8V28z" class="Black" />
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
@ -5,8 +5,9 @@ Namespace SavedSearch
|
||||
Public MustInherit Class SavedSearch
|
||||
Public Property Name As String
|
||||
Public Property Description As String
|
||||
Public Overridable Property GroupText As String = ""
|
||||
Public Property Image As SvgImage
|
||||
Public Property Selected As Boolean
|
||||
Public Overridable Property GroupText As String = ""
|
||||
|
||||
Public ReadOnly Property DisplayName As String
|
||||
Get
|
||||
|
||||
@ -2,49 +2,34 @@
|
||||
Imports System.Xml.Serialization
|
||||
Imports DevExpress.Utils
|
||||
Imports DevExpress.Utils.Svg
|
||||
Imports DigitalData.GUIs.ZooFlow.frmSearchFlow
|
||||
Imports DigitalData.GUIs.ZooFlow.Search.SearchToken
|
||||
Imports DigitalData.Modules.Base
|
||||
Imports DigitalData.Modules.Config
|
||||
Imports DigitalData.Modules.Logging
|
||||
Imports DigitalData.Modules.Language
|
||||
Imports System.Reflection
|
||||
Imports DigitalData.Modules.Database
|
||||
Imports DigitalData.Modules.ZooFlow.State
|
||||
|
||||
Namespace Search
|
||||
Public Class SearchLoader
|
||||
Inherits BaseClass
|
||||
|
||||
Private Const CUSTOM_SEARCH_DIRECTORY = "Searches"
|
||||
|
||||
Private ReadOnly Images As SvgImageCollection
|
||||
Private ReadOnly ImageTable As List(Of ImageTableItem)
|
||||
|
||||
Private ReadOnly Config As ConfigManager(Of SystemConfig)
|
||||
Private ReadOnly Serializer As XmlSerializer
|
||||
Private ReadOnly Database As MSSQLServer
|
||||
Private ReadOnly UserState As UserState
|
||||
|
||||
Public Sub New(pLogConfig As LogConfig, pConfig As ConfigManager(Of SystemConfig), pSvgImages As SvgImageCollection)
|
||||
Public Sub New(pLogConfig As LogConfig, pDatabase As MSSQLServer, pUserState As UserState, pSvgImages As SvgImageCollection)
|
||||
MyBase.New(pLogConfig)
|
||||
|
||||
Images = pSvgImages
|
||||
ImageTable = GetImageTable(pSvgImages)
|
||||
Config = pConfig
|
||||
Database = pDatabase
|
||||
UserState = pUserState
|
||||
Serializer = New XmlSerializer(GetType(SavedSearch.CustomSearchSerializable))
|
||||
End Sub
|
||||
|
||||
Private Function GetSearchDirectoryPath() As String
|
||||
Dim oConfigPath As String = Config.UserConfigPath
|
||||
Dim oConfigDirectory As String = IO.Path.Combine(IO.Path.GetDirectoryName(oConfigPath), CUSTOM_SEARCH_DIRECTORY)
|
||||
|
||||
If IO.Directory.Exists(oConfigDirectory) = False Then
|
||||
Try
|
||||
IO.Directory.CreateDirectory(oConfigDirectory)
|
||||
Catch ex As Exception
|
||||
Logger.Error(ex)
|
||||
End Try
|
||||
End If
|
||||
|
||||
Return oConfigDirectory
|
||||
End Function
|
||||
|
||||
Public Sub CreateCustomSearch(pTitle As String, pDescription As String, pTokens As List(Of Token), pImage As String)
|
||||
Dim oSearch As New SavedSearch.CustomSearch With {
|
||||
.Name = pTitle,
|
||||
@ -54,11 +39,18 @@ Namespace Search
|
||||
}
|
||||
|
||||
Try
|
||||
Dim oDirectoryPath As String = GetSearchDirectoryPath()
|
||||
Dim oFilePath As String = IO.Path.Combine(oDirectoryPath, Utils.ConvertTextToSlug(pTitle) & ".xml")
|
||||
Dim oBuffer As Byte() = SerializeSearch(oSearch)
|
||||
Dim oBase64 = System.Convert.ToBase64String(oBuffer)
|
||||
|
||||
File.WriteAllBytes(oFilePath, oBuffer)
|
||||
If Database.ExecuteNonQuery(
|
||||
$"INSERT INTO TBIDB_SEARCH_DEFINITION (TITLE, DESCRIPTION, XML_VALUE, SYS_SEARCH, ADDED_WHO)
|
||||
VALUES ('{pTitle}', '{pDescription}', '{oBase64}', 0, '{UserState.UserName}')"
|
||||
) = True Then
|
||||
Dim oSearchId = Database.GetScalarValue("SELECT MAX(GUID) FROM TBIDB_SEARCH_DEFINITION")
|
||||
Database.ExecuteNonQuery(
|
||||
$"INSERT INTO TBIDB_SEARCH_DEF_RELATIONS (SEARCH_ID, USR_ID, ADDED_WHO)
|
||||
VALUES ({oSearchId}, {UserState.UserId}, '{UserState.UserName}')")
|
||||
End If
|
||||
Catch ex As Exception
|
||||
Logger.Warn("Custom Search could not be saved!")
|
||||
Logger.Error(ex)
|
||||
@ -78,13 +70,18 @@ Namespace Search
|
||||
|
||||
Public Function LoadCustomSearches() As List(Of SavedSearch.SavedSearch)
|
||||
Dim oSearches As New List(Of SavedSearch.SavedSearch)
|
||||
Dim oPath = GetSearchDirectoryPath()
|
||||
Dim oSQL As String = $"
|
||||
SELECT DEF.*
|
||||
FROM [TBIDB_SEARCH_DEFINITION] DEF
|
||||
JOIN [TBIDB_SEARCH_DEF_RELATIONS] REL ON REL.SEARCH_ID = DEF.GUID
|
||||
WHERE REL.USR_ID = {UserState.UserId}
|
||||
"
|
||||
Dim oTable = Database.GetDatatable(oSQL)
|
||||
|
||||
Dim oFiles = Directory.GetFiles(oPath, "*.xml")
|
||||
|
||||
For Each oFile In oFiles
|
||||
Dim oBytes = File.ReadAllBytes(oFile)
|
||||
Dim oSearch = DeserializeSearch(oBytes)
|
||||
For Each oRow As DataRow In oTable.Rows
|
||||
Dim oBase64 = oRow.Item("XML_VALUE")
|
||||
Dim oBuffer = System.Convert.FromBase64String(oBase64)
|
||||
Dim oSearch = DeserializeSearch(oBuffer)
|
||||
oSearches.Add(oSearch)
|
||||
Next
|
||||
|
||||
@ -215,9 +212,5 @@ Namespace Search
|
||||
Image = pImage
|
||||
End Sub
|
||||
End Class
|
||||
|
||||
|
||||
|
||||
|
||||
End Class
|
||||
End Namespace
|
||||
|
||||
@ -47,6 +47,7 @@ Namespace Search
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Private _ActiveSearchTokens As New List(Of SearchToken.Token)
|
||||
Private _ActiveDateAttribute As String = SEARCH_FACT_DATE_DEFAULT
|
||||
Private _ActiveTokenOperator As TokenOperator = TokenOperator.And
|
||||
|
||||
@ -56,6 +57,12 @@ Namespace Search
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Public ReadOnly Property ActiveTokens As List(Of SearchToken.Token)
|
||||
Get
|
||||
Return _ActiveSearchTokens
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Public Property BaseSearchSQL As String
|
||||
Public Property ExplicitDate As Boolean = False
|
||||
|
||||
@ -102,22 +109,20 @@ Namespace Search
|
||||
''' Only search for Term. Used for sidebar quicksearch.
|
||||
''' </summary>
|
||||
Public Async Function RunWithSearchTerm(pSearchTerm As String) As Task(Of SearchResult)
|
||||
Return Await RunWithSearchTerm(New SearchOptions With {.SearchString = pSearchTerm})
|
||||
Return Await RunWithSearchOptions(New SearchOptions With {.SearchString = pSearchTerm})
|
||||
End Function
|
||||
|
||||
Public Async Function RunWithSearchTerm(pSearchTerm As String, pDateFrom As Date, pDateTo As Date, pSearchTitle As String) As Task(Of SearchResult)
|
||||
Return Await RunWithSearchTerm(New SearchOptions With {
|
||||
.SearchString = pSearchTerm,
|
||||
.SearchTitle = pSearchTitle,
|
||||
.DateFrom = pDateFrom,
|
||||
.DateTo = pDateTo
|
||||
})
|
||||
Return Await RunWithSearchOptions(New SearchOptions With {
|
||||
.SearchString = pSearchTerm,
|
||||
.SearchTitle = pSearchTitle,
|
||||
.DateFrom = pDateFrom,
|
||||
.DateTo = pDateTo
|
||||
})
|
||||
End Function
|
||||
|
||||
Public Async Function RunWithTokens(pTokens As IEnumerable(Of Search.SearchToken.Token)) As Task(Of SearchResult)
|
||||
Return Await RunWithSearchTerm(New SearchOptions With {
|
||||
.SearchTokens = pTokens
|
||||
})
|
||||
Return Await RunWithSearchOptions(New SearchOptions With {.SearchTokens = pTokens})
|
||||
End Function
|
||||
|
||||
Public Async Function RunWithTokens(pTokens As IEnumerable(Of Search.SearchToken.Token), pDateFrom As Date, pDateTo As Date, pSearchTitle As String) As Task(Of SearchResult)
|
||||
@ -128,11 +133,11 @@ Namespace Search
|
||||
Return New SearchResult(0)
|
||||
End If
|
||||
|
||||
Return Await RunWithSearchTerm(New SearchOptions With {
|
||||
.SearchTokens = pTokens,
|
||||
.DateFrom = pDateFrom,
|
||||
.DateTo = pDateTo
|
||||
})
|
||||
Return Await RunWithSearchOptions(New SearchOptions With {
|
||||
.SearchTokens = pTokens,
|
||||
.DateFrom = pDateFrom,
|
||||
.DateTo = pDateTo
|
||||
})
|
||||
End Function
|
||||
|
||||
|
||||
@ -140,21 +145,24 @@ Namespace Search
|
||||
' Return Await RunWithSearchTerm(pSearchTerm, pDateFrom, pDateTo, Nothing, Nothing)
|
||||
'End Function
|
||||
|
||||
Private Async Function RunWithSearchTerm(pOptions As SearchOptions) As Task(Of SearchResult)
|
||||
Private Async Function RunWithSearchOptions(pOptions As SearchOptions) As Task(Of SearchResult)
|
||||
Dim oDateConstraint = Await GetDateConstraint(pOptions.DateFrom, pOptions.DateTo)
|
||||
Dim oWindowTitle = GetResultWindowString(pOptions.SearchString, pOptions.SearchTitle)
|
||||
Dim oParams = GetParams(oWindowTitle)
|
||||
Dim oTokens = pOptions.SearchTokens
|
||||
Dim oSearchTerm = pOptions.SearchString
|
||||
|
||||
Dim oSQL
|
||||
Dim oSQL = String.Empty
|
||||
|
||||
If oTokens IsNot Nothing AndAlso oTokens.Count > 0 Then
|
||||
_ActiveSearchTokens = oTokens
|
||||
Await InsertSearchTokens(oTokens)
|
||||
oSQL = $"EXEC PRIDB_SEARCH_GET_TOKEN_RESULT_DOCS {UserId}, '{oDateConstraint}', '{UserLanguage}'"
|
||||
ElseIf oSearchTerm IsNot Nothing Then
|
||||
_ActiveSearchTokens.Clear()
|
||||
oSQL = $"EXEC PRIDB_SEARCH_GET_TEXT_RESULTS {UserId},'{pOptions.SearchString}','{oDateConstraint}', '{UserLanguage}'"
|
||||
Else
|
||||
_ActiveSearchTokens.Clear()
|
||||
oSQL = $"EXEC PRIDB_SEARCH_GET_TEXT_RESULTS {UserId},'{String.Empty}','{oDateConstraint}', '{UserLanguage}'"
|
||||
End If
|
||||
|
||||
@ -168,9 +176,9 @@ Namespace Search
|
||||
Dim oRowCount = oDTDocResult.Rows.Count
|
||||
If oRowCount > 0 Then
|
||||
oParams.Results.Add(New DocumentResultList.DocumentResult() With {
|
||||
.Title = SearchId,
|
||||
.Datatable = oDTDocResult
|
||||
})
|
||||
.Title = SearchId,
|
||||
.Datatable = oDTDocResult
|
||||
})
|
||||
|
||||
If oDTDocResult.Rows.Count = 1 Then
|
||||
oParams.ShowFileList = False
|
||||
|
||||
203
GUIs.ZooFlow/Search/frmSearchFlow.Designer.vb
generated
203
GUIs.ZooFlow/Search/frmSearchFlow.Designer.vb
generated
@ -23,19 +23,19 @@ Partial Class frmSearchFlow
|
||||
<System.Diagnostics.DebuggerStepThrough()>
|
||||
Private Sub InitializeComponent()
|
||||
Me.components = New System.ComponentModel.Container()
|
||||
Dim ItemTemplate1 As DevExpress.XtraGrid.Views.Tile.ItemTemplate = New DevExpress.XtraGrid.Views.Tile.ItemTemplate()
|
||||
Dim TableColumnDefinition1 As DevExpress.XtraEditors.TableLayout.TableColumnDefinition = New DevExpress.XtraEditors.TableLayout.TableColumnDefinition()
|
||||
Dim TableColumnDefinition2 As DevExpress.XtraEditors.TableLayout.TableColumnDefinition = New DevExpress.XtraEditors.TableLayout.TableColumnDefinition()
|
||||
Dim TileViewItemElement1 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement()
|
||||
Dim TileViewItemElement2 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement()
|
||||
Dim TableRowDefinition1 As DevExpress.XtraEditors.TableLayout.TableRowDefinition = New DevExpress.XtraEditors.TableLayout.TableRowDefinition()
|
||||
Dim TableColumnDefinition3 As DevExpress.XtraEditors.TableLayout.TableColumnDefinition = New DevExpress.XtraEditors.TableLayout.TableColumnDefinition()
|
||||
Dim TableColumnDefinition4 As DevExpress.XtraEditors.TableLayout.TableColumnDefinition = New DevExpress.XtraEditors.TableLayout.TableColumnDefinition()
|
||||
Dim TableRowDefinition2 As DevExpress.XtraEditors.TableLayout.TableRowDefinition = New DevExpress.XtraEditors.TableLayout.TableRowDefinition()
|
||||
Dim TableRowDefinition3 As DevExpress.XtraEditors.TableLayout.TableRowDefinition = New DevExpress.XtraEditors.TableLayout.TableRowDefinition()
|
||||
Dim TileViewItemElement3 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement()
|
||||
Dim TileViewItemElement4 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement()
|
||||
Dim TileViewItemElement5 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement()
|
||||
Dim ItemTemplate2 As DevExpress.XtraGrid.Views.Tile.ItemTemplate = New DevExpress.XtraGrid.Views.Tile.ItemTemplate()
|
||||
Dim TableColumnDefinition5 As DevExpress.XtraEditors.TableLayout.TableColumnDefinition = New DevExpress.XtraEditors.TableLayout.TableColumnDefinition()
|
||||
Dim TableColumnDefinition6 As DevExpress.XtraEditors.TableLayout.TableColumnDefinition = New DevExpress.XtraEditors.TableLayout.TableColumnDefinition()
|
||||
Dim TileViewItemElement6 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement()
|
||||
Dim TileViewItemElement7 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement()
|
||||
Dim TableRowDefinition4 As DevExpress.XtraEditors.TableLayout.TableRowDefinition = New DevExpress.XtraEditors.TableLayout.TableRowDefinition()
|
||||
Dim TableColumnDefinition7 As DevExpress.XtraEditors.TableLayout.TableColumnDefinition = New DevExpress.XtraEditors.TableLayout.TableColumnDefinition()
|
||||
Dim TableColumnDefinition8 As DevExpress.XtraEditors.TableLayout.TableColumnDefinition = New DevExpress.XtraEditors.TableLayout.TableColumnDefinition()
|
||||
Dim TableRowDefinition5 As DevExpress.XtraEditors.TableLayout.TableRowDefinition = New DevExpress.XtraEditors.TableLayout.TableRowDefinition()
|
||||
Dim TableRowDefinition6 As DevExpress.XtraEditors.TableLayout.TableRowDefinition = New DevExpress.XtraEditors.TableLayout.TableRowDefinition()
|
||||
Dim TileViewItemElement8 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement()
|
||||
Dim TileViewItemElement9 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement()
|
||||
Dim TileViewItemElement10 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement()
|
||||
Me.colName = New DevExpress.XtraGrid.Columns.TileViewColumn()
|
||||
Me.colImage = New DevExpress.XtraGrid.Columns.TileViewColumn()
|
||||
Me.colDescription = New DevExpress.XtraGrid.Columns.TileViewColumn()
|
||||
@ -55,6 +55,7 @@ Partial Class frmSearchFlow
|
||||
Me.RepositoryItemTrackBar1 = New DevExpress.XtraEditors.Repository.RepositoryItemTrackBar()
|
||||
Me.BarEditItem2 = New DevExpress.XtraBars.BarEditItem()
|
||||
Me.RepositoryItemTrackBar2 = New DevExpress.XtraEditors.Repository.RepositoryItemTrackBar()
|
||||
Me.BarCheckItem1 = New DevExpress.XtraBars.BarCheckItem()
|
||||
Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
|
||||
Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
|
||||
Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
|
||||
@ -71,6 +72,7 @@ Partial Class frmSearchFlow
|
||||
Me.GridSearches = New DevExpress.XtraGrid.GridControl()
|
||||
Me.ViewSearches = New DevExpress.XtraGrid.Views.Tile.TileView()
|
||||
Me.colGroupText = New DevExpress.XtraGrid.Columns.TileViewColumn()
|
||||
Me.colSelected = New DevExpress.XtraGrid.Columns.TileViewColumn()
|
||||
Me.DateEditFrom = New DevExpress.XtraEditors.DateEdit()
|
||||
Me.DateEditTo = New DevExpress.XtraEditors.DateEdit()
|
||||
Me.CheckEdit1 = New DevExpress.XtraEditors.ToggleSwitch()
|
||||
@ -146,9 +148,9 @@ Partial Class frmSearchFlow
|
||||
'
|
||||
Me.RibbonControl1.ColorScheme = DevExpress.XtraBars.Ribbon.RibbonControlColorScheme.Green
|
||||
Me.RibbonControl1.ExpandCollapseItem.Id = 0
|
||||
Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.lblResults, Me.chkOperatorAnd, Me.chkOperatorOr, Me.chkDatefilter2, Me.BarCheckItem4, Me.chkSearchEverywhere, Me.BarButtonItem1, Me.BarButtonItem2, Me.btnSaveSearch, Me.chkGridVertical, Me.chkGridHorizontal, Me.BarEditItem1, Me.BarEditItem2})
|
||||
Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.lblResults, Me.chkOperatorAnd, Me.chkOperatorOr, Me.chkDatefilter2, Me.BarCheckItem4, Me.chkSearchEverywhere, Me.BarButtonItem1, Me.BarButtonItem2, Me.btnSaveSearch, Me.chkGridVertical, Me.chkGridHorizontal, Me.BarEditItem1, Me.BarEditItem2, Me.BarCheckItem1})
|
||||
Me.RibbonControl1.Location = New System.Drawing.Point(0, 0)
|
||||
Me.RibbonControl1.MaxItemId = 28
|
||||
Me.RibbonControl1.MaxItemId = 30
|
||||
Me.RibbonControl1.Name = "RibbonControl1"
|
||||
Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage3})
|
||||
Me.RibbonControl1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemMarqueeProgressBar1, Me.RepositoryItemTrackBar1, Me.RepositoryItemTrackBar2})
|
||||
@ -156,7 +158,7 @@ Partial Class frmSearchFlow
|
||||
Me.RibbonControl1.ShowDisplayOptionsMenuButton = DevExpress.Utils.DefaultBoolean.[False]
|
||||
Me.RibbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Show
|
||||
Me.RibbonControl1.ShowToolbarCustomizeItem = False
|
||||
Me.RibbonControl1.Size = New System.Drawing.Size(954, 158)
|
||||
Me.RibbonControl1.Size = New System.Drawing.Size(954, 160)
|
||||
Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1
|
||||
Me.RibbonControl1.Toolbar.ShowCustomizeItem = False
|
||||
'
|
||||
@ -275,6 +277,13 @@ Partial Class frmSearchFlow
|
||||
Me.RepositoryItemTrackBar2.Maximum = 5
|
||||
Me.RepositoryItemTrackBar2.Name = "RepositoryItemTrackBar2"
|
||||
'
|
||||
'BarCheckItem1
|
||||
'
|
||||
Me.BarCheckItem1.Caption = "Kanban Ansicht"
|
||||
Me.BarCheckItem1.Id = 28
|
||||
Me.BarCheckItem1.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.columnheaders
|
||||
Me.BarCheckItem1.Name = "BarCheckItem1"
|
||||
'
|
||||
'RibbonPage1
|
||||
'
|
||||
Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2, Me.RibbonPageGroup5})
|
||||
@ -314,6 +323,7 @@ Partial Class frmSearchFlow
|
||||
'
|
||||
Me.RibbonPageGroup3.ItemLinks.Add(Me.chkGridVertical)
|
||||
Me.RibbonPageGroup3.ItemLinks.Add(Me.chkGridHorizontal)
|
||||
Me.RibbonPageGroup3.ItemLinks.Add(Me.BarCheckItem1)
|
||||
Me.RibbonPageGroup3.ItemLinks.Add(Me.BarEditItem1)
|
||||
Me.RibbonPageGroup3.ItemLinks.Add(Me.BarEditItem2)
|
||||
Me.RibbonPageGroup3.Name = "RibbonPageGroup3"
|
||||
@ -327,10 +337,10 @@ Partial Class frmSearchFlow
|
||||
'
|
||||
Me.RibbonStatusBar1.BackColor = System.Drawing.Color.Red
|
||||
Me.RibbonStatusBar1.ItemLinks.Add(Me.lblResults)
|
||||
Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 672)
|
||||
Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 674)
|
||||
Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
|
||||
Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1
|
||||
Me.RibbonStatusBar1.Size = New System.Drawing.Size(954, 24)
|
||||
Me.RibbonStatusBar1.Size = New System.Drawing.Size(954, 22)
|
||||
'
|
||||
'RibbonPage2
|
||||
'
|
||||
@ -341,7 +351,7 @@ Partial Class frmSearchFlow
|
||||
'
|
||||
Me.PanelControl1.Controls.Add(Me.PanelControl2)
|
||||
Me.PanelControl1.Dock = System.Windows.Forms.DockStyle.Fill
|
||||
Me.PanelControl1.Location = New System.Drawing.Point(0, 158)
|
||||
Me.PanelControl1.Location = New System.Drawing.Point(0, 160)
|
||||
Me.PanelControl1.Name = "PanelControl1"
|
||||
Me.PanelControl1.Padding = New System.Windows.Forms.Padding(30)
|
||||
Me.PanelControl1.Size = New System.Drawing.Size(954, 514)
|
||||
@ -405,11 +415,11 @@ Partial Class frmSearchFlow
|
||||
'
|
||||
'ViewSearches
|
||||
'
|
||||
Me.ViewSearches.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colName, Me.colDescription, Me.colImage, Me.colGroupText})
|
||||
Me.ViewSearches.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colName, Me.colDescription, Me.colImage, Me.colGroupText, Me.colSelected})
|
||||
Me.ViewSearches.ColumnSet.CheckedColumn = Me.colSelected
|
||||
Me.ViewSearches.ColumnSet.GroupColumn = Me.colGroupText
|
||||
Me.ViewSearches.GridControl = Me.GridSearches
|
||||
Me.ViewSearches.Name = "ViewSearches"
|
||||
Me.ViewSearches.OptionsTiles.AllowItemHover = True
|
||||
Me.ViewSearches.OptionsTiles.IndentBetweenGroups = 20
|
||||
Me.ViewSearches.OptionsTiles.ItemPadding = New System.Windows.Forms.Padding(10, 4, 10, 4)
|
||||
Me.ViewSearches.OptionsTiles.ItemSize = New System.Drawing.Size(170, 70)
|
||||
@ -417,91 +427,100 @@ Partial Class frmSearchFlow
|
||||
Me.ViewSearches.OptionsTiles.RowCount = 2
|
||||
Me.ViewSearches.OptionsTiles.VerticalContentAlignment = DevExpress.Utils.VertAlignment.Center
|
||||
Me.ViewSearches.SortInfo.AddRange(New DevExpress.XtraGrid.Columns.GridColumnSortInfo() {New DevExpress.XtraGrid.Columns.GridColumnSortInfo(Me.colGroupText, DevExpress.Data.ColumnSortOrder.Ascending)})
|
||||
TableColumnDefinition1.Length.Value = 35.0R
|
||||
TableColumnDefinition1.PaddingRight = 5
|
||||
TableColumnDefinition2.Length.Value = 129.0R
|
||||
ItemTemplate1.Columns.Add(TableColumnDefinition1)
|
||||
ItemTemplate1.Columns.Add(TableColumnDefinition2)
|
||||
TileViewItemElement1.Column = Me.colName
|
||||
TileViewItemElement1.ColumnIndex = 1
|
||||
TileViewItemElement1.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter
|
||||
TileViewItemElement1.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.Squeeze
|
||||
TileViewItemElement1.Text = "colName"
|
||||
TileViewItemElement1.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter
|
||||
TileViewItemElement2.Column = Me.colImage
|
||||
TileViewItemElement2.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter
|
||||
TileViewItemElement2.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.Squeeze
|
||||
TileViewItemElement2.Text = "colImage"
|
||||
TileViewItemElement2.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter
|
||||
ItemTemplate1.Elements.Add(TileViewItemElement1)
|
||||
ItemTemplate1.Elements.Add(TileViewItemElement2)
|
||||
ItemTemplate1.Name = "DefaultSmall"
|
||||
TableRowDefinition1.Length.Value = 43.0R
|
||||
ItemTemplate1.Rows.Add(TableRowDefinition1)
|
||||
Me.ViewSearches.Templates.Add(ItemTemplate1)
|
||||
TableColumnDefinition3.Length.Value = 35.0R
|
||||
TableColumnDefinition3.PaddingRight = 5
|
||||
TableColumnDefinition4.Length.Value = 111.0R
|
||||
Me.ViewSearches.TileColumns.Add(TableColumnDefinition3)
|
||||
Me.ViewSearches.TileColumns.Add(TableColumnDefinition4)
|
||||
TableRowDefinition2.Length.Value = 17.0R
|
||||
TableRowDefinition3.Length.Value = 45.0R
|
||||
Me.ViewSearches.TileRows.Add(TableRowDefinition2)
|
||||
Me.ViewSearches.TileRows.Add(TableRowDefinition3)
|
||||
TileViewItemElement3.Appearance.Normal.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Bold)
|
||||
TileViewItemElement3.Appearance.Normal.Options.UseFont = True
|
||||
TileViewItemElement3.Column = Me.colName
|
||||
TileViewItemElement3.ColumnIndex = 1
|
||||
TileViewItemElement3.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter
|
||||
TileViewItemElement3.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.Squeeze
|
||||
TileViewItemElement3.Text = "colName"
|
||||
TileViewItemElement3.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter
|
||||
TileViewItemElement4.Column = Me.colImage
|
||||
TileViewItemElement4.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter
|
||||
TileViewItemElement4.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.Squeeze
|
||||
TileViewItemElement4.RowIndex = 1
|
||||
TileViewItemElement4.Text = "colImage"
|
||||
TileViewItemElement4.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter
|
||||
TileViewItemElement5.Column = Me.colDescription
|
||||
TileViewItemElement5.ColumnIndex = 1
|
||||
TileViewItemElement5.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter
|
||||
TileViewItemElement5.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.Squeeze
|
||||
TileViewItemElement5.RowIndex = 1
|
||||
TileViewItemElement5.Text = "colDescription"
|
||||
TileViewItemElement5.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter
|
||||
Me.ViewSearches.TileTemplate.Add(TileViewItemElement3)
|
||||
Me.ViewSearches.TileTemplate.Add(TileViewItemElement4)
|
||||
Me.ViewSearches.TileTemplate.Add(TileViewItemElement5)
|
||||
TableColumnDefinition5.Length.Value = 35.0R
|
||||
TableColumnDefinition5.PaddingRight = 5
|
||||
TableColumnDefinition6.Length.Value = 129.0R
|
||||
ItemTemplate2.Columns.Add(TableColumnDefinition5)
|
||||
ItemTemplate2.Columns.Add(TableColumnDefinition6)
|
||||
TileViewItemElement6.Column = Me.colName
|
||||
TileViewItemElement6.ColumnIndex = 1
|
||||
TileViewItemElement6.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter
|
||||
TileViewItemElement6.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.Squeeze
|
||||
TileViewItemElement6.Text = "colName"
|
||||
TileViewItemElement6.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter
|
||||
TileViewItemElement7.Column = Me.colImage
|
||||
TileViewItemElement7.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter
|
||||
TileViewItemElement7.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.Squeeze
|
||||
TileViewItemElement7.Text = "colImage"
|
||||
TileViewItemElement7.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter
|
||||
ItemTemplate2.Elements.Add(TileViewItemElement6)
|
||||
ItemTemplate2.Elements.Add(TileViewItemElement7)
|
||||
ItemTemplate2.Name = "DefaultSmall"
|
||||
TableRowDefinition4.Length.Value = 43.0R
|
||||
ItemTemplate2.Rows.Add(TableRowDefinition4)
|
||||
Me.ViewSearches.Templates.Add(ItemTemplate2)
|
||||
TableColumnDefinition7.Length.Value = 35.0R
|
||||
TableColumnDefinition7.PaddingRight = 5
|
||||
TableColumnDefinition8.Length.Value = 111.0R
|
||||
Me.ViewSearches.TileColumns.Add(TableColumnDefinition7)
|
||||
Me.ViewSearches.TileColumns.Add(TableColumnDefinition8)
|
||||
TableRowDefinition5.Length.Value = 17.0R
|
||||
TableRowDefinition6.Length.Value = 45.0R
|
||||
Me.ViewSearches.TileRows.Add(TableRowDefinition5)
|
||||
Me.ViewSearches.TileRows.Add(TableRowDefinition6)
|
||||
TileViewItemElement8.Appearance.Normal.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Bold)
|
||||
TileViewItemElement8.Appearance.Normal.Options.UseFont = True
|
||||
TileViewItemElement8.Column = Me.colName
|
||||
TileViewItemElement8.ColumnIndex = 1
|
||||
TileViewItemElement8.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter
|
||||
TileViewItemElement8.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.Squeeze
|
||||
TileViewItemElement8.Text = "colName"
|
||||
TileViewItemElement8.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter
|
||||
TileViewItemElement9.Column = Me.colImage
|
||||
TileViewItemElement9.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter
|
||||
TileViewItemElement9.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.Squeeze
|
||||
TileViewItemElement9.RowIndex = 1
|
||||
TileViewItemElement9.Text = "colImage"
|
||||
TileViewItemElement9.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter
|
||||
TileViewItemElement10.Column = Me.colDescription
|
||||
TileViewItemElement10.ColumnIndex = 1
|
||||
TileViewItemElement10.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter
|
||||
TileViewItemElement10.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.Squeeze
|
||||
TileViewItemElement10.RowIndex = 1
|
||||
TileViewItemElement10.Text = "colDescription"
|
||||
TileViewItemElement10.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter
|
||||
Me.ViewSearches.TileTemplate.Add(TileViewItemElement8)
|
||||
Me.ViewSearches.TileTemplate.Add(TileViewItemElement9)
|
||||
Me.ViewSearches.TileTemplate.Add(TileViewItemElement10)
|
||||
'
|
||||
'colGroupText
|
||||
'
|
||||
Me.colGroupText.Caption = "Gruppe"
|
||||
Me.colGroupText.FieldName = "GroupText"
|
||||
Me.colGroupText.Name = "colGroupText"
|
||||
Me.colGroupText.SortMode = DevExpress.XtraGrid.ColumnSortMode.Custom
|
||||
Me.colGroupText.Visible = True
|
||||
Me.colGroupText.VisibleIndex = 3
|
||||
'
|
||||
'colSelected
|
||||
'
|
||||
Me.colSelected.Caption = "Selected"
|
||||
Me.colSelected.FieldName = "Selected"
|
||||
Me.colSelected.Name = "colSelected"
|
||||
Me.colSelected.Visible = True
|
||||
Me.colSelected.VisibleIndex = 4
|
||||
'
|
||||
'DateEditFrom
|
||||
'
|
||||
Me.DateEditFrom.EditValue = Nothing
|
||||
Me.DateEditFrom.Location = New System.Drawing.Point(95, 326)
|
||||
Me.DateEditFrom.Location = New System.Drawing.Point(101, 326)
|
||||
Me.DateEditFrom.MenuManager = Me.RibbonControl1
|
||||
Me.DateEditFrom.Name = "DateEditFrom"
|
||||
Me.DateEditFrom.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
|
||||
Me.DateEditFrom.Properties.CalendarTimeProperties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
|
||||
Me.DateEditFrom.Size = New System.Drawing.Size(784, 20)
|
||||
Me.DateEditFrom.Size = New System.Drawing.Size(778, 20)
|
||||
Me.DateEditFrom.StyleController = Me.LayoutControl1
|
||||
Me.DateEditFrom.TabIndex = 5
|
||||
'
|
||||
'DateEditTo
|
||||
'
|
||||
Me.DateEditTo.EditValue = Nothing
|
||||
Me.DateEditTo.Location = New System.Drawing.Point(95, 378)
|
||||
Me.DateEditTo.Location = New System.Drawing.Point(101, 379)
|
||||
Me.DateEditTo.MenuManager = Me.RibbonControl1
|
||||
Me.DateEditTo.Name = "DateEditTo"
|
||||
Me.DateEditTo.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
|
||||
Me.DateEditTo.Properties.CalendarTimeProperties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
|
||||
Me.DateEditTo.Size = New System.Drawing.Size(784, 20)
|
||||
Me.DateEditTo.Size = New System.Drawing.Size(778, 20)
|
||||
Me.DateEditTo.StyleController = Me.LayoutControl1
|
||||
Me.DateEditTo.TabIndex = 7
|
||||
'
|
||||
@ -512,17 +531,17 @@ Partial Class frmSearchFlow
|
||||
Me.CheckEdit1.Name = "CheckEdit1"
|
||||
Me.CheckEdit1.Properties.OffText = "Datum bis deaktiviert"
|
||||
Me.CheckEdit1.Properties.OnText = "Datum bis aktiviert"
|
||||
Me.CheckEdit1.Size = New System.Drawing.Size(878, 18)
|
||||
Me.CheckEdit1.Size = New System.Drawing.Size(878, 19)
|
||||
Me.CheckEdit1.StyleController = Me.LayoutControl1
|
||||
Me.CheckEdit1.TabIndex = 8
|
||||
'
|
||||
'ComboBoxDateAttributes
|
||||
'
|
||||
Me.ComboBoxDateAttributes.Location = New System.Drawing.Point(95, 408)
|
||||
Me.ComboBoxDateAttributes.Location = New System.Drawing.Point(101, 409)
|
||||
Me.ComboBoxDateAttributes.MenuManager = Me.RibbonControl1
|
||||
Me.ComboBoxDateAttributes.Name = "ComboBoxDateAttributes"
|
||||
Me.ComboBoxDateAttributes.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
|
||||
Me.ComboBoxDateAttributes.Size = New System.Drawing.Size(784, 20)
|
||||
Me.ComboBoxDateAttributes.Size = New System.Drawing.Size(778, 20)
|
||||
Me.ComboBoxDateAttributes.StyleController = Me.LayoutControl1
|
||||
Me.ComboBoxDateAttributes.TabIndex = 9
|
||||
'
|
||||
@ -559,25 +578,25 @@ Partial Class frmSearchFlow
|
||||
Me.LayoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
|
||||
Me.LayoutControlItem2.Size = New System.Drawing.Size(882, 30)
|
||||
Me.LayoutControlItem2.Text = "Datum Von"
|
||||
Me.LayoutControlItem2.TextSize = New System.Drawing.Size(76, 13)
|
||||
Me.LayoutControlItem2.TextSize = New System.Drawing.Size(82, 13)
|
||||
'
|
||||
'LayoutControlItem4
|
||||
'
|
||||
Me.LayoutControlItem4.Control = Me.DateEditTo
|
||||
Me.LayoutControlItem4.Enabled = False
|
||||
Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 52)
|
||||
Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 53)
|
||||
Me.LayoutControlItem4.Name = "LayoutControlItem4"
|
||||
Me.LayoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
|
||||
Me.LayoutControlItem4.Size = New System.Drawing.Size(882, 30)
|
||||
Me.LayoutControlItem4.Text = "Datum Bis"
|
||||
Me.LayoutControlItem4.TextSize = New System.Drawing.Size(76, 13)
|
||||
Me.LayoutControlItem4.TextSize = New System.Drawing.Size(82, 13)
|
||||
'
|
||||
'EmptySpaceItem1
|
||||
'
|
||||
Me.EmptySpaceItem1.AllowHotTrack = False
|
||||
Me.EmptySpaceItem1.Location = New System.Drawing.Point(0, 112)
|
||||
Me.EmptySpaceItem1.Location = New System.Drawing.Point(0, 113)
|
||||
Me.EmptySpaceItem1.Name = "EmptySpaceItem1"
|
||||
Me.EmptySpaceItem1.Size = New System.Drawing.Size(882, 11)
|
||||
Me.EmptySpaceItem1.Size = New System.Drawing.Size(882, 10)
|
||||
Me.EmptySpaceItem1.TextSize = New System.Drawing.Size(0, 0)
|
||||
'
|
||||
'LayoutControlItem6
|
||||
@ -585,19 +604,19 @@ Partial Class frmSearchFlow
|
||||
Me.LayoutControlItem6.Control = Me.CheckEdit1
|
||||
Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 30)
|
||||
Me.LayoutControlItem6.Name = "LayoutControlItem6"
|
||||
Me.LayoutControlItem6.Size = New System.Drawing.Size(882, 22)
|
||||
Me.LayoutControlItem6.Size = New System.Drawing.Size(882, 23)
|
||||
Me.LayoutControlItem6.TextSize = New System.Drawing.Size(0, 0)
|
||||
Me.LayoutControlItem6.TextVisible = False
|
||||
'
|
||||
'LayoutControlItem8
|
||||
'
|
||||
Me.LayoutControlItem8.Control = Me.ComboBoxDateAttributes
|
||||
Me.LayoutControlItem8.Location = New System.Drawing.Point(0, 82)
|
||||
Me.LayoutControlItem8.Location = New System.Drawing.Point(0, 83)
|
||||
Me.LayoutControlItem8.Name = "LayoutControlItem8"
|
||||
Me.LayoutControlItem8.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
|
||||
Me.LayoutControlItem8.Size = New System.Drawing.Size(882, 30)
|
||||
Me.LayoutControlItem8.Text = "Datums Attribut"
|
||||
Me.LayoutControlItem8.TextSize = New System.Drawing.Size(76, 13)
|
||||
Me.LayoutControlItem8.TextSize = New System.Drawing.Size(82, 13)
|
||||
'
|
||||
'LayoutControlGroup3
|
||||
'
|
||||
@ -735,4 +754,6 @@ Partial Class frmSearchFlow
|
||||
Friend WithEvents RepositoryItemTrackBar1 As DevExpress.XtraEditors.Repository.RepositoryItemTrackBar
|
||||
Friend WithEvents BarEditItem2 As DevExpress.XtraBars.BarEditItem
|
||||
Friend WithEvents RepositoryItemTrackBar2 As DevExpress.XtraEditors.Repository.RepositoryItemTrackBar
|
||||
Friend WithEvents BarCheckItem1 As DevExpress.XtraBars.BarCheckItem
|
||||
Friend WithEvents colSelected As DevExpress.XtraGrid.Columns.TileViewColumn
|
||||
End Class
|
||||
|
||||
@ -27,7 +27,8 @@ Public Class frmSearchFlow
|
||||
Private ReadOnly TokenListAttrValues As New Dictionary(Of String, Object)
|
||||
|
||||
Private Sub frmFlowSearch2_Load(sender As Object, e As EventArgs) Handles MyBase.Load
|
||||
SearchLoader = New SearchLoader(My.LogConfig, My.SystemConfigManager, SvgImageCollection1)
|
||||
SearchLoader = New SearchLoader(My.LogConfig, My.DatabaseIDB, My.Application.User, SvgImageCollection1)
|
||||
|
||||
SearchRunner = New SearchRunner(My.LogConfig, My.Application.GetEnvironment, "FlowSearch") With {
|
||||
.BaseSearchSQL = SQL_FLOW_SEARCH_BASE
|
||||
}
|
||||
@ -52,9 +53,16 @@ Public Class frmSearchFlow
|
||||
|
||||
Private Sub SearchRunner_NewSavedSearch(sender As Object, e As EventArgs)
|
||||
Dim oForm As New frmEditSearch With {.IsNew = True}
|
||||
|
||||
If oForm.ShowDialog() = DialogResult.OK Then
|
||||
SearchLoader.CreateCustomSearch(oForm.Title, oForm.Description, New List(Of Token), oForm.ImageString)
|
||||
|
||||
' Get active tokens and create the search
|
||||
Dim oTokens = SearchRunner.ActiveTokens
|
||||
SearchLoader.CreateCustomSearch(oForm.Title, oForm.Description, oTokens, oForm.ImageString)
|
||||
|
||||
' Reload the searches
|
||||
GridSearches.DataSource = SearchLoader.LoadSearches()
|
||||
|
||||
End If
|
||||
End Sub
|
||||
|
||||
@ -359,4 +367,30 @@ Public Class frmSearchFlow
|
||||
Private Sub BarEditItem2_EditValueChanged(sender As Object, e As EventArgs) Handles BarEditItem2.EditValueChanged
|
||||
ViewSearches.OptionsTiles.RowCount = BarEditItem2.EditValue
|
||||
End Sub
|
||||
|
||||
Private Sub BarCheckItem1_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarCheckItem1.CheckedChanged
|
||||
If BarCheckItem1.Checked Then
|
||||
ViewSearches.OptionsTiles.LayoutMode = TileViewLayoutMode.Kanban
|
||||
Else
|
||||
ViewSearches.OptionsTiles.LayoutMode = TileViewLayoutMode.Default
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Private Sub ViewSearches_ItemCheckedChanged(sender As Object, e As TileViewItemClickEventArgs) Handles ViewSearches.ItemCheckedChanged
|
||||
Dim oItem As TileViewItem = e.Item
|
||||
Dim oSearch As SavedSearch.SavedSearch = ViewSearches.GetRow(oItem.RowHandle)
|
||||
|
||||
If TypeOf oSearch Is CustomSearch Then
|
||||
'TODO: show ribbon controls to edit search
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Private Sub ViewSearches_CustomColumnSort(sender As Object, e As Views.Base.CustomColumnSortEventArgs) Handles ViewSearches.CustomColumnSort
|
||||
If TypeOf e.RowObject1 Is CustomSearch Or TypeOf e.RowObject2 Is CustomSearch Then
|
||||
e.Result = -1
|
||||
e.Handled = True
|
||||
Else
|
||||
e.Handled = False
|
||||
End If
|
||||
End Sub
|
||||
End Class
|
||||
@ -1150,6 +1150,7 @@
|
||||
<None Include="Resources\bo_security_permission_action.svg" />
|
||||
<None Include="Resources\alignverticalcenter.svg" />
|
||||
<None Include="Resources\alignhorizontalcenter.svg" />
|
||||
<None Include="Resources\columnheaders.svg" />
|
||||
<Content Include="Zooflow.ico" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user