AppStd/Monorepo
8
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Jonathan Jenne 2022-03-21 12:54:10 +01:00
commit 9ff649e793
4 changed files with 51 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
GUIs.ZooFlow/Search/frmFlowSearch1.Designer.vb generated
View File

@ -406,16 +406,16 @@ Partial Class frmFlowSearch1
Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.PictureEdit1.EditValue = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.ZooFlow_CW_DevExpress
Me.PictureEdit1.Location = New System.Drawing.Point(716, 542)
Me.PictureEdit1.Location = New System.Drawing.Point(666, 516)
Me.PictureEdit1.MenuManager = Me.RibbonControl1
Me.PictureEdit1.Name = "PictureEdit1"
Me.PictureEdit1.Properties.Appearance.BackColor = System.Drawing.Color.Lavender
Me.PictureEdit1.Properties.Appearance.BackColor = System.Drawing.SystemColors.Control
Me.PictureEdit1.Properties.Appearance.Options.UseBackColor = True
Me.PictureEdit1.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder
Me.PictureEdit1.Properties.PictureAlignment = System.Drawing.ContentAlignment.BottomRight
Me.PictureEdit1.Properties.ShowCameraMenuItem = DevExpress.XtraEditors.Controls.CameraMenuItemVisibility.[Auto]
Me.PictureEdit1.Properties.ZoomPercent = 300.0R
Me.PictureEdit1.Size = New System.Drawing.Size(208, 200)
Me.PictureEdit1.Size = New System.Drawing.Size(258, 223)
Me.PictureEdit1.TabIndex = 8
'
'txtSearchInput
@ -429,7 +429,7 @@ Partial Class frmFlowSearch1
'
'frmFlowSearch1
'
Me.Appearance.BackColor = System.Drawing.Color.Lavender
Me.Appearance.BackColor = System.Drawing.SystemColors.Control
Me.Appearance.Options.UseBackColor = True
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font

4
GUIs.ZooFlow/Search/frmFlowSearch1.vb
View File

@ -363,4 +363,8 @@ Public Class frmFlowSearch1
End If
End Sub
Private Sub PictureEdit1_EditValueChanged(sender As Object, e As EventArgs) Handles PictureEdit1.EditValueChanged
End Sub
End Class

65
GUIs.ZooFlow/frmFlowForm.Designer.vb generated
View File

