diff --git a/GUIs.ZooFlow/My Project/Resources.Designer.vb b/GUIs.ZooFlow/My Project/Resources.Designer.vb index 6cc97e74..9655d72a 100644 --- a/GUIs.ZooFlow/My Project/Resources.Designer.vb +++ b/GUIs.ZooFlow/My Project/Resources.Designer.vb @@ -1450,6 +1450,26 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property ZooFlow_drop() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("ZooFlow_drop", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property ZooFlow_drop_drag() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("ZooFlow_drop_drag", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -1480,6 +1500,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property ZooFlow_Sidebar_individuelle_suche() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("ZooFlow_Sidebar_individuelle_suche", 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 4d7283ca..be2fb105 100644 --- a/GUIs.ZooFlow/My Project/Resources.resx +++ b/GUIs.ZooFlow/My Project/Resources.resx @@ -121,8 +121,8 @@ ..\Resources\actions_addcircled5.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\ZooflowTitle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\CW_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\actions_send2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -238,6 +238,9 @@ ..\Resources\actions_deletecircled1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\ZooflowTitle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\FLOW_Sidebar_Task_aktiv.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -277,6 +280,9 @@ ..\Resources\actions_check3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\save5.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\updatedataextract.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -307,8 +313,8 @@ ..\Resources\actions_addcircled1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\documentproperties.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\ZooFlow_G_DevExpress.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 @@ -328,9 +334,6 @@ ..\Resources\markcomplete.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\ZooFlow_G_DevExpress.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\save6.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -358,8 +361,8 @@ ..\Resources\windows.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 + + ..\Resources\editdatasource1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\save4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -370,12 +373,18 @@ ..\Resources\managedatasource1.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 + ..\Resources\pagesetup.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_drop_drag.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\actions_deletecircled6.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -403,15 +412,15 @@ ..\Resources\actions_send1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\editdatasource1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\del5.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\ZooFlow_Sidebar_TOP_Drop.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\FLOW_Sidebar_Search_aktiv.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\save3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -424,8 +433,8 @@ ..\Resources\actions_edit2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\save5.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\FLOW_Sidebar_Search_inaktiv.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\actions_add1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -460,6 +469,9 @@ ..\Resources\4_GLOBIX_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\documentproperties.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\StatusAnnotations_Information_16xLG_color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -511,8 +523,8 @@ ..\Resources\doublenext1.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 + + ..\Resources\ZooFlow_drop.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\1_LOGO_ZOO_FLOW_DROP2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -547,10 +559,7 @@ ..\Resources\del3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\FLOW_Sidebar_Search_aktiv.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - ..\Resources\FLOW_Sidebar_Search_inaktiv.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\ZooFlow_Sidebar_individuelle_suche.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/Resources/ZooFlow_Sidebar_individuelle_suche.svg b/GUIs.ZooFlow/Resources/ZooFlow_Sidebar_individuelle_suche.svg new file mode 100644 index 00000000..b17768ba --- /dev/null +++ b/GUIs.ZooFlow/Resources/ZooFlow_Sidebar_individuelle_suche.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + diff --git a/GUIs.ZooFlow/Resources/ZooFlow_drop.png b/GUIs.ZooFlow/Resources/ZooFlow_drop.png new file mode 100644 index 00000000..499d168f Binary files /dev/null and b/GUIs.ZooFlow/Resources/ZooFlow_drop.png differ diff --git a/GUIs.ZooFlow/Resources/ZooFlow_drop_drag.png b/GUIs.ZooFlow/Resources/ZooFlow_drop_drag.png new file mode 100644 index 00000000..c017fadd Binary files /dev/null and b/GUIs.ZooFlow/Resources/ZooFlow_drop_drag.png differ diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj index 979da98d..5556e3a4 100644 --- a/GUIs.ZooFlow/ZooFlow.vbproj +++ b/GUIs.ZooFlow/ZooFlow.vbproj @@ -1085,6 +1085,9 @@ + + + diff --git a/GUIs.ZooFlow/frmFlowForm.Designer.vb b/GUIs.ZooFlow/frmFlowForm.Designer.vb index 449b0b42..8659070a 100644 --- a/GUIs.ZooFlow/frmFlowForm.Designer.vb +++ b/GUIs.ZooFlow/frmFlowForm.Designer.vb @@ -42,13 +42,9 @@ Partial Class frmFlowForm Me.PictureBoxSearch = New DevExpress.XtraEditors.SvgImageBox() Me.TimerFolderwatch = New System.Windows.Forms.Timer(Me.components) Me.pnlQuicksearch1 = New System.Windows.Forms.Panel() - Me.SvgImageBox2 = New DevExpress.XtraEditors.SvgImageBox() - Me.TextEdit1 = New DevExpress.XtraEditors.TextEdit() + Me.txtQuicksearch1 = New DevExpress.XtraEditors.TextEdit() Me.lblQuicksearch1 = New DevExpress.XtraEditors.LabelControl() - Me.Panel1 = New System.Windows.Forms.Panel() - Me.SvgImageBox1 = New DevExpress.XtraEditors.SvgImageBox() - Me.Panel2 = New System.Windows.Forms.Panel() - Me.PopupMenu1 = New DevExpress.XtraBars.PopupMenu(Me.components) + Me.PictureEditQuicksearch1 = New DevExpress.XtraEditors.PictureEdit() Me.BarManager1 = New DevExpress.XtraBars.BarManager(Me.components) Me.Bar3 = New DevExpress.XtraBars.Bar() Me.BarSubItem1 = New DevExpress.XtraBars.BarSubItem() @@ -66,19 +62,23 @@ Partial Class frmFlowForm Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem5 = New DevExpress.XtraBars.BarButtonItem() + Me.Panel1 = New System.Windows.Forms.Panel() + Me.PictureEdit2 = New DevExpress.XtraEditors.PictureEdit() + Me.Panel2 = New System.Windows.Forms.Panel() + Me.PopupMenu1 = New DevExpress.XtraBars.PopupMenu(Me.components) Me.AdornerUIManager1 = New DevExpress.Utils.VisualEffects.AdornerUIManager(Me.components) Me.TaskBadge = New DevExpress.Utils.VisualEffects.Badge() Me.ContextMenuSystray.SuspendLayout() CType(Me.PictureBoxPM, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBoxSearch, System.ComponentModel.ISupportInitialize).BeginInit() Me.pnlQuicksearch1.SuspendLayout() - CType(Me.SvgImageBox2, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtQuicksearch1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.PictureEditQuicksearch1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel1.SuspendLayout() - CType(Me.SvgImageBox1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.PictureEdit2.Properties, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel2.SuspendLayout() CType(Me.PopupMenu1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.AdornerUIManager1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' @@ -141,10 +141,10 @@ Partial Class frmFlowForm Me.PictureBoxPM.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.PictureBoxPM.Cursor = System.Windows.Forms.Cursors.Hand Me.PictureBoxPM.ItemHitTestType = DevExpress.XtraEditors.ItemHitTestType.BoundingBox - Me.PictureBoxPM.Location = New System.Drawing.Point(12, 22) + Me.PictureBoxPM.Location = New System.Drawing.Point(21, 22) Me.PictureBoxPM.Name = "PictureBoxPM" - Me.PictureBoxPM.Size = New System.Drawing.Size(178, 58) - Me.PictureBoxPM.SizeMode = DevExpress.XtraEditors.SvgImageSizeMode.Stretch + Me.PictureBoxPM.Size = New System.Drawing.Size(158, 58) + Me.PictureBoxPM.SizeMode = DevExpress.XtraEditors.SvgImageSizeMode.Zoom Me.PictureBoxPM.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.FLOW_Sidebar_Task_inaktiv Me.PictureBoxPM.TabIndex = 14 Me.PictureBoxPM.Text = "SvgImageBox1" @@ -155,10 +155,10 @@ Partial Class frmFlowForm Me.PictureBoxSearch.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.PictureBoxSearch.Cursor = System.Windows.Forms.Cursors.Hand Me.PictureBoxSearch.ItemHitTestType = DevExpress.XtraEditors.ItemHitTestType.BoundingBox - Me.PictureBoxSearch.Location = New System.Drawing.Point(12, 17) + Me.PictureBoxSearch.Location = New System.Drawing.Point(21, 21) Me.PictureBoxSearch.Name = "PictureBoxSearch" - Me.PictureBoxSearch.Size = New System.Drawing.Size(178, 53) - Me.PictureBoxSearch.SizeMode = DevExpress.XtraEditors.SvgImageSizeMode.Stretch + Me.PictureBoxSearch.Size = New System.Drawing.Size(158, 49) + Me.PictureBoxSearch.SizeMode = DevExpress.XtraEditors.SvgImageSizeMode.Zoom Me.PictureBoxSearch.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.FLOW_Sidebar_Search_inaktiv Me.PictureBoxSearch.TabIndex = 13 Me.PictureBoxSearch.Text = "SvgImageBox1" @@ -171,89 +171,50 @@ Partial Class frmFlowForm 'pnlQuicksearch1 ' Me.pnlQuicksearch1.BackColor = System.Drawing.Color.White - Me.pnlQuicksearch1.Controls.Add(Me.SvgImageBox2) Me.pnlQuicksearch1.Controls.Add(Me.PictureBoxSearch) - Me.pnlQuicksearch1.Controls.Add(Me.TextEdit1) + Me.pnlQuicksearch1.Controls.Add(Me.PictureEditQuicksearch1) + Me.pnlQuicksearch1.Controls.Add(Me.txtQuicksearch1) Me.pnlQuicksearch1.Controls.Add(Me.lblQuicksearch1) Me.pnlQuicksearch1.Dock = System.Windows.Forms.DockStyle.Bottom - Me.pnlQuicksearch1.Location = New System.Drawing.Point(0, 301) + Me.pnlQuicksearch1.Location = New System.Drawing.Point(0, 281) Me.pnlQuicksearch1.Name = "pnlQuicksearch1" Me.pnlQuicksearch1.Size = New System.Drawing.Size(202, 129) Me.pnlQuicksearch1.TabIndex = 16 Me.pnlQuicksearch1.Visible = False ' - 'SvgImageBox2 + 'txtQuicksearch1 ' - Me.SvgImageBox2.BackColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer)) - Me.SvgImageBox2.ItemAppearance.Normal.FillColor = System.Drawing.Color.White - Me.SvgImageBox2.Location = New System.Drawing.Point(163, 97) - Me.SvgImageBox2.Name = "SvgImageBox2" - Me.SvgImageBox2.Padding = New System.Windows.Forms.Padding(2) - Me.SvgImageBox2.Size = New System.Drawing.Size(27, 26) - Me.SvgImageBox2.SizeMode = DevExpress.XtraEditors.SvgImageSizeMode.Stretch - Me.SvgImageBox2.SvgImage = CType(resources.GetObject("SvgImageBox2.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.SvgImageBox2.TabIndex = 18 - Me.SvgImageBox2.Text = "SvgImageBox2" - ' - 'TextEdit1 - ' - Me.TextEdit1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Me.txtQuicksearch1.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(12, 97) - Me.TextEdit1.Name = "TextEdit1" - Me.TextEdit1.Properties.Appearance.BackColor = System.Drawing.Color.LightGray - 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.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder - Me.TextEdit1.Size = New System.Drawing.Size(149, 26) - Me.TextEdit1.TabIndex = 1 + Me.txtQuicksearch1.Location = New System.Drawing.Point(21, 97) + Me.txtQuicksearch1.Name = "txtQuicksearch1" + Me.txtQuicksearch1.Properties.Appearance.BackColor = System.Drawing.Color.LightGray + Me.txtQuicksearch1.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtQuicksearch1.Properties.Appearance.Options.UseBackColor = True + Me.txtQuicksearch1.Properties.Appearance.Options.UseFont = True + Me.txtQuicksearch1.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder + Me.txtQuicksearch1.Size = New System.Drawing.Size(127, 26) + Me.txtQuicksearch1.TabIndex = 1 ' 'lblQuicksearch1 ' Me.lblQuicksearch1.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.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(12, 76) + Me.lblQuicksearch1.Location = New System.Drawing.Point(21, 76) Me.lblQuicksearch1.Name = "lblQuicksearch1" Me.lblQuicksearch1.Size = New System.Drawing.Size(69, 15) Me.lblQuicksearch1.TabIndex = 0 Me.lblQuicksearch1.Text = "Schnellsuche" ' - 'Panel1 + 'PictureEditQuicksearch1 ' - Me.Panel1.Controls.Add(Me.SvgImageBox1) - Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top - Me.Panel1.Location = New System.Drawing.Point(0, 0) - Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(202, 182) - Me.Panel1.TabIndex = 18 - ' - 'SvgImageBox1 - ' - Me.SvgImageBox1.Dock = System.Windows.Forms.DockStyle.Top - Me.SvgImageBox1.ImageAlignment = System.Drawing.ContentAlignment.TopCenter - Me.SvgImageBox1.Location = New System.Drawing.Point(0, 0) - Me.SvgImageBox1.Name = "SvgImageBox1" - Me.SvgImageBox1.Size = New System.Drawing.Size(202, 198) - Me.SvgImageBox1.SizeMode = DevExpress.XtraEditors.SvgImageSizeMode.Stretch - Me.SvgImageBox1.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.ZooFlow_Sidebar_TOP - Me.SvgImageBox1.TabIndex = 16 - Me.SvgImageBox1.Text = "SvgImageBox1" - ' - 'Panel2 - ' - Me.Panel2.Controls.Add(Me.PictureBoxPM) - Me.Panel2.Controls.Add(Me.pnlQuicksearch1) - Me.Panel2.Dock = System.Windows.Forms.DockStyle.Fill - Me.Panel2.Location = New System.Drawing.Point(0, 182) - Me.Panel2.Name = "Panel2" - Me.Panel2.Size = New System.Drawing.Size(202, 430) - Me.Panel2.TabIndex = 17 - ' - 'PopupMenu1 - ' - Me.PopupMenu1.Manager = Me.BarManager1 - Me.PopupMenu1.Name = "PopupMenu1" + Me.PictureEditQuicksearch1.EditValue = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.ZooFlow_Sidebar_individuelle_suche + Me.PictureEditQuicksearch1.Location = New System.Drawing.Point(147, 93) + Me.PictureEditQuicksearch1.MenuManager = Me.BarManager1 + Me.PictureEditQuicksearch1.Name = "PictureEditQuicksearch1" + Me.PictureEditQuicksearch1.Properties.ShowCameraMenuItem = DevExpress.XtraEditors.Controls.CameraMenuItemVisibility.[Auto] + Me.PictureEditQuicksearch1.Size = New System.Drawing.Size(32, 33) + Me.PictureEditQuicksearch1.TabIndex = 17 ' 'BarManager1 ' @@ -393,6 +354,43 @@ Partial Class frmFlowForm Me.BarButtonItem5.Id = 5 Me.BarButtonItem5.Name = "BarButtonItem5" ' + 'Panel1 + ' + Me.Panel1.Controls.Add(Me.PictureEdit2) + Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top + Me.Panel1.Location = New System.Drawing.Point(0, 0) + Me.Panel1.Name = "Panel1" + Me.Panel1.Size = New System.Drawing.Size(202, 202) + Me.Panel1.TabIndex = 18 + ' + 'PictureEdit2 + ' + Me.PictureEdit2.Dock = System.Windows.Forms.DockStyle.Fill + Me.PictureEdit2.EditValue = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.ZooFlow_drop + Me.PictureEdit2.Location = New System.Drawing.Point(0, 0) + Me.PictureEdit2.MenuManager = Me.BarManager1 + Me.PictureEdit2.Name = "PictureEdit2" + Me.PictureEdit2.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder + Me.PictureEdit2.Properties.ShowCameraMenuItem = DevExpress.XtraEditors.Controls.CameraMenuItemVisibility.[Auto] + Me.PictureEdit2.Properties.SizeMode = DevExpress.XtraEditors.Controls.PictureSizeMode.Zoom + Me.PictureEdit2.Size = New System.Drawing.Size(202, 202) + Me.PictureEdit2.TabIndex = 18 + ' + 'Panel2 + ' + Me.Panel2.Controls.Add(Me.PictureBoxPM) + Me.Panel2.Controls.Add(Me.pnlQuicksearch1) + Me.Panel2.Dock = System.Windows.Forms.DockStyle.Fill + Me.Panel2.Location = New System.Drawing.Point(0, 202) + Me.Panel2.Name = "Panel2" + Me.Panel2.Size = New System.Drawing.Size(202, 410) + Me.Panel2.TabIndex = 17 + ' + 'PopupMenu1 + ' + Me.PopupMenu1.Manager = Me.BarManager1 + Me.PopupMenu1.Name = "PopupMenu1" + ' 'AdornerUIManager1 ' Me.AdornerUIManager1.Elements.Add(Me.TaskBadge) @@ -437,13 +435,13 @@ Partial Class frmFlowForm CType(Me.PictureBoxSearch, System.ComponentModel.ISupportInitialize).EndInit() Me.pnlQuicksearch1.ResumeLayout(False) Me.pnlQuicksearch1.PerformLayout() - CType(Me.SvgImageBox2, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtQuicksearch1.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.PictureEditQuicksearch1.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).EndInit() Me.Panel1.ResumeLayout(False) - CType(Me.SvgImageBox1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.PictureEdit2.Properties, System.ComponentModel.ISupportInitialize).EndInit() Me.Panel2.ResumeLayout(False) CType(Me.PopupMenu1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.AdornerUIManager1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -463,7 +461,7 @@ Partial Class frmFlowForm Friend WithEvents ToolStripSeparator2 As ToolStripSeparator Friend WithEvents ToolStripSeparator3 As ToolStripSeparator Friend WithEvents pnlQuicksearch1 As Panel - Friend WithEvents TextEdit1 As TextEdit + Friend WithEvents txtQuicksearch1 As TextEdit Friend WithEvents lblQuicksearch1 As LabelControl Friend WithEvents Panel1 As Panel Friend WithEvents PopupMenu1 As DevExpress.XtraBars.PopupMenu @@ -485,8 +483,8 @@ Partial Class frmFlowForm Friend WithEvents BarButtonItem8 As DevExpress.XtraBars.BarButtonItem Friend WithEvents Panel2 As Panel Friend WithEvents BarButtonItemGlobixGE As DevExpress.XtraBars.BarButtonItem - Friend WithEvents SvgImageBox1 As SvgImageBox - Friend WithEvents SvgImageBox2 As SvgImageBox Friend WithEvents AdornerUIManager1 As DevExpress.Utils.VisualEffects.AdornerUIManager Friend WithEvents TaskBadge As DevExpress.Utils.VisualEffects.Badge + Friend WithEvents PictureEditQuicksearch1 As PictureEdit + Friend WithEvents PictureEdit2 As PictureEdit End Class diff --git a/GUIs.ZooFlow/frmFlowForm.resx b/GUIs.ZooFlow/frmFlowForm.resx index 5b1cfc0c..d632a6d3 100644 --- a/GUIs.ZooFlow/frmFlowForm.resx +++ b/GUIs.ZooFlow/frmFlowForm.resx @@ -1965,31 +1965,10 @@ 716, 17 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAGQCAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku - UmVke2ZpbGw6I0QxMUMxQzt9CgkuWWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuR3JlZW57ZmlsbDojMDM5 - QzIzO30KPC9zdHlsZT4NCiAgPGcgaWQ9IlZpc2liaWxpdHkiPg0KICAgIDxjaXJjbGUgY3g9IjE2IiBj - eT0iMTYiIHI9IjQiIGNsYXNzPSJCbGFjayIgLz4NCiAgICA8cGF0aCBkPSJNMTYsOEM4LDgsMiwxNiwy - LDE2czYsOCwxNCw4czE0LTgsMTQtOFMyNCw4LDE2LDh6IE0xNiwyMmMtMy4zLDAtNi0yLjctNi02czIu - Ny02LDYtNnM2LDIuNyw2LDYgICBTMTkuMywyMiwxNiwyMnoiIGNsYXNzPSJCbGFjayIgLz4NCiAgPC9n - Pg0KPC9zdmc+Cw== - - - - 865, 17 - 990, 17 + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 @@ -2038,7 +2017,10 @@ LDIwLDE2LDIweiIgY2xhc3M9IkJsdWUiIC8+DQogIDwvZz4NCjwvc3ZnPgs= + + 865, 17 + - 1115, 17 + 17, 56 \ No newline at end of file diff --git a/GUIs.ZooFlow/frmFlowForm.vb b/GUIs.ZooFlow/frmFlowForm.vb index 06b58481..ddef51f9 100644 --- a/GUIs.ZooFlow/frmFlowForm.vb +++ b/GUIs.ZooFlow/frmFlowForm.vb @@ -543,10 +543,10 @@ Public Class frmFlowForm Private Sub frmFlowForm_DragEnter(sender As Object, e As DragEventArgs) Handles MyBase.DragEnter If My.Application.GlobixDropAreaStyle = "PROGRESSIVE" Then 'PictureBoxDragDrop.Image = My.Resources._1_LOGO_ZOO_FLOW_DROP3 - SvgImageBox1.SvgImage = My.Resources.ZooFlow_Sidebar_TOP_Drop + PictureEdit2.Image = My.Resources.ZooFlow_drop_drag Else 'PictureBoxDragDrop.Image = My.Resources._1_LOGO_ZOO_FLOW_DROP2 - SvgImageBox1.SvgImage = My.Resources.ZooFlow_Sidebar_TOP_Drop + PictureEdit2.Image = My.Resources.ZooFlow_drop_drag End If e.Effect = DragDropEffects.Copy @@ -559,7 +559,7 @@ Public Class frmFlowForm Private Sub frmFlowForm_DragLeave(sender As Object, e As EventArgs) Handles Me.DragLeave 'PictureBoxDragDrop.Image = My.Resources._1_LOGO_ZOO_FLOW1 - SvgImageBox1.SvgImage = My.Resources.ZooFlow_Sidebar_TOP + PictureEdit2.Image = My.Resources.ZooFlow_drop End Sub Private Sub PictureBoxAbo_Click(sender As Object, e As EventArgs) @@ -706,7 +706,7 @@ Public Class frmFlowForm My.Application.Globix.DTACTUAL_FILES.Rows.Count > 0 Then Globix_Open_IndexDialog() - SvgImageBox1.SvgImage = My.Resources.ZooFlow_Sidebar_TOP + PictureEdit2.Image = My.Resources.ZooFlow_drop_drag End If Next Catch ex As Exception @@ -1195,7 +1195,7 @@ Public Class frmFlowForm End Try End Function - Private Async Sub TextEdit1_KeyUp(sender As Object, e As KeyEventArgs) Handles TextEdit1.KeyUp + Private Async Sub TextEdit1_KeyUp(sender As Object, e As KeyEventArgs) Handles txtQuicksearch1.KeyUp If e.KeyCode = Keys.Return Then Await CheckRunSearch1() End If @@ -1203,7 +1203,7 @@ Public Class frmFlowForm Async Function CheckRunSearch1() As Threading.Tasks.Task - Dim oSearchText = TextEdit1.Text + Dim oSearchText = txtQuicksearch1.Text If oSearchText <> String.Empty Then Dim oHandle = SplashScreenManager.ShowOverlayForm(Me) @@ -1221,7 +1221,7 @@ Public Class frmFlowForm End If End Function Private Async Function PictureEdit1_Click(sender As Object, e As EventArgs) As Task Handles PictureBoxSearch.Click - If TextEdit1.Text = String.Empty Then + If txtQuicksearch1.Text = String.Empty Then Open_FlowSearch() Return