@ -42,6 +42,7 @@ 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.txtQuicksearch1 = New DevExpress.XtraEditors.TextEdit()
Me.PictureEditQuicksearch1 = New DevExpress.XtraEditors.PictureEdit()
Me.BarManager1 = New DevExpress.XtraBars.BarManager(Me.components)
Me.Bar3 = New DevExpress.XtraBars.Bar()
@ -60,7 +61,6 @@ Partial Class frmFlowForm
Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem()
Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem()
Me.BarButtonItem5 = New DevExpress.XtraBars.BarButtonItem()
Me.txtQuicksearch1 = New DevExpress.XtraEditors.TextEdit()
Me.lblQuicksearch1 = New DevExpress.XtraEditors.LabelControl()
Me.Panel1 = New System.Windows.Forms.Panel()
Me.PictureEdit2 = New DevExpress.XtraEditors.PictureEdit()
@ -68,13 +68,14 @@ Partial Class frmFlowForm
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.Panel3 = New System.Windows.Forms.Panel()
Me.ContextMenuSystray.SuspendLayout()
CType(Me.PictureBoxPM, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.PictureBoxSearch, System.ComponentModel.ISupportInitialize).BeginInit()
Me.pnlQuicksearch1.SuspendLayout()
CType(Me.txtQuicksearch1.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.PictureEditQuicksearch1.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.txtQuicksearch1.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
Me.Panel1.SuspendLayout()
CType(Me.PictureEdit2.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
Me.Panel2.SuspendLayout()
@ -155,7 +156,7 @@ 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(21, 21)
Me.PictureBoxSearch.Location = New System.Drawing.Point(21, 226)
Me.PictureBoxSearch.Name = "PictureBoxSearch"
Me.PictureBoxSearch.Size = New System.Drawing.Size(158, 49)
Me.PictureBoxSearch.SizeMode = DevExpress.XtraEditors.SvgImageSizeMode.Zoom
@ -171,25 +172,41 @@ Partial Class frmFlowForm
'pnlQuicksearch1
'
Me.pnlQuicksearch1.BackColor = System.Drawing.Color.White
Me.pnlQuicksearch1.Controls.Add(Me.PictureBoxSearch)
Me.pnlQuicksearch1.Controls.Add(Me.PictureEditQuicksearch1)
Me.pnlQuicksearch1.Controls.Add(Me.Panel3)
Me.pnlQuicksearch1.Controls.Add(Me.txtQuicksearch1)
Me.pnlQuicksearch1.Controls.Add(Me.PictureEditQuicksearch1)
Me.pnlQuicksearch1.Controls.Add(Me.lblQuicksearch1)
Me.pnlQuicksearch1.Dock = System.Windows.Forms.DockStyle.Bottom
Me.pnlQuicksearch1.Location = New System.Drawing.Point(0, 281)
Me.pnlQuicksearch1.Location = New System.Drawing.Point(0, 333)
Me.pnlQuicksearch1.Name = "pnlQuicksearch1"
Me.pnlQuicksearch1.Size = New System.Drawing.Size(202, 129)
Me.pnlQuicksearch1.Size = New System.Drawing.Size(202, 77)
Me.pnlQuicksearch1.TabIndex = 16
Me.pnlQuicksearch1.Visible = False
'
'txtQuicksearch1
'
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.txtQuicksearch1.Location = New System.Drawing.Point(21, 40)
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(135, 26)
Me.txtQuicksearch1.TabIndex = 1
'
'PictureEditQuicksearch1
'
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.Location = New System.Drawing.Point(138, 42)
Me.PictureEditQuicksearch1.MenuManager = Me.BarManager1
Me.PictureEditQuicksearch1.Name = "PictureEditQuicksearch1"
Me.PictureEditQuicksearch1.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder
Me.PictureEditQuicksearch1.Properties.ShowCameraMenuItem = DevExpress.XtraEditors.Controls.CameraMenuItemVisibility.[Auto]
Me.PictureEditQuicksearch1.Size = New System.Drawing.Size(32, 33)
Me.PictureEditQuicksearch1.Properties.SizeMode = DevExpress.XtraEditors.Controls.PictureSizeMode.Zoom
Me.PictureEditQuicksearch1.Size = New System.Drawing.Size(64, 24)
Me.PictureEditQuicksearch1.TabIndex = 17
'
'BarManager1
@ -330,25 +347,13 @@ Partial Class frmFlowForm
Me.BarButtonItem5.Id = 5
Me.BarButtonItem5.Name = "BarButtonItem5"
'
'txtQuicksearch1
'
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.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.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
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(21, 76)
Me.lblQuicksearch1.Location = New System.Drawing.Point(21, 19)
Me.lblQuicksearch1.Name = "lblQuicksearch1"
Me.lblQuicksearch1.Size = New System.Drawing.Size(69, 15)
Me.lblQuicksearch1.TabIndex = 0
@ -380,6 +385,7 @@ Partial Class frmFlowForm
'
Me.Panel2.Controls.Add(Me.PictureBoxPM)
Me.Panel2.Controls.Add(Me.pnlQuicksearch1)
Me.Panel2.Controls.Add(Me.PictureBoxSearch)
Me.Panel2.Dock = System.Windows.Forms.DockStyle.Fill
Me.Panel2.Location = New System.Drawing.Point(0, 202)
Me.Panel2.Name = "Panel2"
@ -407,6 +413,14 @@ Partial Class frmFlowForm
Me.TaskBadge.TargetElement = Me.PictureBoxPM
Me.TaskBadge.TargetElementRegion = DevExpress.Utils.VisualEffects.TargetElementRegion.Control
'
'Panel3
'
Me.Panel3.BackColor = System.Drawing.Color.Black
Me.Panel3.Location = New System.Drawing.Point(21, 3)
Me.Panel3.Name = "Panel3"
Me.Panel3.Size = New System.Drawing.Size(158, 10)
Me.Panel3.TabIndex = 17
'
'frmFlowForm
'
Me.AllowDrop = True
@ -435,9 +449,9 @@ Partial Class frmFlowForm
CType(Me.PictureBoxSearch, System.ComponentModel.ISupportInitialize).EndInit()
Me.pnlQuicksearch1.ResumeLayout(False)
Me.pnlQuicksearch1.PerformLayout()
CType(Me.txtQuicksearch1.Properties, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.PictureEditQuicksearch1.Properties, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.txtQuicksearch1.Properties, System.ComponentModel.ISupportInitialize).EndInit()
Me.Panel1.ResumeLayout(False)
CType(Me.PictureEdit2.Properties, System.ComponentModel.ISupportInitialize).EndInit()
Me.Panel2.ResumeLayout(False)
@ -487,4 +501,5 @@ Partial Class frmFlowForm
Friend WithEvents TaskBadge As DevExpress.Utils.VisualEffects.Badge
Friend WithEvents PictureEditQuicksearch1 As PictureEdit
Friend WithEvents PictureEdit2 As PictureEdit
Friend WithEvents Panel3 As Panel
End Class

7
GUIs.ZooFlow/frmServiceConfig.vb
View File

@ -25,15 +25,15 @@ Public Class frmServiceConfig
Client = New Client(My.LogConfig, oIPAddress, oPort)
lblStatus.Text = "Verbindung wird hergestellt..."
lblStatus.Text = "Trying to create connection..."
Dim oResult = Client.Connect()
If oResult = True Then
My.SystemConfig.AppServerConfig = $"{oIPAddress}:{oPort.ToString}"
My.SystemConfigManager.Save()
lblStatus.Text = "Verbindung hergestellt."
lblStatus.Text = "Successfully Connected to service"
Else
lblStatus.Text = "Verbindung fehlgeschlagen."
lblStatus.Text = "Connection not successful."
' TODO: Make a connection test that is as elaborate as this one :D
'Select Case oResult
' Case ClassService.ConnectionTestResult.NotFound
@ -48,7 +48,6 @@ Public Class frmServiceConfig
End If
DialogResult = DialogResult.OK
Close()
Catch ex As Exception
Logger.Error(ex)
MsgBox("Fehler beim Verbindungsaufbau", MsgBoxStyle.Critical, Text)